From 6c054c80d15fde3eb29e7ca19296cdad3ad0542e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 26 Nov 2021 15:41:29 +0800
Subject: [PATCH 001/256] =?UTF-8?q?refactor:=20=E5=90=8C=E6=AD=A5=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E7=9A=84=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/commons/utils/ServiceUtils.java  | 4 ++++
 .../metersphere/track/issue/AbstractIssuePlatform.java   | 8 +++-----
 .../java/io/metersphere/track/issue/JiraPlatform.java    | 1 +
 .../java/io/metersphere/track/issue/TapdPlatform.java    | 2 ++
 .../java/io/metersphere/track/issue/ZentaoPlatform.java  | 9 +++++++++
 .../java/io/metersphere/track/service/IssuesService.java | 2 +-
 backend/src/main/java/io/metersphere/xpack               | 2 +-
 frontend/src/network/test-plan.js                        | 3 ++-
 8 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java b/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java
index 6d69db11eb..7c04b0ad8c 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java
@@ -58,6 +58,10 @@ public class ServiceUtils {
         return orders;
     }
 
+    public static List<OrderRequest> getDefaultOrderByField(List<OrderRequest> orders, String field) {
+        return getDefaultOrderByField(null, orders, field);
+    }
+
     /**
      * 获取前端全选的id列表
      *
diff --git a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
index e1193f5c7b..d5682f3d0a 100644
--- a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
@@ -401,10 +401,11 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
     }
 
     protected Map<String, IssuesWithBLOBs> getUuIdMap(List<IssuesWithBLOBs> issues) {
+        HashMap<String, IssuesWithBLOBs> issueMap = new HashMap<>();
         if (org.apache.commons.collections.CollectionUtils.isNotEmpty(issues)) {
-            return issues.stream().collect(Collectors.toMap(Issues::getPlatformId, i -> i));
+            issues.forEach(item -> issueMap.put(item.getPlatformId(), item));
         }
-        return new HashMap<>();
+        return issueMap;
     }
 
     protected void deleteSyncIssue(List<String> ids) {
@@ -456,10 +457,7 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
         issue.setProjectId(projectId);
         issue.setId(UUID.randomUUID().toString());
         issue.setPlatformId(platformId);
-        issue.setCreateTime(System.currentTimeMillis());
-        issue.setUpdateTime(System.currentTimeMillis());
         issue.setCreator(SessionUtils.getUserId());
         issue.setNum(nextNum);
-        issuesMapper.insert(issue); // 批量新增
     }
 }
diff --git a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
index b1266e6598..4933644f23 100644
--- a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
@@ -76,6 +76,7 @@ public class JiraPlatform extends AbstractIssuePlatform {
         JSONObject assignee = (JSONObject) fields.get("assignee");
         issue.setTitle(fields.getString("summary"));
         issue.setCreateTime(fields.getLong("created"));
+        issue.setUpdateTime(fields.getLong("updated"));
         issue.setLastmodify(assignee == null ? "" : assignee.getString("displayName"));
         issue.setDescription(description);
         issue.setPlatformStatus(status);
diff --git a/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java b/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java
index 62590d9e11..e370617cfb 100644
--- a/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java
@@ -240,6 +240,8 @@ public class TapdPlatform extends AbstractIssuePlatform {
         issue.setDescription(htmlDesc2MsDesc(issue.getDescription()));
         issue.setCustomFields(syncIssueCustomField(issue.getCustomFields(), bug));
         issue.setPlatform(key);
+        issue.setCreateTime(bug.getLong("created"));
+        issue.setUpdateTime(bug.getLong("modified"));
         return issue;
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java b/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
index 8a1c750cc4..d066f2c4ca 100644
--- a/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
@@ -143,6 +143,15 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
         issue.setDescription(steps);
         issue.setReporter(bugObj.getOpenedBy());
         issue.setPlatform(key);
+        try {
+            issue.setCreateTime(bug.getLong("openedDate"));
+            issue.setUpdateTime(bug.getLong("lastEditedDate"));
+        } catch (Exception e) {
+            LogUtil.error("update zentao time" + e.getMessage());
+        }
+        if (issue.getUpdateTime() == null) {
+            issue.setUpdateTime(System.currentTimeMillis());
+        }
         issue.setCustomFields(syncIssueCustomField(issue.getCustomFields(), bug));
         return issue;
     }
diff --git a/backend/src/main/java/io/metersphere/track/service/IssuesService.java b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
index e00055144a..83240c91d1 100644
--- a/backend/src/main/java/io/metersphere/track/service/IssuesService.java
+++ b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
@@ -338,7 +338,7 @@ public class IssuesService {
     }
 
     public List<IssuesDao> list(IssuesRequest request) {
-        request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
+        request.setOrders(ServiceUtils.getDefaultOrderByField(request.getOrders(), "create_time"));
         List<IssuesDao> issues = extIssuesMapper.getIssues(request);
 
         List<String> ids = issues.stream()
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 044899d938..269d23d500 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 044899d93802a7a30ba7453aaa58bd78af3a84a9
+Subproject commit 269d23d5004ee49a9e82a977027ca72757d3056a
diff --git a/frontend/src/network/test-plan.js b/frontend/src/network/test-plan.js
index 306f54ddbd..2c69395dfc 100644
--- a/frontend/src/network/test-plan.js
+++ b/frontend/src/network/test-plan.js
@@ -142,5 +142,6 @@ export function editTestPlanLoadCaseOrder(request, callback) {
 }
 
 export function getPlanStageOption(callback) {
-  return baseGet('/test/plan/get/stage/option/' + getCurrentWorkspaceId(), callback);
+  let wId = getCurrentWorkspaceId();
+  return wId ? baseGet('/test/plan/get/stage/option/' + wId, callback) : {};
 }

From 619f2c283dc73fc73a3117651c2c2acbbe2d23d4 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Fri, 26 Nov 2021 15:36:54 +0800
Subject: [PATCH 002/256] =?UTF-8?q?fix(=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5):=20=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96=E9=80=9A=E7=9F=A5=E7=9A=84=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008385 --user=刘瑞斌 【消息通知】jenkins执行场景，机器人通知文案优化 https://www.tapd.cn/55049933/s/1075569
---
 .../java/io/metersphere/api/service/TestResultService.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/TestResultService.java b/backend/src/main/java/io/metersphere/api/service/TestResultService.java
index 9fe412c105..c866024815 100644
--- a/backend/src/main/java/io/metersphere/api/service/TestResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/TestResultService.java
@@ -187,8 +187,8 @@ public class TestResultService {
 
         String subject = "";
         String event = "";
-        String successContext = "${operator}执行接口测试成功: ${name}" + ", 报告: ${reportUrl}";
-        String failedContext = "${operator}执行接口测试失败: ${name}" + ", 报告: ${reportUrl}";
+        String successContext = "${operator}执行接口自动化成功: ${name}" + ", 报告: ${reportUrl}";
+        String failedContext = "${operator}执行接口自动化失败: ${name}" + ", 报告: ${reportUrl}";
 
         if (StringUtils.equals(ReportTriggerMode.API.name(), report.getTriggerMode())) {
             subject = Translator.get("task_notification_jenkins");

From bf4f980757a5612fe3cde1dc814de8691240bce7 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Fri, 26 Nov 2021 16:00:24 +0800
Subject: [PATCH 003/256] =?UTF-8?q?build:=20=E6=8C=87=E5=AE=9Aguava?=
 =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/backend/pom.xml b/backend/pom.xml
index 952fbe8070..ce7b3ed658 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -464,6 +464,13 @@
             <version>2.4</version>
             <classifier>jdk15</classifier>
         </dependency>
+
+        <dependency>
+            <artifactId>guava</artifactId>
+            <groupId>com.google.guava</groupId>
+            <version>31.0.1-jre</version>
+        </dependency>
+
     </dependencies>
 
     <build>

From fb6edca586629ed567e508b70a6e2bf72dbdeed7 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 26 Nov 2021 17:07:45 +0800
Subject: [PATCH 004/256] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE):=20=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008303 --user=lyh 【系统设置】用户组与权限，只给了用户模块的查看权限，但是能进行操作
https://www.tapd.cn/55049933/s/1075611
---
 .../db/migration/V100__v1.15.2_release.sql    | 24 ++++++++++++++
 backend/src/main/resources/permission.json    | 32 ++++++++++++-------
 .../settings/system/BaseSetting.vue           |  2 +-
 .../settings/system/EmailSetting.vue          |  2 +-
 .../settings/system/LdapSetting.vue           |  2 +-
 .../settings/system/SystemWorkspace.vue       |  7 ++--
 .../settings/system/group/UserGroup.vue       |  6 +++-
 .../environment/EnvironmentGroupList.vue      | 10 ++++--
 frontend/src/business/components/xpack        |  2 +-
 9 files changed, 66 insertions(+), 21 deletions(-)
 create mode 100644 backend/src/main/resources/db/migration/V100__v1.15.2_release.sql

diff --git a/backend/src/main/resources/db/migration/V100__v1.15.2_release.sql b/backend/src/main/resources/db/migration/V100__v1.15.2_release.sql
new file mode 100644
index 0000000000..c9ccb69015
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V100__v1.15.2_release.sql
@@ -0,0 +1,24 @@
+-- project admin
+insert into user_group_permission (id, group_id, permission_id, module_id)
+values (UUID(), 'project_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+CREATE_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
+insert into user_group_permission (id, group_id, permission_id, module_id)
+values (UUID(), 'project_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
+insert into user_group_permission (id, group_id, permission_id, module_id)
+values (UUID(), 'project_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+COPY_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
+insert into user_group_permission (id, group_id, permission_id, module_id)
+values (UUID(), 'project_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
+-- project member
+insert into user_group_permission (id, group_id, permission_id, module_id)
+values (UUID(), 'project_member', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+CREATE_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
+insert into user_group_permission (id, group_id, permission_id, module_id)
+values (UUID(), 'project_member', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
+insert into user_group_permission (id, group_id, permission_id, module_id)
+values (UUID(), 'project_member', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+COPY_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
+insert into user_group_permission (id, group_id, permission_id, module_id)
+values (UUID(), 'project_member', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
+-- delete old permission
+delete
+from user_group_permission
+where permission_id = 'WORKSPACE_TEMPLATE:READ+REPORT_TEMPLATE';
+
+
diff --git a/backend/src/main/resources/permission.json b/backend/src/main/resources/permission.json
index 088158dd2e..60354593bf 100644
--- a/backend/src/main/resources/permission.json
+++ b/backend/src/main/resources/permission.json
@@ -105,11 +105,6 @@
       "name": "编辑",
       "resourceId": "SYSTEM_SETTING"
     },
-    {
-      "id": "SYSTEM_SETTING:READ+AUTH_MANAGE",
-      "name": "授权管理",
-      "resourceId": "SYSTEM_SETTING"
-    },
     {
       "id": "SYSTEM_QUOTA:READ",
       "name": "查询系统配额",
@@ -202,7 +197,7 @@
     },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ",
-      "name": "查询环境",
+      "name": "查询",
       "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
     },
     {
@@ -235,6 +230,26 @@
       "name": "导出环境",
       "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
     },
+    {
+      "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+CREATE_GROUP",
+      "name": "创建环境组",
+      "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
+    },
+    {
+      "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT_GROUP",
+      "name": "编辑环境组",
+      "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
+    },
+    {
+      "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+COPY_GROUP",
+      "name": "复制环境组",
+      "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
+    },
+    {
+      "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE_GROUP",
+      "name": "删除环境组",
+      "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
+    },
     {
       "id": "WORKSPACE_OPERATING_LOG:READ",
       "name": "查询操作日志",
@@ -260,11 +275,6 @@
       "name": "自定义字段",
       "resourceId": "WORKSPACE_TEMPLATE"
     },
-    {
-      "id": "WORKSPACE_TEMPLATE:READ+REPORT_TEMPLATE",
-      "name": "测试报告模版",
-      "resourceId": "WORKSPACE_TEMPLATE"
-    },
     {
       "id": "PROJECT_USER:READ",
       "name": "查询成员",
diff --git a/frontend/src/business/components/settings/system/BaseSetting.vue b/frontend/src/business/components/settings/system/BaseSetting.vue
index dfaa923adc..92514a6c0a 100644
--- a/frontend/src/business/components/settings/system/BaseSetting.vue
+++ b/frontend/src/business/components/settings/system/BaseSetting.vue
@@ -19,7 +19,7 @@
       </el-row>
     </el-form>
     <div>
-      <el-button @click="edit" v-if="showEdit" size="small">{{ $t('commons.edit') }}</el-button>
+      <el-button @click="edit" v-if="showEdit" size="small" v-permission="['SYSTEM_SETTING:READ+EDIT']">{{ $t('commons.edit') }}</el-button>
       <el-button type="success" @click="save('formInline')" v-if="showSave" :disabled="disabledSave" size="small">
         {{ $t('commons.save') }}
       </el-button>
diff --git a/frontend/src/business/components/settings/system/EmailSetting.vue b/frontend/src/business/components/settings/system/EmailSetting.vue
index 575702a9dd..fd8e02dfd7 100644
--- a/frontend/src/business/components/settings/system/EmailSetting.vue
+++ b/frontend/src/business/components/settings/system/EmailSetting.vue
@@ -61,7 +61,7 @@
       <el-button type="primary" @click="testConnection('formInline')" :disabled="disabledConnection" size="small">
         {{ $t('system_parameter_setting.test_connection') }}
       </el-button>
-      <el-button @click="edit" v-if="showEdit" size="small">{{ $t('commons.edit') }}</el-button>
+      <el-button @click="edit" v-if="showEdit" size="small" v-permission="['SYSTEM_SETTING:READ+EDIT']">{{ $t('commons.edit') }}</el-button>
       <el-button type="success" @click="save('formInline')" v-if="showSave" :disabled="disabledSave" size="small">
         {{ $t('commons.save') }}
       </el-button>
diff --git a/frontend/src/business/components/settings/system/LdapSetting.vue b/frontend/src/business/components/settings/system/LdapSetting.vue
index fc9ea67764..51f6002a65 100644
--- a/frontend/src/business/components/settings/system/LdapSetting.vue
+++ b/frontend/src/business/components/settings/system/LdapSetting.vue
@@ -31,7 +31,7 @@
       <el-button type="primary" size="small" :disabled="!showLogin || !show" @click="testLogin">
         {{ $t('ldap.test_login') }}
       </el-button>
-      <el-button v-if="showEdit" size="small" @click="edit">{{ $t('ldap.edit') }}</el-button>
+      <el-button v-if="showEdit" size="small" @click="edit" v-permission="['SYSTEM_SETTING:READ+EDIT']">{{ $t('ldap.edit') }}</el-button>
       <el-button type="success" v-if="showSave" size="small" @click="save('form')">{{ $t('commons.save') }}
       </el-button>
       <el-button type="info" v-if="showCancel" size="small" @click="cancel">{{ $t('commons.cancel') }}</el-button>
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index b143b073a8..e4751085e6 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -14,7 +14,7 @@
         <el-table-column prop="description" :label="$t('commons.description')"/>
         <el-table-column :label="$t('commons.member')">
           <template v-slot:default="scope">
-            <el-link type="primary" class="member-size" @click="cellClick(scope.row)">
+            <el-link type="primary" class="member-size" @click="cellClick(scope.row)" :disabled="disabledEditWorkspaceMember">
               {{ scope.row.memberSize }}
             </el-link>
           </template>
@@ -161,7 +161,7 @@ import MsTableOperator from "../../common/components/MsTableOperator";
 import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
 import MsDialogFooter from "../../common/components/MsDialogFooter";
 import {
-  getCurrentWorkspaceId,
+  getCurrentWorkspaceId, hasPermission,
   listenGoBack,
   removeGoBackListener
 } from "@/common/js/utils";
@@ -400,6 +400,9 @@ export default {
   computed: {
     workspaceId() {
       return getCurrentWorkspaceId();
+    },
+    disabledEditWorkspaceMember() {
+      return !hasPermission('SYSTEM_WORKSPACE:READ+EDIT');
     }
   },
   data() {
diff --git a/frontend/src/business/components/settings/system/group/UserGroup.vue b/frontend/src/business/components/settings/system/group/UserGroup.vue
index 363d413c11..f033124dcb 100644
--- a/frontend/src/business/components/settings/system/group/UserGroup.vue
+++ b/frontend/src/business/components/settings/system/group/UserGroup.vue
@@ -17,7 +17,7 @@
         </el-table-column>
         <el-table-column :label="$t('commons.member')" width="100">
           <template v-slot:default="scope">
-            <el-link type="primary" class="member-size" @click="memberClick(scope.row)">
+            <el-link type="primary" class="member-size" @click="memberClick(scope.row)" :disabled="disabledEditGroupMember">
               {{ scope.row.memberSize || 0 }}
             </el-link>
           </template>
@@ -79,6 +79,7 @@ import EditPermission from "@/business/components/settings/system/group/EditPerm
 import MsDeleteConfirm from "@/business/components/common/components/MsDeleteConfirm";
 import {_sort} from "@/common/js/tableUtils";
 import GroupMember from "@/business/components/settings/system/group/GroupMember";
+import {hasPermission} from "@/common/js/utils";
 
 export default {
   name: "UserGroup",
@@ -110,6 +111,9 @@ export default {
   computed: {
     userGroupType() {
       return USER_GROUP_SCOPE;
+    },
+    disabledEditGroupMember() {
+      return !hasPermission('SYSTEM_GROUP:READ+EDIT');
     }
   },
   methods: {
diff --git a/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupList.vue b/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupList.vue
index 650f4e6025..a91c8fdd36 100644
--- a/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupList.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupList.vue
@@ -3,7 +3,7 @@
     <el-card class="table-card" v-loading="result.loading">
       <template v-slot:header>
         <ms-table-header :create-tip="btnTips" :condition.sync="condition" :show-create="!readOnly"
-                         @search="search" @create="createEnvironment">
+                         @search="search" @create="createEnvironment" :create-permission="['WORKSPACE_PROJECT_ENVIRONMENT:READ+CREATE_GROUP']">
         </ms-table-header>
       </template>
       <el-table :data="environmentGroupList"
@@ -26,7 +26,7 @@
             </span>
             <span v-else>
               <span>{{ scope.row.name }}</span>
-              <i class="el-icon-edit" style="cursor:pointer;margin-left: 4px;" @click="editName(scope.row)"/>
+              <i class="el-icon-edit" style="cursor:pointer;margin-left: 4px;" @click="editName(scope.row)" v-permission="['WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT_GROUP']"/>
             </span>
           </template>
         </el-table-column>
@@ -38,9 +38,13 @@
         <el-table-column :label="$t('commons.operating')" width="350">
           <template v-slot:default="scope">
             <div v-if="!readOnly">
-              <ms-table-operator @editClick="editEnvironment(scope.row)" @deleteClick="deleteEnvironment(scope.row)">
+              <ms-table-operator @editClick="editEnvironment(scope.row)"
+                                 :edit-permission="['WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT_GROUP']"
+                                 :delete-permission="['WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE_GROUP']"
+                                 @deleteClick="deleteEnvironment(scope.row)">
                 <template v-slot:middle>
                   <ms-table-operator-button :tip="$t('commons.copy')" @exec="copyEnvironment(scope.row)"
+                                            v-permission="['WORKSPACE_PROJECT_ENVIRONMENT:READ+COPY_GROUP']"
                                             icon="el-icon-document-copy" type="info"/>
                 </template>
               </ms-table-operator>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 8a79109a23..a8c75d8f4c 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 8a79109a23a54ea7b4f0e2860a2da06733adc076
+Subproject commit a8c75d8f4c88979a8e7851402776bce5b7ed2551

From 4afc37eb0ddc957926883b77d24b56fd7d7e8df1 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Fri, 26 Nov 2021 16:44:35 +0800
Subject: [PATCH 005/256] =?UTF-8?q?fix(SQL=E7=94=A8=E4=BE=8B=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C):=20=E4=BF=AE=E5=A4=8DSQL=E7=94=A8=E4=BE=8B=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E6=97=B6=E8=87=AA=E5=8A=A8=E6=B7=BB=E5=8A=A0script?=
 =?UTF-8?q?=E7=A9=BA=E8=84=9A=E6=9C=AC=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008370 --user=宋天阳 【接口测试】创建sql用例，有一个步骤，但是步骤里啥都没有，执行的时候还会报错
https://www.tapd.cn/55049933/s/1075620
---
 .../definition/parse/JMeterScriptUtil.java    | 92 +++++++++++++++++++
 .../request/sampler/MsHTTPSamplerProxy.java   | 40 ++++----
 .../request/sampler/MsJDBCSampler.java        | 51 +++-------
 .../request/sampler/MsTCPSampler.java         | 53 +++--------
 .../components/case/ApiCaseItem.vue           |  2 +-
 5 files changed, 138 insertions(+), 100 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/definition/parse/JMeterScriptUtil.java

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/JMeterScriptUtil.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/JMeterScriptUtil.java
new file mode 100644
index 0000000000..22b132536e
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/JMeterScriptUtil.java
@@ -0,0 +1,92 @@
+package io.metersphere.api.dto.definition.parse;
+
+import io.metersphere.api.dto.definition.request.ParameterConfig;
+import io.metersphere.api.dto.definition.request.processors.post.MsJSR223PostProcessor;
+import io.metersphere.api.dto.definition.request.processors.pre.MsJSR223PreProcessor;
+import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
+import io.metersphere.api.dto.scenario.environment.GlobalScriptConfig;
+import io.metersphere.plugin.core.MsTestElement;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.jorphan.collections.HashTree;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+public class JMeterScriptUtil {
+
+    /**
+     * 判断脚本是否被过滤
+     *
+     * @param filterProtocals 要过滤掉的请求类型
+     * @param protocal        当前请求类型
+     * @return
+     */
+    public static boolean isScriptFilter(List<String> filterProtocals, String protocal) {
+        if (!CollectionUtils.isEmpty(filterProtocals)) {
+            return filterProtocals.contains(protocal);
+        } else {
+            return false;
+        }
+    }
+
+    public static MsJSR223PreProcessor getPreScript(EnvironmentConfig envConfig) {
+        if (envConfig != null && envConfig.getPreProcessor() != null && StringUtils.isNotEmpty(envConfig.getPreProcessor().getScript())) {
+            return envConfig.getPreProcessor();
+        } else {
+            return null;
+        }
+    }
+
+    public static MsJSR223PostProcessor getPostScript(EnvironmentConfig envConfig) {
+        if (envConfig != null && envConfig.getPostProcessor() != null && StringUtils.isNotEmpty(envConfig.getPostProcessor().getScript())) {
+            return envConfig.getPostProcessor();
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Samper中放置脚本
+     *
+     * @param envConfig            环境配置信息
+     * @param samplerHashTree      sampler的hashtree
+     * @param isAfterPrivateScript 是否将脚本放置在sampler的私有脚本之后
+     * @param protocal             请求类型
+     * @param environmentId        环境ID
+     * @param config               参数配置
+     */
+    public static void setScript(EnvironmentConfig envConfig, HashTree samplerHashTree, String protocal, String environmentId, ParameterConfig config, boolean isAfterPrivateScript) {
+        GlobalScriptConfig globalScriptConfig = envConfig != null ? envConfig.getGlobalScriptConfig() : null;
+
+        boolean isPreScriptExecAfterPrivateScript = globalScriptConfig == null ? false : globalScriptConfig.isPreScriptExecAfterPrivateScript();
+        boolean isPostScriptExecAfterPrivateScript = globalScriptConfig == null ? false : globalScriptConfig.isPostScriptExecAfterPrivateScript();
+        List<String> preFilterProtocal = globalScriptConfig == null ? null : globalScriptConfig.getFilterRequestPreScript();
+        List<String> postFilterProtocal = globalScriptConfig == null ? null : globalScriptConfig.getFilterRequestPostScript();
+        MsJSR223PreProcessor preProcessor = JMeterScriptUtil.getPreScript(envConfig);
+        MsJSR223PostProcessor postProcessor = JMeterScriptUtil.getPostScript(envConfig);
+        boolean globalPreScriptIsFilter = JMeterScriptUtil.isScriptFilter(preFilterProtocal, protocal);
+        boolean globalPostScriptIsFilter = JMeterScriptUtil.isScriptFilter(postFilterProtocal, protocal);
+        if (isAfterPrivateScript) {
+            if (isPreScriptExecAfterPrivateScript && !globalPreScriptIsFilter) {
+                addItemHashTree(preProcessor, samplerHashTree, config, environmentId);
+            }
+            if (isPostScriptExecAfterPrivateScript && !globalPostScriptIsFilter) {
+                addItemHashTree(postProcessor, samplerHashTree, config, environmentId);
+            }
+        } else {
+            if (!isPreScriptExecAfterPrivateScript && !globalPreScriptIsFilter) {
+                addItemHashTree(preProcessor, samplerHashTree, config, environmentId);
+            }
+            if (!isPostScriptExecAfterPrivateScript && !globalPostScriptIsFilter) {
+                addItemHashTree(postProcessor, samplerHashTree, config, environmentId);
+            }
+        }
+    }
+
+    private static void addItemHashTree(MsTestElement element, HashTree samplerHashTree, ParameterConfig config, String enviromentId) {
+        if (element != null && element.getEnvironmentId() == null) {
+            element.setEnvironmentId(enviromentId);
+            element.toHashTree(samplerHashTree, element.getHashTree(), config);
+        }
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
index 7ce147b894..9e00a2263b 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
@@ -7,6 +7,7 @@ import com.alibaba.fastjson.annotation.JSONType;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.metersphere.api.dto.definition.parse.JMeterScriptUtil;
 import io.metersphere.api.dto.definition.request.ElementUtil;
 import io.metersphere.api.dto.definition.request.ParameterConfig;
 import io.metersphere.api.dto.definition.request.auth.MsAuthManager;
@@ -307,12 +308,11 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         MsJSR223PreProcessor preProcessor = httpConfig.getPreProcessor();
         MsJSR223PostProcessor postProcessor = httpConfig.getPostProcessor();
         GlobalScriptConfig globalScriptConfig = httpConfig.getGlobalScriptConfig();
-        List<String> filterPreProtocal = globalScriptConfig == null ? new ArrayList<>() : globalScriptConfig.getFilterRequestPreScript();
-        List<String> filterPostProtocal = globalScriptConfig == null ? new ArrayList<>() : globalScriptConfig.getFilterRequestPostScript();
-
-        boolean filterPre = filterPreProtocal.contains(GlobalScriptFilterRequest.HTTP.name());
-        boolean filterPost = filterPostProtocal.contains(GlobalScriptFilterRequest.HTTP.name());
+        List<String> filterPreProtocal = globalScriptConfig == null ? null : globalScriptConfig.getFilterRequestPreScript();
+        List<String> filterPostProtocal = globalScriptConfig == null ? null : globalScriptConfig.getFilterRequestPostScript();
 
+        boolean filterPre = JMeterScriptUtil.isScriptFilter(filterPreProtocal, GlobalScriptFilterRequest.HTTP.name());
+        boolean filterPost = JMeterScriptUtil.isScriptFilter(filterPostProtocal, GlobalScriptFilterRequest.HTTP.name());
         boolean isPreScriptExecAfterPrivateScript = globalScriptConfig == null ? false : globalScriptConfig.isPreScriptExecAfterPrivateScript();
         boolean isPostScriptExecAfterPrivateScript = globalScriptConfig == null ? false : globalScriptConfig.isPostScriptExecAfterPrivateScript();
 
@@ -724,22 +724,22 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         list.stream().
                 filter(KeyValue::isValid).
                 filter(KeyValue::isEnable).forEach(keyValue -> {
-                    try {
-                        String value = StringUtils.isNotEmpty(keyValue.getValue()) && keyValue.getValue().startsWith("@") ? ScriptEngineUtils.buildFunctionCallString(keyValue.getValue()) : keyValue.getValue();
-                        HTTPArgument httpArgument = new HTTPArgument(keyValue.getName(), value);
-                        if (keyValue.getValue() == null) {
-                            httpArgument.setValue("");
-                        }
-                        httpArgument.setAlwaysEncoded(keyValue.isUrlEncode());
-                        if (StringUtils.isNotBlank(keyValue.getContentType())) {
-                            httpArgument.setContentType(keyValue.getContentType());
-                        }
-                        arguments.addArgument(httpArgument);
-                    } catch (Exception e) {
+                            try {
+                                String value = StringUtils.isNotEmpty(keyValue.getValue()) && keyValue.getValue().startsWith("@") ? ScriptEngineUtils.buildFunctionCallString(keyValue.getValue()) : keyValue.getValue();
+                                HTTPArgument httpArgument = new HTTPArgument(keyValue.getName(), value);
+                                if (keyValue.getValue() == null) {
+                                    httpArgument.setValue("");
+                                }
+                                httpArgument.setAlwaysEncoded(keyValue.isUrlEncode());
+                                if (StringUtils.isNotBlank(keyValue.getContentType())) {
+                                    httpArgument.setContentType(keyValue.getContentType());
+                                }
+                                arguments.addArgument(httpArgument);
+                            } catch (Exception e) {
 
-                    }
-                }
-        );
+                            }
+                        }
+                );
         return arguments;
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
index 82cf1125ec..fcaf9f56cc 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
@@ -7,14 +7,12 @@ import com.alibaba.fastjson.annotation.JSONType;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.metersphere.api.dto.definition.parse.JMeterScriptUtil;
 import io.metersphere.api.dto.definition.request.ElementUtil;
 import io.metersphere.api.dto.definition.request.ParameterConfig;
-import io.metersphere.api.dto.definition.request.processors.post.MsJSR223PostProcessor;
-import io.metersphere.api.dto.definition.request.processors.pre.MsJSR223PreProcessor;
 import io.metersphere.api.dto.scenario.DatabaseConfig;
 import io.metersphere.api.dto.scenario.KeyValue;
 import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
-import io.metersphere.api.dto.scenario.environment.GlobalScriptConfig;
 import io.metersphere.api.dto.scenario.environment.GlobalScriptFilterRequest;
 import io.metersphere.api.service.ApiDefinitionService;
 import io.metersphere.api.service.ApiTestCaseService;
@@ -100,7 +98,7 @@ public class MsJDBCSampler extends MsTestElement {
         // 数据兼容处理
         if (config.getConfig() != null && StringUtils.isNotEmpty(this.getProjectId()) && config.getConfig().containsKey(this.getProjectId())) {
             // 1.8 之后 当前正常数据
-        } else if ( config.getConfig() != null && config.getConfig().containsKey(getParentProjectId())) {
+        } else if (config.getConfig() != null && config.getConfig().containsKey(getParentProjectId())) {
             // 1.8 前后 混合数据
             this.setProjectId(getParentProjectId());
         } else {
@@ -152,57 +150,30 @@ public class MsJDBCSampler extends MsTestElement {
         if (arguments != null) {
             tree.add(arguments);
         }
-
         // 环境通用请求头
         Arguments envArguments = getConfigArguments(config);
         if (envArguments != null) {
             tree.add(envArguments);
         }
 
-        MsJSR223PreProcessor preProcessor = envConfig != null ? envConfig.getPreProcessor() : null;
-        MsJSR223PostProcessor postProcessor = envConfig != null ? envConfig.getPostProcessor() : null;
-        GlobalScriptConfig globalScriptConfig = envConfig != null ? envConfig.getGlobalScriptConfig() : null;
-        if (globalScriptConfig != null) {
-            boolean isPreScriptExecAfterPrivateScript = globalScriptConfig.isPreScriptExecAfterPrivateScript();
-            boolean isPostScriptExecAfterPrivateScript = globalScriptConfig.isPostScriptExecAfterPrivateScript();
-            List<String> preFilters = globalScriptConfig == null ? new ArrayList<>() : globalScriptConfig.getFilterRequestPreScript();
-            List<String> postFilters = globalScriptConfig == null ? new ArrayList<>() : globalScriptConfig.getFilterRequestPostScript();
-            boolean globalPreScriptIsFilter = preFilters.contains(GlobalScriptFilterRequest.JDBC.name());
-            boolean globalPostScriptIsFilter = postFilters.contains(GlobalScriptFilterRequest.JDBC.name());
-
-            if (!isPreScriptExecAfterPrivateScript && !globalPreScriptIsFilter) {
-                this.addItemHashTree(preProcessor, samplerHashTree, config);
-            }
-            if (!isPostScriptExecAfterPrivateScript && !globalPostScriptIsFilter) {
-                this.addItemHashTree(postProcessor, samplerHashTree, config);
-            }
-
-            if (isPreScriptExecAfterPrivateScript && !globalPreScriptIsFilter) {
-                this.addItemHashTree(preProcessor, samplerHashTree, config);
-            }
-            if (isPostScriptExecAfterPrivateScript && !globalPostScriptIsFilter) {
-                this.addItemHashTree(postProcessor, samplerHashTree, config);
-            }
+        //处理全局前后置脚本(步骤内)
+        String enviromentId = this.getEnvironmentId();
+        if (enviromentId == null) {
+            enviromentId = this.useEnvironment;
         }
+        //根据配置将脚本放置在私有脚本之前
+        JMeterScriptUtil.setScript(envConfig, samplerHashTree, GlobalScriptFilterRequest.JDBC.name(), enviromentId, config, false);
+
         if (CollectionUtils.isNotEmpty(hashTree)) {
             hashTree.forEach(el -> {
                 el.toHashTree(samplerHashTree, el.getHashTree(), config);
             });
         }
+        //根据配置将脚本放置在私有脚本之后
+        JMeterScriptUtil.setScript(envConfig, samplerHashTree, GlobalScriptFilterRequest.JDBC.name(), enviromentId, config, true);
 
     }
 
-    private void addItemHashTree(MsTestElement element, HashTree samplerHashTree, ParameterConfig config) {
-        if (element != null && element.getEnvironmentId() == null) {
-            if (this.getEnvironmentId() == null) {
-                element.setEnvironmentId(useEnvironment);
-            } else {
-                element.setEnvironmentId(this.getEnvironmentId());
-            }
-            element.toHashTree(samplerHashTree, element.getHashTree(), config);
-        }
-    }
-
     /**
      * 环境通用变量
      */
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
index 2ebc6111fc..c2a7ad5cab 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
@@ -9,13 +9,12 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.metersphere.api.dto.automation.EsbDataStruct;
 import io.metersphere.api.dto.automation.TcpTreeTableDataStruct;
+import io.metersphere.api.dto.definition.parse.JMeterScriptUtil;
 import io.metersphere.api.dto.definition.request.ElementUtil;
 import io.metersphere.api.dto.definition.request.ParameterConfig;
-import io.metersphere.api.dto.definition.request.processors.post.MsJSR223PostProcessor;
 import io.metersphere.api.dto.definition.request.processors.pre.MsJSR223PreProcessor;
 import io.metersphere.api.dto.scenario.KeyValue;
 import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
-import io.metersphere.api.dto.scenario.environment.GlobalScriptConfig;
 import io.metersphere.api.dto.scenario.environment.GlobalScriptFilterRequest;
 import io.metersphere.api.service.ApiDefinitionService;
 import io.metersphere.api.service.ApiTestCaseService;
@@ -151,50 +150,25 @@ public class MsTCPSampler extends MsTestElement {
             samplerHashTree.add(tcpPreProcessor.getJSR223PreProcessor());
         }
 
-        MsJSR223PreProcessor preProcessor = null;
-        MsJSR223PostProcessor postProcessor = null;
-        GlobalScriptConfig globalScriptConfig = null;
-        if(envConfig != null){
-            preProcessor = envConfig.getPreProcessor();
-            postProcessor = envConfig.getPostProcessor();
-            globalScriptConfig = envConfig.getGlobalScriptConfig();
-        }
-
-        boolean isPreScriptExecAfterPrivateScript = globalScriptConfig == null? false : globalScriptConfig.isPreScriptExecAfterPrivateScript();
-        boolean isPostScriptExecAfterPrivateScript = globalScriptConfig == null? false : globalScriptConfig.isPostScriptExecAfterPrivateScript();
-        boolean globalPreScriptIsFilter = false;
-        boolean globalPostScriptIsFilter = false;
-        List<String> preFilterProtocal = globalScriptConfig == null? new ArrayList<>() : globalScriptConfig.getFilterRequestPreScript();
-        List<String> postFilterProtocal = globalScriptConfig == null? new ArrayList<>() : globalScriptConfig.getFilterRequestPostScript();
-        if(preFilterProtocal.contains(GlobalScriptFilterRequest.TCP.name())){
-            globalPreScriptIsFilter = true;
-        }
-        if(postFilterProtocal.contains(GlobalScriptFilterRequest.TCP.name())){
-            globalPostScriptIsFilter = true;
-        }
-
-        if(!isPreScriptExecAfterPrivateScript && !globalPreScriptIsFilter){
-            this.addItemHashTree(preProcessor,samplerHashTree,config);
-        }
-        if(!isPostScriptExecAfterPrivateScript && !globalPostScriptIsFilter){
-            this.addItemHashTree(postProcessor,samplerHashTree,config);
+        //处理全局前后置脚本(步骤内)
+        String enviromentId = this.getEnvironmentId();
+        if (enviromentId == null) {
+            enviromentId = this.useEnvironment;
         }
+        //根据配置将脚本放置在私有脚本之前
+        JMeterScriptUtil.setScript(envConfig, samplerHashTree, GlobalScriptFilterRequest.TCP.name(), enviromentId, config, false);
 
         if (CollectionUtils.isNotEmpty(hashTree)) {
             hashTree.forEach(el -> {
                 el.toHashTree(samplerHashTree, el.getHashTree(), config);
             });
         }
-
-        if(isPreScriptExecAfterPrivateScript && !globalPreScriptIsFilter){
-            this.addItemHashTree(preProcessor,samplerHashTree,config);
-        }
-        if(isPostScriptExecAfterPrivateScript && !globalPostScriptIsFilter){
-            this.addItemHashTree(postProcessor,samplerHashTree,config);
-        }
+        //根据配置将脚本放置在私有脚本之后
+        JMeterScriptUtil.setScript(envConfig, samplerHashTree, GlobalScriptFilterRequest.TCP.name(), enviromentId, config, false);
     }
-    private void addItemHashTree(MsTestElement element, HashTree samplerHashTree,ParameterConfig config){
-        if(element != null){
+
+    private void addItemHashTree(MsTestElement element, HashTree samplerHashTree, ParameterConfig config) {
+        if (element != null) {
             if (element.getEnvironmentId() == null) {
                 if (this.getEnvironmentId() == null) {
                     element.setEnvironmentId(useEnvironment);
@@ -205,6 +179,7 @@ public class MsTCPSampler extends MsTestElement {
             element.toHashTree(samplerHashTree, element.getHashTree(), config);
         }
     }
+
     private void setRefElement() {
         try {
             ApiDefinitionService apiDefinitionService = CommonBeanFactory.getBean(ApiDefinitionService.class);
@@ -234,7 +209,7 @@ public class MsTCPSampler extends MsTestElement {
             if (proxy != null) {
                 if (StringUtils.equals(this.getRefType(), "CASE")) {
                     ElementUtil.mergeHashTree(this, proxy.getHashTree());
-                }else {
+                } else {
                     this.setHashTree(proxy.getHashTree());
                 }
                 this.setClassname(proxy.getClassname());
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index 70a572e95a..d7fd938142 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -124,7 +124,7 @@
           <api-response-component :currentProtocol="apiCase.request.protocol" :api-item="apiCase" :result="runResult"/>
         </div>
 
-        <ms-jmx-step :request="apiCase.request" :api-id="api.id" :response="apiCase.responseData"/>
+        <ms-jmx-step v-if="apiCase.request.hashTree && apiCase.request.hashTree.length > 0" :request="apiCase.request" :api-id="api.id" :response="apiCase.responseData"/>
         <!-- 保存操作 -->
         <el-button type="primary" size="small" style="margin: 20px; float: right" @click="saveTestCase(apiCase)"
                    v-if="type!=='detail'"

From ba10d04449ef1fdaa366c57551ed1b72cc90c412 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 26 Nov 2021 17:48:38 +0800
Subject: [PATCH 006/256] =?UTF-8?q?fix:=20flyway=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V100__v1.15.2_release.sql    | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V100__v1.15.2_release.sql b/backend/src/main/resources/db/migration/V100__v1.15.2_release.sql
index c9ccb69015..44e268d50a 100644
--- a/backend/src/main/resources/db/migration/V100__v1.15.2_release.sql
+++ b/backend/src/main/resources/db/migration/V100__v1.15.2_release.sql
@@ -1,21 +1,12 @@
--- project admin
+-- ws admin
 insert into user_group_permission (id, group_id, permission_id, module_id)
-values (UUID(), 'project_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+CREATE_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
+values (UUID(), 'ws_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+CREATE_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
 insert into user_group_permission (id, group_id, permission_id, module_id)
-values (UUID(), 'project_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
+values (UUID(), 'ws_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
 insert into user_group_permission (id, group_id, permission_id, module_id)
-values (UUID(), 'project_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+COPY_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
+values (UUID(), 'ws_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+COPY_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
 insert into user_group_permission (id, group_id, permission_id, module_id)
-values (UUID(), 'project_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
--- project member
-insert into user_group_permission (id, group_id, permission_id, module_id)
-values (UUID(), 'project_member', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+CREATE_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
-insert into user_group_permission (id, group_id, permission_id, module_id)
-values (UUID(), 'project_member', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
-insert into user_group_permission (id, group_id, permission_id, module_id)
-values (UUID(), 'project_member', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+COPY_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
-insert into user_group_permission (id, group_id, permission_id, module_id)
-values (UUID(), 'project_member', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
+values (UUID(), 'ws_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT');
 -- delete old permission
 delete
 from user_group_permission

From 3ed9f3c7722305b37cb31599549f05c48110be60 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Fri, 26 Nov 2021 18:01:55 +0800
Subject: [PATCH 007/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=89=A7=E8=A1=8C):=20=E4=BF=AE=E5=A4=8D=E4=B8=B2?=
 =?UTF-8?q?=E8=A1=8C=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=97=B6=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=94=A8=E4=BE=8B=E6=89=A7=E8=A1=8C=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1007796 --user=宋天阳
【Github#7579】测试计划中拖拽编排场景用例，只能调整显示顺序，但无法作用于执行顺序【+github#8144】
https://www.tapd.cn/55049933/s/1075681
---
 .../track/service/TestPlanApiCaseService.java | 65 ++++++++++---------
 .../track/service/TestPlanReportService.java  | 45 +++----------
 2 files changed, 41 insertions(+), 69 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
index fcafb5c28f..d0b2c535e5 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
@@ -391,22 +391,22 @@ public class TestPlanApiCaseService {
         if (caseWithBLOBs != null) {
             apiResult.setName(caseWithBLOBs.getName());
         }
-        if(StringUtils.equalsIgnoreCase(request.getTriggerMode(),ApiRunMode.SCHEDULE_API_PLAN.name())) {
+        if (StringUtils.equalsIgnoreCase(request.getTriggerMode(), ApiRunMode.SCHEDULE_API_PLAN.name())) {
             apiResult.setTriggerMode(TriggerMode.SCHEDULE.name());
-        }else if(StringUtils.equalsIgnoreCase(request.getTriggerMode(),ApiRunMode.JENKINS_API_PLAN.name())){
+        } else if (StringUtils.equalsIgnoreCase(request.getTriggerMode(), ApiRunMode.JENKINS_API_PLAN.name())) {
             apiResult.setTriggerMode(TriggerMode.MANUAL.name());
-        }else {
+        } else {
             apiResult.setTriggerMode(TriggerMode.BATCH.name());
         }
         apiResult.setActuator("LOCAL");
         if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) {
             apiResult.setActuator(request.getConfig().getResourcePoolId());
         }
-        if(StringUtils.isEmpty(request.getUserId())){
+        if (StringUtils.isEmpty(request.getUserId())) {
             if (SessionUtils.getUser() != null) {
                 apiResult.setUserId(SessionUtils.getUser().getId());
             }
-        }else {
+        } else {
             apiResult.setUserId(request.getUserId());
         }
 
@@ -423,6 +423,7 @@ public class TestPlanApiCaseService {
         List<String> ids = request.getPlanIds();
         TestPlanApiCaseExample example = new TestPlanApiCaseExample();
         example.createCriteria().andIdIn(ids);
+        example.setOrderByClause("`order` DESC");
         List<TestPlanApiCase> planApiCases = testPlanApiCaseMapper.selectByExample(example);
         SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
         ApiDefinitionExecResultMapper batchMapper = sqlSession.getMapper(ApiDefinitionExecResultMapper.class);
@@ -449,13 +450,13 @@ public class TestPlanApiCaseService {
             planApiCases.forEach(testPlanApiCase -> {
                 ApiDefinitionExecResult report = addResult(request, testPlanApiCase, APITestStatus.Waiting.name(), batchMapper);
                 executeQueue.put(testPlanApiCase, report);
-                executeThreadIdMap.put(testPlanApiCase.getId(),report.getId());
+                executeThreadIdMap.put(testPlanApiCase.getId(), report.getId());
             });
 
             //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
-            if(TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())){
+            if (TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())) {
                 if (!executeThreadIdMap.isEmpty()) {
-                    TestPlanReportExecuteCatch.updateTestPlanThreadInfo(request.getPlanReportId(), executeThreadIdMap,null, null);
+                    TestPlanReportExecuteCatch.updateTestPlanThreadInfo(request.getPlanReportId(), executeThreadIdMap, null, null);
                 }
             }
 
@@ -503,7 +504,7 @@ public class TestPlanApiCaseService {
                                 mapper.updateByPrimaryKey(execResult);
                                 modeDataDTO.setApiCaseId(execResult.getId());
                                 modeDataDTO.setDebugReportId(request.getPlanReportId());
-                                modeDataDTO.setTestId(modeDataDTO.getTestId()+":"+request.getPlanReportId()+ ":"+ execResult.getId());
+                                modeDataDTO.setTestId(modeDataDTO.getTestId() + ":" + request.getPlanReportId() + ":" + execResult.getId());
                                 Future<ApiDefinitionExecResult> future = executorService.submit(new SerialApiExecTask(jMeterService, mapper, modeDataDTO, request.getConfig(), request.getTriggerMode()));
                                 ApiDefinitionExecResult report = future.get();
                                 // 如果开启失败结束执行，则判断返回结果状态
@@ -533,11 +534,11 @@ public class TestPlanApiCaseService {
                         }
 
                         //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
-                        if(TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())){
+                        if (TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())) {
                             if (!executeErrorList.isEmpty()) {
-                                Map<String,String> executeErrorMap = new HashMap<>();
-                                for(String id : executeErrorList){
-                                    executeErrorMap.put(id,TestPlanApiExecuteStatus.FAILD.name());
+                                Map<String, String> executeErrorMap = new HashMap<>();
+                                for (String id : executeErrorList) {
+                                    executeErrorMap.put(id, TestPlanApiExecuteStatus.FAILD.name());
                                 }
                                 TestPlanReportExecuteCatch.updateApiTestPlanExecuteInfo(request.getPlanReportId(), executeErrorMap, null, null);
                             }
@@ -558,14 +559,14 @@ public class TestPlanApiCaseService {
             planApiCases.forEach(testPlanApiCase -> {
                 ApiDefinitionExecResult report = addResult(request, testPlanApiCase, APITestStatus.Running.name(), batchMapper);
                 executeQueue.put(report.getId(), testPlanApiCase);
-                executeThreadIdMap.put(testPlanApiCase.getId(),report.getId());
+                executeThreadIdMap.put(testPlanApiCase.getId(), report.getId());
                 MessageCache.caseExecResourceLock.put(report.getId(), report);
             });
             sqlSession.commit();
             //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
-            if(TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())){
+            if (TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())) {
                 if (!executeThreadIdMap.isEmpty()) {
-                    TestPlanReportExecuteCatch.updateTestPlanThreadInfo(request.getPlanReportId(), executeThreadIdMap,null, null);
+                    TestPlanReportExecuteCatch.updateTestPlanThreadInfo(request.getPlanReportId(), executeThreadIdMap, null, null);
                 }
             }
 
@@ -577,28 +578,28 @@ public class TestPlanApiCaseService {
                 try {
                     String debugId = request.getPlanReportId();
                     if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) {
-                        String testId = testPlanApiCase.getId()+":"+ request.getPlanReportId() + ":" +reportId;
+                        String testId = testPlanApiCase.getId() + ":" + request.getPlanReportId() + ":" + reportId;
                         jMeterService.runTest(testId, reportId, request.getTriggerMode(), request.getPlanReportId(), request.getConfig());
                     } else {
                         HashTree hashTree = generateHashTree(testPlanApiCase.getId());
-                        if(StringUtils.isEmpty(debugId)){
+                        if (StringUtils.isEmpty(debugId)) {
                             debugId = TriggerMode.BATCH.name();
                         }
-                        String testId = reportId+":"+ request.getPlanReportId();
-                        jMeterService.runLocal(testId,request.getConfig(), hashTree, debugId, request.getTriggerMode());
+                        String testId = reportId + ":" + request.getPlanReportId();
+                        jMeterService.runLocal(testId, request.getConfig(), hashTree, debugId, request.getTriggerMode());
                     }
-                }catch (Exception e){
+                } catch (Exception e) {
                     executeErrorList.add(testPlanApiCase.getId());
                 }
 
             }
 
             //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
-            if(TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())){
+            if (TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())) {
                 if (!executeErrorList.isEmpty()) {
-                    Map<String,String> executeErrorMap = new HashMap<>();
-                    for(String id : executeErrorList){
-                        executeErrorMap.put(id,TestPlanApiExecuteStatus.FAILD.name());
+                    Map<String, String> executeErrorMap = new HashMap<>();
+                    for (String id : executeErrorList) {
+                        executeErrorMap.put(id, TestPlanApiExecuteStatus.FAILD.name());
                     }
                     TestPlanReportExecuteCatch.updateApiTestPlanExecuteInfo(request.getPlanReportId(), executeErrorMap, null, null);
                 }
@@ -745,25 +746,25 @@ public class TestPlanApiCaseService {
                 testPlanApiCaseMapper::updateByPrimaryKeySelective);
     }
 
-    public List<TestPlanFailureApiDTO> getByApiExecReportIds(Map<String,String> testPlanApiCaseReportMap,boolean isFinish) {
+    public List<TestPlanFailureApiDTO> getByApiExecReportIds(Map<String, String> testPlanApiCaseReportMap, boolean isFinish) {
         if (testPlanApiCaseReportMap.isEmpty()) {
             return new ArrayList<>();
         }
         String defaultStatus = "Running";
-        if(isFinish){
+        if (isFinish) {
             defaultStatus = "error";
         }
-        List<TestPlanFailureApiDTO> apiTestCases = extTestPlanApiCaseMapper.getFailureListByIds(testPlanApiCaseReportMap.keySet(),null);
-        Map<String,String> reportResult = apiDefinitionExecResultService.selectReportResultByReportIds(testPlanApiCaseReportMap.values());
+        List<TestPlanFailureApiDTO> apiTestCases = extTestPlanApiCaseMapper.getFailureListByIds(testPlanApiCaseReportMap.keySet(), null);
+        Map<String, String> reportResult = apiDefinitionExecResultService.selectReportResultByReportIds(testPlanApiCaseReportMap.values());
         for (TestPlanFailureApiDTO dto : apiTestCases) {
             String testPlanApiCaseId = dto.getId();
             String reportId = testPlanApiCaseReportMap.get(testPlanApiCaseId);
             dto.setReportId(reportId);
-            if(StringUtils.isEmpty(reportId)){
+            if (StringUtils.isEmpty(reportId)) {
                 dto.setExecResult(defaultStatus);
-            }else {
+            } else {
                 String status = reportResult.get(reportId);
-                if(status == null){
+                if (status == null) {
                     status = defaultStatus;
                 }
                 dto.setExecResult(status);
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
index f229abd377..27aeabc3a4 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
@@ -131,28 +131,17 @@ public class TestPlanReportService {
     }
 
     public TestPlanScheduleReportInfoDTO genTestPlanReportBySchedule(String projectID, String planId, String userId, String triggerMode) {
-        Map<String, List<String>> apiTestCaseIdMap = new LinkedHashMap<>();
-
         Map<String, String> planScenarioIdMap = new LinkedHashMap<>();
-        Map<String, String> apiTestCaseDataMap = new LinkedHashMap<>();
+        Map<String, String> planTestCaseIdMap = new LinkedHashMap<>();
         Map<String, String> performanceIdMap = new LinkedHashMap<>();
-
         List<TestPlanApiScenario> testPlanApiScenarioList = extTestPlanScenarioCaseMapper.selectLegalDataByTestPlanId(planId);
         for (TestPlanApiScenario model : testPlanApiScenarioList) {
             planScenarioIdMap.put(model.getId(), model.getApiScenarioId());
         }
         List<TestPlanApiCase> testPlanApiCaseList = extTestPlanApiCaseMapper.selectLegalDataByTestPlanId(planId);
         for (TestPlanApiCase model : testPlanApiCaseList) {
-            if (apiTestCaseIdMap.containsKey(model.getApiCaseId())) {
-                apiTestCaseIdMap.get(model.getApiCaseId()).add(model.getId());
-            } else {
-                List<String> list = new ArrayList<>();
-                list.add(model.getId());
-                apiTestCaseIdMap.put(model.getApiCaseId(), list);
-            }
-
+            planTestCaseIdMap.put(model.getId(), model.getApiCaseId());
         }
-
         LoadCaseRequest loadCaseRequest = new LoadCaseRequest();
         loadCaseRequest.setTestPlanId(planId);
         loadCaseRequest.setProjectId(projectID);
@@ -160,29 +149,12 @@ public class TestPlanReportService {
         for (TestPlanLoadCaseDTO dto : testPlanLoadCaseDTOList) {
             performanceIdMap.put(dto.getId(), dto.getLoadCaseId());
         }
-
         String planReportId = UUID.randomUUID().toString();
 
         Map<String, String> apiCaseInfoMap = new HashMap<>();
-        if (!apiTestCaseIdMap.isEmpty()) {
-            //筛选出未被删除/放入回收站的案例
-            ApiTestCaseExample apiTestCaseExample = new ApiTestCaseExample();
-            apiTestCaseExample.createCriteria().andIdIn(new ArrayList<>(apiTestCaseIdMap.keySet()));
-            List<ApiTestCase> apiCaseList = apiTestCaseMapper.selectByExample(apiTestCaseExample);
-            if (!apiCaseList.isEmpty()) {
-                Map<String, ApiTestCase> apiCaseDataMap = apiCaseList.stream().collect(Collectors.toMap(ApiTestCase::getId, k -> k));
-                for (String id : apiCaseDataMap.keySet()) {
-                    List<String> testPlanCaseIdList = apiTestCaseIdMap.get(id);
-                    if (CollectionUtils.isNotEmpty(testPlanCaseIdList)) {
-                        for (String testPlanCaseId : testPlanCaseIdList) {
-                            apiCaseInfoMap.put(testPlanCaseId, TestPlanApiExecuteStatus.PREPARE.name());
-                            apiTestCaseDataMap.put(testPlanCaseId, id);
-                        }
-                    }
-                }
-            }
+        for (String id : planTestCaseIdMap.keySet()) {
+            apiCaseInfoMap.put(id, TestPlanApiExecuteStatus.PREPARE.name());
         }
-
         Map<String, String> scenarioInfoMap = new HashMap<>();
         for (String id : planScenarioIdMap.keySet()) {
             scenarioInfoMap.put(id, TestPlanApiExecuteStatus.PREPARE.name());
@@ -192,14 +164,13 @@ public class TestPlanReportService {
             performanceInfoMap.put(id, TestPlanApiExecuteStatus.PREPARE.name());
         }
         TestPlanReportSaveRequest saveRequest = new TestPlanReportSaveRequest(planReportId, planId, userId, triggerMode,
-                apiTestCaseDataMap.size() > 0, planScenarioIdMap.size() > 0, performanceIdMap.size() > 0,
+                planTestCaseIdMap.size() > 0, planScenarioIdMap.size() > 0, performanceIdMap.size() > 0,
                 apiCaseInfoMap, scenarioInfoMap, performanceInfoMap);
         TestPlanReport report = this.genTestPlanReport(saveRequest);
-
         TestPlanScheduleReportInfoDTO returnDTO = new TestPlanScheduleReportInfoDTO();
         returnDTO.setTestPlanReport(report);
         returnDTO.setPlanScenarioIdMap(planScenarioIdMap);
-        returnDTO.setApiTestCaseDataMap(apiTestCaseDataMap);
+        returnDTO.setApiTestCaseDataMap(planTestCaseIdMap);
         returnDTO.setPerformanceIdMap(performanceIdMap);
         return returnDTO;
     }
@@ -1171,14 +1142,14 @@ public class TestPlanReportService {
         if (StringUtils.isNotBlank(testPlanReportContent.getScenarioAllCases())) {
             List<TestPlanFailureScenarioDTO> allCases = JSONObject.parseArray(testPlanReportContent.getScenarioAllCases(), TestPlanFailureScenarioDTO.class);
             for (TestPlanFailureScenarioDTO dto : allCases) {
-                if (StringUtils.equalsAnyIgnoreCase("Underway",dto.getStatus(), dto.getLastResult())) {
+                if (StringUtils.equalsAnyIgnoreCase("Underway", dto.getStatus(), dto.getLastResult())) {
                     isUpdate = true;
                     ApiScenarioReport apiReport = apiScenarioReportMapper.selectByPrimaryKey(dto.getReportId());
                     if (apiReport != null) {
                         dto.setLastResult(apiReport.getStatus());
                         dto.setStatus(apiReport.getStatus());
                     }
-                }else if (StringUtils.equalsAnyIgnoreCase("Error",dto.getStatus(), dto.getLastResult())) {
+                } else if (StringUtils.equalsAnyIgnoreCase("Error", dto.getStatus(), dto.getLastResult())) {
                     isUpdate = true;
                     dto.setLastResult("Fail");
                     dto.setStatus("Fail");

From 9800af08dc8b2e1f33bfdd9f0408af83b56fdec1 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 26 Nov 2021 18:36:37 +0800
Subject: [PATCH 008/256] chore: sync

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 frontend/src/business/components/xpack     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 269d23d500..ee09ba144c 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 269d23d5004ee49a9e82a977027ca72757d3056a
+Subproject commit ee09ba144c76178490a957bc0a14884d8761df0d
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index a8c75d8f4c..6837952d3e 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit a8c75d8f4c88979a8e7851402776bce5b7ed2551
+Subproject commit 6837952d3eacf40f19ad2e3e91c01a3b5ba07b89

From 13d0cc5e8f915466ba6181ba1041697473863bac Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Fri, 26 Nov 2021 18:53:38 +0800
Subject: [PATCH 009/256] chore: sync

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 frontend/src/business/components/xpack     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index ee09ba144c..269d23d500 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit ee09ba144c76178490a957bc0a14884d8761df0d
+Subproject commit 269d23d5004ee49a9e82a977027ca72757d3056a
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 6837952d3e..a8c75d8f4c 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 6837952d3eacf40f19ad2e3e91c01a3b5ba07b89
+Subproject commit a8c75d8f4c88979a8e7851402776bce5b7ed2551

From c238ac0640078e0c77867cc0695e5ce3bcdbae8b Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Fri, 26 Nov 2021 17:35:59 +0800
Subject: [PATCH 010/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E5=BC=95=E7=94=A8=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008380 --user=郭雨琦 【接口测试】编辑场景，接口用例ID跳转会跳到系统设置页面
---
 .../scenario/component/ApiComponent.vue       |  1 +
 .../scenario/component/urlhelper.js           | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 6fcba534c1..2ea8cfe9c5 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -646,6 +646,7 @@ export default {
             response.data.sourceId = resource.resourceId;
             response.data.type = resource.type;
             response.data.refType = resource.refType;
+            debugger
             this.clickCase(response.data)
           } else {
             this.$error("接口用例场景场景已经被删除");
diff --git a/frontend/src/business/components/api/automation/scenario/component/urlhelper.js b/frontend/src/business/components/api/automation/scenario/component/urlhelper.js
index 647c05bd24..8098059c73 100644
--- a/frontend/src/business/components/api/automation/scenario/component/urlhelper.js
+++ b/frontend/src/business/components/api/automation/scenario/component/urlhelper.js
@@ -22,6 +22,46 @@ export function getUrl(d) {
         break;
       }
       break;
+    case "JDBCSampler":
+      switch (d.refType){
+        case "API":
+          url += "/api/definition?resourceId=" + resourceId;
+          break;
+        case "CASE":
+          url += "/api/definition?caseId=" + d.id;
+          break;
+      }
+      break;
+    case "DebugSampler":
+      switch (d.refType){
+        case "API":
+          url += "/api/definition?resourceId=" + resourceId;
+          break;
+        case "CASE":
+          url += "/api/definition?caseId=" + d.id;
+          break;
+      }
+      break;
+    case "DubboSampler":
+      switch (d.refType){
+        case "API":
+          url += "/api/definition?resourceId=" + resourceId;
+          break;
+        case "CASE":
+          url += "/api/definition?caseId=" + d.id;
+          break;
+      }
+      break;
+    case "TCPSampler":
+      switch (d.refType){
+        case "API":
+          url += "/api/definition?resourceId=" + resourceId;
+          break;
+        case "CASE":
+          url += "/api/definition?caseId=" + d.id;
+          break;
+      }
+      break;
     case "scenario":
       url += "/api/automation?resourceId=" + resourceId;
       break;

From 944d5428d34f78e607edf7c2b795774927285819 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Fri, 26 Nov 2021 19:21:50 +0800
Subject: [PATCH 011/256] =?UTF-8?q?fix(=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF):=20=E4=B8=89=E6=96=B9=E4=BF=A1=E6=81=AF=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008394 --user=郭雨琦 【github#8173】user bind Jira id with
'not_authorized' error 用户绑定JIRA账号报未授权错误
---
 .../settings/components/PersonRouter.vue      | 45 ++++++++++++++++---
 .../settings/personal/PersonFromSetting.vue   | 29 +++---------
 2 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/frontend/src/business/components/settings/components/PersonRouter.vue b/frontend/src/business/components/settings/components/PersonRouter.vue
index 8efd1136b6..3862728108 100644
--- a/frontend/src/business/components/settings/components/PersonRouter.vue
+++ b/frontend/src/business/components/settings/components/PersonRouter.vue
@@ -6,7 +6,7 @@
       <el-tab-pane   name="third_account" :label="$t('commons.third_account')" class="setting-item"></el-tab-pane>
     </el-tabs>
     <ms-main-container>
-      <ms-person-from-setting v-if="activeIndex==='commons.personal_setting'" @getPlatformInfo = "getPlatformInfo" @cancel = "cancel"/>
+      <ms-person-from-setting v-if="activeIndex==='commons.personal_setting'" :form = form @getPlatformInfo = "getPlatformInfo" @cancel = "cancel" />
       <ms-api-keys v-if="activeIndex==='commons.api_keys'"/>
       <password-info v-if="activeIndex==='change_password'" :rule-form = "ruleForm"></password-info>
       <el-form v-if="activeIndex==='third_account'">
@@ -31,7 +31,7 @@
   import MsApiKeys from "@/business/components/settings/personal/ApiKeys";
   import MsMainContainer from "@/business/components/common/components/MsMainContainer";
   import PasswordInfo from "@/business/components/settings/personal/PasswordInfo";
-  import {getCurrentWorkspaceId} from "@/common/js/utils";
+  import {getCurrentUser, getCurrentWorkspaceId} from "@/common/js/utils";
   import ZentaoUserInfo from "@/business/components/settings/personal/ZentaoUserInfo";
   import TapdUserInfo from "@/business/components/settings/personal/TapdUserInfo";
   import JiraUserInfo from "@/business/components/settings/personal/JiraUserInfo";
@@ -78,10 +78,15 @@
           zentaoPassword: '',
           azureDevopsPat: ''
         },
-        result:{}
+        result:{},
+        workspaceList:[],
+        projectList:[]
       }
     },
     methods:{
+      currentUser: () => {
+        return getCurrentUser();
+      },
       handleAuth(type) {
         let param = {...this.currentPlatformInfo};
         param.workspaceId = getCurrentWorkspaceId();
@@ -91,13 +96,15 @@
         });
       },
       getPlatformInfo(row) {
+        let orgId = getCurrentWorkspaceId();
         if (row.platformInfo) {
           this.form = row;
-          this.form.platformInfo = JSON.parse(row.platformInfo);
+          if (!row.platformInfo[orgId]) {
+            this.form.platformInfo = JSON.parse(row.platformInfo);
+          }
         } else {
           this.form.platformInfo = {};
         }
-        let orgId = getCurrentWorkspaceId();
         if (!this.form.platformInfo[orgId]) {
           this.form.platformInfo[orgId] = {};
         }
@@ -123,15 +130,43 @@
       },
       updateUser(updateUserForm) {
         let param = {};
+        if(!this.form.id){
+          console.log(this.$refs.personFrom)
+          //this.form.id = this.$refs.personFrom.form.id
+        }
+        console.log("this.form")
+        console.log(this.form)
         Object.assign(param, this.form);
         param.platformInfo = JSON.stringify(this.form.platformInfo);
         this.result = this.$post(this.updatePath, param, response => {
           this.$success(this.$t('commons.modify_success'));
           localStorage.setItem(TokenKey, JSON.stringify(response.data));
           this.$emit('closeDialog', false);
+          this.initTableData()
           this.reload();
         });
       },
+      initTableData() {
+        this.result = this.$get("/user/info/" + encodeURIComponent(this.currentUser().id), response => {
+          let data = response.data;
+          this.isLocalUser = response.data.source === 'LOCAL';
+          let dataList = [];
+          dataList[0] = data;
+          this.form = data;
+          this.getPlatformInfo(data);
+          this.getWsAndPj();
+        });
+      },
+      getWsAndPj(){
+        this.$get("/user/get/ws_pj/" + encodeURIComponent(this.currentUser().id), response => {
+          let data = response.data;
+          this.workspaceList = data.workspace;
+          this.projectList = data.project
+        });
+      },
+    },
+    created() {
+      this.initTableData();
     }
 
   }
diff --git a/frontend/src/business/components/settings/personal/PersonFromSetting.vue b/frontend/src/business/components/settings/personal/PersonFromSetting.vue
index c173bc9845..8b13038496 100644
--- a/frontend/src/business/components/settings/personal/PersonFromSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonFromSetting.vue
@@ -58,12 +58,16 @@ export default {
     'reload',
     'reloadTopMenus'
   ],
+  props:{
+    form:{
+      type:Object
+    }
+  },
   data() {
     return {
       result: {},
       isLocalUser: false,
       updatePath: '/user/update/current',
-      form: {platformInfo: {}},
       ruleForm: {},
       rule: {
         name: [
@@ -93,13 +97,11 @@ export default {
           }
         ],
       },
-      workspaceList:[],
-      projectList:[]
     };
   },
 
   created() {
-    this.initTableData();
+
   },
   methods: {
     currentUser: () => {
@@ -118,7 +120,6 @@ export default {
           this.result = this.$post(this.updatePath, param, response => {
             this.$success(this.$t('commons.modify_success'));
             localStorage.setItem(TokenKey, JSON.stringify(response.data));
-            this.initTableData();
             this.reload();
           });
         } else {
@@ -126,24 +127,6 @@ export default {
         }
       });
     },
-    initTableData() {
-      this.result = this.$get("/user/info/" + encodeURIComponent(this.currentUser().id), response => {
-        let data = response.data;
-        this.isLocalUser = response.data.source === 'LOCAL';
-        let dataList = [];
-        dataList[0] = data;
-        this.form = data;
-        this.$emit('getPlatformInfo', data);
-        this.getWsAndPj();
-      });
-    },
-    getWsAndPj(){
-      this.$get("/user/get/ws_pj/" + encodeURIComponent(this.currentUser().id), response => {
-        let data = response.data;
-        this.workspaceList = data.workspace;
-        this.projectList = data.project
-      });
-    },
     handleClose() {
       this.form = {};
       this.ruleForm = {};

From 6f01c2c929eef5995bce52ab4bcf5733c7e35e2b Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 29 Nov 2021 09:37:20 +0800
Subject: [PATCH 012/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E5=BC=95=E7=94=A8=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008380 --user=郭雨琦 场景编辑，复制或引用 tcp、sql、dubbo的接口用例，点击ID，跳转会跳到系统设置页面
---
 .../api/automation/scenario/component/ApiComponent.vue           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 2ea8cfe9c5..6fcba534c1 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -646,7 +646,6 @@ export default {
             response.data.sourceId = resource.resourceId;
             response.data.type = resource.type;
             response.data.refType = resource.refType;
-            debugger
             this.clickCase(response.data)
           } else {
             this.$error("接口用例场景场景已经被删除");

From 2493383e1baaf9c081e7a7d7cf3ef8e3dfbd3d88 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 26 Nov 2021 16:49:44 +0800
Subject: [PATCH 013/256] =?UTF-8?q?refactor:=20=E8=B7=AF=E7=94=B1=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=97=B6=E6=8F=90=E7=A4=BA=E8=84=91=E5=9B=BE=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=20--bug=3D1008131=20--user=3D=E9=99=88=E5=BB=BA?=
 =?UTF-8?q?=E6=98=9F=20=E3=80=90github#7831=E3=80=91=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E3=80=90=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA=E3=80=91-?=
 =?UTF-8?q?=E3=80=90=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E3=80=91=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0=E7=94=A8=E4=BE=8B=E6=89=A7=E8=A1=8C=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=EF=BC=8C=E7=82=B9=E5=87=BB=E5=85=B6=E4=BB=96=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=9C=AA=E6=8F=90=E7=A4=BA=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=94=A8=E4=BE=8B=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=AE=B0=E5=BD=95=E4=B8=A2=E5=A4=B1=E3=80=82?=
 =?UTF-8?q?=20https://www.tapd.cn/55049933/s/1074851?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/track/case/TestCase.vue    | 11 ++++++++++-
 .../track/case/components/TestCaseApiRelate.vue    |  4 +++-
 .../components/track/common/minder/minderUtils.js  | 14 +++++++++++---
 .../components/track/plan/view/TestPlanView.vue    |  9 ++++++++-
 .../functional/FunctionalTestCaseList.vue          |  2 +-
 .../comonents/functional/TestPlanFunctional.vue    | 14 ++++++++++++--
 .../track/review/view/TestCaseReviewView.vue       |  9 ++++++++-
 .../review/view/components/TestReviewFunction.vue  | 14 ++++++++++++--
 8 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index e236795bb3..e3d0d23c15 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -166,7 +166,8 @@ export default {
       type: '',
       activeDom: 'left',
       tmpActiveDom: null,
-      total: 0
+      total: 0,
+      tmpPath: null
     };
   },
   mounted() {
@@ -178,6 +179,14 @@ export default {
       this.init(this.$route);
     }
   },
+  beforeRouteLeave(to, from, next) {
+    if (this.$store.state.isTestCaseMinderChanged) {
+      this.$refs.isChangeConfirm.open();
+      this.tmpPath = to.path;
+    } else {
+      next();
+    }
+  },
   watch: {
     redirectID() {
       this.renderComponent = false;
diff --git a/frontend/src/business/components/track/case/components/TestCaseApiRelate.vue b/frontend/src/business/components/track/case/components/TestCaseApiRelate.vue
index 3a77b75372..1dd90eaa84 100644
--- a/frontend/src/business/components/track/case/components/TestCaseApiRelate.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseApiRelate.vue
@@ -58,7 +58,9 @@ export default {
     open() {
       this.init();
       this.$refs.baseRelevance.open();
-      this.$refs.apiCaseList.clear();
+      if (this.$refs.apiCaseList) {
+        this.$refs.apiCaseList.clear();
+      }
     },
     init() {
       if (this.$refs.apiCaseList) {
diff --git a/frontend/src/business/components/track/common/minder/minderUtils.js b/frontend/src/business/components/track/common/minder/minderUtils.js
index b2fb258e12..e71ab0b544 100644
--- a/frontend/src/business/components/track/common/minder/minderUtils.js
+++ b/frontend/src/business/components/track/common/minder/minderUtils.js
@@ -567,10 +567,18 @@ export function openMinderConfirm(vueObj, activeDom) {
 export function saveMinderConfirm(vueObj, isSave) {
   if (isSave) {
     vueObj.$refs.minder.save(window.minder.exportJson());
-  } else {
-    vueObj.$store.commit('setIsTestCaseMinderChanged', false);
   }
+  vueObj.$store.commit('setIsTestCaseMinderChanged', false);
   vueObj.$nextTick(() => {
-    vueObj.activeDom = vueObj.tmpActiveDom;
+    if (vueObj.tmpActiveDom) {
+      vueObj.activeDom = vueObj.tmpActiveDom;
+      vueObj.tmpActiveDom = null;
+    }
+    if (vueObj.tmpPath) {
+      vueObj.$router.push({
+        path: vueObj.tmpPath
+      });
+      vueObj.tmpPath = null;
+    }
   });
 }
diff --git a/frontend/src/business/components/track/plan/view/TestPlanView.vue b/frontend/src/business/components/track/plan/view/TestPlanView.vue
index 6a3dc17f1b..bb66c0f185 100644
--- a/frontend/src/business/components/track/plan/view/TestPlanView.vue
+++ b/frontend/src/business/components/track/plan/view/TestPlanView.vue
@@ -20,7 +20,7 @@
       </template>
     </ms-test-plan-header-bar>
     <test-plan-functional v-if="activeIndex === 'functional'" :redirectCharType="redirectCharType"
-                          :clickType="clickType" :plan-id="planId"/>
+                          :clickType="clickType" :plan-id="planId" ref="testPlanFunctional"/>
     <test-plan-api v-if="activeIndex === 'api'" :redirectCharType="redirectCharType" :clickType="clickType"
                    :plan-id="planId"/>
     <test-plan-load v-if="activeIndex === 'load'" :redirectCharType="redirectCharType" :clickType="clickType"
@@ -82,6 +82,13 @@ export default {
       this.getTestPlans();
     }
   },
+  beforeRouteLeave(to, from, next) {
+    if (!this.$refs.testPlanFunctional) {
+      next();
+    } else if (this.$refs.testPlanFunctional.handleBeforeRouteLeave(to)) {
+      next();
+    }
+  },
   created() {
     this.$EventBus.$on('projectChange', () => {
       if (this.$route.name === 'planView') {
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index 11177d73a4..747dca3085 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -450,7 +450,7 @@ export default {
         this.testCaseTemplate = template;
         this.fields = getTableHeaderWithCustomFields(this.tableHeaderKey, this.testCaseTemplate.customFields);
         this.result.loading = false;
-        this.$refs.table.reloadTable();
+        if (this.$refs.table) this.$refs.table.reloadTable();
       });
     },
     getCustomFieldValue(row, field) {
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue b/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
index f208e9de4b..60f062aedf 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
@@ -83,7 +83,8 @@ export default {
       activeDom: 'left',
       selectNode: {},
       condition: {},
-      tmpActiveDom: null
+      tmpActiveDom: null,
+      tmpPath: null
     };
   },
   props: [
@@ -164,7 +165,16 @@ export default {
     },
     changeConfirm(isSave) {
       saveMinderConfirm(this, isSave);
-    }
+    },
+    handleBeforeRouteLeave(to) {
+      if (this.$store.state.isTestCaseMinderChanged) {
+        this.$refs.isChangeConfirm.open();
+        this.tmpPath = to.path;
+        return false;
+      } else {
+        return true;
+      }
+    },
   }
 };
 
diff --git a/frontend/src/business/components/track/review/view/TestCaseReviewView.vue b/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
index 045c56b905..f89aba2c3a 100644
--- a/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
+++ b/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
@@ -17,7 +17,7 @@
       </template>
     </ms-test-plan-header-bar>
     <test-review-function v-if="activeIndex === 'functional'" :redirectCharType="redirectCharType"
-                          :clickType="clickType" :review-id="reviewId"></test-review-function>
+                          :clickType="clickType" :review-id="reviewId" ref="testReviewFunction"/>
   </div>
 
 </template>
@@ -86,6 +86,13 @@ export default {
     this.initData();
     this.openTestCaseEdit(this.$route.path);
   },
+  beforeRouteLeave(to, from, next) {
+    if (!this.$refs.testReviewFunction) {
+      next();
+    } else if (this.$refs.testReviewFunction.handleBeforeRouteLeave(to)) {
+      next();
+    }
+  },
   watch: {
     '$route'(to, from) {
       this.openTestCaseEdit(to.path);
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue b/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
index 284f6d0134..16e09ccab0 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
@@ -82,7 +82,8 @@ export default {
       isMenuShow: true,
       activeDom: 'left',
       condition: {},
-      tmpActiveDom: null
+      tmpActiveDom: null,
+      tmpPath: null
     }
   },
   props: [
@@ -130,7 +131,16 @@ export default {
     },
     changeConfirm(isSave) {
       saveMinderConfirm(this, isSave);
-    }
+    },
+    handleBeforeRouteLeave(to) {
+      if (this.$store.state.isTestCaseMinderChanged) {
+        this.$refs.isChangeConfirm.open();
+        this.tmpPath = to.path;
+        return false;
+      } else {
+        return true;
+      }
+    },
   }
 }
 </script>

From daac8f1da9aa21c080cfdc2b3e3ec39351a69a19 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 29 Nov 2021 12:40:54 +0800
Subject: [PATCH 014/256] =?UTF-8?q?fix(=E6=88=91=E7=9A=84=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0):=20xpack?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1007507 --user=郭雨琦 接口用例在接口定义后面
---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index a8c75d8f4c..170b78b71a 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit a8c75d8f4c88979a8e7851402776bce5b7ed2551
+Subproject commit 170b78b71af0fae99f45eca1aea17713fc7c2628

From 06596d33d2d06641a51a2fdfc092b8e040a9c1b6 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 29 Nov 2021 16:09:18 +0800
Subject: [PATCH 015/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BF=AE=E5=A4=8DSQL=E8=AF=B7=E6=B1=82=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=90=8E=E7=94=A8=E4=BE=8B=E5=8F=98=E9=87=8F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008389 --user=赵勇 【github#7532】接口定义中，选择SQL，创建接口，自定义变量修改后，会把原有case的内容全部清空 https://www.tapd.cn/55049933/s/1076029
---
 .../api/service/ApiDefinitionService.java     |  12 +-
 .../scenario/ApiScenarioVariables.vue         |  26 +--
 .../components/ApiScenarioVariables.vue       | 180 +++++++++---------
 .../components/EditCompleteContainer.vue      |   5 -
 4 files changed, 117 insertions(+), 106 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index 8eb0f3aa9a..bc34ce8c34 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -514,11 +514,13 @@ public class ApiDefinitionService {
         }
         this.setModule(test);
         apiDefinitionMapper.updateByPrimaryKeySelective(test);
-        // 同步修改用例
-        List<String> ids = new ArrayList<>();
-        ids.add(request.getId());
-        apiTestCaseService.updateByApiDefinitionId(ids, test.getPath(), test.getMethod(), test.getProtocol());
-        //saveFollows(test.getId(), request.getFollows());
+
+        // 同步修改用例路径
+        if (StringUtils.equals(test.getProtocol(), "HTTP")) {
+            List<String> ids = new ArrayList<>();
+            ids.add(request.getId());
+            apiTestCaseService.updateByApiDefinitionId(ids, test.getPath(), test.getMethod(), test.getProtocol());
+        }
         return test;
     }
 
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioVariables.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioVariables.vue
index 8c7f0947b0..50dd810124 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioVariables.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioVariables.vue
@@ -56,22 +56,26 @@
     },
     methods: {
       remove: function (index) {
-        this.items.splice(index, 1);
-        this.$emit('change', this.items);
+        if(this.items) {
+          this.items.splice(index, 1);
+          this.$emit('change', this.items);
+        }
       },
       change: function () {
         let isNeedCreate = true;
         let removeIndex = -1;
-        this.items.forEach((item, index) => {
-          if (!item.name && !item.value) {
-            // 多余的空行
-            if (index !== this.items.length - 1) {
-              removeIndex = index;
+        if(this.items) {
+          this.items.forEach((item, index) => {
+            if (!item.name && !item.value) {
+              // 多余的空行
+              if (index !== this.items.length - 1) {
+                removeIndex = index;
+              }
+              // 没有空行，需要创建空行
+              isNeedCreate = false;
             }
-            // 没有空行，需要创建空行
-            isNeedCreate = false;
-          }
-        });
+          });
+        }
         if (isNeedCreate) {
           this.items.push(new KeyValue({enable: true}));
         }
diff --git a/frontend/src/business/components/api/definition/components/ApiScenarioVariables.vue b/frontend/src/business/components/api/definition/components/ApiScenarioVariables.vue
index c692d6be57..c6654488a1 100644
--- a/frontend/src/business/components/api/definition/components/ApiScenarioVariables.vue
+++ b/frontend/src/business/components/api/definition/components/ApiScenarioVariables.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <span class="kv-description" v-if="description">
-      {{description}}
+      {{ description }}
     </span>
     <div class="kv-row" v-for="(item, index) in items" :key="index">
       <el-row type="flex" :gutter="5" justify="space-between" align="middle">
@@ -11,8 +11,16 @@
         </el-col>
 
         <el-col>
-          <ms-api-variable-input :show-copy="showCopy" :show-variable="showVariable" :is-read-only="isReadOnly" v-model="item.name" size="small" maxlength="200" @change="change"
-                                 :placeholder="$t('api_test.variable_name')" show-word-limit/>
+          <ms-api-variable-input
+            :show-copy="showCopy"
+            :show-variable="showVariable"
+            :is-read-only="isReadOnly"
+            :placeholder="$t('api_test.variable_name')"
+            v-model="item.name"
+            size="small"
+            maxlength="200"
+            @change="change"
+            show-word-limit/>
         </el-col>
         <el-col>
           <el-autocomplete
@@ -21,7 +29,7 @@
             :fetch-suggestions="funcSearch"
             :placeholder="$t('api_test.value')"
             value-key="name"
-            highlight-first-item>
+            highlight-first-item style="width: 100%">
             <i slot="suffix" class="el-input__icon el-icon-edit pointer" @click="advanced"></i>
           </el-autocomplete>
         </el-col>
@@ -45,47 +53,49 @@
 </template>
 
 <script>
-  import {KeyValue} from "../model/ApiTestModel";
-  import MsApiVariableInput from "./ApiVariableInput";
-  import {JMETER_FUNC, MOCKJS_FUNC} from "@/common/js/constants";
-  import MsApiVariableAdvance from "../../test/components/ApiVariableAdvance";
+import {KeyValue} from "../model/ApiTestModel";
+import MsApiVariableInput from "./ApiVariableInput";
+import {JMETER_FUNC, MOCKJS_FUNC} from "@/common/js/constants";
+import MsApiVariableAdvance from "../../test/components/ApiVariableAdvance";
 
-  export default {
-    name: "MsApiScenarioVariables",
-    components: {MsApiVariableInput, MsApiVariableAdvance},
-    props: {
-      description: String,
-      items: Array,
-      isReadOnly: {
-        type: Boolean,
-        default: false
-      },
-      showVariable: {
-        type: Boolean,
-        default: true
-      },
-      showCopy: {
-        type: Boolean,
-        default: true
-      },
+export default {
+  name: "MsApiScenarioVariables",
+  components: {MsApiVariableInput, MsApiVariableAdvance},
+  props: {
+    description: String,
+    items: Array,
+    isReadOnly: {
+      type: Boolean,
+      default: false
     },
-    data() {
-      return {
-      }
+    showVariable: {
+      type: Boolean,
+      default: true
     },
-    methods: {
-      remove: function (index) {
+    showCopy: {
+      type: Boolean,
+      default: true
+    },
+  },
+  data() {
+    return {}
+  },
+  methods: {
+    remove: function (index) {
+      if (this.items) {
         this.items.splice(index, 1);
         this.$emit('change', this.items);
-      },
-      copy: function (item, index) {
-        let copy = {};
-        Object.assign(copy, item);
-        this.items.splice(index + 1, 0, copy);
-      },
-      change: function () {
-        let isNeedCreate = true;
-        let removeIndex = -1;
+      }
+    },
+    copy: function (item, index) {
+      let copy = {};
+      Object.assign(copy, item);
+      this.items.splice(index + 1, 0, copy);
+    },
+    change: function () {
+      let isNeedCreate = true;
+      let removeIndex = -1;
+      if (this.items) {
         this.items.forEach((item, index) => {
           if (!item.name && !item.value) {
             // 多余的空行
@@ -96,59 +106,59 @@
             isNeedCreate = false;
           }
         });
-        if (isNeedCreate) {
-          this.items.push(new KeyValue({enable: true}));
-        }
-        this.$emit('change', this.items);
-        // TODO 检查key重复
-      },
-      isDisable: function (index) {
-        return this.items.length - 1 === index;
-      },
-      advanced() {
-        this.$refs.variableAdvance.open();
-      },
-      createFilter(queryString) {
-        return (variable) => {
-          return (variable.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
-        };
-      },
-      funcFilter(queryString) {
-        return (func) => {
-          return (func.name.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
-        };
-      },
-      funcSearch(queryString, cb) {
-        let funcs = MOCKJS_FUNC.concat(JMETER_FUNC);
-        let results = queryString ? funcs.filter(this.funcFilter(queryString)) : funcs;
-        // 调用 callback 返回建议列表的数据
-        cb(results);
-      },
-    },
-
-    created() {
-      if (this.items.length === 0) {
+      }
+      if (isNeedCreate) {
         this.items.push(new KeyValue({enable: true}));
       }
+      this.$emit('change', this.items);
+    },
+    isDisable: function (index) {
+      return this.items.length - 1 === index;
+    },
+    advanced() {
+      this.$refs.variableAdvance.open();
+    },
+    createFilter(queryString) {
+      return (variable) => {
+        return (variable.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+      };
+    },
+    funcFilter(queryString) {
+      return (func) => {
+        return (func.name.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+      };
+    },
+    funcSearch(queryString, cb) {
+      let funcs = MOCKJS_FUNC.concat(JMETER_FUNC);
+      let results = queryString ? funcs.filter(this.funcFilter(queryString)) : funcs;
+      // 调用 callback 返回建议列表的数据
+      cb(results);
+    },
+  },
+
+  created() {
+    if (this.items.length === 0) {
+      this.items.push(new KeyValue({enable: true}));
     }
   }
+}
 </script>
 
 <style scoped>
-  .kv-description {
-    font-size: 13px;
-  }
+.kv-description {
+  font-size: 13px;
+}
 
-  .kv-checkbox {
-    width: 20px;
-    margin-right: 10px;
-  }
+.kv-checkbox {
+  width: 70px;
+  margin-right: 10px;
+}
 
-  .kv-row {
-    margin-top: 10px;
-  }
+.kv-row {
+  margin-top: 10px;
+}
 
-  .kv-delete,.kv-copy {
-    width: 60px;
-  }
+.kv-delete, .kv-copy {
+  width: 60px;
+}
 </style>
diff --git a/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue b/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue
index 60ff7c46a5..4c2931e1fe 100644
--- a/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue
+++ b/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue
@@ -78,12 +78,10 @@
     </div>
 
     <div v-if="showMock && (currentProtocol === 'HTTP')" class="ms-api-div">
-      <!--      <mock-config :base-mock-config-data="baseMockConfigData" type="http"/>-->
       <mock-tab :base-mock-config-data="baseMockConfigData" :is-tcp="false"/>
     </div>
     <div v-if="showMock && (currentProtocol === 'TCP')" class="ms-api-div">
       <mock-tab :base-mock-config-data="baseMockConfigData" :is-tcp="true"/>
-      <!--      <tcp-mock-config :base-mock-config-data="baseMockConfigData" type="tcp"/>-->
     </div>
     <div v-if="showTestCaseList">
       <!--测试用例列表-->
@@ -263,9 +261,6 @@ export default {
       this.$emit("refresh");
     },
     changeTab(tabType) {
-      if (this.$refs.apiConfig) {
-        this.$refs.apiConfig.handleSave();
-      }
       this.refreshButtonActiveClass(tabType);
     },
     removeListener() {

From 568bb275e4eb3a0414d5d784a495582cd7c58277 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 29 Nov 2021 17:19:53 +0800
Subject: [PATCH 016/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=20=E4=BF=AE=E5=A4=8D=E5=B9=B6=E5=8F=91=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E6=89=A7=E8=A1=8C=E6=8A=A5=E5=91=8A=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/api/service/MsResultService.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/api/service/MsResultService.java b/backend/src/main/java/io/metersphere/api/service/MsResultService.java
index 9b6fa71db2..25c5afdfb7 100644
--- a/backend/src/main/java/io/metersphere/api/service/MsResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/MsResultService.java
@@ -102,6 +102,9 @@ public class MsResultService {
 
     public void formatTestResult(TestResult testResult, Map<String, ScenarioResult> scenarios, SampleResult result) {
         String scenarioName = StringUtils.substringBeforeLast(result.getThreadName(), THREAD_SPLIT);
+        if (StringUtils.equals(scenarioName, "parallel")) {
+            scenarioName = testResult.getTestId();
+        }
         ScenarioResult scenarioResult;
         if (!scenarios.containsKey(scenarioName)) {
             scenarioResult = new ScenarioResult();

From c17be67a9a7b3ff5a2f7ec31f89a5ada425a5b97 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 29 Nov 2021 18:18:26 +0800
Subject: [PATCH 017/256] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E4=B8=8D?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/api/head/ApiHeaderMenus.vue  | 3 +--
 .../src/business/components/common/head/ProjectSwitch.vue     | 4 +++-
 .../components/performance/head/PerformanceHeaderMenus.vue    | 2 --
 .../business/components/project/head/ProjectHeaderMenus.vue   | 3 +--
 .../src/business/components/project/menu/EnvironmentList.vue  | 2 --
 .../settings/workspace/environment/EnvironmentGroupList.vue   | 2 --
 .../settings/workspace/environment/EnvironmentList.vue        | 2 --
 .../src/business/components/track/head/TrackHeaderMenus.vue   | 3 +--
 8 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/frontend/src/business/components/api/head/ApiHeaderMenus.vue b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
index 79e40d6714..febf0990f0 100644
--- a/frontend/src/business/components/api/head/ApiHeaderMenus.vue
+++ b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
@@ -31,13 +31,12 @@
 import MsRecentList from "../../common/head/RecentList";
 import MsShowAll from "../../common/head/ShowAll";
 import MsCreateButton from "../../common/head/CreateButton";
-import SearchList from "@/business/components/common/head/SearchList";
 import ProjectChange from "@/business/components/common/head/ProjectSwitch";
 import {mapGetters} from "vuex";
 
 export default {
   name: "MsApiHeaderMenus",
-  components: {SearchList, MsCreateButton, MsShowAll, MsRecentList, ProjectChange},
+  components: {MsCreateButton, MsShowAll, MsRecentList, ProjectChange},
   data() {
     return {
       currentPath: '',
diff --git a/frontend/src/business/components/common/head/ProjectSwitch.vue b/frontend/src/business/components/common/head/ProjectSwitch.vue
index 0fa2b5c66e..427d57ba01 100644
--- a/frontend/src/business/components/common/head/ProjectSwitch.vue
+++ b/frontend/src/business/components/common/head/ProjectSwitch.vue
@@ -9,7 +9,9 @@
         </span>
       </template>
       <search-list :current-project.sync="currentProject"/>
-      <el-divider/>
+      <div v-permission="['WORKSPACE_PROJECT_MANAGER:READ']">
+        <el-divider/>
+      </div>
       <el-menu-item :index="'/setting/project/create'" v-permission="['WORKSPACE_PROJECT_MANAGER:READ+CREATE']">
         <font-awesome-icon :icon="['fa', 'plus']"/>
         <span style="padding-left: 7px;">{{ $t("project.create") }}</span>
diff --git a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
index 1a75acc8e1..145e87625e 100644
--- a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
+++ b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
@@ -25,14 +25,12 @@
 import MsRecentList from "../../common/head/RecentList";
 import MsCreateButton from "../../common/head/CreateButton";
 import MsShowAll from "../../common/head/ShowAll";
-import SearchList from "@/business/components/common/head/SearchList";
 import ProjectChange from "@/business/components/common/head/ProjectSwitch";
 
 export default {
   name: "PerformanceHeaderMenus",
   components: {
     ProjectChange,
-    SearchList,
     MsCreateButton,
     MsShowAll,
     MsRecentList,
diff --git a/frontend/src/business/components/project/head/ProjectHeaderMenus.vue b/frontend/src/business/components/project/head/ProjectHeaderMenus.vue
index d0d8e813b4..c59230feb6 100644
--- a/frontend/src/business/components/project/head/ProjectHeaderMenus.vue
+++ b/frontend/src/business/components/project/head/ProjectHeaderMenus.vue
@@ -47,12 +47,11 @@
 import MsShowAll from "@/business/components/common/head/ShowAll";
 import MsRecentList from "@/business/components/common/head/RecentList";
 import MsCreateButton from "@/business/components/common/head/CreateButton";
-import SearchList from "@/business/components/common/head/SearchList";
 import ProjectChange from "@/business/components/common/head/ProjectSwitch";
 
 export default {
   name: "ProjectHeaderMenus",
-  components: {ProjectChange, SearchList, MsShowAll, MsRecentList, MsCreateButton},
+  components: {ProjectChange, MsShowAll, MsRecentList, MsCreateButton},
   data() {
     return {
       currentProject: '',
diff --git a/frontend/src/business/components/project/menu/EnvironmentList.vue b/frontend/src/business/components/project/menu/EnvironmentList.vue
index 1060cd1824..a2a9cdb1e7 100644
--- a/frontend/src/business/components/project/menu/EnvironmentList.vue
+++ b/frontend/src/business/components/project/menu/EnvironmentList.vue
@@ -111,7 +111,6 @@ import EnvironmentEdit from "@/business/components/api/test/components/environme
 import MsAsideItem from "@/business/components/common/components/MsAsideItem";
 import MsAsideContainer from "@/business/components/common/components/MsAsideContainer";
 import ProjectSwitch from "@/business/components/common/head/ProjectSwitch";
-import SearchList from "@/business/components/common/head/SearchList";
 import {downloadFile, getCurrentProjectID} from "@/common/js/utils";
 import EnvironmentImport from "@/business/components/project/menu/EnvironmentImport";
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
@@ -123,7 +122,6 @@ export default {
     MsContainer,
     MsMainContainer,
     EnvironmentImport,
-    SearchList,
     ProjectSwitch,
     MsAsideContainer,
     MsAsideItem,
diff --git a/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupList.vue b/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupList.vue
index a91c8fdd36..301794a490 100644
--- a/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupList.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupList.vue
@@ -73,7 +73,6 @@ import EnvironmentEdit from "@/business/components/api/test/components/environme
 import MsAsideItem from "@/business/components/common/components/MsAsideItem";
 import MsAsideContainer from "@/business/components/common/components/MsAsideContainer";
 import ProjectSwitch from "@/business/components/common/head/ProjectSwitch";
-import SearchList from "@/business/components/common/head/SearchList";
 import EnvironmentImport from "@/business/components/project/menu/EnvironmentImport";
 import EnvironmentGroupRow from "@/business/components/settings/workspace/environment/EnvironmentGroupRow";
 import EditEnvironmentGroup from "@/business/components/settings/workspace/environment/EditEnvironmentGroup";
@@ -84,7 +83,6 @@ export default {
   components: {
     EditEnvironmentGroup,
     EnvironmentImport,
-    SearchList,
     ProjectSwitch,
     MsAsideContainer,
     MsAsideItem,
diff --git a/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue b/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
index 6ad11cf546..d874c93c47 100644
--- a/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
@@ -121,7 +121,6 @@ import EnvironmentEdit from "@/business/components/api/test/components/environme
 import MsAsideItem from "@/business/components/common/components/MsAsideItem";
 import MsAsideContainer from "@/business/components/common/components/MsAsideContainer";
 import ProjectSwitch from "@/business/components/common/head/ProjectSwitch";
-import SearchList from "@/business/components/common/head/SearchList";
 import {downloadFile, strMapToObj} from "@/common/js/utils";
 import EnvironmentImport from "@/business/components/project/menu/EnvironmentImport";
 import ShowMoreBtn from "@/business/components/track/case/components/ShowMoreBtn";
@@ -133,7 +132,6 @@ export default {
   components: {
     EnvGroupCascader,
     EnvironmentImport,
-    SearchList,
     ProjectSwitch,
     MsAsideContainer,
     MsAsideItem,
diff --git a/frontend/src/business/components/track/head/TrackHeaderMenus.vue b/frontend/src/business/components/track/head/TrackHeaderMenus.vue
index 0d24e643bc..f4874a943c 100644
--- a/frontend/src/business/components/track/head/TrackHeaderMenus.vue
+++ b/frontend/src/business/components/track/head/TrackHeaderMenus.vue
@@ -41,13 +41,12 @@
 import MsShowAll from "../../common/head/ShowAll";
 import MsRecentList from "../../common/head/RecentList";
 import MsCreateButton from "../../common/head/CreateButton";
-import SearchList from "@/business/components/common/head/SearchList";
 import ProjectChange from "@/business/components/common/head/ProjectSwitch";
 import {getCurrentProjectID} from "@/common/js/utils";
 
 export default {
   name: "TrackHeaderMenus",
-  components: {ProjectChange, SearchList, MsShowAll, MsRecentList, MsCreateButton},
+  components: {ProjectChange, MsShowAll, MsRecentList, MsCreateButton},
   data() {
     return {
       testPlanViewPath: '',

From be051153ba05b6710765483e96f9bb521063e9b7 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 29 Nov 2021 18:04:47 +0800
Subject: [PATCH 018/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E4=B8=AD?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=95=B0=E6=8D=AE=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/definition/components/ApiConfig.vue   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/ApiConfig.vue b/frontend/src/business/components/api/definition/components/ApiConfig.vue
index 03cb9dc3bb..7e54453f1d 100644
--- a/frontend/src/business/components/api/definition/components/ApiConfig.vue
+++ b/frontend/src/business/components/api/definition/components/ApiConfig.vue
@@ -73,17 +73,18 @@ export default {
       },
       deep: true
     },
-  },
-  response: {
-    handler(newObj, oldObj) {
-      this.responseCount++;
-      if (this.responseCount > 1) {
-        this.$store.state.apiStatus.set("responseChange", true);
-        this.$store.state.apiMap.set(this.currentApi.id, this.$store.state.apiStatus);
-      }
+    response: {
+      handler(newObj, oldObj) {
+        this.responseCount++;
+        if (this.responseCount > 1) {
+          this.$store.state.apiStatus.set("responseChange", true);
+          this.$store.state.apiMap.set(this.currentApi.id, this.$store.state.apiStatus);
+        }
+      },
+      deep: true
     },
-    deep: true
   },
+
   created() {
     this.getMaintainerOptions();
     switch (this.currentProtocol) {

From 0deb97504ceaf34d5368f356339f2af7354976ac Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Tue, 23 Nov 2021 20:15:32 +0800
Subject: [PATCH 019/256] =?UTF-8?q?fix(=E4=BB=BB=E5=8A=A1=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83):=20=E8=AF=AD=E8=A8=80=E9=80=89=E6=8B=A9=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=EF=BC=8C=E7=BF=BB=E9=A1=B5=E6=8C=89=E9=92=AE=E8=A2=AB?=
 =?UTF-8?q?=E6=8C=A4=E6=B2=A1=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008242 --user=王孝刚 【任务中心】语言选择英文，翻页按钮被挤没了
https://www.tapd.cn/55049933/s/1076087
---
 .../api/homepage/components/SceneInfoCard.vue |   8 +-
 .../components/ScheduleTaskInfoCard.vue       |   8 +-
 .../homepage/components/TestCaseInfoCard.vue  | 135 ++++++++++--------
 .../business/components/task/TaskCenter.vue   |   2 +-
 4 files changed, 86 insertions(+), 67 deletions(-)

diff --git a/frontend/src/business/components/api/homepage/components/SceneInfoCard.vue b/frontend/src/business/components/api/homepage/components/SceneInfoCard.vue
index 41051161e1..b15a58e1d4 100644
--- a/frontend/src/business/components/api/homepage/components/SceneInfoCard.vue
+++ b/frontend/src/business/components/api/homepage/components/SceneInfoCard.vue
@@ -50,17 +50,17 @@
       </el-row>
       </el-header>
       <el-main style="padding: 5px 5px 0px 5px;margin-top: 10px">
-        <el-container>
+        <el-container style="height: 100px;margin-top: 10px">
           <el-aside width="60%" class="count-number-show" style="margin-bottom: 0px;margin-top: 0px">
             <el-container style="height: 50px;margin-top: 10px">
               <el-aside width="50%" style="line-height: 40px;">
-                {{$t('api_test.home_page.detail_card.rate.pass')+":"}}
+                {{ $t('api_test.home_page.detail_card.rate.pass') + ":" }}
               </el-aside>
               <el-main style="padding: 0px 0px 0px 0px; line-height: 40px; text-align: center;">
                 <span class="rows-count-number">
-                {{sceneCountData.passRage}}
+                {{ sceneCountData.passRage }}
                   <el-tooltip placement="top" class="info-tool-tip">
-                    <div slot="content">{{ $t('api_test.home_page.formula.pass')}}</div>
+                    <div slot="content">{{ $t('api_test.home_page.formula.pass') }}</div>
                     <el-button icon="el-icon-info" style="padding:0px;border: 0px"></el-button>
                   </el-tooltip>
               </span>
diff --git a/frontend/src/business/components/api/homepage/components/ScheduleTaskInfoCard.vue b/frontend/src/business/components/api/homepage/components/ScheduleTaskInfoCard.vue
index e4abbc6993..11169edeb9 100644
--- a/frontend/src/business/components/api/homepage/components/ScheduleTaskInfoCard.vue
+++ b/frontend/src/business/components/api/homepage/components/ScheduleTaskInfoCard.vue
@@ -44,17 +44,17 @@
         </el-row>
       </el-header>
       <el-main style="padding: 5px;margin-top: 10px">
-        <el-container>
+        <el-container style="height: 96px;margin-top: 10px">
           <el-aside width="60%" class="count-number-show" style="margin-bottom: 0px;margin-top: 0px">
             <el-container>
               <el-aside width="30%">
-                {{$t('api_test.home_page.detail_card.rate.success')+":"}}
+                {{ $t('api_test.home_page.detail_card.rate.success') + ":" }}
               </el-aside>
               <el-main style="padding: 0px 0px 0px 0px; line-height: 100px; text-align: center;">
                 <span class="count-number">
-                {{scheduleTaskCountData.successRage}}
+                {{ scheduleTaskCountData.successRage }}
                   <el-tooltip placement="top" class="info-tool-tip">
-                    <div slot="content">{{ $t('api_test.home_page.formula.success')}}</div>
+                    <div slot="content">{{ $t('api_test.home_page.formula.success') }}</div>
                     <el-button icon="el-icon-info" style="padding:0px;border: 0px"></el-button>
                   </el-tooltip>
               </span>
diff --git a/frontend/src/business/components/api/homepage/components/TestCaseInfoCard.vue b/frontend/src/business/components/api/homepage/components/TestCaseInfoCard.vue
index 24260eadae..f58fc29dbe 100644
--- a/frontend/src/business/components/api/homepage/components/TestCaseInfoCard.vue
+++ b/frontend/src/business/components/api/homepage/components/TestCaseInfoCard.vue
@@ -1,31 +1,34 @@
 <template>
   <el-card class="table-card" v-loading="result.loading" body-style="padding:10px;">
-    <div slot="header" >
+    <div slot="header">
       <span class="title">
-        {{$t('api_test.home_page.test_case_count_card.title')}}
+        {{ $t('api_test.home_page.test_case_count_card.title') }}
       </span>
     </div>
     <el-container>
       <el-aside width="120px">
         <div class="main-number-show">
           <span class="count-number">
-            {{testCaseCountData.allApiDataCountNumber}}
+            {{ testCaseCountData.allApiDataCountNumber }}
           </span>
           <span style="color: #6C317C;">
-            {{$t('api_test.home_page.unit_of_measurement')}}
+            {{ $t('api_test.home_page.unit_of_measurement') }}
           </span>
         </div>
       </el-aside>
       <el-main style="padding-left: 0px;padding-right: 0px">
         <div style="width: 200px;margin:0 auto">
           <el-row align="center" class="hidden-lg-and-down">
-            <el-col :span="6" style="padding: 5px;border-right-style: solid;border-right-width: 1px;border-right-color: #ECEEF4;">
+            <el-col :span="6"
+                    style="padding: 5px;border-right-style: solid;border-right-width: 1px;border-right-color: #ECEEF4;">
               <div class="count-info-div" v-html="testCaseCountData.httpCountStr"></div>
             </el-col>
-            <el-col :span="6" style="padding: 5px;border-right-style: solid;border-right-width: 1px;border-right-color: #ECEEF4;">
+            <el-col :span="6"
+                    style="padding: 5px;border-right-style: solid;border-right-width: 1px;border-right-color: #ECEEF4;">
               <div class="count-info-div" v-html="testCaseCountData.rpcCountStr"></div>
             </el-col>
-            <el-col :span="6" style="padding: 5px;border-right-style: solid;border-right-width: 1px;border-right-color: #ECEEF4;">
+            <el-col :span="6"
+                    style="padding: 5px;border-right-style: solid;border-right-width: 1px;border-right-color: #ECEEF4;">
               <div class="count-info-div" v-html="testCaseCountData.tcpCountStr"></div>
             </el-col>
             <el-col :span="6" style="padding: 5px;">
@@ -33,13 +36,16 @@
             </el-col>
           </el-row>
           <el-row align="right" style="margin-left: 20px" class="hidden-xl-only">
-            <el-col :span="6" style="padding: 5px;border-right-style: solid;border-right-width: 1px;border-right-color: #ECEEF4;">
+            <el-col :span="6"
+                    style="padding: 5px;border-right-style: solid;border-right-width: 1px;border-right-color: #ECEEF4;">
               <div class="count-info-div" v-html="testCaseCountData.httpCountStr"></div>
             </el-col>
-            <el-col :span="6" style="padding: 5px;border-right-style: solid;border-right-width: 1px;border-right-color: #ECEEF4;">
+            <el-col :span="6"
+                    style="padding: 5px;border-right-style: solid;border-right-width: 1px;border-right-color: #ECEEF4;">
               <div class="count-info-div" v-html="testCaseCountData.rpcCountStr"></div>
             </el-col>
-            <el-col :span="6" style="padding: 5px;border-right-style: solid;border-right-width: 1px;border-right-color: #ECEEF4;">
+            <el-col :span="6"
+                    style="padding: 5px;border-right-style: solid;border-right-width: 1px;border-right-color: #ECEEF4;">
               <div class="count-info-div" v-html="testCaseCountData.tcpCountStr"></div>
             </el-col>
             <el-col :span="6" style="padding: 5px;">
@@ -52,47 +58,53 @@
     <el-container class="detail-container">
       <el-header style="height:20px;padding: 0px;margin-bottom: 10px;">
         <el-row :gutter="20" class="hidden-lg-and-down ">
-          <el-col  :span="8">
-            {{$t('api_test.home_page.test_case_details_card.this_week_add')}}
-            <el-link type="info" @click="redirectPage('thisWeekCount')" target="_blank" style="color: #000000">{{testCaseCountData.thisWeekAddedCount}}
+          <el-col :span="8">
+            {{ $t('api_test.home_page.test_case_details_card.this_week_add') }}
+            <el-link type="info" @click="redirectPage('thisWeekCount')" target="_blank" style="color: #000000">
+              {{ testCaseCountData.thisWeekAddedCount }}
             </el-link>
-            {{$t('api_test.home_page.unit_of_measurement')}}
+            {{ $t('api_test.home_page.unit_of_measurement') }}
           </el-col>
-          <el-col :span="8" >
-            {{$t('api_test.home_page.test_case_details_card.this_week_execute',[testCaseCountData.thisWeekExecutedCount])}}
+          <el-col :span="8">
+            {{
+              $t('api_test.home_page.test_case_details_card.this_week_execute', [testCaseCountData.thisWeekExecutedCount])
+            }}
           </el-col>
-          <el-col :span="8" >
-            {{$t('api_test.home_page.test_case_details_card.executed',[testCaseCountData.executedCount])}}
+          <el-col :span="8">
+            {{ $t('api_test.home_page.test_case_details_card.executed', [testCaseCountData.executedCount]) }}
           </el-col>
         </el-row>
         <el-row :gutter="20" class="hidden-xl-only">
-          <el-col  :span="8">
-            {{$t('api_test.home_page.test_case_details_card.this_week_add_sm')}}
+          <el-col :span="8">
+            {{ $t('api_test.home_page.test_case_details_card.this_week_add_sm') }}
             <br/>
-            <el-link type="info" @click="redirectPage('thisWeekCount')" target="_blank" style="color: #000000">{{testCaseCountData.thisWeekAddedCount}}
+            <el-link type="info" @click="redirectPage('thisWeekCount')" target="_blank" style="color: #000000">
+              {{ testCaseCountData.thisWeekAddedCount }}
             </el-link>
-            {{$t('api_test.home_page.unit_of_measurement')}}
+            {{ $t('api_test.home_page.unit_of_measurement') }}
           </el-col>
-          <el-col :span="8" >
-            <div class="count-info-div" v-html="$t('api_test.home_page.test_case_details_card.this_week_execute_sm',[testCaseCountData.thisWeekExecutedCount])"></div>
+          <el-col :span="8">
+            <div class="count-info-div"
+                 v-html="$t('api_test.home_page.test_case_details_card.this_week_execute_sm',[testCaseCountData.thisWeekExecutedCount])"></div>
           </el-col>
-          <el-col :span="8" >
-            <div class="count-info-div" v-html="$t('api_test.home_page.test_case_details_card.executed_sm',[testCaseCountData.executedCount])"></div>
+          <el-col :span="8">
+            <div class="count-info-div"
+                 v-html="$t('api_test.home_page.test_case_details_card.executed_sm',[testCaseCountData.executedCount])"></div>
           </el-col>
         </el-row>
       </el-header>
       <el-main style="padding: 5px;margin-top: 10px">
-        <el-container>
+        <el-container style="height: 96px;margin-top: 10px">
           <el-aside width="60%" class="count-number-show" style="margin-bottom: 0px;margin-top: 0px">
             <el-container>
               <el-aside width="30%">
-                {{$t('api_test.home_page.detail_card.rate.coverage')+":"}}
+                {{ $t('api_test.home_page.detail_card.rate.coverage') + ":" }}
               </el-aside>
               <el-main style="padding: 0px 0px 0px 0px; line-height: 100px; text-align: center;">
                 <span class="count-number">
-                {{testCaseCountData.coverageRage}}
+                {{ testCaseCountData.coverageRage }}
                   <el-tooltip placement="top" class="info-tool-tip">
-                    <div slot="content">{{ $t('api_test.home_page.formula.coverage')}}</div>
+                    <div slot="content">{{ $t('api_test.home_page.formula.coverage') }}</div>
                     <el-button icon="el-icon-info" style="padding:0px;border: 0px"></el-button>
                   </el-tooltip>
               </span>
@@ -105,10 +117,10 @@
                 <el-row>
                   <el-col>
                     <span class="default-property">
-                      {{$t('api_test.home_page.detail_card.uncoverage')}}
-                      {{"\xa0\xa0"}}
+                      {{ $t('api_test.home_page.detail_card.uncoverage') }}
+                      {{ "\xa0\xa0" }}
                       <el-link type="info" @click="redirectPage('uncoverage')" target="_blank" style="color: #000000">
-                        {{testCaseCountData.uncoverageCount}}
+                        {{ testCaseCountData.uncoverageCount }}
                       </el-link>
                     </span>
                   </el-col>
@@ -116,10 +128,10 @@
                   </el-col>
                   <el-col style="margin-top: 5px;">
                     <span class="main-property">
-                      {{$t('api_test.home_page.detail_card.coverage')}}
-                      {{"\xa0\xa0"}}
+                      {{ $t('api_test.home_page.detail_card.coverage') }}
+                      {{ "\xa0\xa0" }}
                       <el-link type="info" @click="redirectPage('coverage')" target="_blank" style="color: #000000">
-                        {{testCaseCountData.coverageCount}}
+                        {{ testCaseCountData.coverageCount }}
                       </el-link>
                     </span>
                   </el-col>
@@ -146,17 +158,17 @@ export default {
       loading: false,
     }
   },
-  props:{
-    testCaseCountData:{},
+  props: {
+    testCaseCountData: {},
   },
   methods: {
-    redirectPage(clickType){
-      if(clickType === 'thisWeekCount'){
+    redirectPage(clickType) {
+      if (clickType === 'thisWeekCount') {
         //这里业务逻辑应当跳转接口案例列表
-        this.$emit("redirectPage","api","apiTestCase",clickType);
-      }else{
+        this.$emit("redirectPage", "api", "apiTestCase", clickType);
+      } else {
         //这里业务逻辑应当跳转接口列表
-        this.$emit("redirectPage","api","api",clickType);
+        this.$emit("redirectPage", "api", "api", clickType);
       }
 
     }
@@ -174,9 +186,10 @@ export default {
   line-height: 100px;
   text-align: center;
 }
-.count-number{
-  font-family:'ArialMT', 'Arial', sans-serif;
-  font-size:33px;
+
+.count-number {
+  font-family: 'ArialMT', 'Arial', sans-serif;
+  font-size: 33px;
   color: var(--count_number);
   position: relative;
 }
@@ -187,24 +200,28 @@ export default {
   border-style: solid;
   border-width: 7px;
   border-color: var(--count_number_shallow);
-  border-radius:50%;
+  border-radius: 50%;
 
 }
 
-.count-number-show{
-  margin:20px auto;
+.count-number-show {
+  margin: 20px auto;
 }
-.detail-container{
+
+.detail-container {
   margin-top: 30px
 }
-.no-shadow-card{
-  -webkit-box-shadow: 0 0px 0px 0 rgba(0,0,0,.1);
-  box-shadow: 0 0px 0px 0 rgba(0,0,0,.1);
+
+.no-shadow-card {
+  -webkit-box-shadow: 0 0px 0px 0 rgba(0, 0, 0, .1);
+  box-shadow: 0 0px 0px 0 rgba(0, 0, 0, .1);
 }
-.default-property{
+
+.default-property {
   font-size: 12px
 }
-.main-property{
+
+.main-property {
   color: #F39021;
   font-size: 12px
 }
@@ -213,13 +230,15 @@ export default {
   border-bottom: 0px solid #EBEEF5;
 }
 
-.count-info-div{
+.count-info-div {
   margin: 3px;
 }
-.count-info-div >>>p{
+
+.count-info-div >>> p {
   font-size: 10px;
 }
-.info-tool-tip{
+
+.info-tool-tip {
   position: absolute;
   top: 0;
 }
diff --git a/frontend/src/business/components/task/TaskCenter.vue b/frontend/src/business/components/task/TaskCenter.vue
index 1db7e06d85..cb56c52596 100644
--- a/frontend/src/business/components/task/TaskCenter.vue
+++ b/frontend/src/business/components/task/TaskCenter.vue
@@ -44,7 +44,7 @@
 
       <el-card style="width: 550px;float: right" v-loading="loading">
         <div style="color: #2B415C;margin: 0px 20px 0px;">
-          <el-form label-width="68px" class="ms-el-form-item">
+          <el-form label-width="95px" class="ms-el-form-item">
             <el-row>
               <el-col :span="12">
                 <el-form-item :label="$t('test_track.report.list.trigger_mode')" prop="runMode">

From 23656ad79435c65da678bba601a63f58417519ce Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 29 Nov 2021 18:37:30 +0800
Subject: [PATCH 020/256] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BF=AE=E5=A4=8D=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E4=B8=8B=E8=BD=BDjmeter.log=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008425 --user=刘瑞斌【性能测试日志详情，点击 下载日志文件  没反应】https://www.tapd.cn/33805590/bugtrace/bugs/view?bug_id=1133805590001008425
---
 .../components/performance/report/components/LogDetails.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/performance/report/components/LogDetails.vue b/frontend/src/business/components/performance/report/components/LogDetails.vue
index 382da5db95..5cf9641438 100644
--- a/frontend/src/business/components/performance/report/components/LogDetails.vue
+++ b/frontend/src/business/components/performance/report/components/LogDetails.vue
@@ -20,7 +20,7 @@
               {{ log.content }}
             </li>
           </ul>
-          <el-link type="primary" @click="downloadLogFile(item)">{{ $t('load_test.download_log_file') }}</el-link>
+          <el-link type="primary" @click="downloadLogFile(currentInstance)">{{ $t('load_test.download_log_file') }}</el-link>
         </div>
       </el-col>
     </el-row>
@@ -115,9 +115,9 @@ export default {
       this.logContent[instance] = [];
       this.load(instance);
     },
-    downloadLogFile(item) {
+    downloadLogFile(resourceId) {
       let config = {
-        url: '/performance/report/log/download/' + this.id + '/' + item.resourceId,
+        url: '/performance/report/log/download/' + this.id + '/' + resourceId,
         method: 'get',
         responseType: 'blob'
       };

From 0b157a3f54bbc53eb7fa10edfdf1a88f42c21774 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 30 Nov 2021 13:18:30 +0800
Subject: [PATCH 021/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E9=87=8D=E5=86=99HTTPSamplerProxy=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=AF=B9=20path=20=E5=A4=9A'/'=E5=92=8C=E5=B0=91'/'?=
 =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复依据来源QA群讨论结果
---
 .../http/sampler/HTTPSamplerProxy.java        | 149 ++++++++++++++++++
 1 file changed, 149 insertions(+)
 create mode 100644 backend/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java

diff --git a/backend/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java b/backend/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java
new file mode 100644
index 0000000000..dcf2d626ab
--- /dev/null
+++ b/backend/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java
@@ -0,0 +1,149 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.protocol.http.sampler;
+
+import io.metersphere.commons.utils.LogUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.jmeter.engine.event.LoopIterationEvent;
+import org.apache.jmeter.samplers.Interruptible;
+
+import java.net.URL;
+
+/**
+ * Proxy class that dispatches to the appropriate HTTP sampler.
+ * <p>
+ * This class is stored in the test plan, and holds all the configuration settings.
+ * The actual implementation is created at run-time, and is passed a reference to this class
+ * so it can get access to all the settings stored by HTTPSamplerProxy.
+ */
+public final class HTTPSamplerProxy extends HTTPSamplerBase implements Interruptible {
+
+    private static final long serialVersionUID = 1L;
+
+    private transient HTTPAbstractImpl impl;
+
+    public HTTPSamplerProxy() {
+        super();
+    }
+
+    /**
+     * Convenience method used to initialise the implementation.
+     *
+     * @param impl the implementation to use.
+     */
+    public HTTPSamplerProxy(String impl) {
+        super();
+        setImplementation(impl);
+    }
+
+    protected String toExternalForm(URL u) {
+        int len = u.getProtocol().length() + 1;
+        if (u.getAuthority() != null && u.getAuthority().length() > 0)
+            len += 2 + u.getAuthority().length();
+        if (u.getPath() != null) {
+            len += u.getPath().length();
+        }
+        if (u.getQuery() != null) {
+            len += 1 + u.getQuery().length();
+        }
+        if (u.getRef() != null)
+            len += 1 + u.getRef().length();
+
+        StringBuffer result = new StringBuffer(len);
+        result.append(u.getProtocol());
+        result.append(":");
+        if (u.getAuthority() != null && u.getAuthority().length() > 0) {
+            result.append("//");
+            result.append(u.getAuthority());
+        }
+        if (StringUtils.isNotEmpty(u.getPath())) {
+            int index = 0;
+            for (int i = 0; i < u.getPath().length(); i++) {
+                char ch = u.getPath().charAt(i);
+                if (String.valueOf(ch).equals("/")) {
+                    index++;
+                } else {
+                    break;
+                }
+            }
+            result.append("/" + u.getPath().substring(index));
+        }
+        if (u.getQuery() != null) {
+            result.append('?');
+            result.append(u.getQuery());
+        }
+        if (u.getRef() != null) {
+            result.append("#");
+            result.append(u.getRef());
+        }
+        return result.toString();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected HTTPSampleResult sample(URL u, String method, boolean areFollowingRedirect, int depth) {
+        // When Retrieve Embedded resources + Concurrent Pool is used
+        // as the instance of Proxy is cloned, we end up with impl being null
+        // testIterationStart will not be executed but it's not a problem for 51380 as it's download of resources
+        // so SSL context is to be reused
+        if (impl == null) { // Not called from multiple threads, so this is OK
+            try {
+                impl = HTTPSamplerFactory.getImplementation(getImplementation(), this);
+            } catch (Exception ex) {
+                return errorResult(ex, new HTTPSampleResult());
+            }
+        }
+        try {
+            String url = toExternalForm(u);
+            u = new URL(url);
+        } catch (Exception ex) {
+            LogUtil.error(ex);
+        }
+        return impl.sample(u, method, areFollowingRedirect, depth);
+    }
+
+    // N.B. It's not possible to forward threadStarted() to the implementation class.
+    // This is because Config items are not processed until later, and HTTPDefaults may define the implementation
+
+    @Override
+    public void threadFinished() {
+        if (impl != null) {
+            impl.threadFinished(); // Forward to sampler
+        }
+    }
+
+    @Override
+    public boolean interrupt() {
+        if (impl != null) {
+            return impl.interrupt(); // Forward to sampler
+        }
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase#testIterationStart(org.apache.jmeter.engine.event.LoopIterationEvent)
+     */
+    @Override
+    public void testIterationStart(LoopIterationEvent event) {
+        if (impl != null) {
+            impl.notifyFirstSampleAfterLoopRestart();
+        }
+    }
+}

From 1b5c129b3b6f776214882570562a09422c65421c Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 30 Nov 2021 13:44:19 +0800
Subject: [PATCH 022/256] =?UTF-8?q?fix(=E6=8F=92=E4=BB=B6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86):=20=E9=BB=98=E8=AE=A4=E6=8F=92=E4=BB=B6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/db/migration/V100__v1.15.2_release.sql | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/resources/db/migration/V100__v1.15.2_release.sql b/backend/src/main/resources/db/migration/V100__v1.15.2_release.sql
index 44e268d50a..abf83df77b 100644
--- a/backend/src/main/resources/db/migration/V100__v1.15.2_release.sql
+++ b/backend/src/main/resources/db/migration/V100__v1.15.2_release.sql
@@ -11,5 +11,11 @@ values (UUID(), 'ws_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE_GROUP', '
 delete
 from user_group_permission
 where permission_id = 'WORKSPACE_TEMPLATE:READ+REPORT_TEMPLATE';
-
+-- admin
+insert into user_group_permission (id, group_id, permission_id, module_id)
+values (UUID(), 'admin', 'SYSTEM_PLUGIN:READ', 'SYSTEM_PLUGIN');
+insert into user_group_permission (id, group_id, permission_id, module_id)
+values (UUID(), 'admin', 'SYSTEM_PLUGIN:UPLOAD', 'SYSTEM_PLUGIN');
+insert into user_group_permission (id, group_id, permission_id, module_id)
+values (UUID(), 'admin', 'SYSTEM_PLUGIN:DEL', 'SYSTEM_PLUGIN');
 

From 78dce730026306a94bb52453a802ce67c85f2f15 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Tue, 30 Nov 2021 16:45:34 +0800
Subject: [PATCH 023/256] =?UTF-8?q?fix(=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF):=20=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 修复三方平台信息为输入也能校验成功
---
 .../settings/components/PersonRouter.vue      | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/settings/components/PersonRouter.vue b/frontend/src/business/components/settings/components/PersonRouter.vue
index 3862728108..e5e2824235 100644
--- a/frontend/src/business/components/settings/components/PersonRouter.vue
+++ b/frontend/src/business/components/settings/components/PersonRouter.vue
@@ -89,6 +89,30 @@
       },
       handleAuth(type) {
         let param = {...this.currentPlatformInfo};
+        debugger
+        if(type==='Jira'){
+          if(!param.jiraAccount){
+            this.$error(this.$t('organization.integration.input_api_account'));
+            return
+          }else if(!param.jiraPassword){
+            this.$error(this.$t('organization.integration.input_api_password'));
+            return
+          }
+
+        }else if(type==='Zentao'){
+          if(!param.zentaoUserName){
+            this.$error(this.$t('organization.integration.input_api_account'));
+            return
+          }else if(!param.zentaoPassword){
+            this.$error(this.$t('organization.integration.input_api_password'));
+            return
+          }
+        }else if(type==='AzureDevops'){
+          if(!param.azureDevopsPat){
+            this.$error(this.$t('organization.integration.input_azure_pat'));
+            return
+          }
+        }
         param.workspaceId = getCurrentWorkspaceId();
         param.platform = type;
         this.$parent.result = this.$post("issues/user/auth", param, () => {
@@ -134,8 +158,6 @@
           console.log(this.$refs.personFrom)
           //this.form.id = this.$refs.personFrom.form.id
         }
-        console.log("this.form")
-        console.log(this.form)
         Object.assign(param, this.form);
         param.platformInfo = JSON.stringify(this.form.platformInfo);
         this.result = this.$post(this.updatePath, param, response => {

From 07f357280590169c5cd902430224f5818397597f Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Tue, 30 Nov 2021 17:38:46 +0800
Subject: [PATCH 024/256] =?UTF-8?q?fix(=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF):=20=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 修复三方平台信息为输入也能校验成功
---
 .../src/business/components/settings/components/PersonRouter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/business/components/settings/components/PersonRouter.vue b/frontend/src/business/components/settings/components/PersonRouter.vue
index e5e2824235..2ba62e27fd 100644
--- a/frontend/src/business/components/settings/components/PersonRouter.vue
+++ b/frontend/src/business/components/settings/components/PersonRouter.vue
@@ -89,7 +89,6 @@
       },
       handleAuth(type) {
         let param = {...this.currentPlatformInfo};
-        debugger
         if(type==='Jira'){
           if(!param.jiraAccount){
             this.$error(this.$t('organization.integration.input_api_account'));

From 08f7cb1bc29a006919a5f1f14da85ea8783dda4f Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 30 Nov 2021 15:43:13 +0800
Subject: [PATCH 025/256] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E7=BB=84=E6=97=B6=E7=BD=AE=E7=A9=BA=E4=B8=8E=E4=B9=8B?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E5=9C=BA=E6=99=AF=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E7=BB=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/api/service/ApiAutomationService.java | 4 ++++
 .../io/metersphere/base/mapper/ext/ExtApiScenarioMapper.java  | 2 ++
 .../io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml   | 3 +++
 .../java/io/metersphere/service/EnvironmentGroupService.java  | 4 ++++
 4 files changed, 13 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 789c30ee7e..777bea6712 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -3043,4 +3043,8 @@ public class ApiAutomationService {
         List<ApiScenarioFollow> follows = apiScenarioFollowMapper.selectByExample(example);
         return follows.stream().map(ApiScenarioFollow::getFollowId).distinct().collect(Collectors.toList());
     }
+
+    public void setScenarioEnvGroupIdNull(String envGroupId) {
+        extApiScenarioMapper.setScenarioEnvGroupIdNull(envGroupId);
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.java
index 6bf78568d5..55dc0a846c 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.java
@@ -85,4 +85,6 @@ public interface ExtApiScenarioMapper {
 
     List<RelationshipGraphData.Node> getTestCaseForGraph(@Param("ids") Set<String> ids);
 
+    void setScenarioEnvGroupIdNull(@Param("environmentGroupId") String environmentGroupId);
+
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index 9677f8bd45..4809a3b305 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -389,6 +389,9 @@
     <update id="updateCustomNumByProjectId">
         update api_scenario set custom_num = num where (custom_num is null or custom_num = '') and project_id = #{projectId}
     </update>
+    <update id="setScenarioEnvGroupIdNull">
+        update api_scenario set environment_group_id = null where environment_group_id = #{environmentGroupId}
+    </update>
 
     <select id="countByProjectID" resultType="java.lang.Long">
         SELECT COUNT(id) AS countNumber FROM api_scenario WHERE project_id = #{0} AND status != 'Trash'
diff --git a/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java b/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
index ff0bb16ae2..1146823d0d 100644
--- a/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
+++ b/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
@@ -1,5 +1,6 @@
 package io.metersphere.service;
 
+import io.metersphere.api.service.ApiAutomationService;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiTestEnvironmentMapper;
 import io.metersphere.base.mapper.EnvironmentGroupMapper;
@@ -43,6 +44,8 @@ public class EnvironmentGroupService {
     private ProjectMapper projectMapper;
     @Resource
     private ApiTestEnvironmentMapper apiTestEnvironmentMapper;
+    @Resource
+    private ApiAutomationService apiAutomationService;
 
     public EnvironmentGroup add(EnvironmentGroupRequest request) {
         request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
@@ -93,6 +96,7 @@ public class EnvironmentGroupService {
             return;
         }
         environmentGroupMapper.deleteByPrimaryKey(id);
+        apiAutomationService.setScenarioEnvGroupIdNull(id);
         EnvironmentGroupProjectExample example = new EnvironmentGroupProjectExample();
         example.createCriteria().andEnvironmentGroupIdEqualTo(id);
         environmentGroupProjectMapper.deleteByExample(example);

From 8a11feed41df0aa2b6a164802edea9480dbb5db6 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 30 Nov 2021 18:21:48 +0800
Subject: [PATCH 026/256] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E5=AF=BC=E5=85=A5MS=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E6=97=B6=E7=BD=AE=E7=A9=BA=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/automation/parse/MsScenarioParser.java            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java
index 587478b3d1..c3042baf3e 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.parser.Feature;
 import io.metersphere.api.dto.ApiTestImportRequest;
+import io.metersphere.api.dto.EnvironmentType;
 import io.metersphere.api.dto.definition.parse.ms.NodeTree;
 import io.metersphere.api.dto.definition.request.MsScenario;
 import io.metersphere.plugin.core.MsTestElement;
@@ -108,6 +109,9 @@ public class MsScenarioParser extends MsAbstractParser<ScenarioImport> {
                         if (environmentMap != null) {
                             scenarioDefinition.put("environmentMap", new HashMap<>());
                         }
+                        item.setEnvironmentType(EnvironmentType.JSON.name());
+                        item.setEnvironmentJson(null);
+                        item.setEnvironmentGroupId(null);
                         item.setScenarioDefinition(JSONObject.toJSONString(scenarioDefinition));
                     }
                 }

From 386d124c86a9b50e95fdaff47e10ed04c99d7d38 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 30 Nov 2021 19:57:38 +0800
Subject: [PATCH 027/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=96=E6=B6=88=E5=85=B3=E8=81=94=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=B1=A0=E6=97=B6=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复测试计划定时任务取消关联资源池时不生效的问题，并在回调函数处增加log记录
---
 .../api/service/ApiScenarioReportService.java          |  7 +++++--
 .../io/metersphere/track/service/TestPlanService.java  | 10 +++++++++-
 .../track/plan/components/ScheduleMaintain.vue         |  5 +++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
index 4933d2a67e..9be91ccb78 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
@@ -157,6 +157,7 @@ public class ApiScenarioReportService {
     public ApiScenarioReport editReport(ScenarioResult test, long startTime) {
         ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(test.getName());
         if (report == null) {
+            LogUtil.info("从缓存中获取场景报告：【" + test.getName() + "】");
             report = MessageCache.scenarioExecResourceLock.get(test.getName());
         }
         if (report != null) {
@@ -170,6 +171,8 @@ public class ApiScenarioReportService {
             }
             MessageCache.scenarioExecResourceLock.remove(report.getId());
             apiScenarioReportMapper.updateByPrimaryKeySelective(report);
+        } else {
+            LogUtil.error("未获取到场景报告！【" + test.getName() + "】");
         }
         return report;
     }
@@ -298,7 +301,7 @@ public class ApiScenarioReportService {
     }
 
     public ApiScenarioReport updateSchedulePlanCase(TestResult result, String runMode) {
-
+        LogUtil.info("收到测试计划场景[" + result.getTestId() + "]的执行信息，开始保存");
         ApiScenarioReport lastReport = null;
         List<ScenarioResult> scenarioResultList = result.getScenarios();
 
@@ -407,7 +410,7 @@ public class ApiScenarioReportService {
             TestPlanReportExecuteCatch.updateApiTestPlanExecuteInfo(reportId, null, scenarioAndErrorMap, null);
             TestPlanReportExecuteCatch.updateTestPlanReport(reportId, null, planScenarioReportMap);
         }
-
+        LogUtil.info("测试计划场景[" + result.getTestId() + "]保存结束");
         return lastReport;
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index cdf9484473..e3a053f618 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -235,7 +235,6 @@ public class TestPlanService {
         return testPlan;
     }
 
-
     public List<TestPlan> getTestPlanByName(String name) {
         TestPlanExample example = new TestPlanExample();
         example.createCriteria()
@@ -1107,6 +1106,15 @@ public class TestPlanService {
             runModeConfig.setEnvMap(new HashMap<>());
             runModeConfig.setOnSampleError(false);
         } else {
+            try {
+                JSONObject runModeObj = JSONObject.parseObject(apiRunConfig);
+                if (runModeObj.containsKey("runWithinResourcePool") && !runModeObj.getBoolean("runWithinResourcePool")) {
+                    runModeConfig.setResourcePoolId(null);
+                }
+            } catch (Exception e) {
+                LogUtil.error(e.getMessage());
+            }
+
             if (runModeConfig.getEnvMap() == null) {
                 runModeConfig.setEnvMap(new HashMap<>());
             }
diff --git a/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue b/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue
index 42aaf8561e..23335ac491 100644
--- a/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue
+++ b/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue
@@ -165,6 +165,11 @@ export default {
   watch: {
     'schedule.value'() {
       this.form.cronValue = this.schedule.value;
+    },
+    'runConfig.runWithinResourcePool'() {
+      if (!this.runConfig.runWithinResourcePool) {
+        this.runConfig.resourcePoolId = null;
+      }
     }
   },
   data() {

From d12027005fc0afddda56d432638421a57f2d59de Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 30 Nov 2021 19:32:03 +0800
Subject: [PATCH 028/256] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E5=88=97=E8=A1=A8=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=9C=BA=E6=99=AF=E5=89=8D=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/ApiAutomationController.java    |  5 +++++
 .../api/service/ApiAutomationService.java          |  6 ++++++
 .../api/automation/scenario/ApiScenarioList.vue    | 14 +++++++++++---
 .../scenario/component/ApiScenarioComponent.vue    |  2 +-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
index 782c281af8..85837936f6 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
@@ -364,6 +364,11 @@ public class ApiAutomationController {
         return apiAutomationService.checkScenarioEnv(request);
     }
 
+    @GetMapping(value = "/checkScenarioEnv/{scenarioId}")
+    public boolean checkScenarioEnvByScenarioId(@PathVariable String scenarioId) {
+        return apiAutomationService.checkScenarioEnv(scenarioId);
+    }
+
     @GetMapping("/follow/{scenarioId}")
     public List<String> getFollows(@PathVariable String scenarioId) {
         return apiAutomationService.getFollows(scenarioId);
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 777bea6712..54cef07147 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -3033,6 +3033,12 @@ public class ApiAutomationService {
         return this.checkScenarioEnv(request, null);
     }
 
+    public boolean checkScenarioEnv(String scenarioId) {
+        ApiScenarioWithBLOBs apiScenarioWithBLOBs = apiScenarioMapper.selectByPrimaryKey(scenarioId);
+        this.setScenarioEnv(apiScenarioWithBLOBs);
+        return this.checkScenarioEnv(apiScenarioWithBLOBs, null);
+    }
+
     public List<String> getFollows(String scenarioId) {
         List<String> result = new ArrayList<>();
         if (StringUtils.isBlank(scenarioId)) {
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 0488f7f838..ddca3b8db0 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -1005,9 +1005,17 @@ export default {
           }
           this.environmentType = this.currentScenario.environmentType;
           this.envGroupId = this.currentScenario.environmentGroupId;
-          this.reportId = getUUID().substring(0, 8);
-          this.runVisible = true;
-          this.$set(row, "isStop", true);
+
+          this.$get("/api/automation/checkScenarioEnv/" + this.currentScenario.id, res => {
+            let data = res.data;
+            if (!data) {
+              this.$warning("请为场景选择环境！");
+              return false;
+            }
+            this.reportId = getUUID().substring(0, 8);
+            this.runVisible = true;
+            this.$set(row, "isStop", true);
+          })
         }
       });
     },
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
index 5d23b1ace4..a8639ca434 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
@@ -177,7 +177,7 @@ export default {
       this.reload();
     },
     checkEnv(val) {
-      this.$post("/api/automation/checkScenarioEnv", {scenarioDefinition: JSON.stringify(this.scenario), projectId: this.projectId}, res => {
+      this.$get("/api/automation/checkScenarioEnv/" + this.scenario.id, res => {
         if (this.scenario.environmentEnable && !res.data) {
           this.scenario.environmentEnable = false;
           this.$warning("当前场景没有环境，需要先设置自身环境");

From 49529e9e23131364e7aa715a1f0c3626d183350c Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Wed, 1 Dec 2021 13:22:42 +0800
Subject: [PATCH 029/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1):=20=E6=AF=8F?=
 =?UTF-8?q?=E6=AC=A1=E4=BF=9D=E5=AD=98=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=E9=87=8D=E7=BD=AE=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=80=E9=9C=80=E8=A6=81=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

每次保存定时任务时重置定时任务所需要的参数
---
 .../job/sechedule/ScheduleManager.java        |  8 ---
 .../metersphere/service/ScheduleService.java  | 61 +++++++++++++------
 .../track/service/TestPlanService.java        |  9 ---
 3 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/job/sechedule/ScheduleManager.java b/backend/src/main/java/io/metersphere/job/sechedule/ScheduleManager.java
index 13d5ca9a5f..0eb385f932 100644
--- a/backend/src/main/java/io/metersphere/job/sechedule/ScheduleManager.java
+++ b/backend/src/main/java/io/metersphere/job/sechedule/ScheduleManager.java
@@ -125,14 +125,6 @@ public class ScheduleManager {
                 trigger = (CronTrigger) triggerBuilder.build();// 创建Trigger对象
 
                 scheduler.rescheduleJob(triggerKey, trigger);// 修改一个任务的触发时间
-                /** 方式一 ：调用 rescheduleJob 结束 */
-
-                /** 方式二：先删除，然后在创建一个新的Job */
-                // JobDetail jobDetail = sched.getJobDetail(JobKey.jobKey(jobName, jobGroupName));
-                // Class<? extends Job> jobClass = jobDetail.getJobClass();
-                // removeJob(jobName, jobGroupName, triggerName, triggerGroupName);
-                // addJob(jobName, jobGroupName, triggerName, triggerGroupName, jobClass, cron);
-                /** 方式二 ：先删除，然后在创建一个新的Job */
             }
         } catch (Exception e) {
             throw new RuntimeException(e);
diff --git a/backend/src/main/java/io/metersphere/service/ScheduleService.java b/backend/src/main/java/io/metersphere/service/ScheduleService.java
index 4f8f0f8e49..ce51671c7b 100644
--- a/backend/src/main/java/io/metersphere/service/ScheduleService.java
+++ b/backend/src/main/java/io/metersphere/service/ScheduleService.java
@@ -67,7 +67,7 @@ public class ScheduleService {
         swaggerUrlProjectMapper.updateByPrimaryKeySelective(swaggerUrlProject);
     }
 
-    public ApiSwaggerUrlDTO selectApiSwaggerUrlDTO(String id){
+    public ApiSwaggerUrlDTO selectApiSwaggerUrlDTO(String id) {
         return extScheduleMapper.select(id);
     }
 
@@ -120,13 +120,13 @@ public class ScheduleService {
     }
 
     private void removeJob(String resourceId, String group) {
-        if(StringUtils.equals(ScheduleGroup.API_SCENARIO_TEST.name(), group)){
+        if (StringUtils.equals(ScheduleGroup.API_SCENARIO_TEST.name(), group)) {
             scheduleManager.removeJob(ApiScenarioTestJob.getJobKey(resourceId), ApiScenarioTestJob.getTriggerKey(resourceId));
-        } else if(StringUtils.equals(ScheduleGroup.TEST_PLAN_TEST.name(), group)){
+        } else if (StringUtils.equals(ScheduleGroup.TEST_PLAN_TEST.name(), group)) {
             scheduleManager.removeJob(TestPlanTestJob.getJobKey(resourceId), TestPlanTestJob.getTriggerKey(resourceId));
-        } else if(StringUtils.equals(ScheduleGroup.SWAGGER_IMPORT.name(), group)){
+        } else if (StringUtils.equals(ScheduleGroup.SWAGGER_IMPORT.name(), group)) {
             scheduleManager.removeJob(SwaggerUrlImportJob.getJobKey(resourceId), SwaggerUrlImportJob.getTriggerKey(resourceId));
-        } else if(StringUtils.equals(ScheduleGroup.PERFORMANCE_TEST.name(), group)){
+        } else if (StringUtils.equals(ScheduleGroup.PERFORMANCE_TEST.name(), group)) {
             scheduleManager.removeJob(PerformanceTestJob.getJobKey(resourceId), PerformanceTestJob.getTriggerKey(resourceId));
         } else {
             scheduleManager.removeJob(ApiTestJob.getJobKey(resourceId), ApiTestJob.getTriggerKey(resourceId));
@@ -173,6 +173,22 @@ public class ScheduleService {
         return schedule;
     }
 
+    public void resetJob(Schedule request, JobKey jobKey, TriggerKey triggerKey, Class clazz) {
+        try {
+            scheduleManager.removeJob(jobKey, triggerKey);
+        } catch (Exception e) {
+            LogUtil.error(e);
+            MSException.throwException("重置定时任务-删除时异常");
+        }
+        try {
+            scheduleManager.addCronJob(jobKey, triggerKey, clazz, request.getValue(),
+                    scheduleManager.getDefaultJobDataMap(request, request.getValue(), SessionUtils.getUser().getId()));
+        } catch (Exception e) {
+            LogUtil.error(e);
+            MSException.throwException("重置定时任务-删除时异常");
+        }
+    }
+
     public void addOrUpdateCronJob(Schedule request, JobKey jobKey, TriggerKey triggerKey, Class clazz) {
         Boolean enable = request.getEnable();
         String cronExpression = request.getValue();
@@ -213,7 +229,7 @@ public class ScheduleService {
     }
 
     public long countTaskByProjectId(String projectId) {
-        return  extScheduleMapper.countTaskByProjectId(projectId);
+        return extScheduleMapper.countTaskByProjectId(projectId);
     }
 
     public long countTaskByProjectIdInThisWeek(String projectId) {
@@ -222,16 +238,16 @@ public class ScheduleService {
         Date firstTime = startAndEndDateInWeek.get("firstTime");
         Date lastTime = startAndEndDateInWeek.get("lastTime");
 
-        if(firstTime==null || lastTime == null){
-            return  0;
-        }else {
-            return extScheduleMapper.countTaskByProjectIdAndCreateTimeRange(projectId,firstTime.getTime(),lastTime.getTime());
+        if (firstTime == null || lastTime == null) {
+            return 0;
+        } else {
+            return extScheduleMapper.countTaskByProjectIdAndCreateTimeRange(projectId, firstTime.getTime(), lastTime.getTime());
         }
     }
 
     public List<TaskInfoResult> findRunningTaskInfoByProjectID(String projectID, BaseQueryRequest request) {
         List<TaskInfoResult> runningTaskInfoList = extScheduleMapper.findRunningTaskInfoByProjectID(projectID, request);
-        return  runningTaskInfoList;
+        return runningTaskInfoList;
     }
 
     public void createSchedule(ScheduleRequest request) {
@@ -241,7 +257,7 @@ public class ScheduleService {
         JobKey jobKey = null;
         TriggerKey triggerKey = null;
         Class clazz = null;
-        if("testPlan".equals(request.getScheduleFrom())){
+        if ("testPlan".equals(request.getScheduleFrom())) {
             TestPlan testPlan = testPlanMapper.selectByPrimaryKey(request.getResourceId());
             schedule.setName(testPlan.getName());
             schedule.setProjectId(testPlan.getProjectId());
@@ -251,7 +267,7 @@ public class ScheduleService {
             triggerKey = TestPlanTestJob.getTriggerKey(request.getResourceId());
             clazz = TestPlanTestJob.class;
             schedule.setJob(TestPlanTestJob.class.getName());
-        }else {
+        } else {
             //默认为情景
             ApiScenarioWithBLOBs apiScene = apiScenarioMapper.selectByPrimaryKey(request.getResourceId());
             schedule.setName(apiScene.getName());
@@ -265,21 +281,23 @@ public class ScheduleService {
         }
         this.addSchedule(schedule);
 
-        this.addOrUpdateCronJob(request,jobKey ,triggerKey , clazz);
+        this.addOrUpdateCronJob(request, jobKey, triggerKey, clazz);
     }
 
     public void updateSchedule(Schedule request) {
-
-
         JobKey jobKey = null;
         TriggerKey triggerKey = null;
         Class clazz = null;
-        if(ScheduleGroup.TEST_PLAN_TEST.name().equals(request.getGroup())){
+
+        //测试计划的定时任务修改会修改任务的配置信息，并不只是单纯的修改定时任务时间。需要重新配置这个定时任务
+        boolean needResetJob = false;
+        if (ScheduleGroup.TEST_PLAN_TEST.name().equals(request.getGroup())) {
             jobKey = TestPlanTestJob.getJobKey(request.getResourceId());
             triggerKey = TestPlanTestJob.getTriggerKey(request.getResourceId());
             clazz = TestPlanTestJob.class;
             request.setJob(TestPlanTestJob.class.getName());
-        }else {
+            needResetJob = true;
+        } else {
             //默认为情景
             jobKey = ApiScenarioTestJob.getJobKey(request.getResourceId());
             triggerKey = ApiScenarioTestJob.getTriggerKey(request.getResourceId());
@@ -288,7 +306,12 @@ public class ScheduleService {
         }
         this.editSchedule(request);
 
-        this.addOrUpdateCronJob(request, jobKey, triggerKey, clazz);
+        if (needResetJob) {
+            this.resetJob(request, jobKey, triggerKey, clazz);
+        } else {
+            this.addOrUpdateCronJob(request, jobKey, triggerKey, clazz);
+        }
+
     }
 
     public Object getCurrentlyExecutingJobs() {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index e3a053f618..457055a691 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -1106,15 +1106,6 @@ public class TestPlanService {
             runModeConfig.setEnvMap(new HashMap<>());
             runModeConfig.setOnSampleError(false);
         } else {
-            try {
-                JSONObject runModeObj = JSONObject.parseObject(apiRunConfig);
-                if (runModeObj.containsKey("runWithinResourcePool") && !runModeObj.getBoolean("runWithinResourcePool")) {
-                    runModeConfig.setResourcePoolId(null);
-                }
-            } catch (Exception e) {
-                LogUtil.error(e.getMessage());
-            }
-
             if (runModeConfig.getEnvMap() == null) {
                 runModeConfig.setEnvMap(new HashMap<>());
             }

From 9eadbc68c190dfebb6ac9890dc7a91b9fe3359d0 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 1 Dec 2021 10:43:43 +0800
Subject: [PATCH 030/256] =?UTF-8?q?fix:=20=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=95=8C=E9=9D=A2=E5=86=85=E7=9A=84=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【个人信息界面内的取消按钮点击无效】https://www.tapd.cn/33805590/bugtrace/bugs/view?bug_id=1133805590001008405
---
 .../business/components/settings/components/PersonRouter.vue    | 2 +-
 .../src/business/components/settings/personal/PasswordInfo.vue  | 2 +-
 .../business/components/settings/personal/PersonFromSetting.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/settings/components/PersonRouter.vue b/frontend/src/business/components/settings/components/PersonRouter.vue
index 2ba62e27fd..744e898a32 100644
--- a/frontend/src/business/components/settings/components/PersonRouter.vue
+++ b/frontend/src/business/components/settings/components/PersonRouter.vue
@@ -8,7 +8,7 @@
     <ms-main-container>
       <ms-person-from-setting v-if="activeIndex==='commons.personal_setting'" :form = form @getPlatformInfo = "getPlatformInfo" @cancel = "cancel" />
       <ms-api-keys v-if="activeIndex==='commons.api_keys'"/>
-      <password-info v-if="activeIndex==='change_password'" :rule-form = "ruleForm"></password-info>
+      <password-info v-if="activeIndex==='change_password'" :rule-form = "ruleForm" @cancel="cancel"></password-info>
       <el-form v-if="activeIndex==='third_account'">
         <jira-user-info @auth="handleAuth" v-if="hasJira" :data="currentPlatformInfo"/>
         <tapd-user-info @auth="handleAuth" v-if="hasTapd" :data="currentPlatformInfo"/>
diff --git a/frontend/src/business/components/settings/personal/PasswordInfo.vue b/frontend/src/business/components/settings/personal/PasswordInfo.vue
index e2ed76f09f..8fc9eccd97 100644
--- a/frontend/src/business/components/settings/personal/PasswordInfo.vue
+++ b/frontend/src/business/components/settings/personal/PasswordInfo.vue
@@ -54,7 +54,7 @@ export default {
   },
   methods:{
     cancel() {
-      return
+      this.$emit("cancel");
     },
     confirm() {
       this.$emit("confirm");
diff --git a/frontend/src/business/components/settings/personal/PersonFromSetting.vue b/frontend/src/business/components/settings/personal/PersonFromSetting.vue
index 8b13038496..59957b2877 100644
--- a/frontend/src/business/components/settings/personal/PersonFromSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonFromSetting.vue
@@ -108,7 +108,7 @@ export default {
       return getCurrentUser();
     },
     cancel() {
-
+      this.$emit("cancel");
     },
     updateUser(updateUserForm) {
       this.$refs[updateUserForm].validate(valid => {

From f1a08fcdc25c5ec13bb49052f6f7cd081e0db326 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 1 Dec 2021 15:32:06 +0800
Subject: [PATCH 031/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E5=B9=B6=E5=8F=91=E6=8A=A5=E5=91=8A=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E5=A4=84=E7=90=86=EF=BC=8C=E6=89=A7=E8=A1=8C=E5=89=8D?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E6=8F=90=E4=BA=A4=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/ApiAutomationService.java     | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 54cef07147..2b92853c60 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -1560,16 +1560,23 @@ public class ApiAutomationService {
      * @param request
      */
     private void parallel(Map<String, RunModeDataDTO> executeQueue, RunScenarioRequest request) {
-        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
-        ApiScenarioReportMapper batchMapper = sqlSession.getMapper(ApiScenarioReportMapper.class);
-        // 开始并发执行
-        for (String reportId : executeQueue.keySet()) {
-            //存储报告
-            APIScenarioReportResult report = executeQueue.get(reportId).getReport();
-            batchMapper.insert(report);
-            MessageCache.scenarioExecResourceLock.put(reportId, report);
-        }
-        sqlSession.flushStatements();
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+                ApiScenarioReportMapper batchMapper = sqlSession.getMapper(ApiScenarioReportMapper.class);
+                // 开始并发执行
+                for (String reportId : executeQueue.keySet()) {
+                    //存储报告
+                    APIScenarioReportResult report = executeQueue.get(reportId).getReport();
+                    batchMapper.insert(report);
+                    MessageCache.scenarioExecResourceLock.put(reportId, report);
+                }
+                sqlSession.commit();
+                sqlSession.clearCache();
+            }
+        });
+        thread.start();
 
         for (String reportId : executeQueue.keySet()) {
             // 增加一个本地锁，防止并发找不到资源

From 22f9a55d174a1adc67508f5734625da6df1a6419 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Wed, 1 Dec 2021 16:27:17 +0800
Subject: [PATCH 032/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E6=A0=87=E7=AD=BE=E5=8F=98=E6=9B=B4=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=98=E6=9B=B4=E5=8E=86=E5=8F=B2=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008162 --user=郭雨琦 修标签变更后，变更历史显示错误问题
---
 .../log/utils/ReflexObjectUtil.java           | 12 ++++++--
 .../log/utils/diff/json/JsonDiff.java         | 14 ++++++++-
 .../metersphere/log/utils/diff/json/Leaf.java | 29 +++++++++++--------
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/log/utils/ReflexObjectUtil.java b/backend/src/main/java/io/metersphere/log/utils/ReflexObjectUtil.java
index dafa9cdbf0..c8e795884a 100644
--- a/backend/src/main/java/io/metersphere/log/utils/ReflexObjectUtil.java
+++ b/backend/src/main/java/io/metersphere/log/utils/ReflexObjectUtil.java
@@ -151,8 +151,16 @@ public class ReflexObjectUtil {
                         column.setNewValue(newColumns.get(i).getOriginalValue());
                         if (StringUtils.isNotEmpty(originalColumns.get(i).getColumnName()) && originalColumns.get(i).getColumnName().equals("tags")) {
                             GsonDiff diff = new GsonDiff();
-                            String oldTags = ApiDefinitionDiffUtil.JSON_START + ((originalColumns.get(i) != null && originalColumns.get(i).getOriginalValue() != null) ? originalColumns.get(i).getOriginalValue().toString() : "\"\"") + ApiDefinitionDiffUtil.JSON_END;
-                            String newTags = ApiDefinitionDiffUtil.JSON_START + ((newColumns.get(i) != null && newColumns.get(i).getOriginalValue() != null) ? newColumns.get(i).getOriginalValue().toString() : "\"\"") + ApiDefinitionDiffUtil.JSON_END;
+                            Object originalValue = originalColumns.get(i).getOriginalValue();
+                            Object newValue = newColumns.get(i).getOriginalValue();
+                            List<String> originalValueArray = JSON.parseArray(originalValue.toString(), String.class);
+                            List<String> newValueArray = JSON.parseArray(newValue.toString(), String.class);
+                            Collections.sort(originalValueArray);
+                            Collections.sort(newValueArray);
+                            Object originalObject = JSON.toJSON(originalValueArray);
+                            Object newObject = JSON.toJSON(newValueArray);
+                            String oldTags = ApiDefinitionDiffUtil.JSON_START + ((originalColumns.get(i) != null && originalObject != null) ? originalObject.toString() : "\"\"") + ApiDefinitionDiffUtil.JSON_END;
+                            String newTags = ApiDefinitionDiffUtil.JSON_START + ((newColumns.get(i) != null && newObject != null) ? newObject.toString() : "\"\"") + ApiDefinitionDiffUtil.JSON_END;
                             String diffStr = diff.diff(oldTags, newTags);
                             String diffValue = diff.apply(newTags, diffStr);
                             column.setDiffValue(diffValue);
diff --git a/backend/src/main/java/io/metersphere/log/utils/diff/json/JsonDiff.java b/backend/src/main/java/io/metersphere/log/utils/diff/json/JsonDiff.java
index 09ef609fc2..90ba99e416 100644
--- a/backend/src/main/java/io/metersphere/log/utils/diff/json/JsonDiff.java
+++ b/backend/src/main/java/io/metersphere/log/utils/diff/json/JsonDiff.java
@@ -285,7 +285,19 @@ public class JsonDiff {
                     String valueJson = DIFF_ADD + (value != null && StringUtils.isNotEmpty(value.toString()) ? value.toString().substring(1, value.toString().length() - 1) : "");
                     JsonPrimitive gsonJsonPrimitive = new JsonPrimitive(valueJson);
                     GsonJsonPrimitive primitive = new GsonJsonPrimitive(gsonJsonPrimitive);
-                    ((JzonArray) applyTo).set(instruction.index, primitive);
+                    JzonArray applyToArray = (JzonArray) applyTo;
+                    JzonElement jzonElementByIndex = applyToArray.get(instruction.index);
+                    if(StringUtils.equals(jzonElementByIndex.toString(),value.toString())){
+                        applyToArray.set(instruction.index, primitive);
+                    }else{
+                        for (int i = 0; i < applyToArray.size()-1; i++) {
+                            JzonElement jzonElement = applyToArray.get(i);
+                            if(StringUtils.equals(jzonElement.toString(),value.toString())){
+                                applyToArray.set(i, primitive);
+                                break;
+                            }
+                        }
+                    }
                 } else {
                     try {
                         JacksonJsonObject object = (JacksonJsonObject) value;
diff --git a/backend/src/main/java/io/metersphere/log/utils/diff/json/Leaf.java b/backend/src/main/java/io/metersphere/log/utils/diff/json/Leaf.java
index c965ec7ecf..00a4f7505a 100644
--- a/backend/src/main/java/io/metersphere/log/utils/diff/json/Leaf.java
+++ b/backend/src/main/java/io/metersphere/log/utils/diff/json/Leaf.java
@@ -55,20 +55,25 @@ class Leaf implements Comparable<Leaf> {
 	}
 
 	boolean cancelDelete(Leaf deleted, Leaf with) {
+
 		if (deleted.parent.hashCode == with.parent.hashCode) {
-			if (JsonDiff.LOG.isLoggable(Level.FINE))
-				JsonDiff.LOG.info("SET " + deleted + " @" + with);
-			with.newStructure.clear();
-			deleted.oper = Oper.SET;
-			//deleted.val = with.val;
-			Leaf newParent = deleted.parent.parent.leaf;
-			// recover deleted children (orphans)
-			for (Leaf orphan : deleted.children) {
-				orphan.parent.parent = deleted.parent;
-				deleted.newStructure.add(orphan);
+			if((deleted.val!=null&&with.val!=null&&deleted.val.equals(with.val))||(deleted.val==null&&with.val==null)){
+				if (JsonDiff.LOG.isLoggable(Level.FINE))
+					JsonDiff.LOG.info("SET " + deleted + " @" + with);
+				with.newStructure.clear();
+				deleted.oper = Oper.SET;
+				//deleted.val = with.val;
+				Leaf newParent = deleted.parent.parent.leaf;
+				// recover deleted children (orphans)
+				for (Leaf orphan : deleted.children) {
+					orphan.parent.parent = deleted.parent;
+					deleted.newStructure.add(orphan);
+				}
+				deleted.rehash(newParent);
+				return true;
+			}else {
+				return false;
 			}
-			deleted.rehash(newParent);
-			return true;
 		}
 		return false;
 	}

From ffbec714ae1a3c33b63def73914d08562d207874 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Wed, 1 Dec 2021 19:08:54 +0800
Subject: [PATCH 033/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E4=BF=AE=E6=94=B9=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B=E8=B7=B3=E8=BD=AC=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=B8=8E=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008454 --user=郭雨琦 项目A导入项目B中的场景，项目B的id链接跳转后仍显示项目A --bug=1008453
【接口自动化】-dubbo 的ID链接跳转协议显示不正确，是http协议
---
 .../components/api/automation/ApiAutomation.vue      |  7 +++++++
 .../automation/scenario/component/ApiComponent.vue   |  2 +-
 .../scenario/component/ApiScenarioComponent.vue      |  2 +-
 .../api/automation/scenario/component/urlhelper.js   | 10 +++++-----
 .../components/api/definition/ApiDefinition.vue      |  9 +++++++++
 .../api/definition/components/module/ApiModule.vue   | 12 +++++++++---
 frontend/src/business/components/api/router.js       |  4 ++--
 7 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index ba751d4512..6fd091c1b3 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -98,6 +98,7 @@
 <script>
 
 import {getCurrentProjectID, getCurrentUser, getUUID, hasPermission} from "@/common/js/utils";
+import {PROJECT_ID} from "@/common/js/constants";
 
 export default {
   name: "ApiAutomation",
@@ -149,6 +150,12 @@ export default {
       initApiTableOpretion: 'init',
     };
   },
+  created() {
+    let projectId = this.$route.params.projectId;
+    if(projectId){
+      sessionStorage.setItem(PROJECT_ID, projectId);
+    }
+  },
   mounted() {
     this.getProject();
     this.getTrashCase();
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 6fcba534c1..0669ff5b69 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -637,7 +637,7 @@ export default {
       if(resource.refType&&resource.refType==='API'){
         let definitionData = this.$router.resolve({
           name: 'ApiDefinition',
-          params: {redirectID: getUUID(), dataType: "api", dataSelectRange: 'edit:' + resource.id}
+          params: {redirectID: getUUID(), dataType: "api", dataSelectRange: 'edit:' + resource.id,projectId:resource.projectId,type:resource.protocol}
         });
         window.open(definitionData.href, '_blank');
       }else if(resource.refType&&resource.refType==='CASE'){
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
index a8639ca434..173b4adf9a 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
@@ -273,7 +273,7 @@ export default {
     clickResource(resource) {
       let automationData = this.$router.resolve({
         name: 'ApiAutomation',
-        params: {redirectID: getUUID(), dataType: "scenario", dataSelectRange: 'edit:' + resource.id}
+        params: {redirectID: getUUID(), dataType: "scenario", dataSelectRange: 'edit:' + resource.id,projectId:resource.projectId}
       });
       window.open(automationData.href, '_blank');
     },
diff --git a/frontend/src/business/components/api/automation/scenario/component/urlhelper.js b/frontend/src/business/components/api/automation/scenario/component/urlhelper.js
index 8098059c73..6296ec3dca 100644
--- a/frontend/src/business/components/api/automation/scenario/component/urlhelper.js
+++ b/frontend/src/business/components/api/automation/scenario/component/urlhelper.js
@@ -18,7 +18,7 @@ export function getUrl(d) {
           url += "/api/definition?resourceId=" + resourceId;
         break;
         case "CASE":
-          url += "/api/definition?caseId=" + d.id;
+          url += "/api/definition?caseId=" + d.id+"&projectId="+d.projectId;
         break;
       }
       break;
@@ -28,7 +28,7 @@ export function getUrl(d) {
           url += "/api/definition?resourceId=" + resourceId;
           break;
         case "CASE":
-          url += "/api/definition?caseId=" + d.id;
+          url += "/api/definition?caseId=" + d.id+"&projectId="+d.projectId;
           break;
       }
       break;
@@ -38,7 +38,7 @@ export function getUrl(d) {
           url += "/api/definition?resourceId=" + resourceId;
           break;
         case "CASE":
-          url += "/api/definition?caseId=" + d.id;
+          url += "/api/definition?caseId=" + d.id+"&projectId="+d.projectId;
           break;
       }
       break;
@@ -48,7 +48,7 @@ export function getUrl(d) {
           url += "/api/definition?resourceId=" + resourceId;
           break;
         case "CASE":
-          url += "/api/definition?caseId=" + d.id;
+          url += "/api/definition?caseId=" + d.id+"&projectId="+d.projectId;
           break;
       }
       break;
@@ -58,7 +58,7 @@ export function getUrl(d) {
           url += "/api/definition?resourceId=" + resourceId;
           break;
         case "CASE":
-          url += "/api/definition?caseId=" + d.id;
+          url += "/api/definition?caseId=" + d.id+"&projectId="+d.projectId;
           break;
       }
       break;
diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index 11463c908b..fd2bc98efc 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -254,6 +254,7 @@ import MockConfig from "@/business/components/api/definition/components/mock/Moc
 import ApiSchedule from "@/business/components/api/definition/components/import/ApiSchedule";
 import MsEditCompleteContainer from "./components/EditCompleteContainer";
 import MsEnvironmentSelect from "./components/case/MsEnvironmentSelect";
+import {PROJECT_ID} from "@/common/js/constants";
 
 
 export default {
@@ -371,6 +372,7 @@ export default {
   },
   watch: {
     currentProtocol() {
+      debugger
       if (this.activeDom === 'right') {
         this.activeDom = 'left';
       }
@@ -397,6 +399,13 @@ export default {
     },
   },
   created() {
+    let projectId = this.$route.params.projectId;
+    if(projectId){
+      sessionStorage.setItem(PROJECT_ID, projectId);
+    }
+    if (this.$route.query.projectId){
+      sessionStorage.setItem(PROJECT_ID, this.$route.query.projectId);
+    }
     this.getEnv();
     // 通知过来的数据跳转到编辑
     if (this.$route.query.caseId) {
diff --git a/frontend/src/business/components/api/definition/components/module/ApiModule.vue b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
index 1a414e68ad..3402362cc7 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModule.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
@@ -145,11 +145,17 @@
     },
     methods: {
       initProtocol() {
-        this.$get('/api/module/getUserDefaultApiType/', response => {
-          this.condition.protocol = response.data;
+        if(this.$route.params.type){
+          this.condition.protocol = this.$route.params.type;
           this.$emit('protocolChange', this.condition.protocol);
           this.list();
-        });
+        }else {
+          this.$get('/api/module/getUserDefaultApiType/', response => {
+            this.condition.protocol = response.data;
+            this.$emit('protocolChange', this.condition.protocol);
+            this.list();
+          });
+        }
       },
       filter() {
         this.$refs.nodeTree.filter(this.condition.filterText);
diff --git a/frontend/src/business/components/api/router.js b/frontend/src/business/components/api/router.js
index e5e9bf53f9..22a09f92aa 100644
--- a/frontend/src/business/components/api/router.js
+++ b/frontend/src/business/components/api/router.js
@@ -40,12 +40,12 @@ export default {
 
     },
     {
-      path: "definition/:redirectID?/:dataType?/:dataSelectRange?",
+      path: "definition/:redirectID?/:dataType?/:dataSelectRange?/:projectId?/:type?",
       name: "ApiDefinition",
       component: () => import('@/business/components/api/definition/ApiDefinition'),
     },
     {
-      path: "automation/:redirectID?/:dataType?/:dataSelectRange?",
+      path: "automation/:redirectID?/:dataType?/:dataSelectRange?/:projectId?",
       name: "ApiAutomation",
       component: () => import('@/business/components/api/automation/ApiAutomation'),
     },

From d1fbeeb3cd4c1a313ae7a2f89944d7cd36014fcc Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Wed, 1 Dec 2021 19:11:45 +0800
Subject: [PATCH 034/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E4=BF=AE=E6=94=B9=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B=E8=B7=B3=E8=BD=AC=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=B8=8E=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 去掉debugger
---
 .../src/business/components/api/definition/ApiDefinition.vue     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index fd2bc98efc..3b8ed9b00a 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -372,7 +372,6 @@ export default {
   },
   watch: {
     currentProtocol() {
-      debugger
       if (this.activeDom === 'right') {
         this.activeDom = 'left';
       }

From 9e0434af6c3f542a7b5424f93fb7ff862c52059b Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 1 Dec 2021 15:55:00 +0800
Subject: [PATCH 035/256] =?UTF-8?q?refactor(=E7=8E=AF=E5=A2=83=E7=BB=84):?=
 =?UTF-8?q?=20=E5=AF=B9=E7=8E=AF=E5=A2=83=E7=BB=84=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=BF=87=E6=BB=A4=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008140 --user=lyh 【环境组】-项目不属于环境组可见环境组选项 和需求不一致
https://www.tapd.cn/55049933/s/1076963
---
 .../EnvironmentGroupController.java           |   6 +
 .../request/EnvironmentGroupRequest.java      |   1 +
 .../metersphere/dto/EnvironmentGroupDTO.java  |  11 ++
 .../service/EnvironmentGroupService.java      |  26 ++++
 .../automation/scenario/EditApiScenario.vue   |   2 +-
 .../api/automation/scenario/EnvGroup.vue      |   4 -
 .../scenario/EnvGroupWithOption.vue           | 137 ++++++++++++++++++
 .../api/automation/scenario/EnvPopover.vue    |  31 +++-
 .../scenario/maximize/ScenarioHeader.vue      |   2 +-
 9 files changed, 207 insertions(+), 13 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/dto/EnvironmentGroupDTO.java
 create mode 100644 frontend/src/business/components/api/automation/scenario/EnvGroupWithOption.vue

diff --git a/backend/src/main/java/io/metersphere/controller/EnvironmentGroupController.java b/backend/src/main/java/io/metersphere/controller/EnvironmentGroupController.java
index 612f669081..0d3a08577b 100644
--- a/backend/src/main/java/io/metersphere/controller/EnvironmentGroupController.java
+++ b/backend/src/main/java/io/metersphere/controller/EnvironmentGroupController.java
@@ -7,6 +7,7 @@ import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.EnvironmentGroupRequest;
+import io.metersphere.dto.EnvironmentGroupDTO;
 import io.metersphere.service.EnvironmentGroupService;
 import org.springframework.web.bind.annotation.*;
 
@@ -71,4 +72,9 @@ public class EnvironmentGroupController {
     public void copy(@PathVariable String id) {
         environmentGroupService.copy(id);
     }
+
+    @PostMapping("/get/option")
+    public List<EnvironmentGroupDTO> getEnvOptionGroup(@RequestBody EnvironmentGroupRequest request) {
+        return environmentGroupService.getEnvOptionGroup(request.getProjectIds());
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/controller/request/EnvironmentGroupRequest.java b/backend/src/main/java/io/metersphere/controller/request/EnvironmentGroupRequest.java
index a0a0d42a27..4383a8bbd6 100644
--- a/backend/src/main/java/io/metersphere/controller/request/EnvironmentGroupRequest.java
+++ b/backend/src/main/java/io/metersphere/controller/request/EnvironmentGroupRequest.java
@@ -19,4 +19,5 @@ public class EnvironmentGroupRequest extends EnvironmentGroup {
      */
     private Map<String, String> map;
     private List<String> groupIds;
+    private List<String> projectIds;
 }
diff --git a/backend/src/main/java/io/metersphere/dto/EnvironmentGroupDTO.java b/backend/src/main/java/io/metersphere/dto/EnvironmentGroupDTO.java
new file mode 100644
index 0000000000..40ed8b138c
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/dto/EnvironmentGroupDTO.java
@@ -0,0 +1,11 @@
+package io.metersphere.dto;
+
+import io.metersphere.base.domain.EnvironmentGroup;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class EnvironmentGroupDTO extends EnvironmentGroup {
+    private Boolean disabled = false;
+}
diff --git a/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java b/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
index 1146823d0d..39b6b6f532 100644
--- a/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
+++ b/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
@@ -10,15 +10,19 @@ import io.metersphere.base.mapper.ext.ExtEnvironmentGroupMapper;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.EnvironmentGroupRequest;
+import io.metersphere.dto.EnvironmentGroupDTO;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -46,6 +50,8 @@ public class EnvironmentGroupService {
     private ApiTestEnvironmentMapper apiTestEnvironmentMapper;
     @Resource
     private ApiAutomationService apiAutomationService;
+    @Resource
+    private EnvironmentGroupProjectService environmentGroupProjectService;
 
     public EnvironmentGroup add(EnvironmentGroupRequest request) {
         request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
@@ -246,4 +252,24 @@ public class EnvironmentGroupService {
         }
         sqlSession.flushStatements();
     }
+
+    public List<EnvironmentGroupDTO> getEnvOptionGroup(List<String> projectIds) {
+        EnvironmentGroupExample example = new EnvironmentGroupExample();
+        example.createCriteria().andWorkspaceIdEqualTo(SessionUtils.getCurrentWorkspaceId());
+        List<EnvironmentGroupDTO> result = new ArrayList<>();
+        List<EnvironmentGroup> groups = environmentGroupMapper.selectByExample(example);
+        for (EnvironmentGroup group : groups) {
+            Map<String, String> envMap = environmentGroupProjectService.getEnvMap(group.getId());
+            EnvironmentGroupDTO dto = new EnvironmentGroupDTO();
+            BeanUtils.copyProperties(group, dto);
+            if (CollectionUtils.isNotEmpty(projectIds)) {
+                boolean b = envMap.keySet().containsAll(projectIds);
+                if (BooleanUtils.isFalse(b)) {
+                    dto.setDisabled(true);
+                }
+            }
+            result.add(dto);
+        }
+        return result;
+    }
 }
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 4bf7b8380e..cb617d84f1 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -137,7 +137,7 @@
                                  :group-id="envGroupId" :project-list="projectList"
                                  :show-config-button-with-out-permission="showConfigButtonWithOutPermission"
                                  @setProjectEnvMap="setProjectEnvMap" @setEnvGroup="setEnvGroup"
-                                 @showPopover="showPopover"
+                                 @showPopover="showPopover" :has-option-group="true"
                                  ref="envPopover" class="ms-message-right"/>
                     <el-tooltip v-if="!debugLoading" content="Ctrl + R" placement="top">
                       <el-dropdown split-button type="primary" @click="runDebug" class="ms-message-right" size="mini" @command="handleCommand" v-permission="['PROJECT_API_SCENARIO:READ+EDIT', 'PROJECT_API_SCENARIO:READ+CREATE']">
diff --git a/frontend/src/business/components/api/automation/scenario/EnvGroup.vue b/frontend/src/business/components/api/automation/scenario/EnvGroup.vue
index c21492a182..c13efb9320 100644
--- a/frontend/src/business/components/api/automation/scenario/EnvGroup.vue
+++ b/frontend/src/business/components/api/automation/scenario/EnvGroup.vue
@@ -2,7 +2,6 @@
   <div>
     <div style="margin-left: 20px;">
       <el-select v-model="envGroupId" placeholder="请选择用户组" style="margin-top: 8px;width: 200px;" size="small">
-        <!--  todo  如果缺少对应的项目进行提示 -->
         <el-option v-for="(group, index) in groups" :key="index"
                    :label="group.name"
                    :value="group.id"/>
@@ -23,7 +22,6 @@
 </template>
 
 <script>
-import {getCurrentProjectID} from "@/common/js/utils";
 import EnvironmentGroup from "@/business/components/settings/workspace/environment/EnvironmentGroupList";
 
 export default {
@@ -58,8 +56,6 @@ export default {
       this.envGroupId = this.groupId;
     },
     init() {
-      // todo  params 查询包含当前项目ID的工作空间下用户组。
-      // 如果项目组中缺少项目项 在选项上进行警告提示，并且禁用选项。
       this.$post('/environment/group/get/all',{}, res => {
         let data = res.data;
         this.groups = data ? data : [];
diff --git a/frontend/src/business/components/api/automation/scenario/EnvGroupWithOption.vue b/frontend/src/business/components/api/automation/scenario/EnvGroupWithOption.vue
new file mode 100644
index 0000000000..234ad03f05
--- /dev/null
+++ b/frontend/src/business/components/api/automation/scenario/EnvGroupWithOption.vue
@@ -0,0 +1,137 @@
+<template>
+  <div>
+    <div style="margin-left: 20px;">
+      <el-select v-model="envGroupId" placeholder="请选择用户组" style="margin-top: 8px;width: 200px;" size="small">
+        <el-option-group
+          v-for="group in groups"
+          :key="group.label"
+          :label="group.label">
+          <el-option
+            v-for="item in group.options"
+            :key="item.name"
+            :label="item.name"
+            :disabled="item.disabled"
+            :value="item.id">
+          </el-option>
+        </el-option-group>
+      </el-select>
+      <span style="margin-left: 8px;">环境组</span>
+      <i class="el-icon-view icon-view-btn" @click="viewGroup"></i>
+    </div>
+    <el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">确 定</el-button>
+    <el-dialog :visible="visble" append-to-body :title="'环境组'" @close="visble = false" style="height: 800px;">
+      <template>
+        <environment-group style="overflow-y: auto;"
+                           :screen-height="'350px'"
+                           :read-only="true"
+        ></environment-group>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import EnvironmentGroup from "@/business/components/settings/workspace/environment/EnvironmentGroupList";
+
+export default {
+  name: "EnvGroupWithOption",
+  components: {EnvironmentGroup},
+  data() {
+    return {
+      groups: [],
+      envGroupId: this.groupId,
+      visble: false,
+      disabledGroups: [],
+      notDisabledGroups: [],
+      result: {}
+    }
+  },
+  props: {
+    groupId: {
+      type: String,
+      default() {
+        return "";
+      }
+    },
+    projectIds: Set,
+  },
+  watch: {
+    groupId(val) {
+      this.envGroupId = val;
+    }
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    open() {
+      this.envGroupId = this.groupId;
+    },
+    init() {
+      this.result = this.$post("/environment/group/get/option", {projectIds: [...this.projectIds]}, res => {
+        let groups = res.data;
+        this.disabledGroups = groups.filter(group => group.disabled === true);
+        this.notDisabledGroups = groups.filter(group => group.disabled === false);
+        this.$set(this.groups, 0, {
+          label: '可用环境组',
+          options: this.notDisabledGroups
+        });
+        this.$set(this.groups, 1, {
+          label: '不可用环境组(缺少项目环境)',
+          options: this.disabledGroups
+        });
+      })
+    },
+    viewGroup() {
+      this.visble = true;
+    },
+    async handleConfirm() {
+      const sign = await this.checkEnv();
+      if (sign) {
+        this.$emit("setEnvGroup", this.envGroupId);
+        this.$emit('close');
+      }
+    },
+    checkEnv() {
+      return new Promise((resolve) => {
+        if (!this.envGroupId) {
+          this.$warning("请选择环境组！");
+          resolve(false);
+          return false;
+        }
+        this.$get("/environment/group/project/map/" + this.envGroupId, res => {
+          let data = res.data;
+          if (!data) {
+            this.$warning("环境组缺少环境！");
+            resolve(false);
+            return;
+          }
+          let map = new Map(Object.entries(data));
+          for (let id of this.projectIds) {
+            if (!map.get(id)) {
+              this.$warning("此环境组缺少必要的项目环境！");
+              resolve(false);
+              return;
+            }
+          }
+          resolve(true);
+        });
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.env-confirm {
+  margin-left: 20px;
+  width: 360px;
+  margin-top: 10px;
+}
+.icon-view-btn {
+  margin-left: 5px;
+}
+.icon-view-btn:hover {
+  cursor: pointer;
+}
+</style>
diff --git a/frontend/src/business/components/api/automation/scenario/EnvPopover.vue b/frontend/src/business/components/api/automation/scenario/EnvPopover.vue
index f037a24110..aaf7f2979b 100644
--- a/frontend/src/business/components/api/automation/scenario/EnvPopover.vue
+++ b/frontend/src/business/components/api/automation/scenario/EnvPopover.vue
@@ -19,9 +19,13 @@
                 @setProjectEnvMap="setProjectEnvMap"
                 v-show="!radio || radio === ENV_TYPE.JSON"
                 ref="envSelect"/>
-    <!-- todo 如果工作空间下的环境组都不包含当前项目则不显示 -->
-    <env-group ref="envGroup" v-show="radio === ENV_TYPE.GROUP" @close="visible = false" :project-ids="projectIds"
+    <env-group ref="envGroup" v-show="radio === ENV_TYPE.GROUP && !hasOptionGroup" @close="visible = false"
+               :project-ids="projectIds"
                @setEnvGroup="setEnvGroup" :group-id="groupId"></env-group>
+    <!-- 对环境组选项进行分类 可用｜不可用 -->
+    <env-group-with-option ref="envOptionGroup" v-show="radio === ENV_TYPE.GROUP && hasOptionGroup" @close="visible = false"
+                           :project-ids="projectIds"
+                           @setEnvGroup="setEnvGroup" :group-id="groupId"></env-group-with-option>
     <el-button type="primary" slot="reference" size="mini" style="margin-top: 2px;">
       {{ $t('api_test.definition.request.run_env') }}
       <i class="el-icon-caret-bottom el-icon--right"></i>
@@ -33,15 +37,16 @@
 import EnvSelect from "@/business/components/api/automation/scenario/EnvSelect";
 import {ENV_TYPE} from "@/common/js/constants";
 import EnvGroup from "@/business/components/api/automation/scenario/EnvGroup";
+import EnvGroupWithOption from "@/business/components/api/automation/scenario/EnvGroupWithOption";
 
 export default {
   name: "EnvPopover",
-  components: {EnvGroup, EnvSelect},
+  components: {EnvGroup, EnvSelect, EnvGroupWithOption},
   props: {
     envMap: Map,
     projectIds: Set,
     projectList: Array,
-    showConfigButtonWithOutPermission:{
+    showConfigButtonWithOutPermission: {
       type: Boolean,
       default() {
         return true;
@@ -77,6 +82,12 @@ export default {
       default() {
         return "bottom";
       }
+    },
+    hasOptionGroup: {
+      type: Boolean,
+      default() {
+        return false;
+      }
     }
   },
   data() {
@@ -105,8 +116,13 @@ export default {
     },
     openEnvSelect() {
       this.$refs.envSelect.open();
-      this.$refs.envGroup.init();
-      this.$refs.envGroup.open();
+      if (!this.hasOptionGroup) {
+        this.$refs.envGroup.init();
+        this.$refs.envGroup.open();
+      } else {
+        this.$refs.envOptionGroup.init();
+        this.$refs.envOptionGroup.open();
+      }
     },
     setProjectEnvMap(map) {
       this.$emit("setProjectEnvMap", map);
@@ -123,7 +139,8 @@ export default {
           let res = this.$refs.envSelect.checkEnv(data);
           resolve(res);
         } else if (this.environmentType === ENV_TYPE.GROUP) {
-          let res = this.$refs.envGroup.checkEnv();
+          let res = !this.hasOptionGroup ? this.$refs.envGroup.checkEnv() :
+            this.$refs.envOptionGroup.checkEnv();
           res.then(r => {
             resolve(r);
           })
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
index 3b4ee83e69..9f775b19d1 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
@@ -28,7 +28,7 @@
           <env-popover :disabled="scenarioDefinition.length < 1" :isReadOnly="scenarioDefinition.length < 1"
                        :env-map="envMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
                        :environment-type.sync="envType" :group-id="envGroupId"
-                       @showPopover="showPopover" :project-list="projectList" ref="envPopover" class="ms-right"
+                       @showPopover="showPopover" :project-list="projectList" ref="envPopover" class="ms-right" :has-option-group="true"
                        :result="envResult"/>
 
           <el-dropdown split-button type="primary" @click="runDebug" style="margin-right: 10px" size="mini" @command="handleCommand" v-if="!debug">

From 5bb39d5cfb8eedd7ffefcf7aa483eccaaa0fa877 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 2 Dec 2021 12:33:53 +0800
Subject: [PATCH 036/256] =?UTF-8?q?fix:=20markdown=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/package.json b/frontend/package.json
index 4b4a080a6c..8b86f7c7ba 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -41,7 +41,7 @@
     "lodash.isnumber": "^3.0.3",
     "lodash.isobject": "^3.0.2",
     "lodash.isstring": "^4.0.1",
-    "mavon-editor": "^2.9.1",
+    "mavon-editor": "2.9.1",
     "md5": "^2.3.0",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",

From 5842bde643940ee84c3dbc1ba15e4382e829e350 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Wed, 1 Dec 2021 19:26:15 +0800
Subject: [PATCH 037/256] =?UTF-8?q?feat(=E5=8A=9F=E8=83=BD=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B):=20=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9C=80=E5=90=8E=E4=B8=80=E6=AC=A1=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

功能用例增加最后一次执行结果的字段
---
 .../base/mapper/ext/ExtTestCaseMapper.java    |  2 +
 .../base/mapper/ext/ExtTestCaseMapper.xml     |  4 +
 .../io/metersphere/track/dto/TestCaseDTO.java |  1 +
 .../track/service/TestCaseService.java        |  6 ++
 .../track/case/components/TestCaseList.vue    | 99 +++++++++++--------
 5 files changed, 71 insertions(+), 41 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
index 482547f17e..749db029bb 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
@@ -125,4 +125,6 @@ public interface ExtTestCaseMapper {
     List<RelationshipGraphData.Node> getTestCaseForGraph(@Param("ids") Set<String> ids);
 
     int countByIds(@Param("ids") List<String> ids);
+
+    String getLastExecStatusById(String id);
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 70d6bbee88..cebcf428b6 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -621,4 +621,8 @@
         </foreach>
     </update>
 
+    <select id="getLastExecStatusById" resultType="java.lang.String">
+        SELECT `status` FROM test_plan_test_case WHERE case_id = #{0} ORDER BY update_time DESC limit 1 ;
+    </select>
+
 </mapper>
diff --git a/backend/src/main/java/io/metersphere/track/dto/TestCaseDTO.java b/backend/src/main/java/io/metersphere/track/dto/TestCaseDTO.java
index d79e9f75a5..6bb4ed8a8a 100644
--- a/backend/src/main/java/io/metersphere/track/dto/TestCaseDTO.java
+++ b/backend/src/main/java/io/metersphere/track/dto/TestCaseDTO.java
@@ -18,6 +18,7 @@ public class TestCaseDTO extends TestCaseWithBLOBs {
     private String lastResultId;
     private String projectName;
     private String createName;
+    private String lastExecuteResult;
 
     private List<String> caseTags = new ArrayList<>();
     private List<IssuesDao> issueList = new ArrayList<>();
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index d862908bf1..155ed5905d 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -397,6 +397,12 @@ public class TestCaseService {
     private List<TestCaseDTO> parseStatus(List<TestCaseDTO> returnList) {
         TestCaseExcelData excelData = new TestCaseExcelDataFactory().getTestCaseExcelDataLocal();
         for (TestCaseDTO data : returnList) {
+            String lastStatus = extTestCaseMapper.getLastExecStatusById(data.getId());
+            if(StringUtils.isNotEmpty(lastStatus)){
+                data.setLastExecuteResult(lastStatus);
+            }else {
+                data.setLastExecuteResult(null);
+            }
             String dataStatus = excelData.parseStatus(data.getStatus());
 
             if (StringUtils.equalsAnyIgnoreCase(data.getStatus(), "Trash")) {
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index b4929286ce..168bb033dc 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -46,15 +46,28 @@
         :label="$t('commons.delete_user')"
         min-width="120"/>
 
+      <ms-table-column
+        prop="lastExecuteResult"
+        min-width="100px"
+        :label="$t('test_track.plan_view.execute_result')">
+        <template v-slot:default="scope">
+          <span @click.stop="clickt = 'stop'">
+              <span class="el-dropdown-link">
+                  <status-table-item :value="scope.row.lastExecuteResult"/>
+              </span>
+            </span>
+        </template>
+      </ms-table-column>
+
       <span v-for="item in fields" :key="item.key">
         <ms-table-column
-            v-if="!customNum"
-            :field="item"
-            :fields-width="fieldsWidth"
-            prop="num"
-            sortable
-            :label="$t('commons.id')"
-            min-width="80"/>
+          v-if="!customNum"
+          :field="item"
+          :fields-width="fieldsWidth"
+          prop="num"
+          sortable
+          :label="$t('commons.id')"
+          min-width="80"/>
 
         <ms-table-column
           v-if="item.id === 'num' && customNum"
@@ -75,7 +88,7 @@
 
         <ms-table-column :label="$t('test_track.case.case_desc')" prop="desc" :field="item">
           <template v-slot:default="scope">
-            <el-link @click.stop="getCase(scope.row.id)" style="color:#783887;">{{$t('commons.preview')}}</el-link>
+            <el-link @click.stop="getCase(scope.row.id)" style="color:#783887;">{{ $t('commons.preview') }}</el-link>
           </template>
         </ms-table-column>
 
@@ -86,7 +99,7 @@
           :label="$t('commons.create_user')"
           min-width="120">
           <template v-slot:default="scope">
-            {{memberMap.get(scope.row.createUser)}}
+            {{ memberMap.get(scope.row.createUser) }}
           </template>
         </ms-table-column>
 
@@ -117,20 +130,22 @@
         </ms-table-column>
 
         <ms-table-column
-            prop="nodePath"
-            :field="item"
-            :fields-width="fieldsWidth"
-            :label="$t('test_track.case.module')"
-            min-width="150px">
+          prop="nodePath"
+          :field="item"
+          :fields-width="fieldsWidth"
+          :label="$t('test_track.case.module')"
+          min-width="150px">
         </ms-table-column>
 
+
+
         <ms-table-column
-            prop="updateTime"
-            sortable
-            :field="item"
-            :fields-width="fieldsWidth"
-            :label="$t('commons.update_time')"
-            min-width="150px">
+          prop="updateTime"
+          sortable
+          :field="item"
+          :fields-width="fieldsWidth"
+          :label="$t('commons.update_time')"
+          min-width="150px">
           <template v-slot:default="scope">
             <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
           </template>
@@ -144,7 +159,7 @@
           <template v-slot:default="scope">
             <span>{{ scope.row.createTime | timestampFormatDate }}</span>
           </template>
-        </ms-table-column >
+        </ms-table-column>
 
         <ms-table-column v-for="field in testCaseTemplate.customFields" :key="field.id"
                          :filters="getCustomFieldFilter(field)"
@@ -155,13 +170,14 @@
                          :prop="field.name">
           <template v-slot="scope">
             <span v-if="field.name === '用例等级'">
-                <priority-table-item :value="getCustomFieldValue(scope.row, field) ? getCustomFieldValue(scope.row, field) : scope.row.priority"/>
+                <priority-table-item
+                  :value="getCustomFieldValue(scope.row, field) ? getCustomFieldValue(scope.row, field) : scope.row.priority"/>
             </span>
             <span v-else-if="field.name === '用例状态'">
-                {{getCustomFieldValue(scope.row, field) ? getCustomFieldValue(scope.row, field) : scope.row.status}}
+                {{ getCustomFieldValue(scope.row, field) ? getCustomFieldValue(scope.row, field) : scope.row.status }}
             </span>
             <span v-else>
-              {{getCustomFieldValue(scope.row, field)}}
+              {{ getCustomFieldValue(scope.row, field) }}
             </span>
           </template>
         </ms-table-column>
@@ -230,6 +246,7 @@ import {SYSTEM_FIELD_NAME_MAP} from "@/common/js/table-constants";
 import TestCasePreview from "@/business/components/track/case/components/TestCasePreview";
 import {editTestCaseOrder} from "@/network/testCase";
 import {getGraphByCondition} from "@/network/graph";
+
 const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
 const relationshipGraphDrawer = requireComponent.keys().length > 0 ? requireComponent("./graph/RelationshipGraphDrawer.vue") : {};
 
@@ -259,7 +276,7 @@ export default {
     StatusTableItem,
     TestCaseDetail,
     ReviewStatus,
-    MsTag,ApiStatus,
+    MsTag, ApiStatus,
     "relationshipGraphDrawer": relationshipGraphDrawer.default,
   },
   data() {
@@ -301,7 +318,7 @@ export default {
         {text: '进行中', value: 'Underway'},
         {text: '已完成', value: 'Completed'},
       ],
-      batchButtons:[],
+      batchButtons: [],
       simpleButtons: [
         {
           name: this.$t('test_track.case.batch_edit_case'),
@@ -413,14 +430,14 @@ export default {
     this.initTableData();
     let redirectParam = this.$route.query.dataSelectRange;
     this.checkRedirectEditPage(redirectParam);
-    if(this.trashEnable){
+    if (this.trashEnable) {
       this.operators = this.trashOperators;
       this.batchButtons = this.trashButtons;
-    }else {
+    } else {
       this.operators = this.simpleOperators;
       this.batchButtons = this.simpleButtons;
     }
-    if(!this.projectName || this.projectName === ""){
+    if (!this.projectName || this.projectName === "") {
       this.getProjectName();
     }
 
@@ -445,7 +462,7 @@ export default {
   watch: {
     selectNodeIds() {
       this.page.currentPage = 1;
-      if(!this.trashEnable){
+      if (!this.trashEnable) {
         this.condition.filters.status = [];
       }
       initCondition(this.condition, false);
@@ -516,7 +533,7 @@ export default {
       } else if (field.name === '用例状态') {
         return this.statusFilters;
       }
-       return null;
+      return null;
     },
     checkRedirectEditPage(redirectParam) {
       if (redirectParam != null) {
@@ -527,10 +544,10 @@ export default {
         });
       }
     },
-    getProjectName (){
+    getProjectName() {
       this.$get('project/get/' + this.projectId, response => {
         let project = response.data;
-        if(project){
+        if (project) {
           this.projectName = project.name;
         }
       });
@@ -557,7 +574,7 @@ export default {
         // param.planId = this.planId;
         this.condition.planId = this.planId;
       }
-      if(!this.trashEnable){
+      if (!this.trashEnable) {
         if (this.selectNodeIds && this.selectNodeIds.length > 0) {
           // param.nodeIds = this.selectNodeIds;
           this.condition.nodeIds = this.selectNodeIds;
@@ -596,7 +613,7 @@ export default {
       }
       this.condition.filters.priority = this.condition.filters['用例等级'];
       this.condition.filters.status = this.condition.filters['用例状态'];
-      if(this.trashEnable){
+      if (this.trashEnable) {
         this.condition.filters = {status: ["Trash"]};
       }
       if (this.projectId) {
@@ -686,7 +703,7 @@ export default {
         }
       });
     },
-    reduction(testCase){
+    reduction(testCase) {
       let param = {};
       param.ids = [testCase.id];
       param.projectId = getCurrentProjectID();
@@ -706,7 +723,7 @@ export default {
         }
       });
     },
-    batchReduction(){
+    batchReduction() {
       let param = buildBatchParam(this, this.$refs.table.selectIds);
       this.$post('/test/case/reduction', param, () => {
         this.$emit('refreshTable');
@@ -730,7 +747,7 @@ export default {
       });
     },
     generateGraph() {
-      getGraphByCondition('TEST_CASE', buildBatchParam(this, this.$refs.table.selectIds),(data) => {
+      getGraphByCondition('TEST_CASE', buildBatchParam(this, this.$refs.table.selectIds), (data) => {
         this.graphData = data;
         this.$refs.relationshipGraph.open();
       });
@@ -792,7 +809,7 @@ export default {
 
       let config = {};
       let fileNameSuffix = "";
-      if(exportType === 'xmind'){
+      if (exportType === 'xmind') {
         config = {
           url: '/test/case/export/testcase/xmind',
           method: 'post',
@@ -800,7 +817,7 @@ export default {
           data: buildBatchParam(this, this.$refs.table.selectIds)
         };
         fileNameSuffix = ".xmind";
-      }else {
+      } else {
         config = {
           url: '/test/case/export/testcase',
           method: 'post',
@@ -816,7 +833,7 @@ export default {
       }
 
       this.page.result = this.$request(config).then(response => {
-        const filename = "Metersphere_case_" + this.projectName+ fileNameSuffix;
+        const filename = "Metersphere_case_" + this.projectName + fileNameSuffix;
         const blob = new Blob([response.data]);
         if ("download" in document.createElement("a")) {
           let aTag = document.createElement('a');

From aee9594dfc5958ae3d1fc371a5285028f0cf44cc Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 2 Dec 2021 15:31:36 +0800
Subject: [PATCH 038/256] =?UTF-8?q?fix=20(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E4=B8=BA=E5=85=A8=E8=B7=AF=E5=BE=84=EF=BC=8C?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=AD=E4=B8=8D=E9=85=8D=E7=BD=AEurl?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=89=A7=E8=A1=8C=E5=A4=9A=E5=87=BAhttp:/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008494 --user=赵勇 [github#8244] url不能完全使用环境变量或参数形式 https://www.tapd.cn/55049933/s/1077354
---
 .../apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java b/backend/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java
index dcf2d626ab..216387be83 100644
--- a/backend/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java
+++ b/backend/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java
@@ -112,6 +112,9 @@ public final class HTTPSamplerProxy extends HTTPSamplerBase implements Interrupt
         }
         try {
             String url = toExternalForm(u);
+            if (StringUtils.isNotEmpty(url) && url.startsWith("http:/http")) {
+                url = url.substring(6);
+            }
             u = new URL(url);
         } catch (Exception ex) {
             LogUtil.error(ex);

From 69b2ab7a70ac3d9c367f047b98c1f0b29dfd0cb6 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Wed, 1 Dec 2021 14:15:14 +0800
Subject: [PATCH 039/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=AE=9A=E6=89=A7=E8=A1=8C):=20=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=8E=A5=E5=8F=A3=E6=A1=88=E4=BE=8B=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=8C=89=E7=85=A7=E5=88=97=E8=A1=A8=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1007796 --user=宋天阳
【Github#7579】测试计划中拖拽编排场景用例，只能调整显示顺序，但无法作用于执行顺序【+github#8144】
https://www.tapd.cn/55049933/s/1076872
---
 .../io/metersphere/track/service/TestPlanApiCaseService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
index d0b2c535e5..c09b2dc5fd 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
@@ -442,7 +442,7 @@ public class TestPlanApiCaseService {
         }
         // 开始选择执行模式
         if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
-            Map<TestPlanApiCase, ApiDefinitionExecResult> executeQueue = new HashMap<>();
+            Map<TestPlanApiCase, ApiDefinitionExecResult> executeQueue = new LinkedHashMap<>();
 
             //记录案例线程结果以及执行失败的案例ID
             Map<String, String> executeThreadIdMap = new HashMap<>();

From 454fcb99336e50bc13c545c1d63e3a8fcb291e07 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Thu, 2 Dec 2021 15:16:32 +0800
Subject: [PATCH 040/256] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=B1=A0):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=BF=9E=E6=8E=A5=E6=B1=A0=E5=9C=A8=E5=A4=A7?=
 =?UTF-8?q?=E5=8E=8B=E5=8A=9B=E4=B8=8B=E5=AE=B9=E6=98=93=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复数据库连接池在大压力下容易出现获取不到的问题
---
 .../api/service/ApiAutomationService.java     |  23 ++-
 .../api/service/ApiDefinitionService.java     |   4 +
 .../ApiEnvironmentRunningParamService.java    |  13 +-
 .../api/service/ApiModuleService.java         |   7 +
 .../api/service/ApiScenarioModuleService.java |   7 +
 .../api/service/ApiScenarioReportService.java | 157 +++++++++---------
 .../api/service/ApiTestCaseService.java       |  16 +-
 .../service/HistoricalDataUpgradeService.java |   4 +
 .../commons/utils/ServiceUtils.java           |   4 +
 .../commons/utils/TestPlanUtils.java          |   2 -
 .../service/PerformanceTestService.java       |   5 +
 .../service/CustomFieldTemplateService.java   |   5 +-
 .../io/metersphere/service/GroupService.java  |  10 ++
 .../service/RelationshipEdgeService.java      |   4 +
 .../io/metersphere/service/UserService.java   |  13 ++
 .../track/service/TestCaseNodeService.java    |  10 ++
 .../service/TestCaseReviewLoadService.java    |   6 +-
 .../track/service/TestCaseReviewService.java  |  62 +------
 .../track/service/TestCaseService.java        |  13 ++
 .../track/service/TestPlanApiCaseService.java |  14 +-
 .../service/TestPlanLoadCaseService.java      |   4 +
 .../service/TestPlanScenarioCaseService.java  |   4 +
 .../track/service/TestPlanService.java        |   9 +
 23 files changed, 247 insertions(+), 149 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 2b92853c60..f093a8a167 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -68,6 +68,7 @@ import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.jorphan.collections.HashTree;
 import org.apache.jorphan.collections.ListedHashTree;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -1468,8 +1469,12 @@ public class ApiAutomationService {
                 report.setStatus(APITestStatus.Waiting.name());
                 batchMapper.insert(report);
             }
-            sqlSession.commit();
+            sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
         }
+
         // 开始串行执行
         Thread thread = new Thread(new Runnable() {
             @Override
@@ -1572,8 +1577,10 @@ public class ApiAutomationService {
                     batchMapper.insert(report);
                     MessageCache.scenarioExecResourceLock.put(reportId, report);
                 }
-                sqlSession.commit();
-                sqlSession.clearCache();
+                sqlSession.flushStatements();
+                if (sqlSession != null && sqlSessionFactory != null) {
+                    SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+                }
             }
         });
         thread.start();
@@ -1595,7 +1602,6 @@ public class ApiAutomationService {
                         TriggerMode.BATCH.name().equals(request.getTriggerMode()) ? TriggerMode.BATCH.name() : request.getReportId(), request.getRunMode());
             }
         }
-        executeQueue.clear();
     }
 
     /**
@@ -1705,6 +1711,9 @@ public class ApiAutomationService {
             }
             testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), new ParameterConfig());
             sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
         } catch (Exception ex) {
             MSException.throwException(ex.getMessage());
         }
@@ -1979,6 +1988,9 @@ public class ApiAutomationService {
             }
         }
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
         return "success";
     }
 
@@ -2318,6 +2330,9 @@ public class ApiAutomationService {
             }
         }
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     private Long getImportNextOrder(String projectId) {
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index bc34ce8c34..378a72447e 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -59,6 +59,7 @@ import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.jorphan.collections.HashTree;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -1145,6 +1146,9 @@ public class ApiDefinitionService {
         if (!CollectionUtils.isEmpty(apiImport.getCases())) {
             importMsCase(apiImport, sqlSession, request);
         }
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
 
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiEnvironmentRunningParamService.java b/backend/src/main/java/io/metersphere/api/service/ApiEnvironmentRunningParamService.java
index 19203e5640..069f3cc184 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiEnvironmentRunningParamService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiEnvironmentRunningParamService.java
@@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -102,11 +103,19 @@ public class ApiEnvironmentRunningParamService {
             sqlSession = sqlSessionFactory.openSession(ExecutorType.SIMPLE);
             ApiTestEnvironmentMapper batchMapper = sqlSession.getMapper(ApiTestEnvironmentMapper.class);
             batchMapper.updateByPrimaryKeyWithBLOBs(apiTestEnvironmentWithBLOBs);
-            sqlSession.commit();
+            sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
         }catch (Exception e){
             sqlSession.rollback();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
         }finally {
-            sqlSession.close();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
         }
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java b/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java
index 8cb6f30304..dac378693b 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java
@@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -353,6 +354,9 @@ public class ApiModuleService extends NodeTreeService<ApiModuleDTO> {
             apiDefinitionMapper.updateByPrimaryKeySelective(value);
         });
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     @Override
@@ -432,6 +436,9 @@ public class ApiModuleService extends NodeTreeService<ApiModuleDTO> {
             apiModuleMapper.updateByPrimaryKeySelective(value);
         });
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     public ApiModule getModuleByName(String projectId, String protocol) {
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
index 2739aa8ad1..4fdf026c46 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
@@ -27,6 +27,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -289,6 +290,9 @@ public class ApiScenarioModuleService extends NodeTreeService<ApiScenarioModuleD
         ApiScenarioMapper apiScenarioMapper = sqlSession.getMapper(ApiScenarioMapper.class);
         apiScenarios.forEach(apiScenarioMapper::updateByPrimaryKeySelective);
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     @Override
@@ -395,6 +399,9 @@ public class ApiScenarioModuleService extends NodeTreeService<ApiScenarioModuleD
         ApiScenarioModuleMapper apiScenarioModuleMapper = sqlSession.getMapper(ApiScenarioModuleMapper.class);
         updateNodes.forEach(apiScenarioModuleMapper::updateByPrimaryKeySelective);
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     public String getLogDetails(List<String> ids) {
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
index 9be91ccb78..226f9f19bd 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
@@ -43,6 +43,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
@@ -159,6 +160,7 @@ public class ApiScenarioReportService {
         if (report == null) {
             LogUtil.info("从缓存中获取场景报告：【" + test.getName() + "】");
             report = MessageCache.scenarioExecResourceLock.get(test.getName());
+            LogUtil.info("从缓存中获取场景报告：【" + test.getName() + "】是否为空：" + (report == null));
         }
         if (report != null) {
             report.setName(report.getScenarioName() + "-" + DateUtils.getTimeStr(System.currentTimeMillis()));
@@ -322,88 +324,86 @@ public class ApiScenarioReportService {
 
             ApiScenarioReport report = editReport(scenarioResult, startTime);
 
-            TestResult newResult = createTestResult(result.getTestId(), scenarioResult);
-            newResult.setConsole(result.getConsole());
-            scenarioResult.setName(report.getScenarioName());
-            newResult.addScenario(scenarioResult);
-            /**
-             * 测试计划的定时任务场景执行时，主键是提前生成的【测试报告ID】。也就是TestResult.id是【测试报告ID】。
-             * report.getScenarioId中存放的是 TestPlanApiScenario.id:TestPlanReport.id 由于参数限制，只得将两个ID拼接起来
-             * 拆分report.getScenarioId, 查出ScenarioId，将真正的场景ID赋值回去
-             * 同时将testPlanReportID存入集合，逻辑走完后更新TestPlanReport
-             */
-            String[] idArr = report.getScenarioId().split(":");
-            String planScenarioId = null;
-            if (idArr.length > 1) {
-                planScenarioId = idArr[0];
-                String planReportID = idArr[1];
-                if (!testPlanReportIdList.contains(planReportID)) {
-                    testPlanReportIdList.add(planReportID);
-                }
-            } else {
-                planScenarioId = report.getScenarioId();
-            }
-            TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(planScenarioId);
-            report.setScenarioId(testPlanApiScenario.getApiScenarioId());
-            report.setTestPlanScenarioId(planScenarioId);
-            report.setEndTime(System.currentTimeMillis());
-            apiScenarioReportMapper.updateByPrimaryKeySelective(report);
-            planScenarioReportMap.put(planScenarioId, report.getId());
+            if(report != null){
+                TestResult newResult = createTestResult(result.getTestId(), scenarioResult);
+                newResult.setConsole(result.getConsole());
+                scenarioResult.setName(report.getScenarioName());
 
-
-            if (scenarioResult.getError() > 0) {
-                scenarioAndErrorMap.put(testPlanApiScenario.getId(), TestPlanApiExecuteStatus.FAILD.name());
-                testPlanApiScenario.setLastResult(ScenarioStatus.Fail.name());
-            } else {
-                scenarioAndErrorMap.put(testPlanApiScenario.getId(), TestPlanApiExecuteStatus.SUCCESS.name());
-                testPlanApiScenario.setLastResult(ScenarioStatus.Success.name());
-            }
-
-            String passRate = new DecimalFormat("0%").format((float) scenarioResult.getSuccess() / (scenarioResult.getSuccess() + scenarioResult.getError()));
-            testPlanApiScenario.setPassRate(passRate);
-            // 报告详情内容
-            ApiScenarioReportDetail detail = new ApiScenarioReportDetail();
-
-            detail.setContent(JSON.toJSONString(newResult).getBytes(StandardCharsets.UTF_8));
-            detail.setReportId(report.getId());
-            detail.setProjectId(report.getProjectId());
-            if (StringUtils.isNotEmpty(report.getTriggerMode()) && report.getTriggerMode().equals("CASE")) {
-                report.setTriggerMode(TriggerMode.MANUAL.name());
-            }
-            apiScenarioReportDetailMapper.insert(detail);
-
-            testPlanApiScenario.setReportId(report.getId());
-            report.setEndTime(System.currentTimeMillis());
-            testPlanApiScenario.setUpdateTime(System.currentTimeMillis());
-            testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
-            scenarioIdList.add(testPlanApiScenario.getApiScenarioId());
-            scenarioNames.append(report.getName()).append(",");
-
-            // 更新场景状态
-            ApiScenario scenario = apiScenarioMapper.selectByPrimaryKey(testPlanApiScenario.getApiScenarioId());
-            if (scenario != null) {
-                if (scenarioResult.getError() > 0) {
-                    scenario.setLastResult("Fail");
+                newResult.addScenario(scenarioResult);
+                /**
+                 * 测试计划的定时任务场景执行时，主键是提前生成的【测试报告ID】。也就是TestResult.id是【测试报告ID】。
+                 * report.getScenarioId中存放的是 TestPlanApiScenario.id:TestPlanReport.id 由于参数限制，只得将两个ID拼接起来
+                 * 拆分report.getScenarioId, 查出ScenarioId，将真正的场景ID赋值回去
+                 * 同时将testPlanReportID存入集合，逻辑走完后更新TestPlanReport
+                 */
+                String[] idArr = report.getScenarioId().split(":");
+                String planScenarioId = null;
+                if (idArr.length > 1) {
+                    planScenarioId = idArr[0];
+                    String planReportID = idArr[1];
+                    if (!testPlanReportIdList.contains(planReportID)) {
+                        testPlanReportIdList.add(planReportID);
+                    }
                 } else {
-                    scenario.setLastResult("Success");
+                    planScenarioId = report.getScenarioId();
                 }
-                scenario.setPassRate(passRate);
-                scenario.setReportId(report.getId());
-                int executeTimes = 0;
-                if (scenario.getExecuteTimes() != null) {
-                    executeTimes = scenario.getExecuteTimes().intValue();
-                }
-                scenario.setExecuteTimes(executeTimes + 1);
+                TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(planScenarioId);
+                report.setScenarioId(testPlanApiScenario.getApiScenarioId());
+                report.setTestPlanScenarioId(planScenarioId);
+                report.setEndTime(System.currentTimeMillis());
+                apiScenarioReportMapper.updateByPrimaryKeySelective(report);
+                planScenarioReportMap.put(planScenarioId, report.getId());
 
-                apiScenarioMapper.updateByPrimaryKey(scenario);
-                // 发送通知
-//                sendNotice(scenario);
+                if (scenarioResult.getError() > 0) {
+                    scenarioAndErrorMap.put(testPlanApiScenario.getId(), TestPlanApiExecuteStatus.FAILD.name());
+                    testPlanApiScenario.setLastResult(ScenarioStatus.Fail.name());
+                } else {
+                    scenarioAndErrorMap.put(testPlanApiScenario.getId(), TestPlanApiExecuteStatus.SUCCESS.name());
+                    testPlanApiScenario.setLastResult(ScenarioStatus.Success.name());
+                }
+
+                String passRate = new DecimalFormat("0%").format((float) scenarioResult.getSuccess() / (scenarioResult.getSuccess() + scenarioResult.getError()));
+                testPlanApiScenario.setPassRate(passRate);
+                // 报告详情内容
+                ApiScenarioReportDetail detail = new ApiScenarioReportDetail();
+
+                detail.setContent(JSON.toJSONString(newResult).getBytes(StandardCharsets.UTF_8));
+                detail.setReportId(report.getId());
+                detail.setProjectId(report.getProjectId());
+                if (StringUtils.isNotEmpty(report.getTriggerMode()) && report.getTriggerMode().equals("CASE")) {
+                    report.setTriggerMode(TriggerMode.MANUAL.name());
+                }
+                apiScenarioReportDetailMapper.insert(detail);
+
+                testPlanApiScenario.setReportId(report.getId());
+                report.setEndTime(System.currentTimeMillis());
+                testPlanApiScenario.setUpdateTime(System.currentTimeMillis());
+                testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
+                scenarioIdList.add(testPlanApiScenario.getApiScenarioId());
+                scenarioNames.append(report.getName()).append(",");
+
+                // 更新场景状态
+                ApiScenario scenario = apiScenarioMapper.selectByPrimaryKey(testPlanApiScenario.getApiScenarioId());
+                if (scenario != null) {
+                    if (scenarioResult.getError() > 0) {
+                        scenario.setLastResult("Fail");
+                    } else {
+                        scenario.setLastResult("Success");
+                    }
+                    scenario.setPassRate(passRate);
+                    scenario.setReportId(report.getId());
+                    int executeTimes = 0;
+                    if (scenario.getExecuteTimes() != null) {
+                        executeTimes = scenario.getExecuteTimes().intValue();
+                    }
+                    scenario.setExecuteTimes(executeTimes + 1);
+
+                    apiScenarioMapper.updateByPrimaryKey(scenario);
+                }
+                lastReport = report;
+                MessageCache.executionQueue.remove(report.getId());
+                reportIds.add(report.getId());
             }
-
-            lastReport = report;
-
-            MessageCache.executionQueue.remove(report.getId());
-            reportIds.add(report.getId());
         }
         testPlanLog.info("TestPlanReportId" + JSONArray.toJSONString(testPlanReportIdList) + " EXECUTE OVER. SCENARIO STATUS : " + JSONObject.toJSONString(scenarioAndErrorMap));
         for (String reportId : testPlanReportIdList) {
@@ -505,6 +505,9 @@ public class ApiScenarioReportService {
                         scenarioReportMapper.updateByPrimaryKeySelective(scenario);
                     });
                     sqlSession.flushStatements();
+                    if (sqlSession != null && sqlSessionFactory != null) {
+                        SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+                    }
                 }
                 passRateMap.clear();
             }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
index da60991019..ec9d2a642c 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@@ -46,6 +46,7 @@ import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.jorphan.collections.HashTree;
 import org.apache.jorphan.collections.ListedHashTree;
 import org.aspectj.util.FileUtil;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -593,6 +594,9 @@ public class ApiTestCaseService {
             testCaseReviewMapper.updateByPrimaryKey(testCaseReview);
         }
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     public List<String> selectIdsNotExistsInPlan(String projectId, String planId) {
@@ -676,6 +680,9 @@ public class ApiTestCaseService {
                 batchMapper.updateByPrimaryKeySelective(apiTestCase);
             });
             sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
         }
     }
 
@@ -714,6 +721,9 @@ public class ApiTestCaseService {
                 batchMapper.updateByPrimaryKeySelective(apiTestCase);
             });
             sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
         }
     }
 
@@ -788,8 +798,10 @@ public class ApiTestCaseService {
             batchMapper.insert(report);
             executeQueue.add(runCaseRequest);
         }
-        sqlSession.commit();
-
+        sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
         for (RunCaseRequest runCaseRequest : executeQueue) {
             MessageCache.caseExecResourceLock.put(runCaseRequest.getReportId(), runCaseRequest.getReport());
             run(runCaseRequest);
diff --git a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
index 73ba8150e6..de62122d07 100644
--- a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
+++ b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
@@ -38,6 +38,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -448,6 +449,9 @@ public class HistoricalDataUpgradeService {
             createApiScenarioWithBLOBs(saveHistoricalDataUpgrade, scenarioTest.getId(), scenarioTest.getName(), listSteps.size(), scenarioDefinition, mapper, num);
         }
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
         return null;
     }
 
diff --git a/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java b/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java
index 7c04b0ad8c..8375dfa882 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java
@@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -159,6 +160,9 @@ public class ServiceUtils {
                 }
                 sqlSession.flushStatements();
             }
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
         } catch (Throwable e) {
             LogUtil.error(e.getMessage(), e);
             MSException.throwException("初始化 order 字段失败");
diff --git a/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java b/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java
index 12f27dd520..a45fd55ede 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java
@@ -59,8 +59,6 @@ public class TestPlanUtils {
                 if (StringUtils.equals(successStatus, status)) {
                     report.setPassCount(report.getPassCount() + 1);
                 }
-            }else {
-                System.out.println(status);
             }
             TestPlanUtils.getStatusResultMap(statusResultMap, status);
         });
diff --git a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
index 638d0513a7..b85100e613 100644
--- a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
+++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
@@ -51,6 +51,7 @@ import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.aspectj.util.FileUtil;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -852,6 +853,10 @@ public class PerformanceTestService {
             scenarioLoadTest.setId(UUID.randomUUID().toString());
             mapper.insert(scenarioLoadTest);
         });
+        sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     public Integer getGranularity(String reportId) {
diff --git a/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java b/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java
index 1e4ab9d5f7..e0c75a13d6 100644
--- a/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java
+++ b/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java
@@ -12,6 +12,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -111,7 +112,9 @@ public class CustomFieldTemplateService {
             });
         }
         sqlSession.flushStatements();
-        sqlSession.close();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
 
diff --git a/backend/src/main/java/io/metersphere/service/GroupService.java b/backend/src/main/java/io/metersphere/service/GroupService.java
index c7ccb69a90..8d7afcf3f0 100644
--- a/backend/src/main/java/io/metersphere/service/GroupService.java
+++ b/backend/src/main/java/io/metersphere/service/GroupService.java
@@ -28,6 +28,7 @@ import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.poi.ss.formula.functions.T;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -199,6 +200,9 @@ public class GroupService {
             }
         });
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     public List<Group> getGroupByType(EditGroupRequest request) {
@@ -438,6 +442,9 @@ public class GroupService {
                 mapper.insertSelective(userGroup);
             }
             sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
         }
     }
 
@@ -467,6 +474,9 @@ public class GroupService {
                     mapper.insertSelective(userGroup);
                 }
                 sqlSession.flushStatements();
+                if (sqlSession != null && sqlSessionFactory != null) {
+                    SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+                }
             }
         }
     }
diff --git a/backend/src/main/java/io/metersphere/service/RelationshipEdgeService.java b/backend/src/main/java/io/metersphere/service/RelationshipEdgeService.java
index 616b18b86b..90896060f2 100644
--- a/backend/src/main/java/io/metersphere/service/RelationshipEdgeService.java
+++ b/backend/src/main/java/io/metersphere/service/RelationshipEdgeService.java
@@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -249,6 +250,9 @@ public class RelationshipEdgeService {
             }
         });
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     private RelationshipEdge getNewRelationshipEdge(String graphId, String sourceId, String targetId, String type) {
diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
index 5a16470da0..7473fbe825 100644
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -48,6 +48,7 @@ import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.*;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.apache.shiro.subject.Subject;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -154,6 +155,9 @@ public class UserService {
                     mapper.insertSelective(userGroup);
                 }
                 sqlSession.flushStatements();
+                if (sqlSession != null && sqlSessionFactory != null) {
+                    SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+                }
             }
 
         }
@@ -856,6 +860,9 @@ public class UserService {
                             mapper.insertSelective(userGroup);
                         }
                         sqlSession.flushStatements();
+                        if (sqlSession != null && sqlSessionFactory != null) {
+                            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+                        }
                     }
                 }
             }
@@ -903,6 +910,9 @@ public class UserService {
                 mapper.insertSelective(userGroup);
             }
             sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
         }
     }
 
@@ -1226,6 +1236,9 @@ public class UserService {
                         mapper.insertSelective(userGroup);
                     }
                     sqlSession.flushStatements();
+                    if (sqlSession != null && sqlSessionFactory != null) {
+                        SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+                    }
                 }
             }
         }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
index ba4f362205..0267104715 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
@@ -30,6 +30,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -568,6 +569,9 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
             testCaseNodeMapper.updateByPrimaryKeySelective(value);
         });
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     private void batchUpdateTestCase(List<TestCaseDTO> testCases) {
@@ -577,6 +581,9 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
             testCaseMapper.updateByPrimaryKeySelective(value);
         });
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     private List<TestCaseDTO> QueryTestCaseByNodeIds(List<String> nodeIds) {
@@ -678,6 +685,9 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
                 testCaseNodeMapper.updateByPrimaryKey(node);
             });
             sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
         }
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java
index c83f343964..afec6802c3 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java
@@ -16,6 +16,7 @@ import io.metersphere.track.request.testreview.TestReviewRequest;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -88,6 +89,9 @@ public class TestCaseReviewLoadService {
             testCaseReviewMapper.updateByPrimaryKey(testCaseReview);
         }
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     public void delete(String id) {
@@ -104,7 +108,7 @@ public class TestCaseReviewLoadService {
         testCaseReviewLoadMapper.updateByPrimaryKeySelective(testCaseReviewLoad);
         return reportId;
     }
-//???
+
     public Boolean isExistReport(LoadCaseReportRequest request) {
         String reportId = request.getReportId();
         String testPlanLoadCaseId = request.getTestPlanLoadCaseId();
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
index ec17fb1cf8..fd7090f3e4 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -36,6 +36,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -389,65 +390,10 @@ public class TestCaseReviewService {
         }
 
         sqlSession.flushStatements();
-        //同步添加关联的接口和测试用例
-     /*   if(request.getChecked()){
-            if (!testCaseIds.isEmpty()) {
-                testCaseIds.forEach(caseId -> {
-                    TestCaseWithBLOBs testDtail=testCaseMapper.selectByPrimaryKey(caseId);
-                    if(StringUtils.equals(testDtail.getType(), TestCaseStatus.performance.name())){
-                        TestCaseReviewLoad t=new TestCaseReviewLoad();
-                        t.setId(UUID.randomUUID().toString());
-                        t.setTestCaseReviewId(request.getReviewId());
-                        t.setLoadCaseId(testDtail.getTestId());
-                        t.setCreateTime(System.currentTimeMillis());
-                        t.setUpdateTime(System.currentTimeMillis());
-                        TestCaseReviewLoadExample example=new TestCaseReviewLoadExample();
-                        example.createCriteria().andTestCaseReviewIdEqualTo(request.getReviewId()).andLoadCaseIdEqualTo(t.getLoadCaseId());
-                        if (testCaseReviewLoadMapper.countByExample(example) <=0) {
-                            testCaseReviewLoadMapper.insert(t);
-                        }
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
 
-                    }
-                    if(StringUtils.equals(testDtail.getType(),TestCaseStatus.testcase.name())){
-                        TestCaseReviewApiCase t=new TestCaseReviewApiCase();
-                        ApiTestCaseWithBLOBs apitest=apiTestCaseMapper.selectByPrimaryKey(testDtail.getTestId());
-                        ApiDefinitionWithBLOBs apidefinition=apiDefinitionMapper.selectByPrimaryKey(apitest.getApiDefinitionId());
-                        t.setId(UUID.randomUUID().toString());
-                        t.setTestCaseReviewId(request.getReviewId());
-                        t.setApiCaseId(testDtail.getTestId());
-                        t.setEnvironmentId(apidefinition.getEnvironmentId());
-                        t.setCreateTime(System.currentTimeMillis());
-                        t.setUpdateTime(System.currentTimeMillis());
-                        TestCaseReviewApiCaseExample example=new TestCaseReviewApiCaseExample();
-                        example.createCriteria().andTestCaseReviewIdEqualTo(request.getReviewId()).andApiCaseIdEqualTo(t.getApiCaseId());
-                        if(testCaseReviewApiCaseMapper.countByExample(example)<=0){
-                            testCaseReviewApiCaseMapper.insert(t);
-                        }
-
-                    }
-                    if(StringUtils.equals(testDtail.getType(),TestCaseStatus.automation.name())){
-                        TestCaseReviewScenario t=new TestCaseReviewScenario();
-                        ApiScenarioWithBLOBs testPlanApiScenario=apiScenarioMapper.selectByPrimaryKey(testDtail.getTestId());
-                        t.setId(UUID.randomUUID().toString());
-                        t.setTestCaseReviewId(request.getReviewId());
-                        t.setApiScenarioId(testDtail.getTestId());
-                        t.setLastResult(testPlanApiScenario.getLastResult());
-                        t.setPassRate(testPlanApiScenario.getPassRate());
-                        t.setReportId(testPlanApiScenario.getReportId());
-                        t.setStatus(testPlanApiScenario.getStatus());
-                        t.setCreateTime(System.currentTimeMillis());
-                        t.setUpdateTime(System.currentTimeMillis());
-                        TestCaseReviewScenarioExample example=new TestCaseReviewScenarioExample();
-                        example.createCriteria().andTestCaseReviewIdEqualTo(request.getReviewId()).andApiScenarioIdEqualTo(t.getApiScenarioId());
-                        if(testCaseReviewScenarioMapper.countByExample(example)<=0){
-                            testCaseReviewScenarioMapper.insert(t);
-                        }
-
-                    }
-
-                });
-            }
-        }*/
         TestCaseReview testCaseReview = testCaseReviewMapper.selectByPrimaryKey(request.getReviewId());
         if (StringUtils.equals(testCaseReview.getStatus(), TestCaseReviewStatus.Prepare.name())
                 || StringUtils.equals(testCaseReview.getStatus(), TestCaseReviewStatus.Completed.name())) {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 155ed5905d..6705aca5f1 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -58,6 +58,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -674,6 +675,9 @@ public class TestCaseService {
             }
         }
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     public void updateImportData(List<TestCaseWithBLOBs> testCases, String projectId) {
@@ -699,6 +703,9 @@ public class TestCaseService {
             });
         }
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     private String updateCustomField(String customFields, String priority) {
@@ -756,6 +763,9 @@ public class TestCaseService {
             });
         }
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     /**
@@ -795,6 +805,9 @@ public class TestCaseService {
             });
         }
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     public void testCaseTemplateExport(String projectId, String importType, HttpServletResponse response) {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
index c09b2dc5fd..9a241ced81 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
@@ -56,6 +56,7 @@ import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.jorphan.collections.HashTree;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -459,8 +460,11 @@ public class TestPlanApiCaseService {
                     TestPlanReportExecuteCatch.updateTestPlanThreadInfo(request.getPlanReportId(), executeThreadIdMap, null, null);
                 }
             }
+            sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
 
-            sqlSession.commit();
             List<String> reportIds = new LinkedList<>();
             // 开始串行执行
             Thread thread = new Thread(new Runnable() {
@@ -562,7 +566,10 @@ public class TestPlanApiCaseService {
                 executeThreadIdMap.put(testPlanApiCase.getId(), report.getId());
                 MessageCache.caseExecResourceLock.put(report.getId(), report);
             });
-            sqlSession.commit();
+            sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
             //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
             if (TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())) {
                 if (!executeThreadIdMap.isEmpty()) {
@@ -677,6 +684,9 @@ public class TestPlanApiCaseService {
         });
 
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     public Boolean hasFailCase(String planId, List<String> apiCaseIds) {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
index c8b94cf828..15e28b101e 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
@@ -31,6 +31,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -128,6 +129,9 @@ public class TestPlanLoadCaseService {
             testPlanMapper.updateByPrimaryKey(testPlan);
         }
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     public void delete(String id) {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
index 0e90809af0..a214983c43 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
@@ -31,6 +31,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -247,6 +248,9 @@ public class TestPlanScenarioCaseService {
                 mapper.updateByPrimaryKeyWithBLOBs(testPlanApiScenario);
             }
             sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
             return;
         }
 
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 457055a691..e15d641499 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -66,6 +66,7 @@ import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.jorphan.collections.HashTree;
 import org.apache.jorphan.collections.ListedHashTree;
+import org.mybatis.spring.SqlSessionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Lazy;
@@ -668,6 +669,10 @@ public class TestPlanService {
             testPlan.setActualEndTime(null);
             testPlanMapper.updateByPrimaryKey(testPlan);
         }
+        sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     public List<TestPlan> recentTestPlans(String projectId) {
@@ -1438,6 +1443,10 @@ public class TestPlanService {
                 }
             }
             sqlSession.flushStatements();
+
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
         }
     }
 

From 4bb295b2fdeeec559f198ed14ae4f0371fa22b3a Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Thu, 2 Dec 2021 16:30:19 +0800
Subject: [PATCH 041/256] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF):=20=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=BB=A4ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008363 --user=郭雨琦 项目设置概览-编辑项目，没有 AzureDevops过滤ID
---
 .../src/business/components/project/menu/EditProject.vue    | 4 ++++
 .../business/components/settings/workspace/MsProject.vue    | 6 +++---
 frontend/src/i18n/en-US.js                                  | 1 +
 frontend/src/i18n/zh-CN.js                                  | 1 +
 frontend/src/i18n/zh-TW.js                                  | 1 +
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/project/menu/EditProject.vue b/frontend/src/business/components/project/menu/EditProject.vue
index 35edc753ef..ec4f4058b5 100644
--- a/frontend/src/business/components/project/menu/EditProject.vue
+++ b/frontend/src/business/components/project/menu/EditProject.vue
@@ -47,6 +47,10 @@
         <el-form-item :label-width="labelWidth" :label="$t('project.azureDevops_id')" v-if="azuredevops">
           <el-input v-model="form.azureDevopsId" autocomplete="off"></el-input>
         </el-form-item>
+        <el-form-item :label-width="labelWidth" :label="$t('project.azureDevops_filter_id')" v-if="azuredevops">
+          <el-input v-model="form.azureFilterId" autocomplete="off"/>
+          <ms-instructions-icon content="非必填项，用例关联需求时，可以只筛选出，所填的 workItem 下的选项" effect="light"/>
+        </el-form-item>
         <el-form-item :label-width="labelWidth" :label="$t('project.repeatable')" prop="repeatable">
           <el-switch v-model="form.repeatable"></el-switch>
         </el-form-item>
diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue
index 86ea1d5940..44006eed79 100644
--- a/frontend/src/business/components/settings/workspace/MsProject.vue
+++ b/frontend/src/business/components/settings/workspace/MsProject.vue
@@ -142,17 +142,17 @@
         <el-form-item :label-width="labelWidth" :label="$t('project.azureDevops_id')" v-if="azuredevops">
           <el-input v-model="form.azureDevopsId" autocomplete="off" ></el-input>
         </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="'AzureDevops过滤ID'" v-if="azuredevops">
+        <el-form-item :label-width="labelWidth" :label="$t('project.azureDevops_filter_id')" v-if="azuredevops">
           <el-input v-model="form.azureFilterId" autocomplete="off"/>
           <ms-instructions-icon content="非必填项，用例关联需求时，可以只筛选出，所填的 workItem 下的选项" effect="light"/>
         </el-form-item>
         <el-form-item :label-width="labelWidth" :label="$t('project.repeatable')" prop="repeatable">
           <el-switch v-model="form.repeatable"></el-switch>
         </el-form-item>
-        <el-form-item :label-width="labelWidth" label="测试用例自定义ID" prop="customNum">
+        <el-form-item :label-width="labelWidth" :label="$t('project.test_case_custom_id')" prop="customNum">
           <el-switch v-model="form.customNum"></el-switch>
         </el-form-item>
-        <el-form-item :label-width="labelWidth" label="场景自定义ID" prop="scenarioCustomNum">
+        <el-form-item :label-width="labelWidth" :label="$t('project.scenario_custom_id')" prop="scenarioCustomNum">
           <el-switch v-model="form.scenarioCustomNum"></el-switch>
         </el-form-item>
       </el-form>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index fa66e511ef..e57b3dd790 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -596,6 +596,7 @@ export default {
     jira_key: 'JIRA Project key',
     zentao_id: 'Zentao Project ID',
     azureDevops_id: 'AzureDevops Project ID',
+    azureDevops_filter_id: 'AzureDevops Filter ID',
     azureDevops_info:'AzureDevops Information',
     azureDevops_tip:'This information is the user token information for submitting defects through Azure Devops. If not filled in, the default information configured in the workspace will be used',
     manager: 'Manager',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index f428d222c5..3e75b36829 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -599,6 +599,7 @@ export default {
     jira_key: 'JIRA项目key',
     zentao_id: 'Zentao项目ID',
     azureDevops_id: 'AzureDevops项目ID',
+    azureDevops_filter_id: 'AzureDevops过滤ID',
     azureDevops_info:'AzureDevops 信息',
     azureDevops_tip:'该信息为通过Azure Devops提交缺陷的用户令牌信息，若未填写，则使用工作空间中配置的默认信息',
     manager: '项目管理',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index a60da06947..b507297b6a 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -600,6 +600,7 @@ export default {
     jira_key: 'JIRA項目key',
     zentao_id: 'Zentao項目ID',
     azureDevops_id: 'AzureDevops項目ID',
+    azureDevops_filter_id: 'AzureDevops過濾ID',
     azureDevops_info:'AzureDevops 信息',
     azureDevops_tip:'該信息為通過Azure Devops提交缺陷的用戶令牌信息，若未填寫，則使用工作空間中配置的默認信息',
     manager: '項目管理',

From 45386556460eb065f8a0bb73b9f16c9f071494c5 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 2 Dec 2021 18:15:47 +0800
Subject: [PATCH 042/256] =?UTF-8?q?refactor(=E7=8E=AF=E5=A2=83=E7=BB=84):?=
 =?UTF-8?q?=20=E7=8E=AF=E5=A2=83=E5=88=97=E5=9F=9F=E5=90=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1004261 --user=lyh 环境组不显示TCP域名优化
https://www.tapd.cn/55049933/s/1077414
---
 .../api/dto/scenario/HttpConfig.java          |  1 +
 .../api/dto/scenario/TCPConfig.java           |  1 +
 .../environment/EnvironmentHttpConfig.vue     | 35 ++++++++---
 .../test/components/request/tcp/TcpConfig.vue | 14 ++++-
 .../api/test/model/EnvironmentModel.js        |  2 +
 .../api/test/model/ScenarioModel.js           |  1 +
 .../project/menu/EnvironmentList.vue          | 36 +++++++++--
 .../environment/EnvironmentGroupRow.vue       | 62 ++++++++++++++++---
 .../workspace/environment/EnvironmentList.vue | 33 ++++++++--
 9 files changed, 153 insertions(+), 32 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/HttpConfig.java b/backend/src/main/java/io/metersphere/api/dto/scenario/HttpConfig.java
index adcab26381..c5870f8686 100644
--- a/backend/src/main/java/io/metersphere/api/dto/scenario/HttpConfig.java
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/HttpConfig.java
@@ -29,6 +29,7 @@ public class HttpConfig {
     private MsJSR223PostProcessor postProcessor;
     private GlobalScriptConfig globalScriptConfig;
     private ApiModuleMapper apiModuleMapper;
+    private String description;
 
 
     public HttpConfig initHttpConfig(HttpConfigCondition configCondition) {
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/TCPConfig.java b/backend/src/main/java/io/metersphere/api/dto/scenario/TCPConfig.java
index 12e8702e9f..47d74d5d6d 100644
--- a/backend/src/main/java/io/metersphere/api/dto/scenario/TCPConfig.java
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/TCPConfig.java
@@ -16,4 +16,5 @@ public class TCPConfig {
     private String eolByte = "";
     private String username = "";
     private String password = "";
+    private String description = "";
 }
diff --git a/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue b/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
index 92b2fe917a..8d6f1fdb6f 100644
--- a/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
+++ b/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
@@ -3,15 +3,23 @@
   <el-form :model="condition" :rules="rules" ref="httpConfig" class="ms-el-form-item__content" :disabled="isReadOnly">
     <div class="ms-border">
       <el-form-item prop="socket">
-        <span class="ms-env-span">{{ $t('api_test.environment.socket') }}</span>
-        <el-input v-model="condition.socket" style="width: 80%" :placeholder="$t('api_test.request.url_description')" clearable size="small">
-          <template slot="prepend">
-            <el-select v-model="condition.protocol" class="request-protocol-select" size="small">
-              <el-option label="http://" value="http"/>
-              <el-option label="https://" value="https"/>
-            </el-select>
-          </template>
-        </el-input>
+        <el-row type="flex" justify="space-between">
+          <el-col :span="16">
+            <span class="ms-env-span" style="line-height: 30px;">{{ $t('api_test.environment.socket') }}</span>
+            <el-input v-model="condition.socket" style="width: 85%" :placeholder="$t('api_test.request.url_description')" clearable size="small">
+              <template slot="prepend">
+                <el-select v-model="condition.protocol" class="request-protocol-select" size="small">
+                  <el-option label="http://" value="http"/>
+                  <el-option label="https://" value="https"/>
+                </el-select>
+              </template>
+            </el-input>
+          </el-col>
+          <el-col :span="8">
+            <span style="margin-right: 12px;">描述</span>
+            <el-input v-model="condition.description" maxlength="200" :show-word-limit="true" size="small" style="width: 85%;"/>
+          </el-col>
+        </el-row>
       </el-form-item>
       <el-form-item prop="enable">
         <span class="ms-env-span">{{ $t('api_test.environment.condition_enable') }}</span>
@@ -67,6 +75,11 @@
             <span>{{ row.time | timestampFormatDate }}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="'描述'">
+          <template v-slot:default="{row}">
+            {{ row.description }}
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('commons.operating')" width="100px">
           <template v-slot:default="{row}">
             <div>
@@ -146,6 +159,7 @@ export default {
         this.condition.domain = this.httpConfig.domain;
         this.condition.time = new Date().getTime();
         this.condition.headers = this.httpConfig.headers;
+        this.condition.description = this.httpConfig.description;
         this.add();
       }
       this.condition = {id: undefined, type: "NONE", details: [new KeyValue({name: "", value: "contains"})], protocol: "http", socket: "", domain: "", port: 0, headers: [new KeyValue()]};
@@ -195,6 +209,7 @@ export default {
         this.httpConfig.socket = row.socket;
         this.httpConfig.protocol = row.protocol;
         this.httpConfig.port = row.port;
+        this.httpConfig.description = row.description;
         this.condition = row;
         if (!this.condition.headers) {
           this.condition.headers = [new KeyValue()];
@@ -298,7 +313,7 @@ export default {
       this.validateSocket();
       let obj = {
         id: getUUID(), type: this.condition.type, socket: this.condition.socket, protocol: this.condition.protocol, headers: this.condition.headers,
-        domain: this.condition.domain, port: this.condition.port, time: new Date().getTime()
+        domain: this.condition.domain, port: this.condition.port, time: new Date().getTime(), description: this.condition.description
       };
       if (this.condition.type === "PATH") {
         obj.details = [JSON.parse(JSON.stringify(this.pathDetails))];
diff --git a/frontend/src/business/components/api/test/components/request/tcp/TcpConfig.vue b/frontend/src/business/components/api/test/components/request/tcp/TcpConfig.vue
index 8336fbc46a..dd845ac011 100644
--- a/frontend/src/business/components/api/test/components/request/tcp/TcpConfig.vue
+++ b/frontend/src/business/components/api/test/components/request/tcp/TcpConfig.vue
@@ -28,7 +28,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('api_test.request.tcp.response')" prop="timeout">
+        <el-form-item :label="$t('api_test.request.tcp.response')" prop="timeout" label-width="120px">
           <el-input-number v-model="config.timeout" controls-position="right" :min="0" :step="1000" :controls="false"/>
         </el-form-item>
       </el-col>
@@ -41,15 +41,23 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('api_test.request.tcp.eol_byte')" prop="eolByte">
+        <el-form-item :label="$t('api_test.request.tcp.eol_byte')" prop="eolByte" label-width="120px">
           <el-input v-model="config.eolByte"/>
         </el-form-item>
       </el-col>
     </el-row>
 
+    <el-row :gutter="10">
+      <el-col :span="24">
+        <el-form-item :label="'描述'" prop="description">
+          <el-input v-model="config.description" maxlength="200" :show-word-limit="true" size="small"/>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
     <el-row :gutter="10">
       <el-col :span="8">
-        <el-form-item :label="$t('api_test.request.tcp.re_use_connection')">
+        <el-form-item :label="$t('api_test.request.tcp.re_use_connection')" label-width="135px">
           <el-checkbox v-model="config.reUseConnection"/>
         </el-form-item>
       </el-col>
diff --git a/frontend/src/business/components/api/test/model/EnvironmentModel.js b/frontend/src/business/components/api/test/model/EnvironmentModel.js
index 3b243225c9..4e83dd7052 100644
--- a/frontend/src/business/components/api/test/model/EnvironmentModel.js
+++ b/frontend/src/business/components/api/test/model/EnvironmentModel.js
@@ -85,6 +85,7 @@ export class HttpConfig extends BaseConfig {
     this.port = undefined;
     this.conditions = [];
     this.isMock = false;
+    this.description = "";
     this.set(options);
     this.sets({headers: KeyValue}, options);
     this.sets({conditions: KeyValue}, options);
@@ -131,6 +132,7 @@ export function compatibleWithEnvironment(environment) {
     config.httpConfig.protocol = environment.protocol;
     config.httpConfig.domain = environment.domain;
     config.httpConfig.socket = environment.socket;
+    config.httpConfig.description = environment.description;
     environment.config = JSON.stringify(config);
   }
 }
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index 1de5bb646b..c66c960a08 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -569,6 +569,7 @@ export class TCPConfig extends BaseConfig {
 
     this.username = options.username;
     this.password = options.password;
+    this.description = options.description;
   }
 }
 
diff --git a/frontend/src/business/components/project/menu/EnvironmentList.vue b/frontend/src/business/components/project/menu/EnvironmentList.vue
index a2a9cdb1e7..4ae0578955 100644
--- a/frontend/src/business/components/project/menu/EnvironmentList.vue
+++ b/frontend/src/business/components/project/menu/EnvironmentList.vue
@@ -68,24 +68,35 @@
           <el-table :data="conditions">
             <el-table-column prop="socket" :label="$t('load_test.domain')" show-overflow-tooltip width="180">
               <template v-slot:default="{row}">
-                {{ getUrl(row) }}
+                {{ row.conditionType ? row.server : getUrl(row) }}
+              </template>
+            </el-table-column>
+            <el-table-column :label="'类型'" show-overflow-tooltip
+                             min-width="100px">
+              <template v-slot:default="{row}">
+                <el-tag type="info" size="mini">{{ row.conditionType ? row.conditionType : "HTTP" }}</el-tag>
               </template>
             </el-table-column>
             <el-table-column prop="type" :label="$t('api_test.environment.condition_enable')" show-overflow-tooltip
                              min-width="100px">
               <template v-slot:default="{row}">
-                {{ getName(row) }}
+                {{ row.conditionType ? "-" : getName(row) }}
               </template>
             </el-table-column>
             <el-table-column prop="details" show-overflow-tooltip min-width="120px" :label="$t('api_test.value')">
               <template v-slot:default="{row}">
-                {{ getDetails(row) }}
+                {{ row.conditionType ? "-" : getDetails(row) }}
               </template>
             </el-table-column>
-            <el-table-column prop="createTime" show-overflow-tooltip min-width="120px"
-                             :label="$t('commons.create_time')">
+            <el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="'描述'">
               <template v-slot:default="{row}">
-                <span>{{ row.time | timestampFormatDate }}</span>
+                <span>{{ row.description ? row.description : "-" }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="createTime" show-overflow-tooltip min-width="120px" :label="$t('commons.create_time')">
+              <template v-slot:default="{row}">
+                <span v-if="!row.conditionType">{{ row.time | timestampFormatDate }}</span>
+                <span v-else>-</span>
               </template>
             </el-table-column>
           </el-table>
@@ -164,6 +175,14 @@ export default {
     showInfo(row) {
       const config = JSON.parse(row.config);
       this.conditions = config.httpConfig.conditions;
+      if (config.tcpConfig && config.tcpConfig.server) {
+        let condition = {
+          conditionType: 'TCP',
+          server: config.tcpConfig.server,
+          description: config.tcpConfig.description
+        }
+        this.conditions.push(condition);
+      }
       this.domainVisible = true;
     },
     getName(row) {
@@ -341,12 +360,17 @@ export default {
           return "";
         } else {
           if (config.httpConfig.conditions.length === 1) {
+            if (config.tcpConfig && config.tcpConfig.server) {
+              return "SHOW_INFO";
+            }
             let obj = config.httpConfig.conditions[0];
             if (obj.protocol && obj.domain) {
               return obj.protocol + "://" + obj.domain;
             }
           } else if (config.httpConfig.conditions.length > 1) {
             return "SHOW_INFO";
+          } else if (config.tcpConfig && config.tcpConfig.server) {
+            return "SHOW_INFO"; // 页面上该字段只要显示域名数据就表示该域名是HTTP类型.如果只有TCP类型则弹窗显示以区分域名类型.
           } else {
             return "";
           }
diff --git a/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupRow.vue b/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupRow.vue
index e4f55f7504..51950a5b9a 100644
--- a/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupRow.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupRow.vue
@@ -35,8 +35,9 @@
             </el-col>
 
             <el-col :span="5">
-              <el-input prop="description" show-overflow-tooltip placeholder="备注" maxlength="100" v-model="item.description"
-                        show-word-limit :size="itemSize" :disabled="rowReadOnly"/>
+              <el-input prop="description" show-overflow-tooltip placeholder="描述" maxlength="100"
+                        v-model="item.domainDescription"
+                        show-word-limit :size="itemSize" :disabled="true"/>
             </el-col>
 
             <el-col :span="3">
@@ -52,30 +53,42 @@
         <el-table :data="conditions">
           <el-table-column prop="socket" :label="$t('load_test.domain')" show-overflow-tooltip width="180">
             <template v-slot:default="{row}">
-              {{ getUrl(row) }}
+              {{ row.conditionType ? row.server : getUrl(row) }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="'类型'" show-overflow-tooltip
+                           min-width="100px">
+            <template v-slot:default="{row}">
+              <el-tag type="info" size="mini">{{ row.conditionType ? row.conditionType : "HTTP" }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column prop="type" :label="$t('api_test.environment.condition_enable')" show-overflow-tooltip
                            min-width="100px">
             <template v-slot:default="{row}">
-              {{ getName(row) }}
+              {{ row.conditionType ? "-" : getName(row) }}
             </template>
           </el-table-column>
           <el-table-column prop="details" show-overflow-tooltip min-width="120px" :label="$t('api_test.value')">
             <template v-slot:default="{row}">
-              {{ getDetails(row) }}
+              {{ row.conditionType ? "-" : getDetails(row) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="'描述'">
+            <template v-slot:default="{row}">
+              <span>{{ row.description ? row.description : "-" }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="createTime" show-overflow-tooltip min-width="120px" :label="$t('commons.create_time')">
             <template v-slot:default="{row}">
-              <span>{{ row.time | timestampFormatDate }}</span>
+              <span v-if="!row.conditionType">{{ row.time | timestampFormatDate }}</span>
+              <span v-else>-</span>
             </template>
           </el-table-column>
         </el-table>
         <span slot="footer" class="dialog-footer">
-        <el-button @click="domainVisible = false" size="mini">{{ $t('commons.cancel') }}</el-button>
-        <el-button type="primary" @click="domainVisible = false" size="mini">{{ $t('commons.confirm') }}</el-button>
-      </span>
+    <el-button @click="domainVisible = false" size="mini">{{ $t('commons.cancel') }}</el-button>
+    <el-button type="primary" @click="domainVisible = false" size="mini">{{ $t('commons.confirm') }}</el-button>
+  </span>
       </el-dialog>
     </div>
   </div>
@@ -156,10 +169,12 @@ export default {
       // 环境改变时初始化判断状态
       this.$set(item, "moreDomain", false);
       this.$set(item, "domainName", '');
+      this.$set(item, "domainDescription", '');
       let environments = item.environments;
       let index = environments.findIndex(e => e.id === item.environmentId);
       if (index === -1) {
         this.$set(item, "domainName", '');
+        this.$set(item, "domainDescription", '');
         return;
       }
       let environment = environments[index].config;
@@ -169,25 +184,36 @@ export default {
           if (config.httpConfig.protocol && config.httpConfig.domain) {
             let domain = config.httpConfig.protocol + "://" + config.httpConfig.domain;
             this.$set(item, "domainName", domain);
+            this.$set(item, "domainDescription", config.httpConfig.description ? config.httpConfig.description : "");
             return;
           }
         } else {
           if (config.httpConfig.conditions.length === 1) {
+            if (config.tcpConfig && config.tcpConfig.server) {
+              this.$set(item, "moreDomain", true);
+              return;
+            }
             let obj = config.httpConfig.conditions[0];
             if (obj.protocol && obj.domain) {
               this.$set(item, "domainName", obj.protocol + "://" + obj.domain);
+              this.$set(item, "domainDescription", obj.description ? obj.description : "");
               return;
             }
           } else if (config.httpConfig.conditions.length > 1) {
             this.$set(item, "moreDomain", true);
             return;
+          } else if (config.tcpConfig && config.tcpConfig.server) {
+            this.$set(item, "moreDomain", true);
+            return;
           }
         }
       } else {
         this.$set(item, "domainName", environment.protocol + '://' + environment.domain);
+        this.$set(item, "domainDescription", environment.description ? environment.description : "");
         return;
       }
       this.$set(item, "domainName", "");
+      this.$set(item, "domainDescription", "");
     },
     showDomainInfo(item) {
       const index = item.environments.findIndex(e => e.id === item.environmentId);
@@ -197,6 +223,14 @@ export default {
       let environment = item.environments[index]
       const config = JSON.parse(environment.config);
       this.conditions = config.httpConfig.conditions;
+      if (config.tcpConfig && config.tcpConfig.server) {
+        let condition = {
+          conditionType: 'TCP',
+          server: config.tcpConfig.server,
+          description: config.tcpConfig.description
+        }
+        this.conditions.push(condition);
+      }
       this.domainVisible = true;
     },
     getProjects() {
@@ -245,20 +279,30 @@ export default {
           if (config.httpConfig.protocol && config.httpConfig.domain) {
             let domain = config.httpConfig.protocol + "://" + config.httpConfig.domain;
             this.$set(item, "domainName", domain);
+            this.$set(item, "domainDescription", config.httpConfig.description ? config.httpConfig.description : "");
           }
         } else {
           if (config.httpConfig.conditions.length === 1) {
+            if (config.tcpConfig && config.tcpConfig.server) {
+              this.$set(item, "moreDomain", true);
+              return;
+            }
             let obj = config.httpConfig.conditions[0];
             if (obj.protocol && obj.domain) {
               this.$set(item, "domainName", obj.protocol + "://" + obj.domain);
+              this.$set(item, "domainDescription", obj.description ? obj.description : "");
             }
           } else if (config.httpConfig.conditions.length > 1) {
             this.$set(item, "moreDomain", true);
             return;
+          } else if (config.tcpConfig && config.tcpConfig.server) {
+            this.$set(item, "moreDomain", true);
+            return;
           }
         }
       } else {
         this.$set(item, "domainName", environment.protocol + '://' + environment.domain);
+        this.$set(item, "domainDescription", environment.description ? environment.description : "");
       }
     },
     getName(row) {
diff --git a/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue b/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
index d874c93c47..b4ad3a6339 100644
--- a/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
@@ -80,23 +80,35 @@
       <el-table :data="conditions">
         <el-table-column prop="socket" :label="$t('load_test.domain')" show-overflow-tooltip width="180">
           <template v-slot:default="{row}">
-            {{ getUrl(row) }}
+            {{ row.conditionType ? row.server : getUrl(row) }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="'类型'" show-overflow-tooltip
+                         min-width="100px">
+          <template v-slot:default="{row}">
+            <el-tag type="info" size="mini">{{ row.conditionType ? row.conditionType : "HTTP" }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="type" :label="$t('api_test.environment.condition_enable')" show-overflow-tooltip
                          min-width="100px">
           <template v-slot:default="{row}">
-            {{ getName(row) }}
+            {{ row.conditionType ? "-" : getName(row) }}
           </template>
         </el-table-column>
         <el-table-column prop="details" show-overflow-tooltip min-width="120px" :label="$t('api_test.value')">
           <template v-slot:default="{row}">
-            {{ getDetails(row) }}
+            {{ row.conditionType ? "-" : getDetails(row) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="'描述'">
+          <template v-slot:default="{row}">
+            <span>{{ row.description ? row.description : "-" }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="createTime" show-overflow-tooltip min-width="120px" :label="$t('commons.create_time')">
           <template v-slot:default="{row}">
-            <span>{{ row.time | timestampFormatDate }}</span>
+            <span v-if="!row.conditionType">{{ row.time | timestampFormatDate }}</span>
+            <span v-else>-</span>
           </template>
         </el-table-column>
       </el-table>
@@ -205,6 +217,14 @@ export default {
     showInfo(row) {
       const config = JSON.parse(row.config);
       this.conditions = config.httpConfig.conditions;
+      if (config.tcpConfig && config.tcpConfig.server) {
+        let condition = {
+          conditionType: 'TCP',
+          server: config.tcpConfig.server,
+          description: config.tcpConfig.description
+        }
+        this.conditions.push(condition);
+      }
       this.domainVisible = true;
     },
     getName(row) {
@@ -381,12 +401,17 @@ export default {
           return "";
         } else {
           if (config.httpConfig.conditions.length === 1) {
+            if (config.tcpConfig && config.tcpConfig.server) {
+              return "SHOW_INFO";
+            }
             let obj = config.httpConfig.conditions[0];
             if (obj.protocol && obj.domain) {
               return obj.protocol + "://" + obj.domain;
             }
           } else if (config.httpConfig.conditions.length > 1) {
             return "SHOW_INFO";
+          } else if (config.tcpConfig && config.tcpConfig.server) {
+            return "SHOW_INFO"; // 页面上该字段只要显示域名数据就表示该域名是HTTP类型.如果只有TCP类型则弹窗显示以区分域名类型.
           } else {
             return "";
           }

From 2782141b7bdd63acc3d56aa759ebf25972577b44 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Thu, 2 Dec 2021 19:27:04 +0800
Subject: [PATCH 043/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E8=B7=A8=E7=A9=BA=E9=97=B4=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 场景编辑跨空间不显示ID
---
 .../scenario/component/ApiComponent.vue       | 23 +++++++++++-----
 .../component/ApiScenarioComponent.vue        | 27 ++++++++++++++-----
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 0669ff5b69..2087f2b008 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -13,7 +13,7 @@
       :show-btn="showBtn"
       :title="displayTitle">
 
-      <template v-slot:afterTitle v-if="request.refType==='API'|| request.refType==='CASE'">
+      <template v-slot:afterTitle v-if="(request.refType==='API'|| request.refType==='CASE')&&isSameSpace">
         <span v-if="isShowNum" @click = "clickResource(request)">{{"（ ID: "+request.num+"）"}}</span>
         <span v-else >
           <el-tooltip class="ms-num" effect="dark" :content="request.refType==='API'?$t('api_test.automation.scenario.api_none'):$t('api_test.automation.scenario.case_none')" placement="top">
@@ -142,7 +142,7 @@ import MsDubboBasisParameters from "../../../definition/components/request/dubbo
 import MsApiRequestForm from "../../../definition/components/request/http/ApiHttpRequestForm";
 import MsRequestResultTail from "../../../definition/components/response/RequestResultTail";
 import MsRun from "../../../definition/components/Run";
-import {getUUID, getCurrentProjectID} from "@/common/js/utils";
+import {getUUID, getCurrentProjectID, getCurrentWorkspaceId} from "@/common/js/utils";
 import ApiBaseComponent from "../common/ApiBaseComponent";
 import ApiResponseComponent from "./ApiResponseComponent";
 import CustomizeReqInfo from "@/business/components/api/automation/scenario/common/CustomizeReqInfo";
@@ -202,6 +202,7 @@ export default {
       envType: this.environmentType,
       environmentMap: this.envMap,
       isShowNum:false,
+      isSameSpace:true,
     }
   },
   created() {
@@ -437,7 +438,7 @@ export default {
             }
             if(response.data.num){
               this.request.num = response.data.num;
-              this.isShowNum = true;
+              this.getWorkspaceId(response.data.projectId);
             }
             this.request.id = response.data.id;
             this.request.disabled = true;
@@ -457,10 +458,9 @@ export default {
         if(this.request.refType==='CASE'){
           this.$get("/api/testcase/get/" + this.request.id, response => {
             if (response.data) {
-
               if(response.data.num){
                 this.request.num = response.data.num;
-                this.isShowNum = true;
+                this.getWorkspaceId(response.data.projectId);
               }
               this.request.id = response.data.id;
             }
@@ -471,7 +471,7 @@ export default {
             if (response.data) {
               if(response.data.num){
                 this.request.num = response.data.num;
-                this.isShowNum = true;
+                this.getWorkspaceId(response.data.projectId);
               }
               this.request.id = response.data.id;
             }
@@ -679,6 +679,17 @@ export default {
       let element = document.getElementById(id);
       element.parentNode.removeChild(element);
     },
+    getWorkspaceId(projectId){
+      this.$get("/project/get/" + projectId, response => {
+        if(response.data){
+          if(response.data.workspaceId===getCurrentWorkspaceId()){
+            this.isShowNum = true;
+          }else {
+            this.isSameSpace = false;
+          }
+        }
+      });
+    }
   }
 }
 </script>
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
index 173b4adf9a..495c25ee58 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
@@ -15,7 +15,7 @@
     background-color="#F4F4F5"
     title='场景'>
 
-    <template v-slot:afterTitle>
+    <template v-slot:afterTitle v-if="isSameSpace">
       <span v-if="isShowNum" @click = "clickResource(scenario)">{{"（ ID: "+scenario.num+"）"}}</span>
       <span v-else >
         <el-tooltip class="ms-num" effect="dark" :content="$t('api_test.automation.scenario.num_none')" placement="top">
@@ -66,7 +66,7 @@ import MsTcpBasisParameters from "../../../definition/components/request/tcp/Tcp
 import MsDubboBasisParameters from "../../../definition/components/request/dubbo/BasisParameters";
 import MsApiRequestForm from "../../../definition/components/request/http/ApiHttpRequestForm";
 import ApiBaseComponent from "../common/ApiBaseComponent";
-import {getCurrentProjectID, getUUID, strMapToObj} from "@/common/js/utils";
+import {getCurrentProjectID, getCurrentWorkspaceId, getUUID, strMapToObj} from "@/common/js/utils";
 
 export default {
   name: "ApiScenarioComponent",
@@ -126,7 +126,7 @@ export default {
           }
           if(response.data.num){
             this.scenario.num = response.data.num;
-            this.isShowNum = true;
+            this.getWorkspaceId(response.data.projectId);
           }
           this.scenario.name = response.data.name;
           this.scenario.headers = obj.headers;
@@ -136,13 +136,17 @@ export default {
         }
       })
     }
-    else if(this.scenario.id && this.scenario.referenced === 'Copy' && !this.scenario.loaded){
+    else if(this.scenario.id && (this.scenario.referenced === 'Copy'||this.scenario.referenced === 'Created') && !this.scenario.loaded){
       this.result = this.$get("/api/automation/getApiScenario/" + this.scenario.id, response => {
         if (response.data) {
           if(response.data.num){
             this.scenario.num = response.data.num;
-            this.isShowNum = true;
+            this.getWorkspaceId(response.data.projectId);
+          }else {
+            this.isSameSpace = false
           }
+        } else {
+          this.isSameSpace = false
         }
       })
     }
@@ -153,6 +157,7 @@ export default {
       loading: false,
       isShowInput: false,
       isShowNum:false,
+      isSameSpace:true
     }
   },
   computed: {
@@ -269,7 +274,6 @@ export default {
       }
 
     },
-
     clickResource(resource) {
       let automationData = this.$router.resolve({
         name: 'ApiAutomation',
@@ -277,6 +281,17 @@ export default {
       });
       window.open(automationData.href, '_blank');
     },
+    getWorkspaceId(projectId){
+      this.$get("/project/get/" + projectId, response => {
+        if(response.data){
+          if(response.data.workspaceId===getCurrentWorkspaceId()){
+            this.isShowNum = true;
+          }else {
+            this.isSameSpace = false;
+          }
+        }
+      });
+    }
   }
 }
 </script>

From 604ebcc8da1427761b6ebcde4eccbbcdad732e3c Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 2 Dec 2021 19:00:41 +0800
Subject: [PATCH 044/256] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E8=B0=83=E8=AF=95=E6=97=B6=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E6=A3=80=E6=9F=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008520 --user=lyh
【github#6612】jmeter调试好的场景，有环境变量，导入MS还提示要选择场景变量。并且还识别不到HTTP请求头中的端口
https://www.tapd.cn/55049933/s/1077469
---
 .../api/service/ApiAutomationService.java     |  2 +-
 .../api/automation/scenario/EnvPopover.vue    | 26 ++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index f093a8a167..c03dcb39f3 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -933,7 +933,7 @@ public class ApiAutomationService {
                         // 校验是否是全路径
                         MsHTTPSamplerProxy httpSamplerProxy = (MsHTTPSamplerProxy) tr;
                         if (httpSamplerProxy.isEnable()) {
-                            if (StringUtils.isBlank(httpSamplerProxy.getUrl()) || !ElementUtil.isURL(httpSamplerProxy.getUrl())) {
+                            if (StringUtils.isBlank(httpSamplerProxy.getUrl()) || (httpSamplerProxy.getIsRefEnvironment() != null && httpSamplerProxy.getIsRefEnvironment())) {
                                 env.setFullUrl(false);
                                 env.getProjectIds().add(httpSamplerProxy.getProjectId());
                             }
diff --git a/frontend/src/business/components/api/automation/scenario/EnvPopover.vue b/frontend/src/business/components/api/automation/scenario/EnvPopover.vue
index aaf7f2979b..0114ced0be 100644
--- a/frontend/src/business/components/api/automation/scenario/EnvPopover.vue
+++ b/frontend/src/business/components/api/automation/scenario/EnvPopover.vue
@@ -135,15 +135,23 @@ export default {
     },
     checkEnv(data) {
       return new Promise((resolve => {
-        if (this.environmentType === ENV_TYPE.JSON) {
-          let res = this.$refs.envSelect.checkEnv(data);
-          resolve(res);
-        } else if (this.environmentType === ENV_TYPE.GROUP) {
-          let res = !this.hasOptionGroup ? this.$refs.envGroup.checkEnv() :
-            this.$refs.envOptionGroup.checkEnv();
-          res.then(r => {
-            resolve(r);
-          })
+        if (data) {
+          // 所有请求全路径不检查环境
+          resolve(true);
+        } else {
+          if (!this.environmentType) {
+            this.$warning("请选择环境！");
+            resolve(false);
+          } else if (this.environmentType === ENV_TYPE.JSON) {
+            let res = this.$refs.envSelect.checkEnv(data);
+            resolve(res);
+          } else if (this.environmentType === ENV_TYPE.GROUP) {
+            let res = !this.hasOptionGroup ? this.$refs.envGroup.checkEnv() :
+              this.$refs.envOptionGroup.checkEnv();
+            res.then(r => {
+              resolve(r);
+            })
+          }
         }
       }))
     },

From bb6f39a41bc8dcb2eaf8a9d06155aa08d29db454 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 3 Dec 2021 11:32:42 +0800
Subject: [PATCH 045/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92):=20=E5=A4=8D=E5=88=B6=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=97=B6=E6=9C=AA=E5=A4=8D=E5=88=B6=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=AF=BC=E8=87=B4=E5=85=B3=E8=81=94=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008539
--user=lyh
【测试计划】关联接口用例报错【+github#8057】
https://www.tapd.cn/55049933/s/1077518

Closes #8057
---
 .../io/metersphere/track/service/TestPlanService.java     | 8 ++------
 .../main/resources/db/migration/V101__v1.15.3_release.sql | 2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 backend/src/main/resources/db/migration/V101__v1.15.3_release.sql

diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index e15d641499..506ebcbe29 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -1317,14 +1317,10 @@ public class TestPlanService {
         String targetPlanId = UUID.randomUUID().toString();
 
         TestPlanWithBLOBs targetPlan = new TestPlanWithBLOBs();
+        BeanUtils.copyBean(targetPlan, testPlan);
+        // 覆盖原内容
         targetPlan.setId(targetPlanId);
         targetPlan.setName(testPlan.getName() + "_" + UUID.randomUUID().toString().substring(0, 5) + "_COPY");
-        targetPlan.setWorkspaceId(testPlan.getWorkspaceId());
-        targetPlan.setDescription(testPlan.getDescription());
-        targetPlan.setStage(testPlan.getStage());
-        targetPlan.setTags(testPlan.getTags());
-        targetPlan.setProjectId(testPlan.getProjectId());
-        testPlan.setAutomaticStatusUpdate(testPlan.getAutomaticStatusUpdate());
         targetPlan.setStatus(TestPlanStatus.Prepare.name());
         targetPlan.setCreator(SessionUtils.getUserId());
         targetPlan.setCreateTime(System.currentTimeMillis());
diff --git a/backend/src/main/resources/db/migration/V101__v1.15.3_release.sql b/backend/src/main/resources/db/migration/V101__v1.15.3_release.sql
new file mode 100644
index 0000000000..8a26c95d5c
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V101__v1.15.3_release.sql
@@ -0,0 +1,2 @@
+-- 修复数据
+update test_plan set repeat_case = 0 where repeat_case is null;
\ No newline at end of file

From 5d0a81453abd2eff3a7e3324370ea1bb751e9c70 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Fri, 3 Dec 2021 11:11:03 +0800
Subject: [PATCH 046/256] =?UTF-8?q?perf(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E5=BC=95=E7=94=A8=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9C=BA=E6=99=AF=E5=8A=A0=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 引用接口自动化场景加搜索ID和名称条件
---
 .../test/components/ExistScenarios.vue        | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/performance/test/components/ExistScenarios.vue b/frontend/src/business/components/performance/test/components/ExistScenarios.vue
index ee2c83cf25..b6b1df358c 100644
--- a/frontend/src/business/components/performance/test/components/ExistScenarios.vue
+++ b/frontend/src/business/components/performance/test/components/ExistScenarios.vue
@@ -1,10 +1,11 @@
 <template>
+
   <el-dialog :title="$t('load_test.scenario_list')"
              :close-on-click-modal="false"
              :destroy-on-close="true"
              width="60%" :visible.sync="loadApiAutomationVisible"
              :modal="true">
-
+    <ms-table-search-bar :condition.sync="condition" @change="search" class="search-bar" :tip="$t('commons.search_by_id_name_tag')" />
     <el-table v-loading="projectLoadingResult.loading" class="basic-config"
               :data="apiScenarios"
               @select-all="handleSelectAll"
@@ -48,10 +49,12 @@ import MsTablePagination from "@/business/components/common/pagination/TablePagi
 import {getCurrentProjectID} from "@/common/js/utils";
 import MsTag from "@/business/components/common/components/MsTag";
 import {findThreadGroup} from "@/business/components/performance/test/model/ThreadGroup";
+import {API_SCENARIO_CONFIGS} from "@/business/components/common/components/search/search-components";
+import MsTableSearchBar from "@/business/components/common/components/MsTableSearchBar";
 
 export default {
   name: "ExistScenarios",
-  components: {MsTag, MsTablePagination, MsDialogFooter},
+  components: {MsTag, MsTablePagination, MsDialogFooter,MsTableSearchBar},
   props: {
     fileList: Array,
     tableData: Array,
@@ -67,6 +70,11 @@ export default {
       total: 0,
       apiScenarios: [],
       selectIds: new Set,
+      condition: {
+        components: API_SCENARIO_CONFIGS,
+        projectId: getCurrentProjectID(),
+        filters: {status: ["Prepare", "Underway", "Completed"]}
+      },
     };
   },
   methods: {
@@ -99,11 +107,7 @@ export default {
       }
     },
     getProjectScenarios() {
-      let condition = {
-        projectId: getCurrentProjectID(),
-        filters: {status: ["Prepare", "Underway", "Completed"]}
-      };
-      this.projectLoadingResult = this.$post('/api/automation/list/' + this.currentPage + "/" + this.pageSize, condition, res => {
+      this.projectLoadingResult = this.$post('/api/automation/list/' + this.currentPage + "/" + this.pageSize, this.condition, res => {
         let data = res.data;
         this.total = data.itemCount;
         this.apiScenarios = data.listObject;
@@ -165,6 +169,9 @@ export default {
       });
       this.selectIds.clear();
     },
+    search() {
+      this.getProjectScenarios();
+    },
   }
 };
 </script>

From 57d41446760dde77d96f2b52a5f20aebcb4d7a9c Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 3 Dec 2021 15:29:19 +0800
Subject: [PATCH 047/256] =?UTF-8?q?refactor(=E7=8E=AF=E5=A2=83=E7=BB=84):?=
 =?UTF-8?q?=20i18n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/scenario/EnvGroup.vue      | 14 +++++-----
 .../scenario/EnvGroupWithOption.vue           | 18 ++++++-------
 .../api/automation/scenario/EnvPopover.vue    |  6 ++---
 .../api/automation/scenario/EnvSelect.vue     |  8 +++---
 .../environment/EditEnvironmentGroup.vue      |  4 +--
 .../environment/EnvGroupCascader.vue          | 12 ++++-----
 .../environment/EnvironmentGroupList.vue      |  4 +--
 .../environment/EnvironmentGroupRow.vue       | 18 ++++++-------
 .../workspace/environment/EnvironmentList.vue | 14 +++++-----
 .../environment/EnvironmentManage.vue         |  2 +-
 frontend/src/i18n/en-US.js                    | 26 +++++++++++++++++++
 frontend/src/i18n/zh-CN.js                    | 26 +++++++++++++++++++
 frontend/src/i18n/zh-TW.js                    | 26 +++++++++++++++++++
 13 files changed, 128 insertions(+), 50 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EnvGroup.vue b/frontend/src/business/components/api/automation/scenario/EnvGroup.vue
index c13efb9320..ef738ff739 100644
--- a/frontend/src/business/components/api/automation/scenario/EnvGroup.vue
+++ b/frontend/src/business/components/api/automation/scenario/EnvGroup.vue
@@ -1,16 +1,16 @@
 <template>
   <div>
     <div style="margin-left: 20px;">
-      <el-select v-model="envGroupId" placeholder="请选择用户组" style="margin-top: 8px;width: 200px;" size="small">
+      <el-select v-model="envGroupId" :placeholder="$t('workspace.env_group.select')" style="margin-top: 8px;width: 200px;" size="small">
         <el-option v-for="(group, index) in groups" :key="index"
                    :label="group.name"
                    :value="group.id"/>
       </el-select>
-      <span style="margin-left: 8px;">环境组</span>
+      <span style="margin-left: 8px;">{{$t('workspace.env_group.name')}}</span>
       <i class="el-icon-view icon-view-btn" @click="viewGroup"></i>
     </div>
-    <el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">确 定</el-button>
-    <el-dialog :visible="visble" append-to-body :title="'环境组'" @close="visble = false" style="height: 800px;">
+    <el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">{{$t('workspace.env_group.confirm')}}</el-button>
+    <el-dialog :visible="visble" append-to-body :title="$t('workspace.env_group.name')" @close="visble = false" style="height: 800px;">
       <template>
         <environment-group style="overflow-y: auto;"
                            :screen-height="'350px'"
@@ -74,21 +74,21 @@ export default {
     checkEnv() {
       return new Promise((resolve) => {
         if (!this.envGroupId) {
-          this.$warning("请选择环境组！");
+          this.$warning(this.$t('workspace.env_group.select'));
           resolve(false);
           return false;
         }
         this.$get("/environment/group/project/map/" + this.envGroupId, res => {
           let data = res.data;
           if (!data) {
-            this.$warning("环境组缺少环境！");
+            this.$warning(this.$t('workspace.env_group.lack_env'));
             resolve(false);
             return;
           }
           let map = new Map(Object.entries(data));
           for (let id of this.projectIds) {
             if (!map.get(id)) {
-              this.$warning("此环境组缺少必要的项目环境！");
+              this.$warning(this.$t('workspace.env_group.lack_necessary_environment'));
               resolve(false);
               return;
             }
diff --git a/frontend/src/business/components/api/automation/scenario/EnvGroupWithOption.vue b/frontend/src/business/components/api/automation/scenario/EnvGroupWithOption.vue
index 234ad03f05..a07c2dd50f 100644
--- a/frontend/src/business/components/api/automation/scenario/EnvGroupWithOption.vue
+++ b/frontend/src/business/components/api/automation/scenario/EnvGroupWithOption.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div style="margin-left: 20px;">
-      <el-select v-model="envGroupId" placeholder="请选择用户组" style="margin-top: 8px;width: 200px;" size="small">
+      <el-select v-model="envGroupId" :placeholder="$t('workspace.env_group.select')" style="margin-top: 8px;width: 200px;" size="small">
         <el-option-group
           v-for="group in groups"
           :key="group.label"
@@ -15,11 +15,11 @@
           </el-option>
         </el-option-group>
       </el-select>
-      <span style="margin-left: 8px;">环境组</span>
+      <span style="margin-left: 8px;">{{$t('workspace.env_group.name')}}</span>
       <i class="el-icon-view icon-view-btn" @click="viewGroup"></i>
     </div>
-    <el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">确 定</el-button>
-    <el-dialog :visible="visble" append-to-body :title="'环境组'" @close="visble = false" style="height: 800px;">
+    <el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">{{$t('workspace.env_group.confirm')}}</el-button>
+    <el-dialog :visible="visble" append-to-body :title="$t('workspace.env_group.name')" @close="visble = false" style="height: 800px;">
       <template>
         <environment-group style="overflow-y: auto;"
                            :screen-height="'350px'"
@@ -73,11 +73,11 @@ export default {
         this.disabledGroups = groups.filter(group => group.disabled === true);
         this.notDisabledGroups = groups.filter(group => group.disabled === false);
         this.$set(this.groups, 0, {
-          label: '可用环境组',
+          label: this.$t('workspace.env_group.available_group'),
           options: this.notDisabledGroups
         });
         this.$set(this.groups, 1, {
-          label: '不可用环境组(缺少项目环境)',
+          label: this.$t('workspace.env_group.not_available_group'),
           options: this.disabledGroups
         });
       })
@@ -95,21 +95,21 @@ export default {
     checkEnv() {
       return new Promise((resolve) => {
         if (!this.envGroupId) {
-          this.$warning("请选择环境组！");
+          this.$warning(this.$t('workspace.env_group.select'));
           resolve(false);
           return false;
         }
         this.$get("/environment/group/project/map/" + this.envGroupId, res => {
           let data = res.data;
           if (!data) {
-            this.$warning("环境组缺少环境！");
+            this.$warning(this.$t('workspace.env_group.lack_env'));
             resolve(false);
             return;
           }
           let map = new Map(Object.entries(data));
           for (let id of this.projectIds) {
             if (!map.get(id)) {
-              this.$warning("此环境组缺少必要的项目环境！");
+              this.$warning(this.$t('workspace.env_group.lack_necessary_environment'));
               resolve(false);
               return;
             }
diff --git a/frontend/src/business/components/api/automation/scenario/EnvPopover.vue b/frontend/src/business/components/api/automation/scenario/EnvPopover.vue
index 0114ced0be..942f5bfc41 100644
--- a/frontend/src/business/components/api/automation/scenario/EnvPopover.vue
+++ b/frontend/src/business/components/api/automation/scenario/EnvPopover.vue
@@ -7,8 +7,8 @@
     @show="showPopover"
     trigger="click">
     <el-radio-group v-model="radio" style="margin-left: 20px;" @change="radioChange">
-      <el-radio :label="ENV_TYPE.JSON">环境列表</el-radio>
-      <el-radio :label="ENV_TYPE.GROUP">环境组</el-radio>
+      <el-radio :label="ENV_TYPE.JSON">{{$t('workspace.env_group.env_list')}}</el-radio>
+      <el-radio :label="ENV_TYPE.GROUP">{{$t('workspace.env_group.name')}}</el-radio>
     </el-radio-group>
     <env-select :project-ids="projectIds"
                 :result="result"
@@ -140,7 +140,7 @@ export default {
           resolve(true);
         } else {
           if (!this.environmentType) {
-            this.$warning("请选择环境！");
+            this.$warning(this.$t('workspace.env_group.please_select_env'));
             resolve(false);
           } else if (this.environmentType === ENV_TYPE.JSON) {
             let res = this.$refs.envSelect.checkEnv(data);
diff --git a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue
index f45c3d4b70..61c2bee5b1 100644
--- a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue
+++ b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="result.loading">
     <div v-for="pe in data" :key="pe.id" style="margin-left: 20px;">
-      <el-select v-model="pe['selectEnv']" placeholder="请选择环境" style="margin-top: 8px;width: 200px;" size="small">
+      <el-select v-model="pe['selectEnv']" :placeholder="$t('workspace.env_group.please_select_env')" style="margin-top: 8px;width: 200px;" size="small">
         <el-option v-for="(environment, index) in pe.envs" :key="index"
                    :label="environment.name"
                    :value="environment.id"/>
@@ -23,7 +23,7 @@
       </span>
     </div>
 
-    <el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">确 定</el-button>
+    <el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">{{$t('workspace.env_group.confirm')}}</el-button>
 
     <!-- 环境配置 -->
     <api-environment-config ref="environmentConfig" @close="environmentConfigClose"/>
@@ -153,7 +153,7 @@ export default {
         map.set(dt.id, dt.selectEnv);
       })
       if (!sign) {
-        this.$warning("请为当前场景选择一个运行环境！");
+        this.$warning(this.$t('workspace.env_group.please_select_env_for_current_scenario'));
         return;
       }
       this.$emit('setProjectEnvMap', map);
@@ -301,7 +301,7 @@ export default {
       }
 
       if (!sign) {
-        this.$warning("请为当前场景选择一个运行环境！");
+        this.$warning(this.$t('workspace.env_group.please_select_env_for_current_scenario'));
         return false;
       }
       return true;
diff --git a/frontend/src/business/components/settings/workspace/environment/EditEnvironmentGroup.vue b/frontend/src/business/components/settings/workspace/environment/EditEnvironmentGroup.vue
index 2313193690..18ab2bba31 100644
--- a/frontend/src/business/components/settings/workspace/environment/EditEnvironmentGroup.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EditEnvironmentGroup.vue
@@ -37,7 +37,7 @@ export default {
   },
   data() {
     return {
-      title: '创建环境组',
+      title: this.$t('workspace.env_group.create'),
       form: {},
       createVisible: false,
       rules: {
@@ -61,7 +61,7 @@ export default {
         if (valid) {
           let sign = this.$refs.environmentGroupRow.valid();
           if (!sign) {
-            this.$warning("项目与环境对应关系不完整！");
+            this.$warning(this.$t('workspace.env_group.not_intact'));
             return false;
           }
           let envGroupProject = this.$refs.environmentGroupRow.envGroupProject;
diff --git a/frontend/src/business/components/settings/workspace/environment/EnvGroupCascader.vue b/frontend/src/business/components/settings/workspace/environment/EnvGroupCascader.vue
index 4c241112b2..6120109357 100644
--- a/frontend/src/business/components/settings/workspace/environment/EnvGroupCascader.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EnvGroupCascader.vue
@@ -4,21 +4,21 @@
     <el-form :model="ruleForm" :rules="rules" ref="ruleForm">
       <el-form-item prop="project" label-width="0px">
         <el-alert
-          title="若环境组中已经包含此次将要加入的项目，则该项目环境将被覆盖" style="height: 33px;"
+          :title="$t('workspace.env_group.cascader_tip')" style="height: 33px;"
           type="info" :closable="false" show-icon></el-alert>
         <el-row type="flex" justify="space-between" :gutter="10">
           <el-col :span="10" class="search">
             <el-input v-model="searchName" prefix-icon="el-icon-search"
-                      placeholder="请输入名称搜索环境组" size="mini" style="width: 100%;"></el-input>
+                      :placeholder="$t('workspace.env_group.search_tip')" size="mini" style="width: 100%;"></el-input>
           </el-col>
           <el-col :span="10" class="search">
-            <el-input v-model="groupName" placeholder="请输入环境组名称快速创建"
+            <el-input v-model="groupName" :placeholder="$t('workspace.env_group.fast_create_tip')"
                       prefix-icon="el-icon-plus"
                       size="mini">
             </el-input>
           </el-col>
           <el-col :span="4">
-            <el-button type="primary" @click="save" size="mini" style="width: 100%;">快速添加</el-button>
+            <el-button type="primary" @click="save" size="mini" style="width: 100%;">{{ $t('workspace.env_group.quickly_add') }}</el-button>
           </el-col>
         </el-row>
         <el-cascader-panel :props="props" v-loading="result.loading"
@@ -115,7 +115,7 @@ export default {
         selectValueArr.push(node.value);
       }
       if (selectValueArr.length < 1) {
-        this.$warning("请选择环境组");
+        this.$warning(this.$t('workspace.env_group.select'));
         return false;
       }
       this.$emit('confirm', selectValueArr);
@@ -135,7 +135,7 @@ export default {
     },
     save() {
       if (!this.groupName) {
-        this.$warning("环境组名不能为空！");
+        this.$warning(this.$t('workspace.env_group.name_not_null'));
         return false;
       }
       this.$post("/environment/group/add", {name: this.groupName}, () => {
diff --git a/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupList.vue b/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupList.vue
index 301794a490..ba49c5008d 100644
--- a/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupList.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupList.vue
@@ -57,7 +57,7 @@
     </el-card>
 
     <edit-environment-group ref="editEnvironmentGroup" @refresh="init"/>
-    <ms-delete-confirm :title="'删除环境组'" @delete="_handleDelete" ref="deleteConfirm"/>
+    <ms-delete-confirm :title="$t('workspace.env_group.delete')" @delete="_handleDelete" ref="deleteConfirm"/>
 
   </div>
 </template>
@@ -98,7 +98,7 @@ export default {
   },
   data() {
     return {
-      btnTips: '创建环境组',
+      btnTips: this.$t('workspace.env_group.create'),
       envGroupId: '',
       condition: {},
       environmentGroupList: [],
diff --git a/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupRow.vue b/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupRow.vue
index 51950a5b9a..258d7ee09f 100644
--- a/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupRow.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupRow.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="btn-div">
-      <el-button size="mini" type="primary" class="save-btn" v-if="!rowReadOnly && !showSaveBtn" @click="update">保存</el-button>
+      <el-button size="mini" type="primary" class="save-btn" v-if="!rowReadOnly && !showSaveBtn" @click="update">{{$t('commons.save')}}</el-button>
     </div>
     <div v-loading="result.loading" class="group-row">
       <el-form class="row-form">
@@ -10,7 +10,7 @@
             <el-col :span="6">
               <el-select v-model="item.projectId" filterable clearable style="width: 100%" @change="projectChange(item)"
                          :size="itemSize"
-                         placeholder="请选择项目" :disabled="rowReadOnly">
+                         :placeholder="$t('workspace.env_group.please_select_project')" :disabled="rowReadOnly">
                 <el-option v-for="(project, projectIndex) in projectList" :key="projectIndex" :label="project.name"
                            :disabled="project.disabled"
                            :value="project.id"></el-option>
@@ -20,7 +20,7 @@
             <el-col :span="6">
               <el-select v-model="item.environmentId" filterable clearable style="width: 100%"
                          @change="environmentChange(item)" :size="itemSize"
-                         placeholder="请选择环境" :disabled="rowReadOnly">
+                         :placeholder="$t('workspace.env_group.please_select_env')" :disabled="rowReadOnly">
                 <el-option v-for="(environment, envIndex) in item.environments" :key="envIndex"
                            :label="environment.name"
                            :value="environment.id"></el-option>
@@ -29,13 +29,13 @@
 
             <el-col :span="4">
               <el-button :size="itemSize" icon="el-icon-s-data" style="width: 100%;"
-                         @click="showDomainInfo(item)" v-if="item.moreDomain">查看域名详情
+                         @click="showDomainInfo(item)" v-if="item.moreDomain">{{ $t('workspace.env_group.view_details') }}
               </el-button>
               <el-input v-else v-model="item.domainName" :disabled="true" :size="itemSize"/>
             </el-col>
 
             <el-col :span="5">
-              <el-input prop="description" show-overflow-tooltip placeholder="描述" maxlength="100"
+              <el-input prop="description" show-overflow-tooltip :placeholder="$t('commons.description')" maxlength="100"
                         v-model="item.domainDescription"
                         show-word-limit :size="itemSize" :disabled="true"/>
             </el-col>
@@ -49,14 +49,14 @@
           </el-row>
         </el-form-item>
       </el-form>
-      <el-dialog title="域名列表" :visible.sync="domainVisible" append-to-body>
+      <el-dialog :title="$t('workspace.env_group.domain_list')" :visible.sync="domainVisible" append-to-body>
         <el-table :data="conditions">
           <el-table-column prop="socket" :label="$t('load_test.domain')" show-overflow-tooltip width="180">
             <template v-slot:default="{row}">
               {{ row.conditionType ? row.server : getUrl(row) }}
             </template>
           </el-table-column>
-          <el-table-column :label="'类型'" show-overflow-tooltip
+          <el-table-column :label="$t('commons.type')" show-overflow-tooltip
                            min-width="100px">
             <template v-slot:default="{row}">
               <el-tag type="info" size="mini">{{ row.conditionType ? row.conditionType : "HTTP" }}</el-tag>
@@ -73,7 +73,7 @@
               {{ row.conditionType ? "-" : getDetails(row) }}
             </template>
           </el-table-column>
-          <el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="'描述'">
+          <el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="$t('commons.description')">
             <template v-slot:default="{row}">
               <span>{{ row.description ? row.description : "-" }}</span>
             </template>
@@ -372,7 +372,7 @@ export default {
     update() {
       let sign = this.valid();
       if (!sign) {
-        this.$warning("项目与环境对应关系不完整！");
+        this.$warning(this.$t('workspace.env_group.not_intact'));
         return false;
       }
       let param = {
diff --git a/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue b/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
index b4ad3a6339..14c471929d 100644
--- a/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
@@ -38,7 +38,7 @@
         <el-table-column :label="$t('api_test.environment.socket')" show-overflow-tooltip>
           <template v-slot="scope">
             <span v-if="parseDomainName(scope.row)!='SHOW_INFO'">{{ parseDomainName(scope.row) }}</span>
-            <el-button size="mini" icon="el-icon-s-data" @click="showInfo(scope.row)" v-else>查看域名详情</el-button>
+            <el-button size="mini" icon="el-icon-s-data" @click="showInfo(scope.row)" v-else>{{ $t('workspace.env_group.view_details') }}</el-button>
           </template>
         </el-table-column>
         <el-table-column :label="$t('commons.operating')">
@@ -76,14 +76,14 @@
     </el-dialog>
     <environment-import :project-list="projectList" @refresh="refresh" ref="envImport"></environment-import>
 
-    <el-dialog title="域名列表" :visible.sync="domainVisible">
+    <el-dialog :title="$t('workspace.env_group.domain_list')" :visible.sync="domainVisible">
       <el-table :data="conditions">
         <el-table-column prop="socket" :label="$t('load_test.domain')" show-overflow-tooltip width="180">
           <template v-slot:default="{row}">
             {{ row.conditionType ? row.server : getUrl(row) }}
           </template>
         </el-table-column>
-        <el-table-column :label="'类型'" show-overflow-tooltip
+        <el-table-column :label="$t('commons.type')" show-overflow-tooltip
                          min-width="100px">
           <template v-slot:default="{row}">
             <el-tag type="info" size="mini">{{ row.conditionType ? row.conditionType : "HTTP" }}</el-tag>
@@ -100,7 +100,7 @@
             {{ row.conditionType ? "-" : getDetails(row) }}
           </template>
         </el-table-column>
-        <el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="'描述'">
+        <el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="$t('commons.description')">
           <template v-slot:default="{row}">
             <span>{{ row.description ? row.description : "-" }}</span>
           </template>
@@ -117,7 +117,7 @@
     <el-button type="primary" @click="domainVisible = false" size="mini">{{ $t('commons.confirm') }}</el-button>
   </span>
     </el-dialog>
-    <env-group-cascader :title="'批量添加到环境组'" ref="cascader" @confirm="_batchAddToGroup"/>
+    <env-group-cascader :title="$t('workspace.env_group.batch_add_to_ws')" ref="cascader" @confirm="_batchAddToGroup"/>
   </div>
 </template>
 
@@ -187,7 +187,7 @@ export default {
       selectDataCounts: 0,
       buttons: [
         {
-          name: '批量添加到环境组', handleClick: this.batchAddToGroup
+          name: this.$t('workspace.env_group.batch_add_to_ws'), handleClick: this.batchAddToGroup
         },
       ]
     };
@@ -463,7 +463,7 @@ export default {
         }
       })
       if (str) {
-        this.$warning(str + "环境选择冲突，一个项目选择一个对应环境！");
+        this.$warning(str + this.$t('workspace.env_group.choice_conflict'));
         return false;
       }
       return true;
diff --git a/frontend/src/business/components/settings/workspace/environment/EnvironmentManage.vue b/frontend/src/business/components/settings/workspace/environment/EnvironmentManage.vue
index 4a2d4d8926..16411c3a8b 100644
--- a/frontend/src/business/components/settings/workspace/environment/EnvironmentManage.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EnvironmentManage.vue
@@ -5,7 +5,7 @@
       <el-tab-pane :label="$t('api_test.environment.environment_list')" name="list">
         <environment-list v-if="activeName === 'list'"/>
       </el-tab-pane>
-      <el-tab-pane :label="'环境组'" name="group">
+      <el-tab-pane :label="$t('workspace.env_group.name')" name="group">
         <environment-group-list v-if="activeName === 'group'"/>
       </el-tab-pane>
     </el-tabs>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index e57b3dd790..cabf7af946 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -193,6 +193,7 @@ export default {
     follow_success:"Follow Success",
     cancel_follow_success: "Cancel Follow Success",
     generate_test_data: "Generate test data",
+    type: "Type",
     relationship: {
       name: 'Dependencies',
       pre_case: 'Prepositional Case',
@@ -482,6 +483,31 @@ export default {
       int: 'Int',
       float: 'Float',
       multipleInput: 'MultipleInput'
+    },
+    env_group: {
+      name: "Environment Group",
+      create: "Create Group",
+      not_intact: "the project and the environment is incomplete!",
+      cascader_tip: "The existing environment will be overwritten",
+      search_tip: "Please enter a name to search",
+      fast_create_tip: "Please enter the name to quickly create",
+      quickly_add: "Quickly add",
+      select: "Please select an environment group",
+      name_not_null: "Environment group name cannot be empty",
+      delete: "Delete environment group",
+      please_select_project: "Please select an item",
+      please_select_env: "Please select environment",
+      view_details: "View details",
+      domain_list: "Domain list",
+      batch_add_to_ws: "Add to environment group in bulk",
+      choice_conflict: "one project chooses a corresponding environment!",
+      env_list: "Environment List",
+      confirm: "Confirm",
+      please_select_env_for_current_scenario: "please select env for current scenario",
+      lack_env: "Environment group is missing environment！",
+      lack_necessary_environment: "This environment group lacks the necessary project environment！",
+      available_group: 'available',
+      not_available_group: "unavailable"
     }
   },
   organization: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 3e75b36829..4386830737 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -193,6 +193,7 @@ export default {
     run_fail: "执行失败",
     follow_success:"关注成功",
     cancel_follow_success:"取消关注成功",
+    type: "类型",
     relationship: {
       name: '依赖关系',
       pre_case: '前置用例',
@@ -483,6 +484,31 @@ export default {
       int: '整型',
       float: '浮点型',
       multipleInput: '多值输入框'
+    },
+    env_group: {
+      name: "环境组",
+      create: "创建环境组",
+      not_intact: "项目与环境对应关系不完整！",
+      cascader_tip: "若环境组中已经包含此次将要加入的项目，则该项目环境将被覆盖",
+      search_tip: "请输入名称搜索环境组",
+      fast_create_tip: "请输入环境组名称快速创建",
+      quickly_add: "快速添加",
+      select: "请选择环境组",
+      name_not_null: "环境组名不能为空",
+      delete: "删除环境组",
+      please_select_project: "请选择项目",
+      please_select_env: "请选择环境",
+      view_details: "查看域名详情",
+      domain_list: "域名列表",
+      batch_add_to_ws: "批量添加到环境组",
+      choice_conflict: "环境选择冲突，一个项目选择一个对应环境！",
+      env_list: "环境列表",
+      confirm: "确 定",
+      please_select_env_for_current_scenario: "请为当前场景选择一个运行环境！",
+      lack_env: "环境组缺少环境！",
+      lack_necessary_environment: "此环境组缺少必要的项目环境！",
+      available_group: '可用环境组',
+      not_available_group: "不可用环境组(缺少项目环境)"
     }
   },
   organization: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index b507297b6a..1ae950b945 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -193,6 +193,7 @@ export default {
     run_fail: "執行失敗",
     follow_success:"關注成功",
     cancel_follow_success: "取消關注成功",
+    type: "類型",
     relationship: {
       name: '依賴關系',
       pre_case: '前置用例',
@@ -483,6 +484,31 @@ export default {
       int: '整型',
       float: '浮點型',
       multipleInput: '多值輸入框'
+    },
+    env_group: {
+      name: "環境組",
+      create: "創建環境組",
+      not_intact: "項目與環境對應關係不完整！",
+      cascader_tip: "若環境組中已經包含此次將要加入的項目，則該項目環境將被覆蓋",
+      search_tip: "請輸入名稱搜索環境組",
+      fast_create_tip: "請輸入名稱搜索環境組",
+      quickly_add: "快速添加",
+      select: "請選擇環境組",
+      name_not_null: "環境組名不能為空",
+      delete: "刪除環境組",
+      please_select_project: "請選擇項目",
+      please_select_env: "請選擇環境",
+      view_details: "請選擇環境",
+      domain_list: "域名列表",
+      batch_add_to_ws: "批量添加到環境組",
+      choice_conflict: "環境選擇衝突，一個項目選擇一個對應環境！",
+      env_list: "環境列表",
+      confirm: "確 定",
+      please_select_env_for_current_scenario: "請為當前場景選擇一個運行環境！",
+      lack_env: "環境組缺少環境！",
+      lack_necessary_environment: "此環境組缺少必要的項目環境！",
+      available_group: '可用環境組',
+      not_available_group: "不可用環境組(缺少項目環境)"
     }
   },
   organization: {

From 3edca1afe6b4ebcc13fc6335db3e759abe51459a Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 3 Dec 2021 15:43:18 +0800
Subject: [PATCH 048/256] =?UTF-8?q?refactor(=E7=8E=AF=E5=A2=83=E7=BB=84):?=
 =?UTF-8?q?=20=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1004261 --user=lyh 环境组不显示TCP域名优化
https://www.tapd.cn/55049933/s/1077592
---
 .../base/domain/EnvironmentGroupProject.java  |  2 -
 .../EnvironmentGroupProjectExample.java       | 70 -------------------
 .../mapper/EnvironmentGroupProjectMapper.xml  | 25 ++-----
 .../service/EnvironmentGroupService.java      |  1 -
 .../db/migration/V101__v1.15.3_release.sql    |  4 +-
 5 files changed, 8 insertions(+), 94 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/domain/EnvironmentGroupProject.java b/backend/src/main/java/io/metersphere/base/domain/EnvironmentGroupProject.java
index 3d57174f0b..a68aa8b549 100644
--- a/backend/src/main/java/io/metersphere/base/domain/EnvironmentGroupProject.java
+++ b/backend/src/main/java/io/metersphere/base/domain/EnvironmentGroupProject.java
@@ -13,7 +13,5 @@ public class EnvironmentGroupProject implements Serializable {
 
     private String projectId;
 
-    private String description;
-
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/EnvironmentGroupProjectExample.java b/backend/src/main/java/io/metersphere/base/domain/EnvironmentGroupProjectExample.java
index 2f4a500fc4..5a6b2dced5 100644
--- a/backend/src/main/java/io/metersphere/base/domain/EnvironmentGroupProjectExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/EnvironmentGroupProjectExample.java
@@ -383,76 +383,6 @@ public class EnvironmentGroupProjectExample {
             addCriterion("project_id not between", value1, value2, "projectId");
             return (Criteria) this;
         }
-
-        public Criteria andDescriptionIsNull() {
-            addCriterion("description is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionIsNotNull() {
-            addCriterion("description is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionEqualTo(String value) {
-            addCriterion("description =", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotEqualTo(String value) {
-            addCriterion("description <>", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionGreaterThan(String value) {
-            addCriterion("description >", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
-            addCriterion("description >=", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLessThan(String value) {
-            addCriterion("description <", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLessThanOrEqualTo(String value) {
-            addCriterion("description <=", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLike(String value) {
-            addCriterion("description like", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotLike(String value) {
-            addCriterion("description not like", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionIn(List<String> values) {
-            addCriterion("description in", values, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotIn(List<String> values) {
-            addCriterion("description not in", values, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionBetween(String value1, String value2) {
-            addCriterion("description between", value1, value2, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotBetween(String value1, String value2) {
-            addCriterion("description not between", value1, value2, "description");
-            return (Criteria) this;
-        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/backend/src/main/java/io/metersphere/base/mapper/EnvironmentGroupProjectMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/EnvironmentGroupProjectMapper.xml
index b9d13bfe0b..3499540dd4 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/EnvironmentGroupProjectMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/EnvironmentGroupProjectMapper.xml
@@ -6,7 +6,6 @@
     <result column="environment_group_id" jdbcType="VARCHAR" property="environmentGroupId" />
     <result column="environment_id" jdbcType="VARCHAR" property="environmentId" />
     <result column="project_id" jdbcType="VARCHAR" property="projectId" />
-    <result column="description" jdbcType="VARCHAR" property="description" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -67,7 +66,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, environment_group_id, environment_id, project_id, description
+    id, environment_group_id, environment_id, project_id
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.base.domain.EnvironmentGroupProjectExample" resultMap="BaseResultMap">
     select
@@ -101,9 +100,9 @@
   </delete>
   <insert id="insert" parameterType="io.metersphere.base.domain.EnvironmentGroupProject">
     insert into environment_group_project (id, environment_group_id, environment_id, 
-      project_id, description)
+      project_id)
     values (#{id,jdbcType=VARCHAR}, #{environmentGroupId,jdbcType=VARCHAR}, #{environmentId,jdbcType=VARCHAR}, 
-      #{projectId,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR})
+      #{projectId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.EnvironmentGroupProject">
     insert into environment_group_project
@@ -120,9 +119,6 @@
       <if test="projectId != null">
         project_id,
       </if>
-      <if test="description != null">
-        description,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -137,9 +133,6 @@
       <if test="projectId != null">
         #{projectId,jdbcType=VARCHAR},
       </if>
-      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
-      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.base.domain.EnvironmentGroupProjectExample" resultType="java.lang.Long">
@@ -163,9 +156,6 @@
       <if test="record.projectId != null">
         project_id = #{record.projectId,jdbcType=VARCHAR},
       </if>
-      <if test="record.description != null">
-        description = #{record.description,jdbcType=VARCHAR},
-      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -176,8 +166,7 @@
     set id = #{record.id,jdbcType=VARCHAR},
       environment_group_id = #{record.environmentGroupId,jdbcType=VARCHAR},
       environment_id = #{record.environmentId,jdbcType=VARCHAR},
-      project_id = #{record.projectId,jdbcType=VARCHAR},
-      description = #{record.description,jdbcType=VARCHAR}
+      project_id = #{record.projectId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -194,9 +183,6 @@
       <if test="projectId != null">
         project_id = #{projectId,jdbcType=VARCHAR},
       </if>
-      <if test="description != null">
-        description = #{description,jdbcType=VARCHAR},
-      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -204,8 +190,7 @@
     update environment_group_project
     set environment_group_id = #{environmentGroupId,jdbcType=VARCHAR},
       environment_id = #{environmentId,jdbcType=VARCHAR},
-      project_id = #{projectId,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR}
+      project_id = #{projectId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java b/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
index 39b6b6f532..78018ebd7c 100644
--- a/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
+++ b/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
@@ -84,7 +84,6 @@ public class EnvironmentGroupService {
             EnvironmentGroupProject e = new EnvironmentGroupProject();
             // todo 检查 项目｜环境 是否存在
             e.setId(UUID.randomUUID().toString());
-            e.setDescription(egp.getDescription());
             e.setEnvironmentGroupId(request.getId());
             e.setProjectId(projectId);
             e.setEnvironmentId(environmentId);
diff --git a/backend/src/main/resources/db/migration/V101__v1.15.3_release.sql b/backend/src/main/resources/db/migration/V101__v1.15.3_release.sql
index 8a26c95d5c..ac64067578 100644
--- a/backend/src/main/resources/db/migration/V101__v1.15.3_release.sql
+++ b/backend/src/main/resources/db/migration/V101__v1.15.3_release.sql
@@ -1,2 +1,4 @@
 -- 修复数据
-update test_plan set repeat_case = 0 where repeat_case is null;
\ No newline at end of file
+update test_plan set repeat_case = 0 where repeat_case is null;
+
+alter table environment_group_project drop column description;
\ No newline at end of file

From f4e9c82bad612c3a5ebdf297f28f06b9c84c51e1 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 3 Dec 2021 17:03:31 +0800
Subject: [PATCH 049/256] =?UTF-8?q?refactor:=20=E9=A1=B9=E7=9B=AE=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E6=97=B6=E6=98=BE=E7=A4=BA=E9=A1=B9=E7=9B=AE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008497 --user= 【github#8262】项目选择框太短，看不清项目名
https://www.tapd.cn/55049933/s/1077666

Closes #8262
---
 .../business/components/common/head/ProjectSwitch.vue    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/common/head/ProjectSwitch.vue b/frontend/src/business/components/common/head/ProjectSwitch.vue
index 427d57ba01..f45c93151c 100644
--- a/frontend/src/business/components/common/head/ProjectSwitch.vue
+++ b/frontend/src/business/components/common/head/ProjectSwitch.vue
@@ -4,9 +4,12 @@
     <el-menu-item index="1" v-show="false">Placeholder</el-menu-item>
     <el-submenu index="2" popper-class="submenu">
       <template v-slot:title>
-        <span class="project-name" :title="currentProject">
-          {{ $t('commons.project') }}: {{ currentProject }}
-        </span>
+        <el-tooltip effect="light" placement="right" :enterable="false">
+          <div slot="content">{{ currentProject }}</div>
+          <span class="project-name">
+            {{ $t('commons.project') }}: {{ currentProject }}
+          </span>
+        </el-tooltip>
       </template>
       <search-list :current-project.sync="currentProject"/>
       <div v-permission="['WORKSPACE_PROJECT_MANAGER:READ']">

From 0d680831f6d1a4d73bf55354b8ccf3b3f3f14ad4 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 3 Dec 2021 11:41:35 +0800
Subject: [PATCH 050/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E4=B8=AD=E5=9C=BA=E6=99=AF=E5=8F=98=E9=87=8F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B8=B8=E9=87=8F=E5=8F=8ASQL=E6=B7=BB=E5=8A=A0=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E9=87=87=E7=94=A8mock=E5=8A=A0=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E4=BF=9D=E5=AD=98=E4=B8=8D=E4=BA=86=EF=BC=8C=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【场景变量添加常量及SQL添加变量，采用mock加函数保存不了，控制台报错】https://www.tapd.cn/33805590/bugtrace/bugs/view?bug_id=1133805590001008481
---
 .../scenario/variable/EditConstant.vue        | 16 +++++++++++----
 .../api/test/components/ApiVariable.vue       | 18 +++++++++++++++--
 .../test/components/ApiVariableAdvance.vue    | 20 ++++++++++++++++++-
 3 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/variable/EditConstant.vue b/frontend/src/business/components/api/automation/scenario/variable/EditConstant.vue
index fd4e63b7d6..be5c780a28 100644
--- a/frontend/src/business/components/api/automation/scenario/variable/EditConstant.vue
+++ b/frontend/src/business/components/api/automation/scenario/variable/EditConstant.vue
@@ -24,12 +24,12 @@
             value-key="name"
             :fetch-suggestions="funcSearch"
             highlight-first-item>
-            <i slot="suffix" class="el-input__icon el-icon-edit pointer" @click="advanced"></i>
+            <i slot="suffix" class="el-input__icon el-icon-edit pointer" @click="advanced(editData.value)"></i>
           </el-autocomplete>
         </el-col>
       </el-form-item>
     </el-form>
-    <ms-api-variable-advance ref="variableAdvance"/>
+    <ms-api-variable-advance ref="variableAdvance" :current-item="editData" @advancedRefresh="reload"/>
   </div>
 </template>
 
@@ -45,11 +45,12 @@
     },
     data() {
       return {
+        currentItem: null,
         rules: {
           name: [
             {required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},
           ],
-        },
+        }
       }
     },
     computed:{
@@ -58,8 +59,9 @@
       }
     },
     methods: {
-      advanced() {
+      advanced(item) {
         this.$refs.variableAdvance.open();
+        this.editData.value = item;
       },
       createFilter(queryString) {
         return (variable) => {
@@ -77,6 +79,12 @@
         // 调用 callback 返回建议列表的数据
         cb(results);
       },
+      reload() {
+        this.isActive = false;
+        this.$nextTick(() => {
+          this.isActive = true;
+        });
+      },
     },
     created() {
       this.$nextTick(() => {
diff --git a/frontend/src/business/components/api/test/components/ApiVariable.vue b/frontend/src/business/components/api/test/components/ApiVariable.vue
index cd36f59bf1..0016fe58fe 100644
--- a/frontend/src/business/components/api/test/components/ApiVariable.vue
+++ b/frontend/src/business/components/api/test/components/ApiVariable.vue
@@ -59,8 +59,10 @@
       </el-row>
     </div>
     <ms-api-variable-advance ref="variableAdvance" :environment="environment" :scenario="scenario"
+                             :append-to-body="appendDialogToBody"
                              :parameters="parameters"
-                             :current-item="currentItem"/>
+                             :current-item="currentItem"
+                             @advancedRefresh="reload"/>
   </div>
 </template>
 
@@ -84,6 +86,12 @@
         type: String,
         default: ''
       },
+      appendDialogToBody: {
+        type: Boolean,
+        default() {
+          return false;
+        }
+      },
       isReadOnly: {
         type: Boolean,
         default: false
@@ -165,7 +173,13 @@
         } else {
           item.contentType = 'text/plain';
         }
-      }
+      },
+      reload() {
+        this.isActive = false;
+        this.$nextTick(() => {
+          this.isActive = true;
+        });
+      },
     },
     created() {
       if (this.parameters.length === 0 || this.parameters[this.parameters.length - 1].name) {
diff --git a/frontend/src/business/components/api/test/components/ApiVariableAdvance.vue b/frontend/src/business/components/api/test/components/ApiVariableAdvance.vue
index 9d02dcaea6..2621d1af93 100644
--- a/frontend/src/business/components/api/test/components/ApiVariableAdvance.vue
+++ b/frontend/src/business/components/api/test/components/ApiVariableAdvance.vue
@@ -101,6 +101,12 @@ export default {
     environment: Object,
     scenario: Scenario,
     currentItem: Object,
+    appendToBody: {
+      type: Boolean,
+      default() {
+        return false;
+      }
+    },
   },
   data() {
     return {
@@ -161,6 +167,7 @@ export default {
   methods: {
     open() {
       this.itemValueVisible = true;
+      this.itemValue = this.currentItem.value;
     },
     prepareData() {
       if (this.scenario) {
@@ -245,6 +252,11 @@ export default {
       this.showPreview();
     },
     addFunc() {
+      if (this.itemValue.indexOf('@') == -1) {
+        this.itemValue = '@' + this.itemValue;
+      } else {
+        this.itemValue = this.itemValue;
+      }
       if (this.mockVariableFuncs.length > 4) {
         this.$info(this.$t('api_test.request.parameters_advance_add_func_limit'));
         return;
@@ -267,9 +279,15 @@ export default {
       this.mockVariableFuncs.push({name: '', params: []});
     },
     saveAdvanced() {
-      this.currentItem.value = this.itemValue;
+      if (this.itemValue.indexOf('@') == -1) {
+        this.currentItem.value = '@' + this.itemValue;
+      } else {
+        this.currentItem.value = this.itemValue;
+      }
       this.itemValueVisible = false;
       this.mockVariableFuncs = [];
+      this.$emit('advancedRefresh', this.currentItem.value);
+
     }
   }
 }

From da869a97d213e319f308814478e222b134dc4298 Mon Sep 17 00:00:00 2001
From: "Melissa.Lu" <Melissa.Lu@fanruan.com>
Date: Fri, 3 Dec 2021 13:43:22 +0800
Subject: [PATCH 051/256] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=8E=8B?=
 =?UTF-8?q?=E6=B5=8B=E4=B8=AD=E5=9B=A0=E4=B8=BA=E7=BD=91=E7=BB=9C=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0=E5=AF=BC=E8=87=B4=E7=9A=84jmx=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit beafdc1b3164fab238e0244e693535cbb27646e7)
---
 .../performance/service/JmeterFileService.java      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java b/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java
index 95019dfc56..292f6dd410 100644
--- a/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java
+++ b/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java
@@ -20,6 +20,8 @@ import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import static org.python.modules.time.Time.sleep;
+
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class JmeterFileService {
@@ -30,7 +32,16 @@ public class JmeterFileService {
 
     public byte[] downloadZip(String reportId, double[] ratios, int resourceIndex) {
         try {
-            LoadTestReportWithBLOBs loadTestReport = loadTestReportMapper.selectByPrimaryKey(reportId);
+            LoadTestReportWithBLOBs loadTestReport = null;
+            double waitingSeconds = 0;
+            while (loadTestReport == null) {
+                if (waitingSeconds > 12000) {
+                    break;
+                }
+                sleep(0.3);
+                waitingSeconds += 0.3;
+                loadTestReport = loadTestReportMapper.selectByPrimaryKey(reportId);
+            }
             if (loadTestReport == null) {
                 MSException.throwException("测试报告不存在或还没产生");
             }

From 879f4d3062168ff5ffa94dabda9c55aecffc7d51 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 3 Dec 2021 17:58:09 +0800
Subject: [PATCH 052/256] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE):=20=E7=94=A8=E6=88=B7=E7=BB=84=E4=B8=8E=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/api/automation/ApiAutomation.vue | 4 ++--
 .../business/components/api/definition/ApiDefinition.vue | 4 ++--
 frontend/src/business/components/task/TaskCenter.vue     | 2 +-
 frontend/src/business/components/track/case/TestCase.vue | 4 ++--
 frontend/src/i18n/en-US.js                               | 9 +++++++--
 frontend/src/i18n/zh-CN.js                               | 5 +++++
 frontend/src/i18n/zh-TW.js                               | 5 +++++
 7 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index 6fd091c1b3..65fccaa33a 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -315,7 +315,7 @@ export default {
         }
       })
       if (message !== "") {
-        this.$alert("场景[ " + message.substr(0, message.length - 1) + " ]未保存，是否确认关闭全部？", '', {
+        this.$alert(this.$t('commons.scenario') + " [ " + message.substr(0, message.length - 1) + " ] " + this.$t('commons.confirm_info'), '', {
           confirmButtonText: this.$t('commons.confirm'),
           cancelButtonText: this.$t('commons.cancel'),
           callback: (action) => {
@@ -358,7 +358,7 @@ export default {
     closeConfirm(targetName) {
       let t = this.tabs.filter(tab => tab.name === targetName);
       if (t && this.$store.state.scenarioMap.has(t[0].currentScenario.id) && this.$store.state.scenarioMap.get(t[0].currentScenario.id) > 1) {
-        this.$alert("场景[ " + t[0].currentScenario.name + " ]未保存，是否确认关闭？", '', {
+        this.$alert(this.$t('commons.scenario') + " [ " + t[0].currentScenario.name + " ] " + this.$t('commons.confirm_info'), '', {
           confirmButtonText: this.$t('commons.confirm'),
           cancelButtonText: this.$t('commons.cancel'),
           callback: (action) => {
diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index 3b8ed9b00a..0479c23693 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -544,7 +544,7 @@ export default {
         }
       })
       if (message !== "") {
-        this.$alert("接口[ " + message.substr(0, message.length - 1) + " ]未保存，是否确认关闭全部？", '', {
+        this.$alert(this.$t('commons.api') + " [ " + message.substr(0, message.length - 1) + " ] " + this.$t('commons.confirm_info'), '', {
           confirmButtonText: this.$t('commons.confirm'),
           cancelButtonText: this.$t('commons.cancel'),
           callback: (action) => {
@@ -569,7 +569,7 @@ export default {
           if (t.api && this.$store.state.apiMap.size > 0 && this.$store.state.apiMap.has(t.api.id)) {
             if (this.$store.state.apiMap.get(t.api.id).get("responseChange") === true || this.$store.state.apiMap.get(t.api.id).get("requestChange") === true ||
               this.$store.state.apiMap.get(t.api.id).get("fromChange") === true) {
-              this.$alert("接口[ " + t.api.name + " ]未保存，是否确认关闭？", '', {
+              this.$alert(this.$t('commons.api') + " [ " + t.api.name + " ] " + this.$t('commons.confirm_info'), '', {
                 confirmButtonText: this.$t('commons.confirm'),
                 cancelButtonText: this.$t('commons.cancel'),
                 callback: (action) => {
diff --git a/frontend/src/business/components/task/TaskCenter.vue b/frontend/src/business/components/task/TaskCenter.vue
index cb56c52596..9780d3fa69 100644
--- a/frontend/src/business/components/task/TaskCenter.vue
+++ b/frontend/src/business/components/task/TaskCenter.vue
@@ -99,7 +99,7 @@
               </el-button>
               <br/>
               <span>
-                  执行器：{{ item.actuator }} 由 {{ item.executor }} {{
+                  {{ $t('commons.actuator') }}：{{ item.actuator }} {{ $t('commons.from') }} {{ item.executor }} {{
                   item.executionTime | timestampFormatDate
                 }} {{ getMode(item.triggerMode) }}
               </span>
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index e3d0d23c15..590e3d2512 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -309,7 +309,7 @@ export default {
         }
       })
       if (message !== "") {
-        this.$alert("用例[ " + message.substr(0, message.length - 1) + " ]未保存，是否确认关闭全部？", '', {
+        this.$alert(this.$t('commons.track') + " [ " + message.substr(0, message.length - 1) + " ] " + this.$t('commons.confirm_info'), '', {
           confirmButtonText: this.$t('commons.confirm'),
           cancelButtonText: this.$t('commons.cancel'),
           callback: (action) => {
@@ -330,7 +330,7 @@ export default {
     closeConfirm(targetName) {
       let t = this.tabs.filter(tab => tab.name === targetName);
       if (t && this.$store.state.testCaseMap.has(t[0].testCaseInfo.id) && this.$store.state.testCaseMap.get(t[0].testCaseInfo.id) > 1) {
-        this.$alert("用例[ " + t[0].testCaseInfo.name + " ]未保存，是否确认关闭？", '', {
+        this.$alert(this.$t('commons.track') + " [ " + t[0].testCaseInfo.name + " ] " + this.$t('commons.confirm_info'), '', {
           confirmButtonText: this.$t('commons.confirm'),
           cancelButtonText: this.$t('commons.cancel'),
           callback: (action) => {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index cabf7af946..acd569fa85 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -53,6 +53,11 @@ export default {
     delete_cancel: 'Deleted Cancel',
     confirm: 'Confirm',
     cancel: 'Cancel',
+    from: 'from',
+    scenario: 'Scenario',
+    track: 'Case',
+    actuator: 'Actuator',
+    confirm_info: 'Not saved, are you sure to close?',
     prompt: 'Prompt',
     operating: 'Operating',
     input_limit: 'Within {0} and {1} characters',
@@ -669,7 +674,7 @@ export default {
     env_desc: 'Project operating environment',
     file_desc: 'Jar package and resource file management',
     log_desc: 'The whole operation process of the project',
-    group_desc: 'Add user groups and permissions and global configuration',
+    group_desc: 'Add user groups and global configuration',
     code_segment_desc: 'Custom code snippet',
     test_case_custom_id: 'Test Case Custom ID',
     scenario_custom_id: 'Scenario Custom ID',
@@ -1483,7 +1488,7 @@ export default {
         success: "Success",
         rate: {
           completion: "Completion rate",
-          coverage: "Coverage rate",
+          coverage: "Coverage",
           pass: "Pass rate",
           success: "Success rate",
           interface_coverage: "Interface coverage",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 4386830737..e832e2846d 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -54,6 +54,11 @@ export default {
     option_cannot_spread_pages: '这个操作不支持跨页，是否继续？',
     confirm: '确定',
     cancel: '取消',
+    scenario: '场景',
+    confirm_info: '未保存，是否确认关闭？',
+    track: '用例',
+    actuator: '执行器',
+    from: '由',
     prompt: '提示',
     operating: '操作',
     input_limit: '长度在 {0} 到 {1} 个字符',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 1ae950b945..503ef39b20 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -54,6 +54,11 @@ export default {
     option_cannot_spread_pages: '這個操作不支持跨頁，是否繼續？',
     confirm: '確定',
     cancel: '取消',
+    scenario: '場景',
+    confirm_info: '未保存，是否確認關閉？',
+    track: '用例',
+    actuator: '執行器',
+    from: '由',
     prompt: '提示',
     operating: '操作',
     input_limit: '長度在 {0} 到 {1} 個字符',

From 07bfc96e9436b279c2d82720135f6c7d5c9b79d1 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Sat, 4 Dec 2021 20:47:55 +0800
Subject: [PATCH 053/256] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96tcp?=
 =?UTF-8?q?=EF=BC=8Cdubbo=20sql=E8=AE=BE=E7=BD=AE=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/complete/BasisApi.vue          |  19 +-
 .../complete/EditCompleteDubboApi.vue         | 203 +++++++++++-------
 .../complete/EditCompleteSQLApi.vue           |  60 +++++-
 .../complete/EditCompleteTCPApi.vue           | 128 +++++++----
 .../components/complete/TCPBasicApi.vue       |  20 +-
 5 files changed, 273 insertions(+), 157 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/complete/BasisApi.vue b/frontend/src/business/components/api/definition/components/complete/BasisApi.vue
index 72254940a8..d834a52686 100644
--- a/frontend/src/business/components/api/definition/components/complete/BasisApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/BasisApi.vue
@@ -45,28 +45,13 @@
             <ms-input-tag :currentScenario="basicForm" ref="tag"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item :label="$t('api_test.automation.follow_people')" prop="followPeople">
-            <el-select v-model="basicForm.follows"
-                       clearable multiple
-                       :placeholder="$t('api_test.automation.follow_people')" filterable size="small"
-                       class="ms-http-textarea">
-              <el-option
-                v-for="item in maintainerOptions"
-                :key="item.id"
-                :label="item.id + ' (' + item.name + ')'"
-                :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item :label="$t('commons.description')" prop="description">
             <el-input class="ms-http-textarea"
                       v-model="basicForm.description"
                       type="textarea"
-                      :autosize="{ minRows: 2, maxRows: 10}"
-                      :rows="2" size="small"/>
+                      :autosize="{ minRows: 1, maxRows: 10}"
+                      :rows="1" size="small"/>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteDubboApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteDubboApi.vue
index 7d4870f215..b06328cdbc 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteDubboApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteDubboApi.vue
@@ -6,6 +6,14 @@
       <el-col>
         <!--操作按钮-->
         <div style="float: right;margin-right: 20px;margin-top: 20px" class="ms-opt-btn">
+          <el-tooltip :content="$t('commons.follow')" placement="bottom" effect="dark" v-if="!showFollow">
+            <i class="el-icon-star-off" style="color: #783987; font-size: 25px; margin-right: 5px; position: relative; top: 5px; cursor: pointer "
+               @click="saveFollow"/>
+          </el-tooltip>
+          <el-tooltip :content="$t('commons.cancel')" placement="bottom" effect="dark" v-if="showFollow">
+            <i class="el-icon-star-on" style="color: #783987; font-size: 28px; margin-right: 5px; position: relative; top: 5px; cursor: pointer "
+               @click="saveFollow"/>
+          </el-tooltip>
           <el-link type="primary" style="margin-right: 20px" @click="openHis" v-if="basisData.id">
             {{ $t('operating_log.change_history') }}
           </el-link>
@@ -33,90 +41,131 @@
 </template>
 
 <script>
-  import MsBasisApi from "./BasisApi";
-  import MsBasisParameters from "../request/dubbo/BasisParameters";
-  import MsChangeHistory from "../../../../history/ChangeHistory";
-  import ApiOtherInfo from "@/business/components/api/definition/components/complete/ApiOtherInfo";
+import MsBasisApi from "./BasisApi";
+import MsBasisParameters from "../request/dubbo/BasisParameters";
+import MsChangeHistory from "../../../../history/ChangeHistory";
+import ApiOtherInfo from "@/business/components/api/definition/components/complete/ApiOtherInfo";
+import {getCurrentUser} from "@/common/js/utils";
 
-  export default {
-    name: "MsApiDubboRequestForm",
-    components: {
-      ApiOtherInfo,
-      MsBasisApi, MsBasisParameters,MsChangeHistory
+export default {
+  name: "MsApiDubboRequestForm",
+  components: {
+    ApiOtherInfo,
+    MsBasisApi, MsBasisParameters, MsChangeHistory
+  },
+  props: {
+    request: {},
+    basisData: {},
+    moduleOptions: Array,
+    isReadOnly: {
+      type: Boolean,
+      default: false
     },
-    props: {
-      request: {},
-      basisData: {},
-      moduleOptions: Array,
-      isReadOnly: {
-        type: Boolean,
-        default: false
-      },
-      syncTabs: Array,
+    syncTabs: Array,
+  },
+  watch: {
+    syncTabs() {
+      if (this.basisData && this.syncTabs && this.syncTabs.includes(this.basisData.id)) {
+        // 标示接口在其他地方更新过，当前页面需要同步
+        let url = "/api/definition/get/";
+        this.$get(url + this.basisData.id, response => {
+          if (response.data) {
+            let request = JSON.parse(response.data.request);
+            let index = this.syncTabs.findIndex(item => {
+              if (item === this.basisData.id) {
+                return true;
+              }
+            })
+            this.syncTabs.splice(index, 1);
+            Object.assign(this.request, request);
+          }
+        });
+      }
+    }
+  },
+  created() {
+    this.$get('/api/definition/follow/' + this.basisData.id, response => {
+      this.basisData.follows = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if (response.data[i] === getCurrentUser().id) {
+          this.showFollow = true;
+          break;
+        }
+      }
+    });
+  },
+  data() {
+    return {
+      validated: false,
+      showFollow: false
+    }
+  },
+  methods: {
+    openHis() {
+      this.$refs.changeHistory.open(this.basisData.id, ["接口定义", "接口定義", "Api definition"]);
     },
-    watch: {
-      syncTabs() {
-        if (this.basisData && this.syncTabs && this.syncTabs.includes(this.basisData.id)) {
-          // 标示接口在其他地方更新过，当前页面需要同步
-          let url = "/api/definition/get/";
-          this.$get(url + this.basisData.id, response => {
-            if (response.data) {
-              let request = JSON.parse(response.data.request);
-              let index = this.syncTabs.findIndex(item => {
-                if (item === this.basisData.id) {
-                  return true;
-                }
-              })
-              this.syncTabs.splice(index, 1);
-              Object.assign(this.request, request);
-            }
+    callback() {
+      this.validated = true;
+    },
+    validateApi() {
+      this.validated = false;
+      this.basisData.method = this.request.protocol;
+      this.$refs['basicForm'].validate();
+    },
+    saveApi() {
+      this.validateApi();
+      if (this.validated) {
+        this.basisData.request = this.request;
+        if (this.basisData.tags instanceof Array) {
+          this.basisData.tags = JSON.stringify(this.basisData.tags);
+        }
+        this.$emit('saveApi', this.basisData);
+      }
+    },
+    runTest() {
+      this.validateApi();
+      if (this.validated) {
+        this.basisData.request = this.request;
+        if (this.basisData.tags instanceof Array) {
+          this.basisData.tags = JSON.stringify(this.basisData.tags);
+        }
+        this.$emit('runTest', this.basisData);
+      }
+    },
+    createRootModelInTree() {
+      this.$emit("createRootModelInTree");
+    },
+    saveFollow() {
+      if (this.showFollow) {
+        this.showFollow = false;
+        for (let i = 0; i < this.basisData.follows.length; i++) {
+          if (this.basisData.follows[i] === getCurrentUser().id) {
+            this.basisData.follows.splice(i, 1)
+            break;
+          }
+        }
+        if (this.basisData.id) {
+          this.$post("/api/definition/update/follows/" + this.basisData.id, this.basisData.follows, () => {
+            this.$success(this.$t('commons.cancel_follow_success'));
+          });
+        }
+      } else {
+        this.showFollow = true;
+        if (!this.basisData.follows) {
+          this.basisData.follows = [];
+        }
+        this.basisData.follows.push(getCurrentUser().id)
+        if (this.basisData.id) {
+          this.$post("/api/definition/update/follows/" + this.basisData.id, this.basisData.follows, () => {
+            this.$success(this.$t('commons.follow_success'));
           });
         }
       }
-    },
+    }
+  },
 
-    data() {
-      return {validated: false}
-    },
-    methods: {
-      openHis(){
-        this.$refs.changeHistory.open(this.basisData.id,["接口定义" , "接口定義" , "Api definition"]);
-      },
-      callback() {
-        this.validated = true;
-      },
-      validateApi() {
-        this.validated = false;
-        this.basisData.method = this.request.protocol;
-        this.$refs['basicForm'].validate();
-      },
-      saveApi() {
-        this.validateApi();
-        if (this.validated) {
-          this.basisData.request = this.request;
-          if (this.basisData.tags instanceof Array) {
-            this.basisData.tags = JSON.stringify(this.basisData.tags);
-          }
-          this.$emit('saveApi', this.basisData);
-        }
-      },
-      runTest() {
-        this.validateApi();
-        if (this.validated) {
-          this.basisData.request = this.request;
-          if (this.basisData.tags instanceof Array) {
-            this.basisData.tags = JSON.stringify(this.basisData.tags);
-          }
-          this.$emit('runTest', this.basisData);
-        }
-      },
-      createRootModelInTree() {
-        this.$emit("createRootModelInTree");
-      },
-    },
-
-    computed: {}
-  }
+  computed: {}
+}
 </script>
 
 <style scoped>
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteSQLApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteSQLApi.vue
index ccb36d8e2c..d3d1f6fc15 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteSQLApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteSQLApi.vue
@@ -5,6 +5,14 @@
       <el-col>
         <!--操作按钮-->
         <div style="float: right;margin-right: 20px;margin-top: 20px" class="ms-opt-btn">
+          <el-tooltip :content="$t('commons.follow')" placement="bottom" effect="dark" v-if="!showFollow">
+            <i class="el-icon-star-off" style="color: #783987; font-size: 25px; margin-right: 5px; position: relative; top: 5px; cursor: pointer "
+               @click="saveFollow"/>
+          </el-tooltip>
+          <el-tooltip :content="$t('commons.cancel')" placement="bottom" effect="dark" v-if="showFollow">
+            <i class="el-icon-star-on" style="color: #783987; font-size: 28px; margin-right: 5px; position: relative; top: 5px; cursor: pointer "
+               @click="saveFollow"/>
+          </el-tooltip>
           <el-link type="primary" style="margin-right: 20px" @click="openHis" v-if="basisData.id">
             {{ $t('operating_log.change_history') }}
           </el-link>
@@ -38,12 +46,13 @@ import MsBasisApi from "./BasisApi";
 import MsBasisParameters from "../request/database/BasisParameters";
 import MsChangeHistory from "../../../../history/ChangeHistory";
 import ApiOtherInfo from "@/business/components/api/definition/components/complete/ApiOtherInfo";
+import {getCurrentUser} from "@/common/js/utils";
 
 export default {
   name: "MsApiSqlRequestForm",
   components: {
     ApiOtherInfo,
-    MsBasisApi, MsBasisParameters,MsChangeHistory
+    MsBasisApi, MsBasisParameters, MsChangeHistory
   },
   props: {
     request: {},
@@ -53,7 +62,7 @@ export default {
       type: Boolean,
       default: false
     },
-    syncTabs:{},
+    syncTabs: {},
   },
   watch: {
     syncTabs() {
@@ -76,11 +85,25 @@ export default {
     }
   },
   data() {
-    return {validated: false}
+    return {
+      validated: false,
+      showFollow: false
+    }
+  },
+  created() {
+    this.$get('/api/definition/follow/' + this.basisData.id, response => {
+      this.basisData.follows = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if (response.data[i] === getCurrentUser().id) {
+          this.showFollow = true;
+          break;
+        }
+      }
+    });
   },
   methods: {
-    openHis(){
-      this.$refs.changeHistory.open(this.basisData.id,["接口定义" , "接口定義" , "Api definition"]);
+    openHis() {
+      this.$refs.changeHistory.open(this.basisData.id, ["接口定义", "接口定義", "Api definition"]);
     },
     callback() {
       this.validated = true;
@@ -113,6 +136,33 @@ export default {
     createRootModelInTree() {
       this.$emit("createRootModelInTree");
     },
+    saveFollow() {
+      if (this.showFollow) {
+        this.showFollow = false;
+        for (let i = 0; i < this.basisData.follows.length; i++) {
+          if (this.basisData.follows[i] === getCurrentUser().id) {
+            this.basisData.follows.splice(i, 1)
+            break;
+          }
+        }
+        if (this.basisData.id) {
+          this.$post("/api/definition/update/follows/" + this.basisData.id, this.basisData.follows, () => {
+            this.$success(this.$t('commons.cancel_follow_success'));
+          });
+        }
+      } else {
+        this.showFollow = true;
+        if (!this.basisData.follows) {
+          this.basisData.follows = [];
+        }
+        this.basisData.follows.push(getCurrentUser().id)
+        if (this.basisData.id) {
+          this.$post("/api/definition/update/follows/" + this.basisData.id, this.basisData.follows, () => {
+            this.$success(this.$t('commons.follow_success'));
+          });
+        }
+      }
+    }
   },
 }
 </script>
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteTCPApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteTCPApi.vue
index 6d81ecfc92..26570b4043 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteTCPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteTCPApi.vue
@@ -5,6 +5,14 @@
       <el-col>
         <!--操作按钮-->
         <div style="float: right;margin-right: 20px;margin-top: 20px" class="ms-opt-btn">
+          <el-tooltip :content="$t('commons.follow')" placement="bottom" effect="dark" v-if="!showFollow">
+            <i class="el-icon-star-off" style="color: #783987; font-size: 25px; margin-right: 5px; position: relative; top: 5px; cursor: pointer "
+               @click="saveFollow"/>
+          </el-tooltip>
+          <el-tooltip :content="$t('commons.cancel')" placement="bottom" effect="dark" v-if="showFollow">
+            <i class="el-icon-star-on" style="color: #783987; font-size: 28px; margin-right: 5px; position: relative; top: 5px; cursor: pointer "
+               @click="saveFollow"/>
+          </el-tooltip>
           <el-link type="primary" style="margin-right: 20px" @click="openHis" v-if="basisData.id">
             {{ $t('operating_log.change_history') }}
           </el-link>
@@ -17,8 +25,9 @@
     <br/>
     <el-row>
       <el-col>
-        <ms-tcp-basic-api :method-types="methodTypes" @createRootModelInTree="createRootModelInTree" :moduleOptions="moduleOptions" :basisData="basisData" ref="basicForm"
-          @changeApiProtocol="changeApiProtocol" @callback="callback"/>
+        <ms-tcp-basic-api :method-types="methodTypes" @createRootModelInTree="createRootModelInTree" :moduleOptions="moduleOptions"
+                          :basisData="basisData" ref="basicForm"
+                          @changeApiProtocol="changeApiProtocol" @callback="callback"/>
       </el-col>
     </el-row>
     <!-- MOCK信息 -->
@@ -30,7 +39,7 @@
           <el-link v-if="this.mockInfo !== '' " target="_blank" style="color: black"
                    type="primary">{{ this.mockInfo }}
           </el-link>
-          <el-link v-else  target="_blank" style="color: darkred"
+          <el-link v-else target="_blank" style="color: darkred"
                    type="primary">当前项目未开启Mock服务
           </el-link>
         </el-col>
@@ -42,15 +51,15 @@
     <!-- 请求参数 -->
     <div v-if="apiProtocol=='TCP'">
       <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
-<!--      <ms-basis-parameters :show-script="false" :request="request"/>-->
+      <!--      <ms-basis-parameters :show-script="false" :request="request"/>-->
       <ms-tcp-format-parameters :show-script="false" :request="request" ref="tcpFormatParameter"/>
     </div>
     <div v-else-if="apiProtocol=='ESB'">
       <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
       <esb-definition v-xpack v-if="showXpackCompnent" :show-script="false" :request="request" ref="esbDefinition"/>
-      <p class="tip">{{$t('api_test.definition.request.res_param')}}</p>
-      <esb-definition-response v-xpack v-if="showXpackCompnent" :is-api-component="true" :show-options-button="true" :request="request" />
-<!--      <api-response-component :currentProtocol="apiCase.request.protocol" :api-item="apiCase"/>-->
+      <p class="tip">{{ $t('api_test.definition.request.res_param') }}</p>
+      <esb-definition-response v-xpack v-if="showXpackCompnent" :is-api-component="true" :show-options-button="true" :request="request"/>
+      <!--      <api-response-component :currentProtocol="apiCase.request.protocol" :api-item="apiCase"/>-->
     </div>
     <api-other-info :api="basisData"/>
 
@@ -62,20 +71,21 @@
 
 <script>
 import MsTcpBasicApi from "./TCPBasicApi";
-import MsTcpFormatParameters from  "../request/tcp/TcpFormatParameters";
+import MsTcpFormatParameters from "../request/tcp/TcpFormatParameters";
 import MsChangeHistory from "../../../../history/ChangeHistory";
-import {hasLicense, getCurrentProjectID, getUUID} from "@/common/js/utils";
+import {hasLicense, getCurrentProjectID, getUUID, getCurrentUser} from "@/common/js/utils";
 import ApiOtherInfo from "@/business/components/api/definition/components/complete/ApiOtherInfo";
 
 const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
-const esbDefinition = (requireComponent!=null&&requireComponent.keys().length) > 0 ? requireComponent("./apidefinition/EsbDefinition.vue") : {};
-const esbDefinitionResponse = (requireComponent!=null&&requireComponent.keys().length) > 0 ? requireComponent("./apidefinition/EsbDefinitionResponse.vue") : {};
+const esbDefinition = (requireComponent != null && requireComponent.keys().length) > 0 ? requireComponent("./apidefinition/EsbDefinition.vue") : {};
+const esbDefinitionResponse = (requireComponent != null && requireComponent.keys().length) > 0 ? requireComponent("./apidefinition/EsbDefinitionResponse.vue") : {};
 export default {
   name: "MsAddCompleteTcpApi",
   components: {
-    ApiOtherInfo, MsTcpBasicApi, MsTcpFormatParameters,MsChangeHistory,
+    ApiOtherInfo, MsTcpBasicApi, MsTcpFormatParameters, MsChangeHistory,
     "esbDefinition": esbDefinition.default,
-    "esbDefinitionResponse": esbDefinitionResponse.default},
+    "esbDefinitionResponse": esbDefinitionResponse.default
+  },
   props: {
     request: {},
     basisData: {},
@@ -84,41 +94,51 @@ export default {
       type: Boolean,
       default: false
     },
-    syncTabs:Array,
+    syncTabs: Array,
   },
   data() {
     return {
       validated: false,
       apiProtocol: "TCP",
       mockInfo: "",
-      methodTypes:[
+      showFollow: false,
+      methodTypes: [
         {
-          'key':"TCP",
-          'value':this.$t('api_test.request.tcp.general_format'),
+          'key': "TCP",
+          'value': this.$t('api_test.request.tcp.general_format'),
         }
       ],
-      showXpackCompnent:false,
+      showXpackCompnent: false,
     }
   },
   created: function () {
-    if(this.basisData.method != 'TCP'&& this.basisData.method != 'ESB'){
+    if (this.basisData.method != 'TCP' && this.basisData.method != 'ESB') {
       this.basisData.method = this.basisData.protocol;
     }
     this.apiProtocol = this.basisData.method;
-    if(this.apiProtocol == null || this.apiProtocol == "" ){
+    if (this.apiProtocol == null || this.apiProtocol == "") {
       this.apiProtocol = "TCP";
     }
-    if (requireComponent != null && JSON.stringify(esbDefinition) != '{}'&& JSON.stringify(esbDefinitionResponse) != '{}') {
+    if (requireComponent != null && JSON.stringify(esbDefinition) != '{}' && JSON.stringify(esbDefinitionResponse) != '{}') {
       this.showXpackCompnent = true;
-      if(hasLicense()){
-        if(this.methodTypes.length == 1){
+      if (hasLicense()) {
+        if (this.methodTypes.length == 1) {
           let esbMethodType = {};
           esbMethodType.key = "ESB";
-          esbMethodType.value="ESB";
+          esbMethodType.value = "ESB";
           this.methodTypes.push(esbMethodType);
         }
       }
     }
+    this.$get('/api/definition/follow/' + this.basisData.id, response => {
+      this.basisData.follows = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if (response.data[i] === getCurrentUser().id) {
+          this.showFollow = true;
+          break;
+        }
+      }
+    });
     this.getMockInfo();
   },
   watch: {
@@ -142,8 +162,8 @@ export default {
     },
   },
   methods: {
-    openHis(){
-      this.$refs.changeHistory.open(this.basisData.id,["接口定义" , "接口定義" , "Api definition"]);
+    openHis() {
+      this.$refs.changeHistory.open(this.basisData.id, ["接口定义", "接口定義", "Api definition"]);
     },
     callback() {
       this.validated = true;
@@ -159,23 +179,23 @@ export default {
         if (this.basisData.tags instanceof Array) {
           this.basisData.tags = JSON.stringify(this.basisData.tags);
         }
-        if(this.basisData.method == 'ESB'){
+        if (this.basisData.method == 'ESB') {
           let validataResult = this.$refs.esbDefinition.validateEsbDataStruct(this.request.esbDataStruct);
-          if(!validataResult){
+          if (!validataResult) {
             return;
           }
-          if(this.request.esbDataStruct != null){
+          if (this.request.esbDataStruct != null) {
             this.esbDataStruct = JSON.stringify(this.request.esbDataStruct);
             this.basisData.esbDataStruct = this.esbDataStruct;
           }
-          if(this.request.backEsbDataStruct != null){
+          if (this.request.backEsbDataStruct != null) {
             this.basisData.backEsbDataStruct = JSON.stringify(this.request.backEsbDataStruct);
           }
-          if(this.request.backScript != null){
+          if (this.request.backScript != null) {
             this.basisData.backScript = JSON.stringify(this.request.backScript);
           }
-        }else{
-          if(this.$refs.tcpFormatParameter){
+        } else {
+          if (this.$refs.tcpFormatParameter) {
             this.$refs.tcpFormatParameter.validateXmlDataStruct();
           }
         }
@@ -204,8 +224,8 @@ export default {
           if (this.request.backScript != null) {
             this.basisData.backScript = JSON.stringify(this.request.backScript);
           }
-        }else{
-          if(this.$refs.tcpFormatParameter){
+        } else {
+          if (this.$refs.tcpFormatParameter) {
             this.$refs.tcpFormatParameter.validateXmlDataStruct();
           }
         }
@@ -215,22 +235,49 @@ export default {
     createRootModelInTree() {
       this.$emit("createRootModelInTree");
     },
-    changeApiProtocol(protocol){
+    changeApiProtocol(protocol) {
       this.apiProtocol = protocol;
     },
-    getMockInfo(){
+    getMockInfo() {
       let projectId = getCurrentProjectID();
       this.$get("/api/environment/getTcpMockInfo/" + projectId, response => {
         this.mockInfo = response.data;
       });
     },
     mockSetting() {
-      if(this.basisData.id){
-        this.$emit('changeTab','mock');
-      }else {
+      if (this.basisData.id) {
+        this.$emit('changeTab', 'mock');
+      } else {
         this.$alert(this.$t('api_test.mock.create_error'));
       }
     },
+    saveFollow() {
+      if (this.showFollow) {
+        this.showFollow = false;
+        for (let i = 0; i < this.basisData.follows.length; i++) {
+          if (this.basisData.follows[i] === getCurrentUser().id) {
+            this.basisData.follows.splice(i, 1)
+            break;
+          }
+        }
+        if (this.basisData.id) {
+          this.$post("/api/definition/update/follows/" + this.basisData.id, this.basisData.follows, () => {
+            this.$success(this.$t('commons.cancel_follow_success'));
+          });
+        }
+      } else {
+        this.showFollow = true;
+        if (!this.basisData.follows) {
+          this.basisData.follows = [];
+        }
+        this.basisData.follows.push(getCurrentUser().id)
+        if (this.basisData.id) {
+          this.$post("/api/definition/update/follows/" + this.basisData.id, this.basisData.follows, () => {
+            this.$success(this.$t('commons.follow_success'));
+          });
+        }
+      }
+    }
   },
 }
 </script>
@@ -239,6 +286,7 @@ export default {
 .mock-info {
   margin: 20px 45px;
 }
+
 .ms-opt-btn {
   position: fixed;
   right: 50px;
diff --git a/frontend/src/business/components/api/definition/components/complete/TCPBasicApi.vue b/frontend/src/business/components/api/definition/components/complete/TCPBasicApi.vue
index e7a80586bb..e66e7f06ef 100644
--- a/frontend/src/business/components/api/definition/components/complete/TCPBasicApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/TCPBasicApi.vue
@@ -52,29 +52,13 @@
             <ms-input-tag :currentScenario="basicForm" ref="tag"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item :label="$t('api_test.automation.follow_people')" prop="followPeople">
-            <el-select v-model="basicForm.follows"
-                       clearable
-                       multiple
-                       :placeholder="$t('api_test.automation.follow_people')" filterable size="small"
-                       class="ms-http-textarea">
-              <el-option
-                  v-for="item in maintainerOptions"
-                  :key="item.id"
-                  :label="item.id + ' (' + item.name + ')'"
-                  :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item :label="$t('commons.description')" prop="description">
             <el-input class="ms-http-textarea"
                       v-model="basicForm.description"
                       type="textarea"
-                      :autosize="{ minRows: 2, maxRows: 10}"
-                      :rows="2" size="small"/>
+                      :autosize="{ minRows: 1, maxRows: 10}"
+                      :rows="1" size="small"/>
           </el-form-item>
         </el-col>
       </el-row>

From 1c35572370bab8a3764501ea9bd46766f24f723f Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 6 Dec 2021 11:10:18 +0800
Subject: [PATCH 054/256] =?UTF-8?q?refactor:=20=E5=85=B3=E9=97=ADSqlSessio?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/service/EnvironmentGroupService.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java b/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
index 78018ebd7c..4fd4cac6c1 100644
--- a/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
+++ b/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -90,6 +91,9 @@ public class EnvironmentGroupService {
             mapper.insert(e);
         }
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     public List<EnvironmentGroup> getList(EnvironmentGroupRequest request) {
@@ -195,6 +199,9 @@ public class EnvironmentGroupService {
             mapper.insertSelective(environmentGroupProject);
         }
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     public void modify(EnvironmentGroupRequest request) {
@@ -250,6 +257,9 @@ public class EnvironmentGroupService {
             }
         }
         sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
     }
 
     public List<EnvironmentGroupDTO> getEnvOptionGroup(List<String> projectIds) {

From 7f18cf17cdebe4bd42c2be40cc8ae9f6fa0340bf Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 6 Dec 2021 11:32:40 +0800
Subject: [PATCH 055/256] =?UTF-8?q?perf(=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=A8=A1=E6=9D=BF=E4=BC=98=E5=8C=96):=20=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=9F=A5=E6=A8=A1=E6=9D=BF=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?-=E5=8A=A0=E6=96=87=E6=9C=AC=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 消息通知模板优化-加文本说明
---
 .../schedule/ScheduleNotification.vue         | 140 ++++++++---
 .../api/ApiAutomationNotification.vue         | 140 ++++++++---
 .../api/ApiDefinitionNotification.vue         | 220 ++++++++++++++----
 .../components/api/ApiHomeNotification.vue    |  76 ++++--
 .../components/api/ApiReportNotification.vue  | 125 ++++++++--
 .../PerformanceReportNotification.vue         |  95 ++++++--
 .../PerformanceTestNotification.vue           |  75 ++++--
 .../track/DefectTaskNotification.vue          |  70 ++++--
 .../components/track/TestCaseNotification.vue | 140 ++++++++---
 .../track/TestPlanTaskNotification.vue        | 100 ++++++--
 .../track/TestReviewNotification.vue          |  60 ++++-
 .../track/TrackHomeNotification.vue           |  80 +++++--
 .../track/TrackReportNotification.vue         |  85 +++++--
 frontend/src/i18n/en-US.js                    |  62 ++++-
 frontend/src/i18n/zh-CN.js                    |  63 ++++-
 frontend/src/i18n/zh-TW.js                    |  62 ++++-
 16 files changed, 1293 insertions(+), 300 deletions(-)

diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
index 1edf6d98f5..7b89f73188 100644
--- a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
+++ b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
@@ -182,35 +182,119 @@ export default {
         {value: 'LARK', label: this.$t('organization.message.lark')}
       ],
       variables: [
-        'operator',
-        'id',
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
         'reportUrl',
-        'projectId',
-        'tags',
-        'userId',
-        'apiScenarioModuleId',
-        'modulePath',
-        'name',
-        'level',
-        'status',
-        'principal',
-        'stepTotal',
-        'schedule',
-        'createTime',
-        'updateTime',
-        'passRate',
-        'lastResult',
-        'reportId',
-        'num',
-        'originalState',
-        'customNum',
-        'createUser',
-        'version',
-        'deleteTime',
-        'deleteUserId',
-        'executeTimes',
-        'order',
-        'environment'
+        {
+          label:this.$t('project.id'),
+          value:'projectId',
+        },
+        {
+          label:this.$t('commons.tag'),
+          value:'tags',
+        },
+        {
+          label:this.$t('user.id'),
+          value:'userId',
+        },
+        {
+          label:this.$t('api_test.scenario.module_id'),
+          value:'apiScenarioModuleId',
+        },
+        {
+          label:this.$t('module.path'),
+          value:'modulePath',
+        },
+        {
+          label:this.$t('commons.name'),
+          value:'name',
+        },
+        {
+          label:this.$t('commons.level'),
+          value:'level',
+        },
+        {
+          label:this.$t('commons.status'),
+          value:'status',
+        },
+        {
+          label:this.$t('api_test.automation.scenario.principal'),
+          value:'principal',
+        },
+        {
+          label:this.$t('api_test.automation.step_total'),
+          value:'stepTotal',
+        },
+        {
+          label:this.$t('api_test.automation.schedule'),
+          value:'schedule',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('test_track.pass_rate'),
+          value:'passRate',
+        },
+        {
+          label:this.$t('api_test.automation.last_result'),
+          value:'lastResult',
+        },
+        {
+          label:this.$t('report.id'),
+          value:'reportId',
+        },
+        {
+          label:this.$t('commons.num'),
+          value:'num',
+        },
+        {
+          label:this.$t('commons.original_state'),
+          value:'originalState',
+        },
+        {
+          label:this.$t('commons.custom_num'),
+          value:'customNum',
+        },
+        {
+          label:this.$t('commons.create_user'),
+          value:'createUser',
+        },
+        {
+          label:this.$t('commons.version'),
+          value:'version',
+        },
+        {
+          label:this.$t('commons.delete_time'),
+          value:'deleteTime',
+        },
+        {
+          label:this.$t('commons.delete_user_id'),
+          value:'deleteUserId',
+        },
+        {
+          label:this.$t('test_track.plan.execute_time'),
+          value:'executeTimes',
+        },
+        {
+          label:this.$t('api_test.definition.document.order'),
+          value:'order',
+        },
+        {
+          label:this.$t('api_test.environment.environment'),
+          value:'environment',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue
index 2dddf799f0..2423a39452 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue
@@ -178,34 +178,118 @@ export default {
         {value: 'EXECUTE_FAILED', label: this.$t('commons.run_fail')},
       ],
       variables: [
-        'operator',
-        'id',
-        'projectId',
-        'tags',
-        'userId',
-        'apiScenarioModuleId',
-        'modulePath',
-        'name',
-        'level',
-        'status',
-        'principal',
-        'stepTotal',
-        'schedule',
-        'createTime',
-        'updateTime',
-        'passRate',
-        'lastResult',
-        'reportId',
-        'num',
-        'originalState',
-        'customNum',
-        'createUser',
-        'version',
-        'deleteTime',
-        'deleteUserId',
-        'executeTimes',
-        'order',
-        'environment'
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
+        {
+          label:this.$t('project.id'),
+          value:'projectId',
+        },
+        {
+          label:this.$t('commons.tag'),
+          value:'tags',
+        },
+        {
+          label:this.$t('user.id'),
+          value:'userId',
+        },
+        {
+          label:this.$t('api_test.scenario.module_id'),
+          value:'apiScenarioModuleId',
+        },
+        {
+          label:this.$t('module.path'),
+          value:'modulePath',
+        },
+        {
+          label:this.$t('commons.name'),
+          value:'name',
+        },
+        {
+          label:this.$t('commons.level'),
+          value:'level',
+        },
+        {
+          label:this.$t('commons.status'),
+          value:'status',
+        },
+        {
+          label:this.$t('api_test.automation.scenario.principal'),
+          value:'principal',
+        },
+        {
+          label:this.$t('api_test.automation.step_total'),
+          value:'stepTotal',
+        },
+        {
+          label:this.$t('api_test.automation.schedule'),
+          value:'schedule',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('test_track.pass_rate'),
+          value:'passRate',
+        },
+        {
+          label:this.$t('api_test.automation.last_result'),
+          value:'lastResult',
+        },
+        {
+          label:this.$t('report.id'),
+          value:'reportId',
+        },
+        {
+          label:this.$t('commons.num'),
+          value:'num',
+        },
+        {
+          label:this.$t('commons.original_state'),
+          value:'originalState',
+        },
+        {
+          label:this.$t('commons.custom_num'),
+          value:'customNum',
+        },
+        {
+          label:this.$t('commons.create_user'),
+          value:'createUser',
+        },
+        {
+          label:this.$t('commons.version'),
+          value:'version',
+        },
+        {
+          label:this.$t('commons.delete_time'),
+          value:'deleteTime',
+        },
+        {
+          label:this.$t('commons.delete_user_id'),
+          value:'deleteUserId',
+        },
+        {
+          label:this.$t('test_track.plan.execute_time'),
+          value:'executeTimes',
+        },
+        {
+          label:this.$t('api_test.definition.document.order'),
+          value:'order',
+        },
+        {
+          label:this.$t('api_test.environment.environment'),
+          value:'environment',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue
index 0f76bb891e..d5a0b41ec9 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue
@@ -182,52 +182,184 @@ export default {
       ],
       variables: [],
       apiVariables: [
-        'operator',
-        'id',
-        'projectId',
-        'name',
-        'method',
-        'protocol',
-        'path',
-        'modulePath',
-        'environmentId',
-        'schedule',
-        'status',
-        'moduleId',
-        'userId',
-        'createTime',
-        'updateTime',
-        'num',
-        'tags',
-        'originalState',
-        'createUser',
-        'caseTotal',
-        'caseStatus',
-        'casePassingRate',
-        'deleteTime',
-        'deleteUserId',
-        'order'
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
+        {
+          label:this.$t('project.id'),
+          value:'projectId',
+        },
+        {
+          label:this.$t('commons.name'),
+          value:'name',
+        },
+        {
+          label:this.$t('api_test.request.method'),
+          value:'method',
+        },
+        {
+          label:this.$t('api_test.request.dubbo.protocol'),
+          value:'protocol',
+        },
+        {
+          label:this.$t('api_test.request.path'),
+          value:'path',
+        },
+        {
+          label:this.$t('module.path'),
+          value:'modulePath',
+        },
+        {
+          label:this.$t('api_test.environment.id'),
+          value:'environmentId',
+        },
+        {
+          label:this.$t('api_test.automation.schedule'),
+          value:'schedule',
+        },
+        {
+          label:this.$t('commons.status'),
+          value:'status',
+        },
+        {
+          label:this.$t('test_track.module.id'),
+          value:'moduleId',
+        },
+        {
+          label:this.$t('user.id'),
+          value:'userId',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('commons.num'),
+          value:'num',
+        },
+        {
+          label:this.$t('commons.tag'),
+          value:'tags',
+        },
+        {
+          label:this.$t('commons.original_state'),
+          value:'originalState',
+        },
+        {
+          label:this.$t('commons.create_user'),
+          value:'createUser',
+        },
+        {
+          label:this.$t('test_track.case.total'),
+          value:'caseTotal',
+        },
+        {
+          label:this.$t('test_track.case.status'),
+          value:'caseStatus',
+        },
+        {
+          label:this.$t('test_track.case.passing_rate'),
+          value:'casePassingRate',
+        },
+        {
+          label:this.$t('commons.delete_time'),
+          value:'deleteTime',
+        },
+        {
+          label:this.$t('commons.delete_user_id'),
+          value:'deleteUserId',
+        },
+        {
+          label:this.$t('api_test.definition.document.order'),
+          value:'order',
+        },
       ],
       caseVariables: [
-        'operator',
-        'id',
-        'projectId',
-        'name',
-        'priority',
-        'apiDefinitionId',
-        'createUserId',
-        'updateUserId',
-        'createTime',
-        'updateTime',
-        'num',
-        'tags',
-        'lastResultId',
-        'status',
-        'originalStatus',
-        'deleteTime',
-        'deleteUserId',
-        'version',
-        'order'
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
+        {
+          label:this.$t('project.id'),
+          value:'projectId',
+        },
+        {
+          label:this.$t('commons.name'),
+          value:'name',
+        },
+        {
+          label:this.$t('test_track.case.priority'),
+          value:'priority',
+        },
+        {
+          label:this.$t('api_test.definition.id'),
+          value:'apiDefinitionId',
+        },
+        {
+          label:this.$t('commons.create_user_id'),
+          value:'createUserId',
+        },
+        {
+          label:this.$t('commons.update_user_id'),
+          value:'updateUserId',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('commons.num'),
+          value:'num',
+        },
+        {
+          label:this.$t('commons.tag'),
+          value:'tags',
+        },
+        {
+          label:this.$t('api_test.automation.last_result_id'),
+          value:'lastResultId',
+        },
+        {
+          label:this.$t('commons.status'),
+          value:'status',
+        },
+        {
+          label:this.$t('commons.original_state'),
+          value:'originalStatus',
+        },
+        {
+          label:this.$t('commons.delete_time'),
+          value:'deleteTime',
+        },
+        {
+          label:this.$t('commons.delete_user_id'),
+          value:'deleteUserId',
+        },
+        {
+          label:this.$t('commons.version'),
+          value:'version',
+        },
+        {
+          label:this.$t('api_test.definition.document.order'),
+          value:'order',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue
index d408ff861c..a77e453c91 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue
@@ -174,22 +174,66 @@ export default {
         {value: 'CLOSE_SCHEDULE', label: '关闭定时任务'},
       ],
       variables: [
-        'operator',
-        'id',
-        'key',
-        'type',
-        'value',
-        'group',
-        'job',
-        'enable',
-        'resourceId',
-        'userId',
-        'workspaceId',
-        'createTime',
-        'updateTime',
-        'projectId',
-        'name',
-        'config'
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
+        {
+          label:this.$t('api_test.key'),
+          value:'key',
+        },
+        {
+          label:this.$t('operating_log.type'),
+          value:'type',
+        },
+        {
+          label:this.$t('commons.group'),
+          value:'group',
+        },
+        {
+          label:this.$t('schedule.job'),
+          value:'job',
+        },
+        {
+          label:this.$t('api_test.scenario.enable'),
+          value:'enable',
+        },
+        {
+          label:this.$t('commons.resourceId'),
+          value:'resourceId',
+        },
+        {
+          label:this.$t('user.id'),
+          value:'userId',
+        },
+        {
+          label:this.$t('workspace.id'),
+          value:'workspaceId',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('project.id'),
+          value:'projectId',
+        },
+        {
+          label:this.$t('commons.name'),
+          value:'name',
+        },
+        {
+          label:this.$t('variables.config'),
+          value:'config',
+        }
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue
index cb6109efcc..39af4c8371 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue
@@ -174,31 +174,106 @@ export default {
         {value: 'DELETE', label: this.$t('commons.delete')},
       ],
       variables: [
-        'operator',
-        'id',
-        'projectId',
-        'name',
-        'method',
-        'protocol',
-        'path',
-        'modulePath',
-        'environmentId',
-        'schedule',
-        'status',
-        'moduleId',
-        'userId',
-        'createTime',
-        'updateTime',
-        'num',
-        'tags',
-        'originalState',
-        'createUser',
-        'caseTotal',
-        'caseStatus',
-        'casePassingRate',
-        'deleteTime',
-        'deleteUserId',
-        'order'
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
+        {
+          label:this.$t('project.id'),
+          value:'projectId',
+        },
+        {
+          label:this.$t('commons.name'),
+          value:'name',
+        },
+        {
+          label:this.$t('api_test.request.method'),
+          value:'method',
+        },
+        {
+          label:this.$t('api_test.request.dubbo.protocol'),
+          value:'protocol',
+        },
+        {
+          label:this.$t('api_test.request.path'),
+          value:'path',
+        },
+        {
+          label:this.$t('module.path'),
+          value:'modulePath',
+        },
+        {
+          label:this.$t('api_test.environment.id'),
+          value:'environmentId',
+        },
+        {
+          label:this.$t('api_test.automation.schedule'),
+          value:'schedule',
+        },
+        {
+          label:this.$t('commons.status'),
+          value:'status',
+        },
+        {
+          label:this.$t('test_track.module.id'),
+          value:'moduleId',
+        },
+        {
+          label:this.$t('user.id'),
+          value:'userId',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('commons.num'),
+          value:'num',
+        },
+        {
+          label:this.$t('commons.tag'),
+          value:'tags',
+        },
+        {
+          label:this.$t('commons.original_state'),
+          value:'originalState',
+        },
+        {
+          label:this.$t('commons.create_user'),
+          value:'createUser',
+        },
+        {
+          label:this.$t('test_track.case.total'),
+          value:'caseTotal',
+        },
+        {
+          label:this.$t('test_track.case.status'),
+          value:'caseStatus',
+        },
+        {
+          label:this.$t('test_track.case.passing_rate'),
+          value:'casePassingRate',
+        },
+        {
+          label:this.$t('commons.delete_time'),
+          value:'deleteTime',
+        },
+        {
+          label:this.$t('commons.delete_user_id'),
+          value:'deleteUserId',
+        },
+        {
+          label:this.$t('api_test.definition.document.order'),
+          value:'order',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue b/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue
index 3468c3e614..26c7fa1ea3 100644
--- a/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue
@@ -174,25 +174,82 @@ export default {
         {value: 'DELETE', label: this.$t('commons.delete')},
       ],
       variables: [
-        'operator',
-        'id',
-        'testId',
-        'name',
-        'createTime',
-        'updateTime',
-        'status',
-        'userId',
-        'triggerMode',
-        'fileId',
-        'maxUsers',
-        'avgResponseTime',
-        'tps',
-        'projectId',
-        'testName',
-        'testStartTime',
-        'testEndTime',
-        'testDuration',
-        'testResourcePoolId'
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
+        {
+          label:this.$t('load_test.id'),
+          value:'testId',
+        },
+        {
+          label:this.$t('commons.name'),
+          value:'name',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('commons.status'),
+          value:'status',
+        },
+        {
+          label:this.$t('user.id'),
+          value:'userId',
+        },
+        {
+          label:this.$t('test_track.report.list.trigger_mode'),
+          value:'triggerMode',
+        },
+        {
+          label:this.$t('report.file_id'),
+          value:'fileId',
+        },
+        {
+          label:this.$t('report.max_users'),
+          value:'maxUsers',
+        },
+        {
+          label:this.$t('report.avg_response_time'),
+          value:'avgResponseTime',
+        },
+        {
+          label:this.$t('report.tps'),
+          value:'tps',
+        },
+        {
+          label:this.$t('project.id'),
+          value:'projectId',
+        },
+        {
+          label:this.$t('load_test.name'),
+          value:'testName',
+        },
+        {
+          label:this.$t('report.test_start_time'),
+          value:'testStartTime',
+        },
+        {
+          label:this.$t('report.test_end_time'),
+          value:'testEndTime',
+        },
+        {
+          label:this.$t('report.test_duration'),
+          value:'testDuration',
+        },
+        {
+          label:this.$t('test_resource_pool.id'),
+          value:'testResourcePoolId',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue b/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue
index c059354633..3081748561 100644
--- a/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue
@@ -177,21 +177,66 @@ export default {
         {value: 'EXECUTE_COMPLETED', label: this.$t('commons.run_completed')},
       ],
       variables: [
-        'operator',
-        'id',
-        'projectId',
-        'name',
-        'description',
-        'createTime',
-        'updateTime',
-        'status',
-        'testResourcePoolId',
-        'userId',
-        'num',
-        'createUser',
-        'scenarioVersion',
-        'scenarioId',
-        'order'
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
+        {
+          label:this.$t('project.id'),
+          value:'projectId',
+        },
+        {
+          label:this.$t('commons.name'),
+          value:'name',
+        },
+        {
+          label:this.$t('commons.description'),
+          value:'description',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('commons.status'),
+          value:'status',
+        },
+        {
+          label:this.$t('test_resource_pool.id'),
+          value:'testResourcePoolId',
+        },
+        {
+          label:this.$t('user.id'),
+          value:'userId',
+        },
+        {
+          label:this.$t('commons.num'),
+          value:'num',
+        },
+        {
+          label:this.$t('commons.create_user'),
+          value:'createUser',
+        },
+        {
+          label:this.$t('api_test.scenario.version'),
+          value:'scenarioVersion',
+        },
+        {
+          label:this.$t('api_test.scenario.id'),
+          value:'scenarioId',
+        },
+        {
+          label:this.$t('api_test.definition.document.order'),
+          value:'order',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue b/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue
index 04c5ff8438..0820b025c6 100644
--- a/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue
@@ -176,20 +176,62 @@ export default {
         {value: 'DELETE', label: this.$t('commons.delete')},
       ],
       variables: [
-        'operator',
-        'id',
-        'title',
-        'status',
-        'createTime',
-        'updateTime',
-        'reporter',
-        'lastmodify',
-        'platform',
-        'projectId',
-        'creator',
-        'resourceId',
-        'num',
-        'platformStatus'
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
+        {
+          label:this.$t('commons.title'),
+          value:'title',
+        },
+        {
+          label:this.$t('commons.status'),
+          value:'status',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('test_track.reporter'),
+          value:'reporter',
+        },
+        {
+          label:this.$t('test_track.lastmodify'),
+          value:'lastmodify',
+        },
+        {
+          label:this.$t('test_track.issue.platform'),
+          value:'platform',
+        },
+        {
+          label:this.$t('project.id'),
+          value:'projectId',
+        },
+        {
+          label:this.$t('commons.create_user'),
+          value:'creator',
+        },
+        {
+          label:this.$t('commons.resourceId'),
+          value:'resourceId',
+        },
+        {
+          label:this.$t('commons.num'),
+          value:'num',
+        },
+        {
+          label:this.$t('test_track.issue.platform_status'),
+          value:'platformStatus',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue
index a96380116e..d260b1473b 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue
@@ -177,34 +177,118 @@ export default {
         {value: 'COMMENT', label: this.$t('commons.comment')}
       ],
       variables: [
-        'operator',
-        'id',
-        'nodeId',
-        'testId',
-        'nodePath',
-        'projectId',
-        'name',
-        'type',
-        'maintainer',
-        'priority',
-        'method',
-        'createTime',
-        'updateTime',
-        'sort',
-        'num',
-        'otherTestName',
-        'reviewStatus',
-        'tags',
-        'demandId',
-        'demandName',
-        'status',
-        'stepModel',
-        'customNum',
-        'createUser',
-        'originalStatus',
-        'deleteTime',
-        'deleteUserId',
-        'order',
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
+        {
+          label:this.$t('test_track.case.node_id'),
+          value:'nodeId',
+        },
+        {
+          label:this.$t('load_test.id'),
+          value:'testId',
+        },
+        {
+          label:this.$t('test_track.case.node_path'),
+          value:'nodePath',
+        },
+        {
+          label:this.$t('project.id'),
+          value:'projectId',
+        },
+        {
+          label:this.$t('commons.name'),
+          value:'name',
+        },
+        {
+          label:this.$t('operating_log.type'),
+          value:'type',
+        },
+        {
+          label:this.$t('test_track.case.maintainer'),
+          value:'maintainer',
+        },
+        {
+          label:this.$t('test_track.case.priority'),
+          value:'priority',
+        },
+        {
+          label:this.$t('api_test.request.method'),
+          value:'method',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('test_track.sort'),
+          value:'sort',
+        },
+        {
+          label:this.$t('commons.num'),
+          value:'num',
+        },
+        {
+          label:this.$t('test_track.other_test_name'),
+          value:'otherTestName',
+        },
+        {
+          label:this.$t('test_track.review.review_status'),
+          value:'reviewStatus',
+        },
+        {
+          label:this.$t('commons.tag'),
+          value:'tags',
+        },
+        {
+          label:this.$t('test_track.demand.id'),
+          value:'demandId',
+        },
+        {
+          label:this.$t('test_track.demand.name'),
+          value:'demandName',
+        },
+        {
+          label:this.$t('commons.status'),
+          value:'status',
+        },
+        {
+          label:this.$t('test_track.step_model'),
+          value:'stepModel',
+        },
+        {
+          label:this.$t('commons.custom_num'),
+          value:'customNum',
+        },
+        {
+          label:this.$t('commons.create_user'),
+          value:'createUser',
+        },
+        {
+          label:this.$t('commons.original_state'),
+          value:'originalStatus',
+        },
+        {
+          label:this.$t('commons.delete_time'),
+          value:'deleteTime',
+        },
+        {
+          label:this.$t('commons.delete_user_id'),
+          value:'deleteUserId',
+        },
+        {
+          label:this.$t('api_test.definition.document.order'),
+          value:'order',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue
index 09bdf6fd38..66c7b515c7 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue
@@ -180,26 +180,86 @@ export default {
         // {value: 'FAIL_ONE_BY_ONE', label: '逐条失败（接口）'},
       ],
       variables: [
-        'operator',
-        'id',
-        'workspaceId',
-        'reportId',
-        'name',
-        'description',
-        'status',
-        'stage',
-        'testCaseMatchRule',
-        'executorMatchRule',
-        'createTime',
-        'updateTime',
-        'actualEndTime',
-        'plannedStartTime',
-        'plannedEndTime',
-        'actualStartTime',
-        'creator',
-        'projectId',
-        'executionTimes',
-        'automaticStatusUpdate'
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
+        {
+          label:this.$t('workspace.id'),
+          value:'workspaceId',
+        },
+        {
+          label:this.$t('report.id'),
+          value:'reportId',
+        },
+        {
+          label:this.$t('commons.name'),
+          value:'name',
+        },
+        {
+          label:this.$t('commons.description'),
+          value:'description',
+        },
+        {
+          label:this.$t('commons.status'),
+          value:'status',
+        },
+        {
+          label:this.$t('test_track.plan.plan_stage'),
+          value:'stage',
+        },
+        {
+          label:this.$t('test_track.case.match_rule'),
+          value:'testCaseMatchRule',
+        },
+        {
+          label:this.$t('test_track.plan.plan_stage'),
+          value:'executorMatchRule',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('test_track.plan.actual_start_time'),
+          value:'actualStartTime',
+        },
+        {
+          label:this.$t('test_track.plan.actual_end_time'),
+          value:'actualEndTime',
+        },
+        {
+          label:this.$t('test_track.plan.planned_start_time'),
+          value:'plannedStartTime',
+        },
+        {
+          label:this.$t('test_track.plan.planned_end_time'),
+          value:'plannedEndTime',
+        },
+        {
+          label:this.$t('commons.create_user'),
+          value:'creator',
+        },
+        {
+          label:this.$t('project.id'),
+          value:'projectId',
+        },
+        {
+          label:this.$t('commons.execution_times'),
+          value:'executionTimes',
+        },
+        {
+          label:this.$t('test_track.automatic_status_update'),
+          value:'automaticStatusUpdate',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue
index 28e1c3b0ef..f482b3ead4 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue
@@ -178,18 +178,54 @@ export default {
         {value: 'COMPLETE', label: '评审完成'}
       ],
       variables: [
-        'operator',
-        'id',
-        'name',
-        'creator',
-        'status',
-        'createTime',
-        'updateTime',
-        'endTime',
-        'projectId',
-        'tags',
-        'createUser',
-        'description'
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
+        {
+          label:this.$t('commons.name'),
+          value:'name',
+        },
+        {
+          label:this.$t('commons.create_user'),
+          value:'creator',
+        },
+        {
+          label:this.$t('commons.status'),
+          value:'status',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('test_track.review.end_time'),
+          value:'endTime',
+        },
+        {
+          label:this.$t('project.id'),
+          value:'projectId',
+        },
+        {
+          label:this.$t('commons.tag'),
+          value:'tags',
+        },
+        {
+          label:this.$t('commons.create_user'),
+          value:'createUser',
+        },
+        {
+          label:this.$t('commons.description'),
+          value:'description',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue
index 723ef24fe0..649afd272d 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue
@@ -174,22 +174,70 @@ export default {
         {value: 'CLOSE_SCHEDULE', label: '关闭定时任务'},
       ],
       variables: [
-        'operator',
-        'id',
-        'key',
-        'type',
-        'value',
-        'group',
-        'job',
-        'enable',
-        'resourceId',
-        'userId',
-        'workspaceId',
-        'createTime',
-        'updateTime',
-        'projectId',
-        'name',
-        'config'
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
+        {
+          label:this.$t('api_test.key'),
+          value:'key',
+        },
+        {
+          label:this.$t('operating_log.type'),
+          value:'type',
+        },
+        {
+          label:this.$t('api_test.value'),
+          value:'value',
+        },
+        {
+          label:this.$t('commons.group'),
+          value:'group',
+        },
+        {
+          label:this.$t('schedule.job'),
+          value:'job',
+        },
+        {
+          label:this.$t('api_test.scenario.enable'),
+          value:'enable',
+        },
+        {
+          label:this.$t('commons.resourceId'),
+          value:'resourceId',
+        },
+        {
+          label:this.$t('user.id'),
+          value:'userId',
+        },
+        {
+          label:this.$t('workspace.id'),
+          value:'workspaceId',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('project.id'),
+          value:'projectId',
+        },
+        {
+          label:this.$t('commons.name'),
+          value:'name',
+        },
+        {
+          label:this.$t('variables.config'),
+          value:'config',
+        }
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue
index 5d9a10a390..3a09281b64 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue
@@ -174,23 +174,74 @@ export default {
         {value: 'DELETE', label: this.$t('commons.delete')},
       ],
       variables: [
-        'operator',
-        'id',
-        'testPlanId',
-        'createTime',
-        'updateTime',
-        'name',
-        'status',
-        'triggerMode',
-        'creator',
-        'startTime',
-        'endTime',
-        'isApiCaseExecuting',
-        'isScenarioExecuting',
-        'isPerformanceExecuting',
-        'principal',
-        'components',
-        'isNew'
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
+        {
+          label:this.$t('test_track.plan.test_plan_id'),
+          value:'testPlanId',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('commons.name'),
+          value:'name',
+        },
+        {
+          label:this.$t('commons.status'),
+          value:'status',
+        },
+        {
+          label:this.$t('test_track.report.list.trigger_mode'),
+          value:'triggerMode',
+        },
+        {
+          label:this.$t('commons.create_user'),
+          value:'creator',
+        },
+        {
+          label:this.$t('api_report.start_time'),
+          value:'startTime',
+        },
+        {
+          label:this.$t('test_track.review.end_time'),
+          value:'endTime',
+        },
+        {
+          label:this.$t('test_track.plan.is_api_case_executing'),
+          value:'isApiCaseExecuting',
+        },
+        {
+          label:this.$t('test_track.plan.is_scenario_executing'),
+          value:'isScenarioExecuting',
+        },
+        {
+          label:this.$t('test_track.plan.is_performance_executing'),
+          value:'isPerformanceExecuting',
+        },
+        {
+          label:this.$t('api_test.automation.scenario.principal'),
+          value:'principal',
+        },
+        {
+          label:this.$t('test_track.plan_view.component'),
+          value:'components',
+        },
+        {
+          label:this.$t('commons.is_new'),
+          value:'isNew',
+        },
       ]
     };
   },
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index acd569fa85..655a5f599e 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -69,9 +69,11 @@ export default {
     input_password: 'Please enter password',
     test: 'Test',
     create_time: 'Created Time',
+    update_user_id:'Updater ID',
     update_time: 'Updated Time',
     delete_time: 'Delete Time',
     delete_user: 'Deleted by',
+    delete_user_id:'Deleted by id',
     add: 'Add',
     preview: 'Preview',
     member: 'Member',
@@ -186,6 +188,7 @@ export default {
     mentioned_me_notice: '@Mentioned Me',
     all_module_title: "All module",
     create_user: 'Creator',
+    create_user_id: 'Creator ID',
     run_message: "The task is being executed, please go to the task center to view the details",
     executor: "Executor",
     execute_history: "Execute history",
@@ -360,7 +363,13 @@ export default {
     to_be_completed:'To be completed',
     pending_upgrade:'Pending upgrade',
     information:'Information',
-    nick_name:'Nick name'
+    nick_name:'Nick name',
+    resourceId:'Resource ID',
+    num:'Number',
+    original_state:'Original State',
+    custom_num:'CustomNum',
+    version:'Version',
+    is_new:"Is new"
   },
   license: {
     title: 'Authorization management',
@@ -458,6 +467,7 @@ export default {
     option_value_check: 'Please fill in the full option values',
   },
   workspace: {
+    id:'Workspace ID',
     create: 'Create Workspace',
     update: 'Update Workspace',
     delete: 'Delete Workspace',
@@ -608,6 +618,7 @@ export default {
     }
   },
   project: {
+    id:'Project ID',
     name: 'Project name',
     recent: 'Recent Projects',
     create: 'Create Project',
@@ -704,6 +715,7 @@ export default {
     no_such_user: 'Without this user information, please enter the correct user ID or user Email!',
   },
   user: {
+    id:'User ID',
     create: 'Create',
     modify: 'Modify',
     input_name: 'Please enter a user name',
@@ -773,6 +785,7 @@ export default {
     add: 'Add Role',
   },
   report: {
+    id:'Report ID',
     api_test_report: 'Api Test Report',
     load_test_report: 'Load Test Report',
     test_plan_report: 'Test Plan Report',
@@ -818,9 +831,13 @@ export default {
     batch_delete: "Delete reports in bulk",
     delete_batch_confirm: 'Confirm batch delete report',
     response_time: 'Response Time(s)',
-    max_users: 'VUs'
+    max_users: 'VUs',
+    file_id:'Report File ID',
+    avg_response_time:'Average Response Time',
+    tps:'Transactions Per Second'
   },
   load_test: {
+    id:'Load Test ID',
     concurrency_thread_group: 'Concurrent read group',
     thread_group: 'ThreadGroup',
     completed_test_report: 'Completed test report',
@@ -1000,6 +1017,7 @@ export default {
       }
     },
     definition: {
+      id:'Api Definition ID',
       api_title: "Api test",
       case_title: "Test Case",
       doc_title: "DOC",
@@ -1176,6 +1194,7 @@ export default {
       update_time: "Update time",
       step: "Step",
       last_result: "Last result",
+      last_result_id:'Last result id',
       passing_rate: "Passing rate",
       success: "Success",
       fail: "Fail",
@@ -1218,6 +1237,7 @@ export default {
       generate_report: "Generate report",
     },
     environment: {
+      id:'Environment ID',
       create: 'Create environment',
       name: "Environment Name",
       socket: "Socket",
@@ -1241,6 +1261,7 @@ export default {
       response_timeout: "Response Timeout",
     },
     scenario: {
+      id:"Scenario ID",
       scenario: "Scenario",
       dubbo: "Dubbo Config",
       config: "Scenario Config",
@@ -1264,7 +1285,10 @@ export default {
       reference: "Reference",
       clone: "Copy",
       cant_reference: 'Historical test files, can be referenced after re-saving',
-      share_cookie: 'share cookie'
+      share_cookie: 'share cookie',
+      module_id:'Scenario Module ID',
+      level: 'Level',
+      version:"Scenario Version"
     },
     request: {
       debug: "Debug",
@@ -1651,6 +1675,14 @@ export default {
     performance_test_case: "Performance Case",
     scenario_test_case: "Scenario Case",
     report_statistics: "Report Statistics",
+    sort:'Sort',
+    other_test_name:'Other Test Name',
+    demand:{
+      id:'Demand ID',
+      name:'Demand Name'
+    },
+    step_model:'Step Model',
+    automatic_status_update:"Automatic Status Update",
     case: {
       list: "List",
       minder: "Minder",
@@ -1731,6 +1763,10 @@ export default {
       upload_tip: "Only jpg, jpeg, png, docx, doc, pdf, xlsx, txt files can be uploaded",
       attachment: "Attachment",
       upload_time: "Upload Time",
+      total: "Total Case",
+      node_id:"Node ID",
+      node_path:"Node Path",
+      match_rule:"Test Case Match Rule",
       import: {
         import: "Import test case",
         case_import: "Import test case",
@@ -1761,10 +1797,12 @@ export default {
         export: "Export cases",
         export_tip: "Switch to Interface List and check Use Case Export"
       },
-      case_desc: "Case Desc"
+      case_desc: "Case Desc",
+      passing_rate:'Case Pass Rate'
     },
     plan: {
       test_plan: "Plan",
+      test_plan_id:'Plan ID',
       create_plan: "Create test plan",
       edit_plan: "Edit test plan",
       plan_name: "Test plan name",
@@ -1801,6 +1839,10 @@ export default {
       api_case: "Api case",
       scenario_case: "Scenario case",
       execute_result: "Execute Result",
+      execute_time:'Execute Time',
+      is_api_case_executing:"Api Case Executing",
+      is_scenario_executing:'Scenario Executing',
+      is_performance_executing:'Performance Executing',
       test_plan_test_case_count: "Track case count",
       test_plan_api_case_count: "Api case count",
       test_plan_api_scenario_count: "Scenario case count",
@@ -1864,6 +1906,7 @@ export default {
       cannot_delete: "Cannot delete this comment！",
     },
     module: {
+      id:'Module ID',
       search: "Search module",
       rename: "Rename",
       add_submodule: "Add submodule",
@@ -1906,6 +1949,7 @@ export default {
       relevance_test_case: "Relevance case",
       cancel_all_relevance: "Unlink all",
       executor: "Executor",
+      executor_match_rule:"Executor Match Rule",
       execute_result: "Result",
       pass: "Pass",
       not_pass: "UnPass",
@@ -1930,6 +1974,7 @@ export default {
       submit_issues: "Commit issues",
       operate_step: "Operate step",
       edit_component: "Edit component",
+      component:"component",
       base_info: "Base info",
       mock_info: "Mock service",
       test_result: "Test result",
@@ -1999,9 +2044,12 @@ export default {
         manual: "Manual",
         automation: "Automation",
       },
-    }
+    },
+    reporter:'Reporter',
+    lastmodify:'Last Modify'
   },
   test_resource_pool: {
+    id:'Resource Pool ID',
     type: 'type',
     enable_disable: 'Enable / disable',
     search_by_name: 'Search by name',
@@ -2094,6 +2142,7 @@ export default {
     task_config: "Task Config",
     test_name: 'Test Name',
     running_rule: 'Rule',
+    job:'Job',
     job_status: 'Status',
     running_task: 'Running Task',
     please_input_cron_expression: "Please Input Cron Expression",
@@ -2223,7 +2272,8 @@ export default {
     auth_name_valid: 'Name does not support special characters',
   },
   module: {
-    title: 'Module Management'
+    title: 'Module Management',
+    path:'Module Path'
   },
   table: {
     header_display_field: 'Header display field',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index e832e2846d..e3541be76b 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -70,9 +70,11 @@ export default {
     input_password: '请输入密码',
     test: '测试',
     create_time: '创建时间',
+    update_user_id:'更新人ID',
     update_time: '更新时间',
     delete_time: '删除时间',
     delete_user: '删除人',
+    delete_user_id:'删除人ID',
     add: '添加',
     preview: '预览',
     member: '成员',
@@ -187,6 +189,7 @@ export default {
     mentioned_me_notice: '@提到我的',
     all_module_title: "全部模块",
     create_user: '创建人',
+    create_user_id: '创建人ID',
     run_message: "任务执行中，请到任务中心查看详情",
     executor: "执行人",
     execute_history: "执行历史",
@@ -361,7 +364,14 @@ export default {
     to_be_completed:'待完成',
     pending_upgrade:'待更新',
     information:'信息',
-    nick_name:'昵称'
+    nick_name:'昵称',
+    resourceId:'资源ID',
+    level:'级别',
+    num:'数量',
+    original_state:'原始状态',
+    custom_num:'自定义编号',
+    version:'版本',
+    is_new:"是否新建"
   },
   license: {
     title: '授权管理',
@@ -459,6 +469,7 @@ export default {
     option_value_check: '请填写完整选项值',
   },
   workspace: {
+    id:'工作空间ID',
     create: '创建工作空间',
     update: '修改工作空间',
     delete: '删除工作空间',
@@ -612,6 +623,7 @@ export default {
     }
   },
   project: {
+    id:'项目ID',
     recent: '最近的项目',
     create: '创建项目',
     edit: '编辑项目',
@@ -709,6 +721,7 @@ export default {
     no_such_user: '无此用户信息, 请输入正确的用户 ID 或者 用户邮箱！',
   },
   user: {
+    id:'用户ID',
     create: '创建用户',
     modify: '修改用户',
     input_name: '请输入用户姓名',
@@ -778,6 +791,7 @@ export default {
     add: '添加角色',
   },
   report: {
+    id:'报告ID',
     api_test_report: '接口测试报告',
     load_test_report: '性能测试报告',
     test_plan_report: '测试计划报告',
@@ -823,9 +837,13 @@ export default {
     batch_delete: "批量删除报告",
     delete_batch_confirm: '确认批量删除报告',
     response_time: '响应时间(s)',
-    max_users: '并发数'
+    max_users: '并发数',
+    file_id:'文件ID',
+    avg_response_time:'平均响应时间',
+    tps:'每秒传输的事物处理个数'
   },
   load_test: {
+    id:'测试ID',
     concurrency_thread_group: '并发读取组',
     thread_group: '线程组',
     completed_test_report: '已完成测试报告',
@@ -1008,6 +1026,7 @@ export default {
       }
     },
     definition: {
+      id:'接口定义ID',
       api_title: "接口列表",
       case_title: "用例列表",
       doc_title: "文档",
@@ -1183,6 +1202,7 @@ export default {
       update_time: "最后更新时间",
       step: "步骤数",
       last_result: "最后结果",
+      last_result_id:'最后结果ID',
       passing_rate: "通过率",
       success: "通过",
       fail: "失败",
@@ -1225,6 +1245,7 @@ export default {
       generate_report: "生成报告",
     },
     environment: {
+      id:'环境ID',
       create: '创建环境',
       name: "环境名称",
       socket: "环境域名",
@@ -1248,6 +1269,7 @@ export default {
       response_timeout: "响应超时",
     },
     scenario: {
+      id:"场景ID",
       scenario: "场景",
       dubbo: "Dubbo配置",
       config: "场景配置",
@@ -1271,7 +1293,9 @@ export default {
       clone: "复制",
       cant_reference: '历史测试文件，重新保存后才可被引用',
       share_cookie: '共享cookie',
-
+      module_id:'场景模块ID',
+      level: '级别',
+      version:"场景版本"
     },
     request: {
       debug: "调试",
@@ -1662,6 +1686,9 @@ export default {
     performance_test_case: "性能测试用例",
     scenario_test_case: "场景测试用例",
     report_statistics: "报告统计",
+    sort:'种类',
+    other_test_name:'其他测试名称',
+    automatic_status_update:"自动状态更新",
     case: {
       list: "列表",
       minder: "脑图",
@@ -1742,6 +1769,10 @@ export default {
       upload_tip: "只能上传jpg、jpeg、png、docx、doc、pdf、xlsx、txt文件",
       attachment: "附件",
       upload_time: "上传时间",
+      total:"用例总数",
+      node_id:"节点ID",
+      node_path:"节点路径",
+      match_rule:"测试用例匹配规则",
       import: {
         import: "导入用例",
         case_import: "导入测试用例",
@@ -1772,10 +1803,13 @@ export default {
         export: "导出用例",
         export_tip: "请切换成接口列表勾选用例导出！"
       },
-      case_desc: "用例描述"
+      case_desc: "用例描述",
+      passing_rate:'用例通过率'
+
     },
     plan: {
       test_plan: "测试计划",
+      test_plan_id:'测试计划Id',
       create_plan: "创建测试计划",
       edit_plan: "编辑测试计划",
       plan_name: "计划名称",
@@ -1812,6 +1846,10 @@ export default {
       api_case: "接口测试用例",
       scenario_case: "场景测试用例",
       execute_result: "执行结果",
+      execute_time:'执行时间',
+      is_api_case_executing:"是否执行接口用例",
+      is_scenario_executing:'是否执行场景',
+      is_performance_executing:'是否执行性能',
       test_plan_test_case_count: "功能用例数",
       test_plan_api_case_count: "接口用例数",
       test_plan_api_scenario_count: "场景用例数",
@@ -1828,6 +1866,11 @@ export default {
         report_not_found: "报告不存在",
       }
     },
+    demand:{
+      id:'需求ID',
+      name:'需求名称'
+    },
+    step_model:'步骤模型',
     review: {
       test_review: "用例评审",
       create_review: "创建用例评审",
@@ -1875,6 +1918,7 @@ export default {
       execute_result: "评审结果",
     },
     module: {
+      id:'模块ID',
       search: "搜索模块",
       rename: "重命名",
       add_submodule: "添加子模块",
@@ -1917,6 +1961,7 @@ export default {
       relevance_test_case: "关联测试用例",
       cancel_all_relevance: "取消全部关联",
       executor: "执行人",
+      executor_match_rule:"执行者匹配规则",
       execute_result: "执行结果",
       pass: "通过",
       not_pass: "不通过",
@@ -1941,6 +1986,7 @@ export default {
       submit_issues: "提缺陷",
       operate_step: "操作步骤",
       edit_component: "编辑组件",
+      component:"组件",
       base_info: "基础信息",
       mock_info: "Mock服务",
       test_result: "测试结果",
@@ -2013,9 +2059,12 @@ export default {
         manual: "手动触发",
         automation: "自动触发",
       },
-    }
+    },
+    reporter:'报告人',
+    lastmodify:'最后更改'
   },
   test_resource_pool: {
+    id:"测试资源池ID",
     type: '类型',
     enable_disable: '启用/禁用',
     search_by_name: '根据名称搜索',
@@ -2104,6 +2153,7 @@ export default {
     not_set: "未设置",
     test_name: '测试名称',
     running_rule: '运行规则',
+    job:'任务',
     job_status: '任务状态',
     running_task: '运行中的任务',
     next_execution_time: "下次执行时间",
@@ -2236,7 +2286,8 @@ export default {
     auth_name_valid: '名称不支持特殊字符',
   },
   module: {
-    title: '模块管理'
+    title: '模块管理',
+    path:'模块路径'
   },
   table: {
     header_display_field: '表头显示字段',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 503ef39b20..6878681ee7 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -70,9 +70,11 @@ export default {
     input_password: '請輸入密碼',
     test: '測試',
     create_time: '創建時間',
+    update_user_id:'更新人ID',
     update_time: '更新時間',
     delete_time: '刪除時間',
     delete_user: '刪除人',
+    delete_user_id:'删除人ID',
     add: '添加',
     preview: '預覽',
     member: '成員',
@@ -187,6 +189,7 @@ export default {
     mentioned_me_notice: '@提到我的',
     all_module_title: "全部模塊",
     create_user: '創建人',
+    create_user_id: '創建人ID',
     run_message: "任務執行中，請到任務中心查看詳情",
     executor: "執行人",
     execute_history: "執行歷史",
@@ -361,7 +364,13 @@ export default {
     to_be_completed:'待完成',
     pending_upgrade:'待更新',
     information:'信息',
-    nick_name:'暱稱'
+    nick_name:'暱稱',
+    resourceId:'資源ID',
+    num:'數量',
+    original_state:'原始狀態',
+    custom_num:'自定義編號',
+    version:'版本',
+    is_new:"是否新建"
   },
   license: {
     title: '授權管理',
@@ -459,6 +468,7 @@ export default {
     option_value_check: '請填寫完整選項值',
   },
   workspace: {
+    id:'工作空間ID',
     create: '創建工作空間',
     update: '修改工作空間',
     delete: '刪除工作空間',
@@ -612,6 +622,7 @@ export default {
     }
   },
   project: {
+    id:'項目ID',
     recent: '最近的項目',
     create: '創建項目',
     edit: '編輯項目',
@@ -708,6 +719,7 @@ export default {
     no_such_user: '無此用戶信息, 請輸入正確的用戶 ID 或者 用戶郵箱！',
   },
   user: {
+    id:"用户ID",
     create: '創建用戶',
     modify: '修改用戶',
     input_name: '請輸入用戶姓名',
@@ -777,6 +789,7 @@ export default {
     add: '添加角色',
   },
   report: {
+    id:'報告ID',
     api_test_report: '接口測試報告',
     load_test_report: '性能測試報告',
     test_plan_report: '測試計劃報告',
@@ -822,9 +835,13 @@ export default {
     batch_delete: "批量刪除報告",
     delete_batch_confirm: '確認批量刪除報告',
     response_time: '響應時間(s)',
-    max_users: '並發數'
+    max_users: '並發數',
+    file_id:'文件ID',
+    avg_response_time:'平均響應時間',
+    tps:'每秒傳輸的事物處理個數'
   },
   load_test: {
+    id:'測試ID',
     concurrency_thread_group: '並發讀取組',
     thread_group: '線程組',
     completed_test_report: '已完成測試報告',
@@ -1006,6 +1023,7 @@ export default {
       }
     },
     definition: {
+      id:'接口定義ID',
       api_title: "接口列表",
       case_title: "用例列表",
       doc_title: "文檔",
@@ -1181,6 +1199,7 @@ export default {
       update_time: "最後更新時間",
       step: "步驟數",
       last_result: "最後結果",
+      last_result_id:'最後结果ID',
       passing_rate: "通過率",
       success: "通過",
       fail: "失敗",
@@ -1223,6 +1242,7 @@ export default {
       generate_report: "生成報告",
     },
     environment: {
+      id:'環境ID',
       create: '創建環境',
       name: "環境名稱",
       socket: "環境域名",
@@ -1247,6 +1267,7 @@ export default {
       response_timeout: "響應超時",
     },
     scenario: {
+      id:"場景ID",
       scenario: "場景",
       dubbo: "Dubbo配置",
       config: "場景配置",
@@ -1269,7 +1290,10 @@ export default {
       reference: "引用",
       clone: "復製",
       cant_reference: '歷史測試文件，重新保存後才可被引用',
-      share_cookie: '共享cookie'
+      share_cookie: '共享cookie',
+      module_id:'場景模塊ID',
+      level: '級別',
+      version:"場景版本"
     },
     request: {
       debug: "調試",
@@ -1660,6 +1684,14 @@ export default {
     performance_test_case: "性能測試用例",
     scenario_test_case: "場景測試用例",
     report_statistics: "報告統計",
+    sort:'種類',
+    other_test_name:'其他測試名稱',
+    demand:{
+      id:'需求ID',
+      name:'需求名稱'
+    },
+    step_model:'步驟模型',
+    automatic_status_update:"自動狀態更新",
     case: {
       list: "列表",
       minder: "腦圖",
@@ -1740,6 +1772,10 @@ export default {
       upload_tip: "只能上傳jpg、jpeg、png、docx、doc、pdf、xlsx、txt文件",
       attachment: "附件",
       upload_time: "上傳時間",
+      total: "用例總數",
+      node_id:"節點ID",
+      node_path:"節點路徑",
+      match_rule:"測試用例匹配規則",
       import: {
         import: "導入用例",
         case_import: "導入測試用例",
@@ -1770,10 +1806,12 @@ export default {
         export: "導出用例",
         export_tip: "請切換成接口列表勾選用例導出！"
       },
-      case_desc: "用例描述"
+      case_desc: "用例描述",
+      passing_rate:'用例通過率'
     },
     plan: {
       test_plan: "測試計劃",
+      test_plan_id:'測試計劃Id',
       create_plan: "創建測試計劃",
       edit_plan: "編輯測試計劃",
       plan_name: "計劃名稱",
@@ -1810,6 +1848,10 @@ export default {
       api_case: "接口測試用例",
       scenario_case: "場景測試用例",
       execute_result: "執行結果",
+      execute_time:'執行時間',
+      is_api_case_executing:"是否执行接口用例",
+      is_scenario_executing:'是否执行场景',
+      is_performance_executing:'是否执行性能',
       test_plan_test_case_count: "功能用例數",
       test_plan_api_case_count: "接口用例數",
       test_plan_api_scenario_count: "場景用例數",
@@ -1873,6 +1915,7 @@ export default {
       execute_result: "評審結果",
     },
     module: {
+      id:'模塊ID',
       search: "搜索模塊",
       rename: "重命名",
       add_submodule: "添加子模塊",
@@ -1915,6 +1958,7 @@ export default {
       relevance_test_case: "關聯測試用例",
       cancel_all_relevance: "取消全部關聯",
       executor: "執行人",
+      executor_match_rule:"執行者匹配規則",
       execute_result: "執行結果",
       pass: "通過",
       not_pass: "不通過",
@@ -1939,6 +1983,7 @@ export default {
       submit_issues: "提缺陷",
       operate_step: "操作步驟",
       edit_component: "編輯組件",
+      component:"組件",
       base_info: "基礎信息",
       mock_info: "Mock服務",
       test_result: "測試結果",
@@ -2011,9 +2056,12 @@ export default {
         manual: "手動觸發",
         automation: "自動觸發",
       },
-    }
+    },
+    reporter:'報告人',
+    lastmodify:'最後更改'
   },
   test_resource_pool: {
+    id:"測試資源池ID",
     type: '類型',
     enable_disable: '啟用/禁用',
     search_by_name: '根據名稱搜索',
@@ -2102,6 +2150,7 @@ export default {
     not_set: "未設置",
     test_name: '測試名稱',
     running_rule: '運行規則',
+    job:'任務',
     job_status: '任務狀態',
     running_task: '運行中的任務',
     next_execution_time: "下次執行時間",
@@ -2234,7 +2283,8 @@ export default {
     auth_name_valid: '名稱不支持特殊字符',
   },
   module: {
-    title: '模塊管理'
+    title: '模塊管理',
+    path:'模塊路徑'
   },
   table: {
     header_display_field: '表頭顯示字段',

From cb6f8f716ca3b07e9d0a1246346276e827507b6a Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 6 Dec 2021 11:40:31 +0800
Subject: [PATCH 056/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E5=AF=BC=E5=85=A5jmx=E6=96=87=E4=BB=B6query?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008540 --user=赵勇 【github#8283】jmeter脚本上传到ms之后url拼接丢失 https://www.tapd.cn/55049933/s/1077896
---
 .../dto/automation/parse/MsJmeterParser.java  | 61 +++++++++++++------
 1 file changed, 44 insertions(+), 17 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index 9cf36881ba..10e2f7cbba 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -175,7 +175,6 @@ public class MsJmeterParser extends ApiImportAbstractParser<ScenarioImport> {
         if (!path.startsWith("http://") && !path.startsWith("https://")) {
             String domain = source.getDomain();
             String protocol = source.getProtocol();
-            String method = source.getMethod();
             StringBuilder pathAndQuery = new StringBuilder(100);
             if ("file".equalsIgnoreCase(protocol)) {
                 domain = null;
@@ -184,18 +183,6 @@ public class MsJmeterParser extends ApiImportAbstractParser<ScenarioImport> {
             }
 
             pathAndQuery.append(path);
-            if ("GET".equals(method) || "DELETE".equals(method) || "OPTIONS".equals(method)) {
-                String queryString = source.getQueryString(source.getContentEncoding());
-                if (queryString.length() > 0) {
-                    if (path.contains("?")) {
-                        pathAndQuery.append("&");
-                    } else {
-                        pathAndQuery.append("?");
-                    }
-
-                    pathAndQuery.append(queryString);
-                }
-            }
             String portAsString = source.getPropertyAsString("HTTPSampler.port");
             return this.isProtocolDefaultPort(source) ? new URL(protocol, domain, pathAndQuery.toString()).toExternalForm() : this.url(protocol, domain, portAsString, pathAndQuery.toString());
         } else {
@@ -213,6 +200,44 @@ public class MsJmeterParser extends ApiImportAbstractParser<ScenarioImport> {
         return null;
     }
 
+    private static String truncateUrlPage(String strURL) {
+        String strAllParam = null;
+        if (StringUtils.isNotEmpty(strURL)) {
+            String[] arrSplit = strURL.split("[?]");
+            if (strURL.length() > 1) {
+                if (arrSplit.length > 1) {
+                    if (arrSplit[1] != null) {
+                        strAllParam = arrSplit[1];
+                    }
+                }
+            }
+        }
+        return strAllParam;
+    }
+
+    public static Map<String, String> parseURLParam(String URL) {
+        Map<String, String> mapRequest = new LinkedHashMap<>();
+        String strUrlParam = truncateUrlPage(URL);
+        if (StringUtils.isEmpty(strUrlParam)) {
+            return mapRequest;
+        }
+        //每个键值为一组
+        String[] arrSplit = strUrlParam.split("[&]");
+        for (String strSplit : arrSplit) {
+            String[] arrSplitEqual = strSplit.split("[=]");
+            //解析出键值
+            if (arrSplitEqual.length > 1) {
+                mapRequest.put(arrSplitEqual[0], arrSplitEqual[1]);
+            } else {
+                if (StringUtils.isNotEmpty(arrSplitEqual[0])) {
+                    //只有参数没有值，不加入
+                    mapRequest.put(arrSplitEqual[0], "");
+                }
+            }
+        }
+        return mapRequest;
+    }
+
     private void convertHttpSampler(MsHTTPSamplerProxy samplerProxy, Object key) {
         try {
             HTTPSamplerProxy source = (HTTPSamplerProxy) key;
@@ -303,9 +328,9 @@ public class MsJmeterParser extends ApiImportAbstractParser<ScenarioImport> {
                 }
                 samplerProxy.getBody().initBinary();
             }
-            // samplerProxy.setPath(source.getPath());
             samplerProxy.setMethod(source.getMethod());
-            if (this.getUrl(source) != null) {
+            URL url = source.getUrl();
+            if (url != null) {
                 samplerProxy.setUrl(this.getUrl(source));
                 samplerProxy.setPath(null);
             }
@@ -530,9 +555,11 @@ public class MsJmeterParser extends ApiImportAbstractParser<ScenarioImport> {
             RegexExtractor regexExtractor = (RegexExtractor) key;
             if (regexExtractor.useRequestHeaders()) {
                 regex.setUseHeaders("request_headers");
-            }if (regexExtractor.useHeaders()) {
+            }
+            if (regexExtractor.useHeaders()) {
                 regex.setUseHeaders("true");
-            } if (regexExtractor.useBody()) {
+            }
+            if (regexExtractor.useBody()) {
                 regex.setUseHeaders("false");
             } else if (regexExtractor.useUnescapedBody()) {
                 regex.setUseHeaders("unescaped");

From ebdf1a34f6d6a1841905a5dce7d1d9c2ca746d21 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 6 Dec 2021 13:41:48 +0800
Subject: [PATCH 057/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E4=B8=AD=E5=9C=BA=E6=99=AFSQL=E6=B7=BB=E5=8A=A0=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E9=87=87=E7=94=A8mock=E5=8A=A0=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E4=BF=9D=E5=AD=98=E4=B8=8D=E4=BA=86=EF=BC=8C=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【场景变量添加常量及SQL添加变量，采用mock加函数保存不了，控制台报错】https://www.tapd.cn/33805590/bugtrace/bugs/view?bug_id=1133805590001008481
---
 .../components/ApiScenarioVariables.vue        | 18 ++++++++++++++----
 .../api/test/components/ApiVariableAdvance.vue |  1 -
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/ApiScenarioVariables.vue b/frontend/src/business/components/api/definition/components/ApiScenarioVariables.vue
index c6654488a1..48e8704907 100644
--- a/frontend/src/business/components/api/definition/components/ApiScenarioVariables.vue
+++ b/frontend/src/business/components/api/definition/components/ApiScenarioVariables.vue
@@ -30,7 +30,7 @@
             :placeholder="$t('api_test.value')"
             value-key="name"
             highlight-first-item style="width: 100%">
-            <i slot="suffix" class="el-input__icon el-icon-edit pointer" @click="advanced"></i>
+            <i slot="suffix" class="el-input__icon el-icon-edit pointer" @click="advanced(item)"></i>
           </el-autocomplete>
         </el-col>
         <el-col>
@@ -48,7 +48,7 @@
         </el-col>
       </el-row>
     </div>
-    <ms-api-variable-advance ref="variableAdvance"/>
+    <ms-api-variable-advance ref="variableAdvance" :current-item="currentItem" @advancedRefresh="reload"/>
   </div>
 </template>
 
@@ -78,7 +78,9 @@ export default {
     },
   },
   data() {
-    return {}
+    return {
+      currentItem: null
+    }
   },
   methods: {
     remove: function (index) {
@@ -115,8 +117,10 @@ export default {
     isDisable: function (index) {
       return this.items.length - 1 === index;
     },
-    advanced() {
+    advanced(item) {
+      this.currentItem = item;
       this.$refs.variableAdvance.open();
+
     },
     createFilter(queryString) {
       return (variable) => {
@@ -134,6 +138,12 @@ export default {
       // 调用 callback 返回建议列表的数据
       cb(results);
     },
+    reload() {
+      this.isActive = false;
+      this.$nextTick(() => {
+        this.isActive = true;
+      });
+    },
   },
 
   created() {
diff --git a/frontend/src/business/components/api/test/components/ApiVariableAdvance.vue b/frontend/src/business/components/api/test/components/ApiVariableAdvance.vue
index 2621d1af93..4be9f71876 100644
--- a/frontend/src/business/components/api/test/components/ApiVariableAdvance.vue
+++ b/frontend/src/business/components/api/test/components/ApiVariableAdvance.vue
@@ -167,7 +167,6 @@ export default {
   methods: {
     open() {
       this.itemValueVisible = true;
-      this.itemValue = this.currentItem.value;
     },
     prepareData() {
       if (this.scenario) {

From cfb0999bb9cb2565f0b63445f810431acb9f190d Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 6 Dec 2021 11:35:42 +0800
Subject: [PATCH 058/256] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E4=B8=AD=E5=9C=BA=E6=99=AF=E5=AF=BC=E5=85=A5=E3=80=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=88=97=E8=A1=A8=E5=AF=BC=E5=85=A5=20=E5=B0=86?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=92=8C=E5=BC=95=E7=94=A8=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=94=BE=E5=88=B0=E5=8F=B3=E4=B8=8A=E8=A7=92=20=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=AB=98=E5=BA=A6=E6=94=BE=E5=A4=A7=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=A4=9A=E6=98=BE=E7=A4=BA=E5=87=A0=E8=A1=8C=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1004210 --user=王孝刚 6.场景导入、接口列表导入 将复制和引用按钮放到右上角 列表高度放大可以多显示几行数据
https://www.tapd.cn/55049933/s/1077870
---
 .../automation/scenario/ApiScenarioList.vue   |  2 +-
 .../automation/scenario/api/ApiRelevance.vue  |  9 ++-
 .../scenario/api/RelevanceApiList.vue         |  2 +-
 .../scenario/api/RelevanceCaseList.vue        |  2 +-
 .../scenario/api/ScenarioRelevance.vue        | 10 +++-
 .../common/components/MsDialogHeader.vue      | 56 +++++++++++++++++++
 .../view/comonents/base/RelevanceDialog.vue   | 22 ++++++--
 .../comonents/base/TestCaseRelevanceBase.vue  | 31 +++++-----
 8 files changed, 106 insertions(+), 28 deletions(-)
 create mode 100644 frontend/src/business/components/common/components/MsDialogHeader.vue

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index ddca3b8db0..b0c58dee3a 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -6,7 +6,7 @@
 
       <ms-table
         :data="tableData"
-        :screen-height="isRelate ? 'calc(100vh - 400px)' :  screenHeight"
+        :screen-height="isRelate ? 'calc(100vh - 300px)' :  screenHeight"
         :condition="condition"
         :page-size="pageSize"
         :operators="isRelate ? [] : operators"
diff --git a/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
index 1791093355..8934c915e2 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
@@ -32,9 +32,12 @@
       @isApiListEnableChange="isApiListEnableChange"
       ref="apiCaseList"/>
 
-    <template v-slot:footer>
-      <el-button type="primary" @click="copy" :loading="buttonIsWorking" @keydown.enter.native.prevent>{{ $t('commons.copy') }}</el-button>
-      <el-button v-if="!isApiListEnable" type="primary" :loading="buttonIsWorking" @click="reference" @keydown.enter.native.prevent>
+    <template v-slot:header>
+      <el-button type="primary" @click="copy" :loading="buttonIsWorking" @keydown.enter.native.prevent>
+        {{ $t('commons.copy') }}
+      </el-button>
+      <el-button v-if="!isApiListEnable" type="primary" :loading="buttonIsWorking" @click="reference"
+                 @keydown.enter.native.prevent>
         {{ $t('api_test.scenario.reference') }}
       </el-button>
     </template>
diff --git a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
index 53f1aa39d0..29ba45dede 100644
--- a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
@@ -55,7 +55,7 @@
           components: TEST_PLAN_RELEVANCE_API_DEFINITION_CONFIGS
         },
         result: {},
-        screenHeight: 'calc(100vh - 400px)',//屏幕高度,
+        screenHeight: 'calc(100vh - 300px)',//屏幕高度,
         tableData: [],
         environmentId: "",
         total: 0,
diff --git a/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue b/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
index 679189f7fa..a6ec775e05 100644
--- a/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
@@ -136,7 +136,7 @@ export default {
         priority: CASE_PRIORITY,
       },
       methodColorMap: new Map(API_METHOD_COLOUR),
-      screenHeight: 'calc(100vh - 400px)',//屏幕高度
+      screenHeight: 'calc(100vh - 300px)',//屏幕高度
       tableData: [],
       currentPage: 1,
       pageSize: 10,
diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
index 1e3a58ba60..4cc552a55c 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
@@ -25,9 +25,13 @@
       :custom-num="customNum"
       ref="apiScenarioList"/>
 
-    <template v-slot:footer>
-      <el-button type="primary" @click="copy" :loading="buttonIsWorking" @keydown.enter.native.prevent>{{$t('commons.copy')}}</el-button>
-      <el-button type="primary" @click="reference" :loading="buttonIsWorking" @keydown.enter.native.prevent> {{ $t('api_test.scenario.reference') }}</el-button>
+    <template v-slot:header>
+      <el-button type="primary" @click="copy" :loading="buttonIsWorking" @keydown.enter.native.prevent>
+        {{ $t('commons.copy') }}
+      </el-button>
+      <el-button type="primary" @click="reference" :loading="buttonIsWorking" @keydown.enter.native.prevent>
+        {{ $t('api_test.scenario.reference') }}
+      </el-button>
     </template>
   </test-case-relevance-base>
 </template>
diff --git a/frontend/src/business/components/common/components/MsDialogHeader.vue b/frontend/src/business/components/common/components/MsDialogHeader.vue
new file mode 100644
index 0000000000..160c9d3d25
--- /dev/null
+++ b/frontend/src/business/components/common/components/MsDialogHeader.vue
@@ -0,0 +1,56 @@
+<template>
+
+  <div class="dialog-header">
+    <el-button @click="cancel" :size="btnSize">{{ $t('commons.cancel') }}</el-button>
+    <el-button type="primary" @click="confirm" @keydown.enter.native.prevent :size="btnSize">
+      {{ $t('commons.confirm') }}
+    </el-button>
+    <el-button type="primary" v-if="isShow" @click="saveAsEdit" @keydown.enter.native.prevent>{{ title }}</el-button>
+  </div>
+
+</template>
+
+<script>
+export default {
+  name: "MsDialogFooter",
+  props: {
+    isShow: {
+      type: Boolean,
+      default: false,
+    },
+    title: String,
+    btnSize: {
+      type: String,
+      default() {
+        return '';
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.$emit("cancel");
+    },
+    confirm() {
+      this.$emit("confirm");
+    },
+    saveAsEdit() {
+      this.$emit("saveAsEdit");
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+.dialog-header {
+  position: absolute;
+  top: 40px;
+  right: 20px;
+  padding: 0;
+  background: 0 0;
+  border: none;
+  outline: 0;
+  cursor: pointer;
+}
+
+</style>
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue b/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
index 5a95ba6722..da6d64562a 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
@@ -7,8 +7,11 @@
              :destroy-on-close="true"
              top="50px" append-to-body>
 
-    <el-container class="main-content">
+    <el-header class="header-btn">
+      <slot name="header"></slot>
+    </el-header>
 
+    <el-container class="main-content">
       <el-aside class="tree-aside" width="250px">
         <slot name="aside"></slot>
       </el-aside>
@@ -21,9 +24,9 @@
 
     </el-container>
 
-    <template v-slot:footer>
-      <slot name="footer"></slot>
-    </template>
+    <!--    <template v-slot:footer>
+          <slot name="footer"></slot>
+        </template>-->
 
   </el-dialog>
 </template>
@@ -71,4 +74,15 @@
     padding: 10px 20px;
   }
 
+  .header-btn {
+    position: absolute;
+    top: 40px;
+    right: 30px;
+    padding: 0;
+    background: 0 0;
+    border: none;
+    outline: 0;
+    cursor: pointer;
+  }
+
 </style>
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
index f6bbec56c7..8c5ec35e8e 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
@@ -1,6 +1,18 @@
 <template>
-  <relevance-dialog :width="width" :title="dialogTitle"  ref="relevanceDialog">
+  <relevance-dialog :width="width" :title="dialogTitle" ref="relevanceDialog">
 
+    <template v-slot:header>
+
+      <div v-if="$slots.header">
+        <slot name="header"></slot>
+      </div>
+      <div v-else>
+        <div style="margin-bottom: 15px" v-if="flag">
+          <el-checkbox v-model="checked">{{ $t('test_track.sync_add_api_load') }}</el-checkbox>
+        </div>
+        <ms-dialog-header @cancel="close" v-loading="isSaving" @confirm="save"/>
+      </div>
+    </template>
     <template v-slot:aside>
       <select-menu
         :data="projects"
@@ -14,26 +26,15 @@
 
     <slot></slot>
 
-    <template v-slot:footer>
 
-    <div v-if="$slots.footer">
-        <slot name="footer"></slot>
-      </div>
-      <div v-else>
-        <div style="margin-bottom: 15px" v-if="flag">
-          <el-checkbox v-model="checked">{{ $t('test_track.sync_add_api_load') }}</el-checkbox>
-        </div>
-        <ms-dialog-footer @cancel="close" v-loading="isSaving" @confirm="save"/>
-      </div>
-    </template>
 
   </relevance-dialog>
 </template>
 
 <script>
 
-  import MsDialogFooter from '../../../../../common/components/MsDialogFooter'
-  import SelectMenu from "../../../../common/SelectMenu";
+import MsDialogHeader from '../../../../../common/components/MsDialogHeader'
+import SelectMenu from "../../../../common/SelectMenu";
   import RelevanceDialog from "./RelevanceDialog";
   import {getCurrentProjectID, getCurrentUserId, getCurrentWorkspaceId} from "@/common/js/utils";
 
@@ -42,7 +43,7 @@
     components: {
       RelevanceDialog,
       SelectMenu,
-      MsDialogFooter,
+      MsDialogHeader,
     },
     data() {
       return {

From 8eb763de0335441780ac3cb0545a2c662e666453 Mon Sep 17 00:00:00 2001
From: zhangdahai112 <dahai.zhang@fit2cloud.com>
Date: Mon, 6 Dec 2021 13:37:09 +0800
Subject: [PATCH 059/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20=E3=80=90gi?=
 =?UTF-8?q?thub#8151=E3=80=91=E4=BD=BF=E7=94=A8=20postman=20=E6=88=96?=
 =?UTF-8?q?=E8=80=85=20idea=20=E6=8F=92=E4=BB=B6=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8Cpathvariable=20=E6=97=A0=E6=B3=95=E8=87=AA?=
 =?UTF-8?q?=E5=B8=A6=E6=98=BE=E7=A4=BA=E5=88=B0=20rest=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/api/dto/parse/postman/PostmanUrl.java    | 1 +
 .../io/metersphere/api/parse/PostmanAbstractParserParser.java    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanUrl.java b/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanUrl.java
index 55481b4b12..aead1899ff 100644
--- a/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanUrl.java
+++ b/backend/src/main/java/io/metersphere/api/dto/parse/postman/PostmanUrl.java
@@ -11,4 +11,5 @@ public class PostmanUrl {
     private String protocol;
     private String port;
     private List<PostmanKeyValue> query;
+    private List<PostmanKeyValue> variable;
 }
diff --git a/backend/src/main/java/io/metersphere/api/parse/PostmanAbstractParserParser.java b/backend/src/main/java/io/metersphere/api/parse/PostmanAbstractParserParser.java
index 4a48319285..a8d95dc9ed 100644
--- a/backend/src/main/java/io/metersphere/api/parse/PostmanAbstractParserParser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/PostmanAbstractParserParser.java
@@ -31,6 +31,7 @@ public abstract class PostmanAbstractParserParser<T> extends ApiImportAbstractPa
         requestDesc.getAuth(); // todo 认证方式等待优化
         PostmanUrl url = requestDesc.getUrl();
         MsHTTPSamplerProxy request = buildRequest(requestItem.getName(), url == null ? "" : url.getRaw(), requestDesc.getMethod());
+        request.setRest(parseKeyValue(requestDesc.getUrl().getVariable()));
         if (StringUtils.isNotBlank(request.getPath())) {
             String path = request.getPath().split("\\?")[0];
             path = parseVariable(path);

From dc4786229c2e8fa27aa93e84a039607b0e035eb2 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 6 Dec 2021 15:32:39 +0800
Subject: [PATCH 060/256] =?UTF-8?q?fix(=E7=8E=AF=E5=A2=83=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86):=20tcp=E5=9F=9F=E5=90=8D=E5=B1=95=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008570 --user=lyh
【环境管理】环境列表增加tcp域名显示，如果只有一个域名不展示在列表
https://www.tapd.cn/55049933/s/1078037
---
 .../project/menu/EnvironmentList.vue          |  6 ++---
 .../environment/EnvironmentGroupRow.vue       | 25 ++++++++++++-------
 .../workspace/environment/EnvironmentList.vue |  2 +-
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/frontend/src/business/components/project/menu/EnvironmentList.vue b/frontend/src/business/components/project/menu/EnvironmentList.vue
index 4ae0578955..15989349c9 100644
--- a/frontend/src/business/components/project/menu/EnvironmentList.vue
+++ b/frontend/src/business/components/project/menu/EnvironmentList.vue
@@ -32,7 +32,7 @@
             <el-table-column :label="$t('api_test.environment.socket')" show-overflow-tooltip>
               <template v-slot="scope">
                 <span v-if="parseDomainName(scope.row)!='SHOW_INFO'">{{ parseDomainName(scope.row) }}</span>
-                <el-button size="mini" icon="el-icon-s-data" @click="showInfo(scope.row)" v-else>查看域名详情</el-button>
+                <el-button size="mini" icon="el-icon-s-data" @click="showInfo(scope.row)" v-else>{{ $t('workspace.env_group.view_details') }}</el-button>
               </template>
             </el-table-column>
             <el-table-column :label="$t('commons.operating')">
@@ -88,7 +88,7 @@
                 {{ row.conditionType ? "-" : getDetails(row) }}
               </template>
             </el-table-column>
-            <el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="'描述'">
+            <el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="$t('commons.description')">
               <template v-slot:default="{row}">
                 <span>{{ row.description ? row.description : "-" }}</span>
               </template>
@@ -370,7 +370,7 @@ export default {
           } else if (config.httpConfig.conditions.length > 1) {
             return "SHOW_INFO";
           } else if (config.tcpConfig && config.tcpConfig.server) {
-            return "SHOW_INFO"; // 页面上该字段只要显示域名数据就表示该域名是HTTP类型.如果只有TCP类型则弹窗显示以区分域名类型.
+            return config.tcpConfig.server;
           } else {
             return "";
           }
diff --git a/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupRow.vue b/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupRow.vue
index 258d7ee09f..29e7075a19 100644
--- a/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupRow.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EnvironmentGroupRow.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <div class="btn-div">
-      <el-button size="mini" type="primary" class="save-btn" v-if="!rowReadOnly && !showSaveBtn" @click="update">{{$t('commons.save')}}</el-button>
+      <el-button size="mini" type="primary" class="save-btn" v-if="!rowReadOnly && !showSaveBtn" @click="update">
+        {{ $t('commons.save') }}
+      </el-button>
     </div>
     <div v-loading="result.loading" class="group-row">
       <el-form class="row-form">
@@ -29,13 +31,15 @@
 
             <el-col :span="4">
               <el-button :size="itemSize" icon="el-icon-s-data" style="width: 100%;"
-                         @click="showDomainInfo(item)" v-if="item.moreDomain">{{ $t('workspace.env_group.view_details') }}
+                         @click="showDomainInfo(item)" v-if="item.moreDomain">
+                {{ $t('workspace.env_group.view_details') }}
               </el-button>
               <el-input v-else v-model="item.domainName" :disabled="true" :size="itemSize"/>
             </el-col>
 
             <el-col :span="5">
-              <el-input prop="description" show-overflow-tooltip :placeholder="$t('commons.description')" maxlength="100"
+              <el-input prop="description" show-overflow-tooltip :placeholder="$t('commons.description')"
+                        maxlength="100"
                         v-model="item.domainDescription"
                         show-word-limit :size="itemSize" :disabled="true"/>
             </el-col>
@@ -73,7 +77,8 @@
               {{ row.conditionType ? "-" : getDetails(row) }}
             </template>
           </el-table-column>
-          <el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="$t('commons.description')">
+          <el-table-column prop="description" show-overflow-tooltip min-width="120px"
+                           :label="$t('commons.description')">
             <template v-slot:default="{row}">
               <span>{{ row.description ? row.description : "-" }}</span>
             </template>
@@ -86,9 +91,9 @@
           </el-table-column>
         </el-table>
         <span slot="footer" class="dialog-footer">
-    <el-button @click="domainVisible = false" size="mini">{{ $t('commons.cancel') }}</el-button>
-    <el-button type="primary" @click="domainVisible = false" size="mini">{{ $t('commons.confirm') }}</el-button>
-  </span>
+          <el-button @click="domainVisible = false" size="small">{{ $t('commons.cancel') }}</el-button>
+          <el-button type="primary" @click="domainVisible = false" size="small">{{ $t('commons.confirm') }}</el-button>
+        </span>
       </el-dialog>
     </div>
   </div>
@@ -203,7 +208,8 @@ export default {
             this.$set(item, "moreDomain", true);
             return;
           } else if (config.tcpConfig && config.tcpConfig.server) {
-            this.$set(item, "moreDomain", true);
+            this.$set(item, "domainName", config.tcpConfig.server);
+            this.$set(item, "domainDescription", config.tcpConfig.description);
             return;
           }
         }
@@ -296,7 +302,8 @@ export default {
             this.$set(item, "moreDomain", true);
             return;
           } else if (config.tcpConfig && config.tcpConfig.server) {
-            this.$set(item, "moreDomain", true);
+            this.$set(item, "domainName", config.tcpConfig.server);
+            this.$set(item, "domainDescription", config.tcpConfig.description);
             return;
           }
         }
diff --git a/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue b/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
index 14c471929d..b1fc0555d5 100644
--- a/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
@@ -411,7 +411,7 @@ export default {
           } else if (config.httpConfig.conditions.length > 1) {
             return "SHOW_INFO";
           } else if (config.tcpConfig && config.tcpConfig.server) {
-            return "SHOW_INFO"; // 页面上该字段只要显示域名数据就表示该域名是HTTP类型.如果只有TCP类型则弹窗显示以区分域名类型.
+            return config.tcpConfig.server;
           } else {
             return "";
           }

From 603707e4e4df6e792fe46d993b6dfd1f3f139778 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 6 Dec 2021 15:47:48 +0800
Subject: [PATCH 061/256] =?UTF-8?q?refactor(=E7=8E=AF=E5=A2=83=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86):=20=E7=8E=AF=E5=A2=83=E5=88=97=E8=A1=A8=E5=92=8C?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=BB=84=E5=88=97=E8=A1=A8=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/workspace/environment/EnvironmentList.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue b/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
index b1fc0555d5..2478e9700e 100644
--- a/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
@@ -178,7 +178,7 @@ export default {
       total: 0,
       projectIds: [],   //当前工作空间所拥有的所有项目id
       projectFilters: [],
-      screenHeight: 'calc(100vh - 195px)',
+      screenHeight: 'calc(100vh - 210px)',
       rules: {
         currentProjectId: [
           {required: true, message: "", trigger: 'blur'},

From cd2d92ced25951eeaad5a83cd6bb0150950a2ebd Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 6 Dec 2021 15:54:04 +0800
Subject: [PATCH 062/256] chore(sync):
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008580 --user=郭雨琦 [我的工作台]-我的关注没有统计 我关注的TCP,SQL和DUBBO协议的接口定义
---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 170b78b71a..433c1b7e4d 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 170b78b71af0fae99f45eca1aea17713fc7c2628
+Subproject commit 433c1b7e4dcf67ada7ca75219c10fdaaacd8c83a

From beeb91d20e6bd7b369fcb9da9955e19c40723414 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 6 Dec 2021 15:37:18 +0800
Subject: [PATCH 063/256] =?UTF-8?q?fix:=20=E5=85=B3=E8=81=94=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E4=B8=8E=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
index fd44a1330e..744e29c80d 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
@@ -67,6 +67,7 @@
         and (test_case_issues.test_case_id is null or test_case_issues.test_case_id != #{request.caseId})
         and (issues.platform_status != 'delete' or issues.platform_status is NULL)
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
+        group by issues.id
     </select>
     <select id="getIssueForSync" resultType="io.metersphere.base.domain.IssuesDao">
         select id,platform, platform_id

From 02ae1148049e47cc50d6d1a76e701ce9aae7aff4 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 6 Dec 2021 18:03:31 +0800
Subject: [PATCH 064/256] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=94=A8=E4=BE=8B=E6=8F=90=E7=A4=BA=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E8=84=91=E5=9B=BE=20--bug=3D1008131=20--user=3D=E9=99=88?=
 =?UTF-8?q?=E5=BB=BA=E6=98=9F=20=E3=80=90github#7831=E3=80=91=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E3=80=90=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA=E3=80=91?=
 =?UTF-8?q?-=E3=80=90=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E3=80=91?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=87=E8=AE=B0=E7=94=A8=E4=BE=8B=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=EF=BC=8C=E7=82=B9=E5=87=BB=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=EF=BC=8C=E6=9C=AA=E6=8F=90=E7=A4=BA=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=94=A8=E4=BE=8B=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E7=BB=93=E6=9E=9C=E8=AE=B0=E5=BD=95=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=E3=80=82=20https://www.tapd.cn/55049933/s/10781699?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/plan/view/TestPlanView.vue          | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/track/plan/view/TestPlanView.vue b/frontend/src/business/components/track/plan/view/TestPlanView.vue
index bb66c0f185..b69ab8afeb 100644
--- a/frontend/src/business/components/track/plan/view/TestPlanView.vue
+++ b/frontend/src/business/components/track/plan/view/TestPlanView.vue
@@ -27,6 +27,12 @@
                     :plan-id="planId"/>
     <test-plan-report-content v-if="activeIndex === 'report'" :plan-id="planId"/>
 
+    <is-change-confirm
+      :title="'请保存脑图'"
+      :tip="'脑图未保存，确认保存脑图吗？'"
+      @confirm="changeConfirm"
+      ref="isChangeConfirm"/>
+
   </div>
 
 </template>
@@ -45,10 +51,12 @@ import TestPlanApi from "./comonents/api/TestPlanApi";
 import TestPlanLoad from "@/business/components/track/plan/view/comonents/load/TestPlanLoad";
 import {getCurrentProjectID} from "@/common/js/utils";
 import TestPlanReportContent from "@/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent";
+import IsChangeConfirm from "@/business/components/common/components/IsChangeConfirm";
 
 export default {
   name: "TestPlanView",
   components: {
+    IsChangeConfirm,
     TestPlanReportContent,
     TestPlanApi,
     TestPlanFunctional,
@@ -66,6 +74,7 @@ export default {
       redirectCharType: '',
       //报表跳转过来的参数-通过哪种数据跳转的
       clickType: '',
+      tmpActiveIndex: ''
     };
   },
   computed: {
@@ -80,7 +89,7 @@ export default {
     '$route.params.planId'() {
       this.genRedirectParam();
       this.getTestPlans();
-    }
+    },
   },
   beforeRouteLeave(to, from, next) {
     if (!this.$refs.testPlanFunctional) {
@@ -131,8 +140,26 @@ export default {
       this.$router.push('/track/plan/view/' + plan.id);
     },
     handleSelect(key) {
+      let isTestCaseMinderChanged = this.$store.state.isTestCaseMinderChanged;
+      if (key !== 'functional' && isTestCaseMinderChanged) {
+        this.$refs.isChangeConfirm.open();
+        this.tmpActiveIndex = key;
+        return;
+      }
       this.activeIndex = key;
     },
+    changeConfirm(isSave) {
+      if (isSave) {
+        this.$refs.testPlanFunctional.$refs.minder.save(window.minder.exportJson());
+      }
+      this.$store.commit('setIsTestCaseMinderChanged', false);
+      this.$nextTick(() => {
+        if (this.tmpActiveIndex) {
+          this.activeIndex = this.tmpActiveIndex;
+          this.tmpActiveIndex = null;
+        }
+      });
+    },
     reloadMenu() {
       this.isMenuShow = false;
       this.$nextTick(() => {

From 04c2e722e1837bcb8fd5eda0eff296a31519f546 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 6 Dec 2021 17:27:14 +0800
Subject: [PATCH 065/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E4=B8=AD=E5=9C=BA=E6=99=AF=E5=AF=BC=E5=85=A5=E3=80=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=88=97=E8=A1=A8=E5=AF=BC=E5=85=A5=20=E5=B0=86?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=92=8C=E5=BC=95=E7=94=A8=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=94=BE=E5=88=B0=E5=8F=B3=E4=B8=8A=E8=A7=92=20=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=AB=98=E5=BA=A6=E6=94=BE=E5=A4=A7=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=A4=9A=E6=98=BE=E7=A4=BA=E5=87=A0=E8=A1=8C=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scenario/api/ScenarioRelevance.vue        |  2 +-
 .../common/components/MsDialogHeader.vue      |  7 +++----
 .../view/comonents/base/RelevanceDialog.vue   |  9 ++++----
 .../comonents/base/TestCaseRelevanceBase.vue  | 21 ++++++++++++++-----
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
index 4cc552a55c..6b99c65212 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
@@ -25,7 +25,7 @@
       :custom-num="customNum"
       ref="apiScenarioList"/>
 
-    <template v-slot:header>
+    <template v-slot:headerBtn>
       <el-button type="primary" @click="copy" :loading="buttonIsWorking" @keydown.enter.native.prevent>
         {{ $t('commons.copy') }}
       </el-button>
diff --git a/frontend/src/business/components/common/components/MsDialogHeader.vue b/frontend/src/business/components/common/components/MsDialogHeader.vue
index 160c9d3d25..aab4670cc2 100644
--- a/frontend/src/business/components/common/components/MsDialogHeader.vue
+++ b/frontend/src/business/components/common/components/MsDialogHeader.vue
@@ -12,7 +12,7 @@
 
 <script>
 export default {
-  name: "MsDialogFooter",
+  name: "MsDialogHeader",
   props: {
     isShow: {
       type: Boolean,
@@ -22,7 +22,7 @@ export default {
     btnSize: {
       type: String,
       default() {
-        return '';
+        return 'mini';
       }
     }
   },
@@ -43,8 +43,7 @@ export default {
 <style scoped>
 
 .dialog-header {
-  position: absolute;
-  top: 40px;
+  top: 20px;
   right: 20px;
   padding: 0;
   background: 0 0;
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue b/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
index da6d64562a..b69d53e728 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/RelevanceDialog.vue
@@ -8,7 +8,7 @@
              top="50px" append-to-body>
 
     <el-header class="header-btn">
-      <slot name="header"></slot>
+      <slot name="headerBtn"></slot>
     </el-header>
 
     <el-container class="main-content">
@@ -24,9 +24,9 @@
 
     </el-container>
 
-    <!--    <template v-slot:footer>
-          <slot name="footer"></slot>
-        </template>-->
+    <template v-slot:footer>
+      <slot name="footer"></slot>
+    </template>
 
   </el-dialog>
 </template>
@@ -83,6 +83,7 @@
     border: none;
     outline: 0;
     cursor: pointer;
+    height: 30px;
   }
 
 </style>
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
index 8c5ec35e8e..4c897fa4ad 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
@@ -1,18 +1,18 @@
 <template>
   <relevance-dialog :width="width" :title="dialogTitle" ref="relevanceDialog">
+    <template v-slot:headerBtn>
 
-    <template v-slot:header>
-
-      <div v-if="$slots.header">
-        <slot name="header"></slot>
+      <div v-if="$slots.headerBtn">
+        <slot name="headerBtn"></slot>
       </div>
       <div v-else>
-        <div style="margin-bottom: 15px" v-if="flag">
+        <div style="margin-bottom: 5px" v-if="flag">
           <el-checkbox v-model="checked">{{ $t('test_track.sync_add_api_load') }}</el-checkbox>
         </div>
         <ms-dialog-header @cancel="close" v-loading="isSaving" @confirm="save"/>
       </div>
     </template>
+
     <template v-slot:aside>
       <select-menu
         :data="projects"
@@ -26,7 +26,18 @@
 
     <slot></slot>
 
+    <!--    <template v-slot:footer>
 
+          <div v-if="$slots.footer">
+            <slot name="footer"></slot>
+          </div>
+          <div v-else>
+            <div style="margin-bottom: 15px" v-if="flag">
+              <el-checkbox v-model="checked">{{ $t('test_track.sync_add_api_load') }}</el-checkbox>
+            </div>
+            <ms-dialog-footer @cancel="close" v-loading="isSaving" @confirm="save"/>
+          </div>
+        </template>-->
 
   </relevance-dialog>
 </template>

From 26dba06c87b7786797a58c6a41e1972d3f7081cb Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 6 Dec 2021 18:04:04 +0800
Subject: [PATCH 066/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=89=A7=E8=A1=8C):=20=E6=9B=B4=E6=94=B9=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E6=89=A7=E8=A1=8C=E7=9A=84=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更改测试计划执行时的线程顺序为先开启监听线程再开启执行线程、测试计划列表展现时增加结果状态检查
---
 .../api/service/ApiScenarioReportService.java |  46 ++++----
 .../track/service/TestPlanReportService.java  | 106 +++++++++++++++---
 .../track/service/TestPlanService.java        |   8 +-
 3 files changed, 121 insertions(+), 39 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
index 226f9f19bd..9e948eb98d 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
@@ -323,7 +323,6 @@ public class ApiScenarioReportService {
             }
 
             ApiScenarioReport report = editReport(scenarioResult, startTime);
-
             if(report != null){
                 TestResult newResult = createTestResult(result.getTestId(), scenarioResult);
                 newResult.setConsole(result.getConsole());
@@ -347,26 +346,37 @@ public class ApiScenarioReportService {
                 } else {
                     planScenarioId = report.getScenarioId();
                 }
+
+                String passRate = new DecimalFormat("0%").format((float) scenarioResult.getSuccess() / (scenarioResult.getSuccess() + scenarioResult.getError()));
+
                 TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(planScenarioId);
-                report.setScenarioId(testPlanApiScenario.getApiScenarioId());
-                report.setTestPlanScenarioId(planScenarioId);
+                if(testPlanApiScenario != null){
+                    //更新测试计划场景相关状态
+                    report.setScenarioId(testPlanApiScenario.getApiScenarioId());
+                    report.setTestPlanScenarioId(planScenarioId);
+
+                    if (scenarioResult.getError() > 0) {
+                        scenarioAndErrorMap.put(testPlanApiScenario.getId(), TestPlanApiExecuteStatus.FAILD.name());
+                        testPlanApiScenario.setLastResult(ScenarioStatus.Fail.name());
+                        testPlanApiScenario.setPassRate(passRate);
+                    } else {
+                        scenarioAndErrorMap.put(testPlanApiScenario.getId(), TestPlanApiExecuteStatus.SUCCESS.name());
+                        testPlanApiScenario.setLastResult(ScenarioStatus.Success.name());
+                    }
+                    testPlanApiScenario.setReportId(report.getId());
+                    testPlanApiScenario.setUpdateTime(System.currentTimeMillis());
+                    testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
+                    scenarioIdList.add(testPlanApiScenario.getApiScenarioId());
+                }else {
+                    LogUtil.info("TestPlanReport_Id is null. scenario report id : ["+report.getId()+"]; planScenarioIdArr:["+report.getScenarioId()+"] DATA:"+JSON.toJSONString(scenarioResult));
+                }
+
                 report.setEndTime(System.currentTimeMillis());
                 apiScenarioReportMapper.updateByPrimaryKeySelective(report);
                 planScenarioReportMap.put(planScenarioId, report.getId());
 
-                if (scenarioResult.getError() > 0) {
-                    scenarioAndErrorMap.put(testPlanApiScenario.getId(), TestPlanApiExecuteStatus.FAILD.name());
-                    testPlanApiScenario.setLastResult(ScenarioStatus.Fail.name());
-                } else {
-                    scenarioAndErrorMap.put(testPlanApiScenario.getId(), TestPlanApiExecuteStatus.SUCCESS.name());
-                    testPlanApiScenario.setLastResult(ScenarioStatus.Success.name());
-                }
-
-                String passRate = new DecimalFormat("0%").format((float) scenarioResult.getSuccess() / (scenarioResult.getSuccess() + scenarioResult.getError()));
-                testPlanApiScenario.setPassRate(passRate);
                 // 报告详情内容
                 ApiScenarioReportDetail detail = new ApiScenarioReportDetail();
-
                 detail.setContent(JSON.toJSONString(newResult).getBytes(StandardCharsets.UTF_8));
                 detail.setReportId(report.getId());
                 detail.setProjectId(report.getProjectId());
@@ -375,15 +385,11 @@ public class ApiScenarioReportService {
                 }
                 apiScenarioReportDetailMapper.insert(detail);
 
-                testPlanApiScenario.setReportId(report.getId());
-                report.setEndTime(System.currentTimeMillis());
-                testPlanApiScenario.setUpdateTime(System.currentTimeMillis());
-                testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
-                scenarioIdList.add(testPlanApiScenario.getApiScenarioId());
+
                 scenarioNames.append(report.getName()).append(",");
 
                 // 更新场景状态
-                ApiScenario scenario = apiScenarioMapper.selectByPrimaryKey(testPlanApiScenario.getApiScenarioId());
+                ApiScenario scenario = apiScenarioMapper.selectByPrimaryKey(report.getScenarioId());
                 if (scenario != null) {
                     if (scenarioResult.getError() > 0) {
                         scenario.setLastResult("Fail");
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
index 27aeabc3a4..369ff094b3 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
@@ -65,6 +65,8 @@ public class TestPlanReportService {
     @Resource
     ApiScenarioReportMapper apiScenarioReportMapper;
     @Resource
+    ApiDefinitionExecResultMapper apiDefinitionExecResultMapper;
+    @Resource
     TestPlanReportDataMapper testPlanReportDataMapper;
     @Resource
     ExtTestPlanScenarioCaseMapper extTestPlanScenarioCaseMapper;
@@ -105,7 +107,6 @@ public class TestPlanReportService {
         if (StringUtils.isBlank(request.getProjectId())) {
             return list;
         }
-
         if (request.getCombine() != null && !request.getCombine().isEmpty()) {
             if (request.getCombine().get("status") != null) {
                 HashMap<String, Object> map = (HashMap<String, Object>) request.getCombine().get("status");
@@ -127,6 +128,7 @@ public class TestPlanReportService {
             }
         }
         list = extTestPlanReportMapper.list(request);
+        this.checkReportStatus(list);
         return list;
     }
 
@@ -584,8 +586,8 @@ public class TestPlanReportService {
                 testPlanReport.setEndTime(endTime);
                 testPlanReport.setUpdateTime(endTime);
             }
-
             TestPlanReportExecuteCatch.remove(testPlanReport.getId());
+            testPlanLog.info("Task is finish. Remove listener:" + testPlanReport.getId());
         }
         testPlanReportContentMapper.updateByPrimaryKeySelective(parseReportDaoToReportContent(reportDTO, reportContent));
 
@@ -1024,7 +1026,9 @@ public class TestPlanReportService {
     public synchronized TestPlanReport updateExecuteApis(String planReportId) {
 
         TestPlanExecuteInfo executeInfo = TestPlanReportExecuteCatch.getTestPlanExecuteInfo(planReportId);
-
+        if (executeInfo == null) {
+            return null;
+        }
         Map<String, String> executeApiCaseIdMap = executeInfo.getApiCaseExecInfo();
         Map<String, String> executeScenarioCaseIdMap = executeInfo.getApiScenarioCaseExecInfo();
         Map<String, String> executePerformanceIdMap = executeInfo.getLoadCaseExecInfo();
@@ -1069,17 +1073,11 @@ public class TestPlanReportService {
     }
 
     public void countReport(String planReportId) {
-        TestPlanExecuteInfo executeInfo = TestPlanReportExecuteCatch.getTestPlanExecuteInfo(planReportId);
-        int unFinishNum = executeInfo.countUnFinishedNum();
-        if (unFinishNum > 0) {
-            //如果间隔超过5分钟没有案例执行完成，则把执行结果变成false
-            long lastCountTime = executeInfo.getLastFinishedNumCountTime();
-            long nowTime = System.currentTimeMillis();
-            if (nowTime - lastCountTime > 1800000) {
-                TestPlanReportExecuteCatch.finishAllTask(planReportId);
-            }
+        boolean isTimeOut = this.checkTestPlanReportIsTimeOut(planReportId);
+        if (isTimeOut) {
+            //判断是否超时。超时时强行停止任务
+            TestPlanReportExecuteCatch.finishAllTask(planReportId);
         }
-
         this.updateExecuteApis(planReportId);
     }
 
@@ -1139,26 +1137,55 @@ public class TestPlanReportService {
 
     private void updateReportExecResult(TestPlanReportContentWithBLOBs testPlanReportContent) {
         boolean isUpdate = false;
+        boolean isTaskRunning = false;
+        boolean reportHasData = false;
+        if (StringUtils.isNotBlank(testPlanReportContent.getApiAllCases())) {
+            reportHasData = true;
+            List<TestPlanFailureApiDTO> allCases = JSONObject.parseArray(testPlanReportContent.getApiAllCases(), TestPlanFailureApiDTO.class);
+            for (TestPlanFailureApiDTO dto : allCases) {
+                String status = dto.getExecResult();
+                if (StringUtils.equalsAnyIgnoreCase(status, "Running", "Waiting")) {
+                    isUpdate = true;
+                    ApiDefinitionExecResult definitionExecResult = apiDefinitionExecResultMapper.selectByPrimaryKey(dto.getReportId());
+                    if (definitionExecResult != null) {
+                        dto.setExecResult(definitionExecResult.getStatus());
+                    }
+                }
+
+                if (StringUtils.equalsAnyIgnoreCase(dto.getExecResult(), "Running", "Waiting")) {
+                    isTaskRunning = true;
+                }
+            }
+            testPlanReportContent.setApiAllCases(JSONArray.toJSONString(allCases));
+        }
+
         if (StringUtils.isNotBlank(testPlanReportContent.getScenarioAllCases())) {
+            reportHasData = true;
             List<TestPlanFailureScenarioDTO> allCases = JSONObject.parseArray(testPlanReportContent.getScenarioAllCases(), TestPlanFailureScenarioDTO.class);
             for (TestPlanFailureScenarioDTO dto : allCases) {
-                if (StringUtils.equalsAnyIgnoreCase("Underway", dto.getStatus(), dto.getLastResult())) {
+                String lastResult = dto.getLastResult();
+                if (StringUtils.equalsAnyIgnoreCase(lastResult, "Running", "Waiting", "Underway")) {
                     isUpdate = true;
                     ApiScenarioReport apiReport = apiScenarioReportMapper.selectByPrimaryKey(dto.getReportId());
                     if (apiReport != null) {
                         dto.setLastResult(apiReport.getStatus());
                         dto.setStatus(apiReport.getStatus());
                     }
-                } else if (StringUtils.equalsAnyIgnoreCase("Error", dto.getStatus(), dto.getLastResult())) {
+                } else if (StringUtils.equalsAnyIgnoreCase("Error", lastResult)) {
                     isUpdate = true;
                     dto.setLastResult("Fail");
                     dto.setStatus("Fail");
                 }
+
+                if (StringUtils.equalsAnyIgnoreCase(dto.getLastResult(), "Running", "Waiting", "Underway")) {
+                    isTaskRunning = true;
+                }
             }
             testPlanReportContent.setScenarioAllCases(JSONArray.toJSONString(allCases));
         }
 
         if (StringUtils.isNotBlank(testPlanReportContent.getLoadAllCases())) {
+            reportHasData = true;
             List<TestPlanLoadCaseDTO> allCases = JSONObject.parseArray(testPlanReportContent.getLoadAllCases(), TestPlanLoadCaseDTO.class);
             for (TestPlanLoadCaseDTO dto : allCases) {
                 if (StringUtils.equalsIgnoreCase(dto.getStatus(), "run")) {
@@ -1168,12 +1195,20 @@ public class TestPlanReportService {
                         dto.setStatus(report.getStatus());
                     }
                 }
+
+                if (StringUtils.equalsAnyIgnoreCase("Underway", dto.getStatus(), dto.getStatus())) {
+                    isTaskRunning = true;
+                }
             }
             testPlanReportContent.setLoadAllCases(JSONArray.toJSONString(allCases));
         }
         if (isUpdate) {
             testPlanReportContentMapper.updateByPrimaryKeyWithBLOBs(testPlanReportContent);
         }
+
+        if (!isTaskRunning && reportHasData) {
+            this.finishTestPlanReport(testPlanReportContent.getTestPlanReportId());
+        }
     }
 
     public void finishReport(TestPlanReport testPlanReport) {
@@ -1182,6 +1217,45 @@ public class TestPlanReportService {
         testPlanReport.setUpdateTime(endTime);
 
         testPlanReport.setStatus(TestPlanReportStatus.FAILED.name());
-        testPlanReportMapper.updateByPrimaryKey(testPlanReport);
+        testPlanReportMapper.updateByPrimaryKeySelective(testPlanReport);
     }
+
+    private void checkReportStatus(List<TestPlanReportDTO> list) {
+        String errorStatus = "FAILED";
+        for (TestPlanReportDTO dto : list) {
+            if (StringUtils.equalsIgnoreCase(dto.getStatus(), "Running")) {
+                if (!TestPlanReportExecuteCatch.containsReport(dto.getId())) {
+                    //测试计划报告处于Running状态，且监听中不存在此ID，更改Running的运行状态。一般在测试计划执行结束之前服务关闭时会出现这种情况
+                    TestPlanReport report = new TestPlanReport();
+                    report.setId(dto.getId());
+                    this.finishReport(report);
+                    dto.setStatus(errorStatus);
+                }
+            }
+        }
+    }
+
+    private boolean checkTestPlanReportIsTimeOut(String planReportId) {
+        TestPlanExecuteInfo executeInfo = TestPlanReportExecuteCatch.getTestPlanExecuteInfo(planReportId);
+        int unFinishNum = executeInfo.countUnFinishedNum();
+        if (unFinishNum > 0) {
+            //15分钟没有案例执行结果更新，则定位超时
+            long lastCountTime = executeInfo.getLastFinishedNumCountTime();
+            long nowTime = System.currentTimeMillis();
+            if (nowTime - lastCountTime > 9000) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void finishTestPlanReport(String planReportId) {
+        TestPlanReport testPlanReport = testPlanReportMapper.selectByPrimaryKey(planReportId);
+        if (testPlanReport != null && StringUtils.equalsIgnoreCase("Running", testPlanReport.getStatus())) {
+            this.finishReport(testPlanReport);
+            testPlanLog.info("结束测试计划报告：[" + planReportId + "]");
+        }
+        TestPlanReportExecuteCatch.remove(planReportId);
+    }
+
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 506ebcbe29..be8335bd29 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -197,7 +197,7 @@ public class TestPlanService {
     @Resource
     private LoadTestMapper loadTestMapper;
 
-    private final ExecutorService executorService = Executors.newFixedThreadPool(20, new NamedThreadFactory("TestPlanService"));
+    private final ExecutorService executorService = Executors.newFixedThreadPool(40, new NamedThreadFactory("TestPlanService"));
 
     public synchronized TestPlan addTestPlan(AddTestPlanRequest testPlan) {
         if (getTestPlanByName(testPlan.getName()).size() > 0) {
@@ -1141,11 +1141,13 @@ public class TestPlanService {
         extTestPlanMapper.updateActualEndTimeIsNullById(testPlanID);
         String planReportId = testPlanReport.getId();
         testPlanLog.info("ReportId[" + planReportId + "] created. TestPlanID:[" + testPlanID + "]. " + "API Run Config:【" + apiRunConfig + "】");
+        //开启测试计划执行状态的监听
+        this.listenTaskExecuteStatus(planReportId);
+
         //不同任务的执行ID
         Map<String, String> executePerformanceIdMap = new HashMap<>();
         Map<String, String> executeApiCaseIdMap = new HashMap<>();
         Map<String, String> executeScenarioCaseIdMap = new HashMap<>();
-
         //执行性能测试任务
         Map<String, String> performaneReportIDMap = new LinkedHashMap<>();
         Map<String, String> performaneThreadIDMap = new LinkedHashMap<>();
@@ -1212,7 +1214,6 @@ public class TestPlanService {
         this.executeApiTestCase(triggerMode, planReportId, userId, new ArrayList<>(planApiCaseMap.keySet()), runModeConfig);
         //执行场景执行任务
         this.executeScenarioCase(planReportId, testPlanID, projectID, runModeConfig, triggerMode, userId, planScenarioIdsMap);
-        this.listenTaskExecuteStatus(planReportId);
         return testPlanReport.getId();
     }
 
@@ -1226,6 +1227,7 @@ public class TestPlanService {
                     Thread.sleep(10000);
                 }
             } catch (InterruptedException e) {
+                TestPlanReportExecuteCatch.remove(planReportId);
                 LogUtil.error(e);
             }
         });

From 849ffeccf65d6028c0c92d0abbf1b583920be16f Mon Sep 17 00:00:00 2001
From: zhangdahai112 <dahai.zhang@fit2cloud.com>
Date: Mon, 6 Dec 2021 15:54:48 +0800
Subject: [PATCH 067/256] =?UTF-8?q?docs:=20=E5=8E=BB=E6=8E=89=E2=80=9D?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E2=80=9C=E6=8F=90=E4=BA=A4=E8=87=B3=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/en-US.js | 2 +-
 frontend/src/i18n/zh-CN.js | 2 +-
 frontend/src/i18n/zh-TW.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 655a5f599e..97a5b92da7 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -2008,7 +2008,7 @@ export default {
       add_issue: "Add Issue",
       issue_list: "Issue List",
       search_name: "Search for title",
-      platform_tip: "Integrated defect management platform in the system setting-workspace-service integration can automatically submit defects to the designated defect management platform",
+      platform_tip: "Integrated defect management platform in the system setting-workspace-service integration can submit defects to the designated defect management platform",
       input_title: "Please enter title",
       id: "Issue ID",
       title: "Issue Title",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index e3541be76b..493c2cece9 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -2020,7 +2020,7 @@ export default {
       add_issue: "添加缺陷",
       issue_list: "缺陷列表",
       search_name: "根据标题搜索",
-      platform_tip: "在系统设置-工作空间-服务集成中集成缺陷管理平台可以自动提交缺陷到指定缺陷管理平台",
+      platform_tip: "在系统设置-工作空间-服务集成中集成缺陷管理平台可以提交缺陷到指定缺陷管理平台",
       input_title: "请输入标题",
       id: "缺陷ID",
       title: "缺陷标题",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 6878681ee7..2e9220b71e 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -2017,7 +2017,7 @@ export default {
       add_issue: "添加缺陷",
       issue_list: "缺陷列表",
       search_name: "根據標題搜索",
-      platform_tip: "在系統設置-工作空間-服務集成中集成缺陷管理平臺可以自動提交缺陷到指定缺陷管理平臺",
+      platform_tip: "在系統設置-工作空間-服務集成中集成缺陷管理平臺可以提交缺陷到指定缺陷管理平臺",
       input_title: "請輸入標題",
       id: "缺陷ID",
       title: "缺陷標題",

From cd350e217e68fd8c98222b4c62d77f4eba84b346 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Tue, 7 Dec 2021 11:32:43 +0800
Subject: [PATCH 068/256] =?UTF-8?q?style(=E6=B6=88=E6=81=AF=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83):=20=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E7=BF=BB=E9=A1=B5=E6=97=B6=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notice/components/MentionedMeData.vue     | 26 ++++++++++---------
 .../notice/components/SystemNoticeData.vue    | 26 ++++++++++---------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/frontend/src/business/components/notice/components/MentionedMeData.vue b/frontend/src/business/components/notice/components/MentionedMeData.vue
index 4e0af64cf2..af9c7c5356 100644
--- a/frontend/src/business/components/notice/components/MentionedMeData.vue
+++ b/frontend/src/business/components/notice/components/MentionedMeData.vue
@@ -1,20 +1,22 @@
 <template>
   <div>
-    <div style="padding-left: 270px; padding-bottom: 5px; width: 100%">
-      <span style="color: gray; padding-right: 10px">({{ totalCount }} {{ $t('commons.notice_count') }})</span>
-      <el-dropdown @command="handleCommand" style="padding-right: 10px">
+    <div style="padding-bottom: 5px; width: 100%; height: 50px;">
+      <div style="float:right;">
+        <span style="color: gray; padding-right: 10px">({{ totalCount }} {{ $t('commons.notice_count') }})</span>
+        <el-dropdown @command="handleCommand" style="padding-right: 10px">
         <span class="el-dropdown-link" v-if="totalPage > 0">
           {{ goPage }}/{{ totalPage }}<i class="el-icon-arrow-down el-icon--right"></i>
         </span>
-        <span v-else class="el-dropdown-link">0/0</span>
-        <el-dropdown-menu slot="dropdown">
-          <div class="dropdown-content">
-            <el-dropdown-item v-for="i in totalPage" :key="i" :command="i">{{ i }}</el-dropdown-item>
-          </div>
-        </el-dropdown-menu>
-      </el-dropdown>
-      <el-button icon="el-icon-arrow-left" size="mini" :disabled="goPage === 1" @click="prevPage"/>
-      <el-button icon="el-icon-arrow-right" size="mini" :disabled="goPage === totalPage" @click="nextPage"/>
+          <span v-else class="el-dropdown-link">0/0</span>
+          <el-dropdown-menu slot="dropdown">
+            <div class="dropdown-content">
+              <el-dropdown-item v-for="i in totalPage" :key="i" :command="i">{{ i }}</el-dropdown-item>
+            </div>
+          </el-dropdown-menu>
+        </el-dropdown>
+        <el-button icon="el-icon-arrow-left" size="mini" :disabled="goPage === 1" @click="prevPage"/>
+        <el-button icon="el-icon-arrow-right" size="mini" :disabled="goPage === totalPage" @click="nextPage"/>
+      </div>
     </div>
     <div class="report-container">
       <el-table :data="systemNoticeData"
diff --git a/frontend/src/business/components/notice/components/SystemNoticeData.vue b/frontend/src/business/components/notice/components/SystemNoticeData.vue
index 6e144a0627..c17d707cbf 100644
--- a/frontend/src/business/components/notice/components/SystemNoticeData.vue
+++ b/frontend/src/business/components/notice/components/SystemNoticeData.vue
@@ -1,20 +1,22 @@
 <template>
   <div>
-    <div style="padding-left: 270px; padding-bottom: 5px; width: 100%">
-      <span style="color: gray; padding-right: 10px">({{ totalCount }} {{ $t('commons.notice_count') }})</span>
-      <el-dropdown @command="handleCommand" style="padding-right: 10px">
+    <div style="padding-bottom: 5px; width: 100%; height: 50px;">
+      <div style="float:right;">
+        <span style="color: gray; padding-right: 10px">({{ totalCount }} {{ $t('commons.notice_count') }})</span>
+        <el-dropdown @command="handleCommand" style="padding-right: 10px">
         <span class="el-dropdown-link" v-if="totalPage > 0">
           {{ goPage }}/{{ totalPage }}<i class="el-icon-arrow-down el-icon--right"></i>
         </span>
-        <span v-else class="el-dropdown-link">0/0</span>
-        <el-dropdown-menu slot="dropdown">
-          <div class="dropdown-content">
-            <el-dropdown-item v-for="i in totalPage" :key="i" :command="i">{{ i }}</el-dropdown-item>
-          </div>
-        </el-dropdown-menu>
-      </el-dropdown>
-      <el-button icon="el-icon-arrow-left" size="mini" :disabled="goPage === 1" @click="prevPage"/>
-      <el-button icon="el-icon-arrow-right" size="mini" :disabled="goPage === totalPage" @click="nextPage"/>
+          <span v-else class="el-dropdown-link">0/0</span>
+          <el-dropdown-menu slot="dropdown">
+            <div class="dropdown-content">
+              <el-dropdown-item v-for="i in totalPage" :key="i" :command="i">{{ i }}</el-dropdown-item>
+            </div>
+          </el-dropdown-menu>
+        </el-dropdown>
+        <el-button icon="el-icon-arrow-left" size="mini" :disabled="goPage === 1" @click="prevPage"/>
+        <el-button icon="el-icon-arrow-right" size="mini" :disabled="goPage === totalPage" @click="nextPage"/>
+      </div>
     </div>
     <div class="report-container">
       <el-table :data="systemNoticeData"

From adc73158fa905f32cc8a9ecf860b26a0b12981d1 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 7 Dec 2021 12:37:01 +0800
Subject: [PATCH 069/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BF=AE=E5=A4=8DWhile=E5=BE=AA=E7=8E=AF?=
 =?UTF-8?q?=E5=86=85=E8=AE=A1=E6=95=B0=E5=99=A8=E5=A4=9A=E8=AE=A1=E6=95=B0?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【while循环控制器，当变量小于判断条件时，也会执行】https://www.tapd.cn/33805590/bugtrace/bugs/view?bug_id=1133805590001008502
---
 .../api/dto/definition/request/ElementUtil.java           | 8 ++++++--
 .../api/dto/definition/request/MsScenario.java            | 2 +-
 .../definition/request/controller/MsLoopController.java   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
index 5bb62cd93c..c5f0ad1cb0 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
@@ -111,7 +111,7 @@ public class ElementUtil {
         }
     }
 
-    public static void addCounter(HashTree tree, List<ScenarioVariable> variables) {
+    public static void addCounter(HashTree tree, List<ScenarioVariable> variables, boolean isInternal) {
         if (CollectionUtils.isNotEmpty(variables)) {
             List<ScenarioVariable> list = variables.stream().filter(ScenarioVariable::isCounterValid).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(list)) {
@@ -121,7 +121,11 @@ public class ElementUtil {
                     counterConfig.setProperty(TestElement.TEST_CLASS, CounterConfig.class.getName());
                     counterConfig.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("CounterConfigGui"));
                     counterConfig.setName(item.getName());
-                    counterConfig.setStart(item.getStartNumber());
+                    if (isInternal) {
+                        counterConfig.setStart((item.getStartNumber() + 1));
+                    } else {
+                        counterConfig.setStart(item.getStartNumber());
+                    }
                     counterConfig.setEnd(item.getEndNumber());
                     counterConfig.setVarName(item.getName());
                     counterConfig.setIncrement(item.getIncrement());
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
index 3da52f26a7..40e34da394 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
@@ -162,7 +162,7 @@ public class MsScenario extends MsTestElement {
             tree.add(ParameterConfig.valueSupposeMock(arguments));
         }
         ElementUtil.addCsvDataSet(tree, variables, config, "shareMode.group");
-        ElementUtil.addCounter(tree, variables);
+        ElementUtil.addCounter(tree, variables, false);
         ElementUtil.addRandom(tree, variables);
         if (CollectionUtils.isNotEmpty(this.headers)) {
             config.setHeaders(this.headers);
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
index fc84a96da2..98a497b71c 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
@@ -60,7 +60,7 @@ public class MsLoopController extends MsTestElement {
         final HashTree groupTree = controller(tree);
         if (CollectionUtils.isNotEmpty(config.getVariables())) {
             ElementUtil.addCsvDataSet(groupTree, config.getVariables(), config, "shareMode.thread");
-            ElementUtil.addCounter(groupTree, config.getVariables());
+            ElementUtil.addCounter(groupTree, config.getVariables(), true);
             ElementUtil.addRandom(groupTree, config.getVariables());
         }
 

From f33a63f75617cd473828a1721ea98a6be1f15ee9 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 7 Dec 2021 12:47:08 +0800
Subject: [PATCH 070/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5jmx=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8Curl=E5=8F=82=E6=95=B0=E6=8B=BC=E6=8E=A5=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008540 --user=赵勇 【github#8283】jmeter脚本上传到ms之后url拼接丢失 https://www.tapd.cn/55049933/s/1078363
---
 .../request/sampler/MsHTTPSamplerProxy.java   | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
index 9e00a2263b..e8e30606b4 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
@@ -702,7 +702,11 @@ public class MsHTTPSamplerProxy extends MsTestElement {
     private String getPostQueryParameters(String path) {
         StringBuffer stringBuffer = new StringBuffer();
         stringBuffer.append(path);
-        stringBuffer.append("?");
+        if (path.indexOf("?") != -1) {
+            stringBuffer.append("&");
+        } else {
+            stringBuffer.append("?");
+        }
         this.getArguments().stream().filter(KeyValue::isEnable).filter(KeyValue::isValid).forEach(keyValue -> {
             stringBuffer.append(keyValue.getName());
             if (keyValue.getValue() != null) {
@@ -724,22 +728,22 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         list.stream().
                 filter(KeyValue::isValid).
                 filter(KeyValue::isEnable).forEach(keyValue -> {
-                            try {
-                                String value = StringUtils.isNotEmpty(keyValue.getValue()) && keyValue.getValue().startsWith("@") ? ScriptEngineUtils.buildFunctionCallString(keyValue.getValue()) : keyValue.getValue();
-                                HTTPArgument httpArgument = new HTTPArgument(keyValue.getName(), value);
-                                if (keyValue.getValue() == null) {
-                                    httpArgument.setValue("");
-                                }
-                                httpArgument.setAlwaysEncoded(keyValue.isUrlEncode());
-                                if (StringUtils.isNotBlank(keyValue.getContentType())) {
-                                    httpArgument.setContentType(keyValue.getContentType());
-                                }
-                                arguments.addArgument(httpArgument);
-                            } catch (Exception e) {
-
-                            }
+                    try {
+                        String value = StringUtils.isNotEmpty(keyValue.getValue()) && keyValue.getValue().startsWith("@") ? ScriptEngineUtils.buildFunctionCallString(keyValue.getValue()) : keyValue.getValue();
+                        HTTPArgument httpArgument = new HTTPArgument(keyValue.getName(), value);
+                        if (keyValue.getValue() == null) {
+                            httpArgument.setValue("");
                         }
-                );
+                        httpArgument.setAlwaysEncoded(keyValue.isUrlEncode());
+                        if (StringUtils.isNotBlank(keyValue.getContentType())) {
+                            httpArgument.setContentType(keyValue.getContentType());
+                        }
+                        arguments.addArgument(httpArgument);
+                    } catch (Exception e) {
+
+                    }
+                }
+        );
         return arguments;
     }
 

From c0419a2769fddfef585bad2f92bc6916297a4971 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 7 Dec 2021 14:41:47 +0800
Subject: [PATCH 071/256] =?UTF-8?q?refactor:=20=E5=88=87=E6=8D=A2=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=8F=9C=E5=8D=95=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/common/head/ProjectSwitch.vue   | 2 +-
 frontend/src/business/components/common/head/SearchList.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/common/head/ProjectSwitch.vue b/frontend/src/business/components/common/head/ProjectSwitch.vue
index f45c93151c..18bacbc1fa 100644
--- a/frontend/src/business/components/common/head/ProjectSwitch.vue
+++ b/frontend/src/business/components/common/head/ProjectSwitch.vue
@@ -57,7 +57,7 @@ export default {
 <style scoped>
 .project-name {
   display: inline-block;
-  width: 130px;
+  width: 160px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
diff --git a/frontend/src/business/components/common/head/SearchList.vue b/frontend/src/business/components/common/head/SearchList.vue
index 0b581f2afe..f7d4f9bcc4 100644
--- a/frontend/src/business/components/common/head/SearchList.vue
+++ b/frontend/src/business/components/common/head/SearchList.vue
@@ -178,8 +178,8 @@ export default {
 
 .title {
   display: inline-block;
-  padding-left: 15px;
-  max-width: 200px;
+  padding-left: 10px;
+  max-width: 140px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -187,7 +187,7 @@ export default {
 
 .el-icon-check {
   color: #773888;
-  margin-left: 10px;
+  margin-left: 2px;
   font-weight: bold;
 }
 </style>

From ebd0f2de8dea519089c63a3728e493af84a168b9 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 7 Dec 2021 14:52:50 +0800
Subject: [PATCH 072/256] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E9=9A=90=E8=97=8F=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/project/head/ProjectHeaderMenus.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/project/head/ProjectHeaderMenus.vue b/frontend/src/business/components/project/head/ProjectHeaderMenus.vue
index c59230feb6..cb0a598024 100644
--- a/frontend/src/business/components/project/head/ProjectHeaderMenus.vue
+++ b/frontend/src/business/components/project/head/ProjectHeaderMenus.vue
@@ -30,10 +30,10 @@
           <el-menu-item :index="'/project/log'" popper-class="submenu" v-permission="['PROJECT_OPERATING_LOG:READ']">
             {{ $t('project.log') }}
           </el-menu-item>
-          <el-menu-item popper-class="submenu" @click="clickPlanMenu" class="hidden-sm-and-down">
+          <el-menu-item popper-class="submenu" @click="clickPlanMenu">
             {{ $t('project.version_manage') }}
           </el-menu-item>
-          <el-menu-item popper-class="submenu" @click="clickPlanMenu" class="hidden-sm-and-down">
+          <el-menu-item popper-class="submenu" @click="clickPlanMenu">
             {{ $t('project.app_manage') }}
           </el-menu-item>
         </el-menu>

From 8e0e0234b03b2dd8f0f33d08c79068df8b2269f5 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 6 Dec 2021 17:52:10 +0800
Subject: [PATCH 073/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92):=20=E6=89=B9=E9=87=8F=E6=89=A7=E8=A1=8C=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E7=94=A8=E4=BE=8B=E7=8E=AF=E5=A2=83=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008243 --user=lyh 【环境组】-测试计划中批量执行场景用例环境列表显示错误
https://www.tapd.cn/55049933/s/1078465
---
 .../api/service/ApiAutomationService.java        | 13 ++++++-------
 .../track/service/TestPlanService.java           | 15 ++-------------
 .../components/api/automation/api-automation.js  | 16 ++++++++++++++++
 .../api/automation/scenario/EditApiScenario.vue  | 13 +++++++++----
 4 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index c03dcb39f3..6af3bab094 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -2029,12 +2029,8 @@ public class ApiAutomationService {
         Long nextOrder = ServiceUtils.getNextOrder(request.getPlanId(), extTestPlanScenarioCaseMapper::getLastOrder);
         for (String id : set) {
             Map<String, String> newEnvMap = new HashMap<>(16);
-            if (envMap != null && !envMap.isEmpty()) {
-                List<String> list = mapping.get(id);
-                list.forEach(l -> {
-                    newEnvMap.put(l, envMap.get(l));
-                });
-            }
+            List<String> list = mapping.get(id);
+            list.forEach(l -> newEnvMap.put(l, envMap == null ? "" : envMap.getOrDefault(l, "")));
             TestPlanApiScenario testPlanApiScenario = new TestPlanApiScenario();
             testPlanApiScenario.setId(UUID.randomUUID().toString());
             testPlanApiScenario.setCreateUser(SessionUtils.getUserId());
@@ -2042,12 +2038,15 @@ public class ApiAutomationService {
             testPlanApiScenario.setTestPlanId(request.getPlanId());
             testPlanApiScenario.setCreateTime(System.currentTimeMillis());
             testPlanApiScenario.setUpdateTime(System.currentTimeMillis());
+            String environmentJson = JSON.toJSONString(newEnvMap);
             if (StringUtils.equals(envType, EnvironmentType.JSON.name())) {
-                testPlanApiScenario.setEnvironment(JSON.toJSONString(newEnvMap));
+                testPlanApiScenario.setEnvironment(environmentJson);
                 testPlanApiScenario.setEnvironmentType(EnvironmentType.JSON.name());
             } else if (StringUtils.equals(envType, EnvironmentType.GROUP.name())) {
                 testPlanApiScenario.setEnvironmentType(EnvironmentType.GROUP.name());
                 testPlanApiScenario.setEnvironmentGroupId(envGroupId);
+                // JSON类型环境中也保存最新值
+                testPlanApiScenario.setEnvironment(environmentJson);
             }
             testPlanApiScenario.setOrder(nextOrder);
             nextOrder += 5000;
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index be8335bd29..e860f130a1 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -1500,21 +1500,10 @@ public class TestPlanService {
 
         for (TestPlanApiScenario testPlanApiScenario : testPlanApiScenarios) {
             String env = testPlanApiScenario.getEnvironment();
-            String envType = testPlanApiScenario.getEnvironmentType();
-            String envGroupId = testPlanApiScenario.getEnvironmentGroupId();
-            if (StringUtils.isBlank(envType)) {
+            if (StringUtils.isBlank(env)) {
                 continue;
             }
-            if ((StringUtils.equals(envType, EnvironmentType.JSON.name()) && StringUtils.isBlank(env))
-                    || StringUtils.equals(envType, EnvironmentType.GROUP.name()) && StringUtils.isBlank(envGroupId)) {
-                continue;
-            }
-            Map<String, String> map = new HashMap<>();
-            if (StringUtils.equals(envType, EnvironmentType.JSON.name())) {
-                map = JSON.parseObject(env, Map.class);
-            } else if (StringUtils.equals(envType, EnvironmentType.GROUP.name())) {
-                map = environmentGroupProjectService.getEnvMap(envGroupId);
-            }
+            Map<String, String> map = JSON.parseObject(env, Map.class);
             if (!map.isEmpty()) {
                 Set<String> set = map.keySet();
                 for (String s : set) {
diff --git a/frontend/src/business/components/api/automation/api-automation.js b/frontend/src/business/components/api/automation/api-automation.js
index 47d1bcf4be..ea3e7eaa29 100644
--- a/frontend/src/business/components/api/automation/api-automation.js
+++ b/frontend/src/business/components/api/automation/api-automation.js
@@ -106,3 +106,19 @@ export function saveScenario(url, scenario, scenarioDefinition, _this, success)
 export function editApiScenarioCaseOrder(request, callback) {
   return basePost('/api/automation/edit/order', request, callback);
 }
+
+export function savePreciseEnvProjectIds(projectIds, envMap) {
+  if (envMap != null && projectIds != null) {
+    let keys = envMap.keys();
+    for (let key of keys) {
+      if (!projectIds.has(key)) {
+        envMap.delete(key);
+      }
+    }
+    for (let id of projectIds) {
+      if (!envMap.get(id)) {
+        envMap.set(id, "");
+      }
+    }
+  }
+}
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index cb617d84f1..0078f72c2b 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -344,7 +344,7 @@ import {
 } from "@/common/js/utils";
 import "@/common/css/material-icons.css"
 import OutsideClick from "@/common/js/outside-click";
-import {saveScenario} from "@/business/components/api/automation/api-automation";
+import {savePreciseEnvProjectIds, saveScenario} from "@/business/components/api/automation/api-automation";
 import MsComponentConfig from "./component/ComponentConfig";
 import {ENV_TYPE} from "@/common/js/constants";
 
@@ -1315,9 +1315,9 @@ export default {
       }
       return new Promise((resolve) => {
         document.getElementById("inputDelay").focus();  //  保存前在input框自动失焦，以免保存失败
-        this.$refs['currentScenario'].validate((valid) => {
+        this.$refs['currentScenario'].validate(async (valid) => {
           if (valid) {
-            this.setParameter();
+            await this.setParameter();
             saveScenario(this.path, this.currentScenario, this.scenarioDefinition, this, (response) => {
               this.$success(this.$t('commons.save_success'));
               this.$store.state.scenarioMap.delete(this.currentScenario.id);
@@ -1458,7 +1458,7 @@ export default {
         }
       }
     },
-    setParameter() {
+    async setParameter() {
       this.currentScenario.stepTotal = this.scenarioDefinition.length;
       if (!this.currentScenario.projectId) {
         this.currentScenario.projectId = this.projectId;
@@ -1483,6 +1483,11 @@ export default {
         this.formatData(scenario.hashTree);
       }
       this.currentScenario.environmentType = this.environmentType;
+      let definition = JSON.parse(JSON.stringify(this.currentScenario));
+      definition.hashTree = this.scenarioDefinition;
+      await this.getEnv(JSON.stringify(definition));
+      // 保存时同步所需要的项目环境
+      savePreciseEnvProjectIds(this.projectIds, this.projectEnvMap);
       this.currentScenario.environmentJson = JSON.stringify(strMapToObj(this.projectEnvMap));
       this.currentScenario.environmentGroupId = this.envGroupId;
       this.currentScenario.scenarioDefinition = scenario;

From 440b264a66b720cbe02a5dddb1d8a9640111f4b5 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 7 Dec 2021 16:12:46 +0800
Subject: [PATCH 074/256] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/scenario/EnvSelect.vue     | 117 ----------
 .../track/plan/common/EnvPopover.vue          | 120 ----------
 .../track/plan/common/EnvSelect.vue           | 211 ------------------
 3 files changed, 448 deletions(-)
 delete mode 100644 frontend/src/business/components/track/plan/common/EnvPopover.vue
 delete mode 100644 frontend/src/business/components/track/plan/common/EnvSelect.vue

diff --git a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue
index 61c2bee5b1..2c1e25a4dc 100644
--- a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue
+++ b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue
@@ -57,7 +57,6 @@ export default {
   data() {
     return {
       data: [],
-      // result: {},
       projects: [],
       environments: [],
       permissionProjectIds:[],
@@ -159,122 +158,6 @@ export default {
       this.$emit('setProjectEnvMap', map);
       this.$emit('close');
     },
-    getApiInfo(request) {
-      if (request.id && request.referenced === 'REF') {
-        let requestResult = request.requestResult;
-        let url = request.refType && request.refType === 'CASE' ? "/api/testcase/get/" : "/api/definition/get/";
-        let enable = request.enable;
-        this.$get(url + request.id, response => {
-          if (response.data) {
-            Object.assign(request, JSON.parse(response.data.request));
-            request.name = response.data.name;
-            request.enable = enable;
-            if (response.data.path && response.data.path != null) {
-              request.path = response.data.path;
-              request.url = response.data.url;
-              this.setUrl(request.path);
-            }
-            if (response.data.method && response.data.method != null) {
-              request.method = response.data.method;
-            }
-            request.requestResult = requestResult;
-            request.id = response.data.id;
-            request.disabled = true;
-            request.root = true;
-            if (!request.projectId) {
-              request.projectId = response.data.projectId;
-            }
-            this.reload();
-            this.sort();
-          } else {
-            request.referenced = "Deleted";
-          }
-        })
-      }
-    },
-    getScenario(scenario) {
-      this.result = this.$get("/api/automation/getApiScenario/" + scenario.id, response => {
-        if (response.data) {
-          scenario.loaded = true;
-          let obj = {};
-          if (response.data.scenarioDefinition) {
-            obj = JSON.parse(response.data.scenarioDefinition);
-            scenario.hashTree = obj.hashTree;
-          }
-          //scenario.disabled = true;
-          scenario.name = response.data.name;
-          if (!scenario.projectId) {
-            scenario.projectId = response.data.projectId;
-          }
-          scenario.headers = obj.headers;
-          scenario.variables = obj.variables;
-          scenario.environmentMap = obj.environmentMap;
-          this.$emit('refReload');
-        } else {
-          scenario.referenced = "Deleted";
-        }
-      })
-    },
-    recursiveSorting(arr) {
-      for (let i in arr) {
-        if (arr[i].referenced === 'REF') {
-          // 分场景和接口
-          if (arr[i].type === "HTTPSamplerProxy") {
-            // 获取源头内容
-            this.getApiInfo(arr[i]);
-            // 校验是否是全路径
-            if (!arr[i].url || (!arr[i].url.startsWith("http://") && !arr[i].url.startsWith("https://"))) {
-              this.isFullUrl = false;
-            }
-          } else if (arr[i].type === "scenario") {
-            this.getScenario(arr[i]);
-          }
-
-        } else {
-          if (arr[i].type === "HTTPSamplerProxy") {
-            // 校验是否是全路径
-            if (arr[i].enable) {
-              if (!arr[i].url || (!arr[i].url.startsWith("http://") && !arr[i].url.startsWith("https://"))) {
-                this.isFullUrl = false;
-              }
-            }
-          }
-        }
-        if (arr[i].hashTree != undefined && arr[i].hashTree.length > 0) {
-          this.recursiveSorting(arr[i].hashTree);
-        }
-      }
-    },
-    checkFullUrl(scenarioDefinition) {
-      for (let i in scenarioDefinition) {
-        // 设置项目ID
-        let request = scenarioDefinition[i];
-        if (request.referenced === 'REF') {
-          if (request.type === "HTTPSamplerProxy") {
-            this.getApiInfo(request);
-            // 校验是否是全路径
-            if (!request.url || (!request.url.startsWith("http://") && !request.url.startsWith("https://"))) {
-              this.isFullUrl = false;
-            }
-          } else if (request.type === "scenario") {
-            this.getScenario(request);
-          }
-        } else {
-          if (request.type === "HTTPSamplerProxy") {
-            // 校验是否是全路径
-
-            if (request.enable) {
-              if (!request.url || (!request.url.startsWith("http://") && !request.url.startsWith("https://"))) {
-                this.isFullUrl = false;
-              }
-            }
-          }
-        }
-        if (scenarioDefinition[i].hashTree != undefined && scenarioDefinition[i].hashTree.length > 0) {
-          this.recursiveSorting(scenarioDefinition[i].hashTree);
-        }
-      }
-    },
     checkEnv(data) {
       let sign = true;
       this.isFullUrl = true;
diff --git a/frontend/src/business/components/track/plan/common/EnvPopover.vue b/frontend/src/business/components/track/plan/common/EnvPopover.vue
deleted file mode 100644
index 7b11d53566..0000000000
--- a/frontend/src/business/components/track/plan/common/EnvPopover.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-  <el-popover
-    v-model="visible"
-    placement="bottom-start"
-    width="400"
-    :disabled="isReadOnly"
-    @show="showPopover"
-    trigger="click">
-    <el-radio-group v-model="radio" style="margin-left: 20px;" @change="radioChange">
-      <el-radio :label="ENV_TYPE.JSON">环境列表</el-radio>
-      <el-radio :label="ENV_TYPE.GROUP">环境组</el-radio>
-    </el-radio-group>
-    <env-select :project-ids="projectIds"
-                :result="result"
-                :project-env-map="projectEnvMap"
-                :project-list="projectList"
-                :show-config-button-with-out-permission="showConfigButtonWithOutPermission"
-                @close="visible = false"
-                ref="envSelect"
-                v-show="!radio || radio === ENV_TYPE.JSON"
-                @setProjectEnvMap="setProjectEnvMap"/>
-    <!-- todo 如果工作空间下的环境组都不包含当前项目则不显示 -->
-    <env-group ref="envGroup" v-show="radio === ENV_TYPE.GROUP" @close="visible = false"
-               @setEnvGroup="setEnvGroup" :group-id="groupId"></env-group>
-    <el-button type="primary" slot="reference" size="mini" style="margin-top: 2px;">
-      {{ $t('api_test.definition.request.run_env') }}
-      <i class="el-icon-caret-bottom el-icon--right"></i>
-    </el-button>
-  </el-popover>
-</template>
-
-<script>
-import EnvSelect from "@/business/components/track/plan/common/EnvSelect";
-import {ENV_TYPE} from "@/common/js/constants";
-import EnvGroup from "@/business/components/api/automation/scenario/EnvGroup";
-
-export default {
-  name: "EnvPopover",
-  components: {EnvGroup, EnvSelect},
-  props: {
-    projectIds: Set,
-    projectList: Array,
-    showConfigButtonWithOutPermission: {
-      type: Boolean,
-      default() {
-        return true;
-      }
-    },
-    isReadOnly: {
-      type: Boolean,
-      default() {
-        return false;
-      }
-    },
-    result: {
-      type: Object,
-      default() {
-        return {loading: false}
-      }
-    },
-    projectEnvMap: {
-      type: Object,
-      default() {
-        return {};
-      }
-    },
-    groupId: {
-      type: String,
-      default() {
-        return "";
-      }
-    },
-    environmentType: String
-  },
-  data() {
-    return {
-      visible: false,
-      radio: this.environmentType,
-    }
-  },
-  watch: {
-    environmentType(val) {
-      this.radio = val;
-    }
-  },
-  computed: {
-    ENV_TYPE() {
-      return ENV_TYPE;
-    }
-  },
-  methods: {
-    showPopover() {
-      this.$emit("showPopover");
-    },
-    openEnvSelect() {
-      return this.$refs.envSelect.open();
-    },
-    setProjectEnvMap(map) {
-      this.$emit("setProjectEnvMap", map);
-    },
-    setEnvGroup(envGroupId) {
-      this.$emit("setEnvGroup", envGroupId);
-    },
-    initEnv() {
-      return this.$refs.envSelect.initEnv();
-    },
-    checkEnv(data) {
-      return this.$refs.envSelect.checkEnv(data);
-    },
-    radioChange(val) {
-      this.$emit("update:environmentType", val);
-    }
-  }
-
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/frontend/src/business/components/track/plan/common/EnvSelect.vue b/frontend/src/business/components/track/plan/common/EnvSelect.vue
deleted file mode 100644
index cbdfd95f87..0000000000
--- a/frontend/src/business/components/track/plan/common/EnvSelect.vue
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-  <div v-loading="result.loading">
-    <div v-for="pe in data" :key="pe.id" style="margin-left: 20px;">
-      <el-select v-model="pe['selectEnv']"
-                 placeholder="请选择环境"
-                 style="margin-top: 8px;width: 200px;"
-                 size="small"
-                 clearable>
-        <el-option v-for="(environment, index) in pe.envs"
-                   :key="index"
-                   :label="environment.name"
-                   :value="environment.id"/>
-        <el-button v-if="isShowConfirmButton(pe.id)"
-                   @click="openEnvironmentConfig(pe.id, pe['selectEnv'])"
-                   class="ms-scenario-button"
-                   size="mini"
-                   type="primary">
-          {{ $t('api_test.environment.environment_config') }}
-        </el-button>
-        <template v-slot:empty>
-          <div v-if="isShowConfirmButton(pe.id)" class="empty-environment">
-            <el-button class="ms-scenario-button" size="mini" type="primary"
-                       @click="openEnvironmentConfig(pe.id, pe['selectEnv'])">
-              {{ $t('api_test.environment.environment_config') }}
-            </el-button>
-          </div>
-        </template>
-      </el-select>
-      <span class="project-name" :title="getProjectName(pe.id)">
-        {{ getProjectName(pe.id) }}
-        <el-tooltip class="item"
-                    effect="light"
-                    :content="'存在多个环境' + '(' + pe.conflictEnv + ')'"
-                    placement="top-end">
-          <i class="el-icon-warning-outline"
-             v-show="pe.selectEnv === '' && pe.conflictEnv !== ''"/>
-        </el-tooltip>
-      </span>
-    </div>
-
-    <el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">确 定</el-button>
-    <!-- 环境配置 -->
-    <api-environment-config ref="environmentConfig" @close="environmentConfigClose"/>
-  </div>
-</template>
-
-<script>
-import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
-import ApiEnvironmentConfig from "@/business/components/api/test/components/ApiEnvironmentConfig";
-
-export default {
-  name: "EnvironmentSelect",
-  components: {ApiEnvironmentConfig},
-  props: {
-    projectIds: Set,
-    projectList: Array,
-    showConfigButtonWithOutPermission: {
-      type: Boolean,
-      default() {
-        return true;
-      }
-    },
-    result: {
-      type: Object,
-      default() {
-        return {loading: false}
-      }
-    },
-    projectEnvMap: {
-      type: Object,
-      default() {
-        return {};
-      }
-    }
-  },
-  data() {
-    return {
-      data: [],
-      permissionProjectIds: [],
-      dialogVisible: false,
-      envMap: new Map()
-    }
-  },
-  methods: {
-    isShowConfirmButton(projectId) {
-      if (this.showConfigButtonWithOutPermission === true) {
-        return true;
-      } else {
-        if (this.permissionProjectIds) {
-          if (this.permissionProjectIds.indexOf(projectId) < 0) {
-            return false;
-          } else {
-            return true;
-          }
-        } else {
-          return false;
-        }
-      }
-    },
-    init() {
-      //获取当前用户有权限的ID
-      if (this.permissionProjectIds.length === 0) {
-        this.getUserPermissionProjectIds();
-      }
-      let arr = [];
-      this.projectIds.forEach(projectId => {
-        const project = this.projectList.find(p => p.id === projectId);
-        if (project) {
-          let item = {id: projectId, envs: [], selectEnv: "", conflictEnv: ""};
-          this.data.push(item);
-          let p = new Promise(resolve => {
-            this.$get('/api/environment/list/' + projectId, res => {
-              let envs = res.data;
-              // 格式化
-              envs.forEach(environment => {
-                parseEnvironment(environment);
-              });
-              // 固定环境列表渲染顺序
-              let temp = this.data.find(dt => dt.id === projectId);
-              temp.envs = envs;
-              let envList = [];
-              // projectEnvMap {"projectId": {"env1", "env2"}} 获取项目的环境列表
-              for (let pid in this.projectEnvMap) {
-                if (projectId === pid) {
-                  envList = this.projectEnvMap[pid];
-                  break;
-                }
-              }
-              // 环境回显
-              if (envList.length <= 1) {
-                // 选中环境是否存在，无冲突显示环境
-                temp.selectEnv = envs.filter(e => e.id === envList[0]).length === 0 ? null : envList[0];
-              } else {
-                // 环境冲突，记录环境并展示
-                envList.forEach(env => {
-                  const index = envs.findIndex(e => e.id === env);
-                  if (index !== -1) {
-                    item.conflictEnv = item.conflictEnv + " " + envs[index].name;
-                  }
-                });
-              }
-              resolve();
-            })
-          });
-          arr.push(p);
-        }
-      })
-      return arr;
-    },
-    getUserPermissionProjectIds() {
-      this.$get('/project/getOwnerProjectIds/', res => {
-        this.permissionProjectIds = res.data;
-      })
-    },
-    open() {
-      this.data = [];
-      if (this.projectIds.size > 0) {
-        this.init();
-      }
-    },
-    initEnv() {
-      this.data = [];
-      return Promise.all(this.init());
-    },
-    getProjectName(id) {
-      const project = this.projectList.find(p => p.id === id);
-      return project ? project.name : "";
-    },
-    openEnvironmentConfig(projectId, envId) {
-      if (!projectId) {
-        this.$error(this.$t('api_test.select_project'));
-        return;
-      }
-      this.$refs.environmentConfig.open(projectId, envId);
-    },
-    handleConfirm() {
-      let map = new Map();
-      this.data.forEach(dt => {
-        map.set(dt.id, dt.selectEnv);
-      })
-      this.$emit('setProjectEnvMap', map);
-      this.$emit('close');
-    },
-    environmentConfigClose() {
-      // todo 关闭处理
-    }
-  }
-}
-</script>
-
-<style scoped>
-.ms-scenario-button {
-  margin-left: 20px;
-}
-
-.env-confirm {
-  margin-left: 20px;
-  width: 360px;
-  margin-top: 10px;
-}
-
-.project-name {
-  display: inline-block;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  width: 150px;
-  margin-left: 8px;
-  vertical-align: middle;
-}
-</style>

From c81d70106079ba854e7d00192785e170456cabbd Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 7 Dec 2021 15:00:41 +0800
Subject: [PATCH 075/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=8A=A5=E5=91=8A):=20=E4=BF=AE=E5=A4=8D=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5=E5=91=8A=E6=9C=80=E7=BB=88?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4=E6=9C=AA=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复测试计划报告最终执行时间未更新的问题
---
 .../io/metersphere/track/service/TestPlanReportService.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
index 369ff094b3..9d198ab408 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
@@ -1218,6 +1218,12 @@ public class TestPlanReportService {
 
         testPlanReport.setStatus(TestPlanReportStatus.FAILED.name());
         testPlanReportMapper.updateByPrimaryKeySelective(testPlanReport);
+
+        TestPlanReportContentWithBLOBs bloBs = new TestPlanReportContentWithBLOBs();
+        bloBs.setEndTime(endTime);
+        TestPlanReportContentExample example = new TestPlanReportContentExample();
+        example.createCriteria().andTestPlanReportIdEqualTo(testPlanReport.getId());
+        testPlanReportContentMapper.updateByExampleSelective(bloBs,example);
     }
 
     private void checkReportStatus(List<TestPlanReportDTO> list) {

From a175e99bb82ac6e494ac1308cd7a7fb10738747d Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 7 Dec 2021 16:32:21 +0800
Subject: [PATCH 076/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=8A=A5=E5=91=8A):=20=E4=BF=AE=E5=A4=8D=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5=E5=91=8A=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0=E6=9C=80=E7=BB=88=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复测试计划报告性能不更新最终状态的问题
---
 .../commons/utils/TestPlanUtils.java          |  1 +
 .../track/dto/TestPlanLoadCaseEventDTO.java   |  1 +
 .../track/service/TestPlanReportService.java  | 19 +++++++++++--------
 .../track/service/TestPlanService.java        |  6 +++---
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java b/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java
index a45fd55ede..2bb1db3996 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java
@@ -44,6 +44,7 @@ public class TestPlanUtils {
         addToReportStatusResultList(resultMap, statusResult, "Fail");
         addToReportStatusResultList(resultMap, statusResult, "success");
         addToReportStatusResultList(resultMap, statusResult, "Success");
+        addToReportStatusResultList(resultMap, statusResult, "SUCCESS");
         addToReportStatusResultList(resultMap, statusResult, TestPlanTestCaseStatus.Prepare.name());
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/dto/TestPlanLoadCaseEventDTO.java b/backend/src/main/java/io/metersphere/track/dto/TestPlanLoadCaseEventDTO.java
index a18ba21dfe..cf1583883c 100644
--- a/backend/src/main/java/io/metersphere/track/dto/TestPlanLoadCaseEventDTO.java
+++ b/backend/src/main/java/io/metersphere/track/dto/TestPlanLoadCaseEventDTO.java
@@ -14,4 +14,5 @@ public class TestPlanLoadCaseEventDTO {
     private String reportId;
     private String triggerMode;
     private String status;
+    private String id;
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
index 9d198ab408..820f8f996a 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
@@ -84,6 +84,8 @@ public class TestPlanReportService {
     ApiTestCaseMapper apiTestCaseMapper;
     @Resource
     LoadTestReportMapper loadTestReportMapper;
+    @Resource
+    TestPlanLoadCaseMapper testPlanLoadCaseMapper;
     @Lazy
     @Resource
     TestPlanService testPlanService;
@@ -910,8 +912,8 @@ public class TestPlanReportService {
                             testPlanLog.info("TestPlanReportId[" + testPlanReport.getId() + "] SELECT performance ID:" + loadTestReportId + ",RESULT :" + loadTestReportFromDatabase.getStatus());
                             if (StringUtils.equalsAny(loadTestReportFromDatabase.getStatus(),
                                     PerformanceTestStatus.Completed.name(), PerformanceTestStatus.Error.name())) {
-                                finishLoadTestId.put(loadTestReportFromDatabase.getTestId(), TestPlanApiExecuteStatus.SUCCESS.name());
-                                caseReportMap.put(loadTestReportFromDatabase.getTestId(), loadTestReportId);
+                                finishLoadTestId.put(performaneReportIDMap.get(loadTestReportId), TestPlanApiExecuteStatus.SUCCESS.name());
+                                caseReportMap.put(performaneReportIDMap.get(loadTestReportId), loadTestReportId);
                                 performaneReportIDList.remove(loadTestReportId);
                             }
                         }
@@ -925,13 +927,14 @@ public class TestPlanReportService {
                 testPlanLog.info("TestPlanReportId[" + testPlanReport.getId() + "] SELECT performance BATCH OVER:" + JSONArray.toJSONString(selectList));
                 if (performaneReportIDList.isEmpty()) {
                     testPlanLog.info("TestPlanReportId[" + testPlanReport.getId() + "] performance EXECUTE OVER. TRIGGER_MODE:" + triggerMode + ",REsult:" + JSONObject.toJSONString(finishLoadTestId));
-                    if (StringUtils.equals(triggerMode, ReportTriggerMode.API.name())) {
+                    if (StringUtils.equalsAnyIgnoreCase(triggerMode, ReportTriggerMode.API.name() ,ReportTriggerMode.MANUAL.name())) {
                         for (String string : finishLoadTestId.keySet()) {
-                            TestPlanLoadCaseEventDTO eventDTO = new TestPlanLoadCaseEventDTO();
-                            eventDTO.setReportId(string);
-                            eventDTO.setTriggerMode(triggerMode);
-                            eventDTO.setStatus(PerformanceTestStatus.Completed.name());
-                            this.updatePerformanceTestStatus(eventDTO);
+                            String reportId = caseReportMap.get(string);
+                            TestPlanLoadCaseWithBLOBs updateDTO = new TestPlanLoadCaseWithBLOBs();
+                            updateDTO.setId(string);
+                            updateDTO.setStatus(finishLoadTestId.get(string));
+                            updateDTO.setLoadReportId(reportId);
+                            testPlanLoadCaseMapper.updateByPrimaryKeySelective(updateDTO);
                         }
                     }
                     TestPlanReportExecuteCatch.updateApiTestPlanExecuteInfo(testPlanReport.getId(), null, null, finishLoadTestId);
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index e860f130a1..37bd04d9c4 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -1171,7 +1171,7 @@ public class TestPlanService {
             try {
                 reportId = performanceTestService.run(performanceRequest);
                 if (reportId != null) {
-                    performaneReportIDMap.put(reportId, caseID);
+                    performaneReportIDMap.put(reportId, id);
                     TestPlanLoadCaseWithBLOBs testPlanLoadCase = new TestPlanLoadCaseWithBLOBs();
                     testPlanLoadCase.setId(performanceRequest.getTestPlanLoadId());
                     testPlanLoadCase.setLoadReportId(reportId);
@@ -1189,9 +1189,9 @@ public class TestPlanService {
             }
             performaneThreadIDMap.put(performanceRequest.getTestPlanLoadId(), reportId);
             if (StringUtils.isNotEmpty(reportId)) {
-                executePerformanceIdMap.put(caseID, TestPlanApiExecuteStatus.RUNNING.name());
+                executePerformanceIdMap.put(performanceRequest.getTestPlanLoadId(), TestPlanApiExecuteStatus.RUNNING.name());
             } else {
-                executePerformanceIdMap.put(caseID, TestPlanApiExecuteStatus.PREPARE.name());
+                executePerformanceIdMap.put(performanceRequest.getTestPlanLoadId(), TestPlanApiExecuteStatus.PREPARE.name());
             }
         }
         TestPlanReportExecuteCatch.updateTestPlanThreadInfo(planReportId, null, null, performaneThreadIDMap);

From 6f553a4809979a01b9593d145336746fb7aa4353 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 7 Dec 2021 18:11:58 +0800
Subject: [PATCH 077/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=89=A7=E8=A1=8C):=20=E6=9B=B4=E6=96=B0=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E7=9A=84=E8=B6=85=E6=97=B6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新测试计划的超时时间
---
 .../io/metersphere/track/service/TestPlanReportService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
index 820f8f996a..ec0f1f7f26 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
@@ -1248,10 +1248,10 @@ public class TestPlanReportService {
         TestPlanExecuteInfo executeInfo = TestPlanReportExecuteCatch.getTestPlanExecuteInfo(planReportId);
         int unFinishNum = executeInfo.countUnFinishedNum();
         if (unFinishNum > 0) {
-            //15分钟没有案例执行结果更新，则定位超时
+            //20分钟没有案例执行结果更新，则定位超时
             long lastCountTime = executeInfo.getLastFinishedNumCountTime();
             long nowTime = System.currentTimeMillis();
-            if (nowTime - lastCountTime > 9000) {
+            if (nowTime - lastCountTime > 1200000) {
                 return true;
             }
         }

From 43f1dc598295b6270bb5f6ed56fcd5ef8b07b4c2 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 7 Dec 2021 20:45:15 +0800
Subject: [PATCH 078/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=8A=B6=E6=80=81):=20=E4=BC=98=E5=8C=96=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E7=9A=84=E6=89=A7=E8=A1=8C=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化测试计划的执行状态检查，如果测试计划中包含性能测试，那么不再提前结束任务，以性能测试最终结束时间或测试计划超时时间为准
---
 .../track/service/TestPlanReportService.java     | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
index ec0f1f7f26..dd4c4da761 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
@@ -1188,22 +1188,10 @@ public class TestPlanReportService {
         }
 
         if (StringUtils.isNotBlank(testPlanReportContent.getLoadAllCases())) {
-            reportHasData = true;
             List<TestPlanLoadCaseDTO> allCases = JSONObject.parseArray(testPlanReportContent.getLoadAllCases(), TestPlanLoadCaseDTO.class);
-            for (TestPlanLoadCaseDTO dto : allCases) {
-                if (StringUtils.equalsIgnoreCase(dto.getStatus(), "run")) {
-                    isUpdate = true;
-                    LoadTestReport report = loadTestReportMapper.selectByPrimaryKey(dto.getReportId());
-                    if (report != null) {
-                        dto.setStatus(report.getStatus());
-                    }
-                }
-
-                if (StringUtils.equalsAnyIgnoreCase("Underway", dto.getStatus(), dto.getStatus())) {
-                    isTaskRunning = true;
-                }
+            if(!allCases.isEmpty()){
+                isTaskRunning = true;
             }
-            testPlanReportContent.setLoadAllCases(JSONArray.toJSONString(allCases));
         }
         if (isUpdate) {
             testPlanReportContentMapper.updateByPrimaryKeyWithBLOBs(testPlanReportContent);

From df176dbfbba9fd647844cab140c5159300e4f4e5 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Tue, 7 Dec 2021 14:59:04 +0800
Subject: [PATCH 079/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E5=9C=BA=E6=99=AF=E5=AF=BC=E5=85=A5=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/api/ApiRelevance.vue  |  2 +-
 .../scenario/api/ScenarioRelevance.vue        |  2 +-
 .../comonents/base/TestCaseRelevanceBase.vue  | 20 ++++---------------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
index 8934c915e2..f5da2c9789 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
@@ -32,7 +32,7 @@
       @isApiListEnableChange="isApiListEnableChange"
       ref="apiCaseList"/>
 
-    <template v-slot:header>
+    <template v-slot:footer>
       <el-button type="primary" @click="copy" :loading="buttonIsWorking" @keydown.enter.native.prevent>
         {{ $t('commons.copy') }}
       </el-button>
diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
index 6b99c65212..21a1ff2a8b 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
@@ -25,7 +25,7 @@
       :custom-num="customNum"
       ref="apiScenarioList"/>
 
-    <template v-slot:headerBtn>
+    <template v-slot:footer>
       <el-button type="primary" @click="copy" :loading="buttonIsWorking" @keydown.enter.native.prevent>
         {{ $t('commons.copy') }}
       </el-button>
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
index 4c897fa4ad..b3cc41dbb2 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
@@ -1,17 +1,5 @@
 <template>
   <relevance-dialog :width="width" :title="dialogTitle" ref="relevanceDialog">
-    <template v-slot:headerBtn>
-
-      <div v-if="$slots.headerBtn">
-        <slot name="headerBtn"></slot>
-      </div>
-      <div v-else>
-        <div style="margin-bottom: 5px" v-if="flag">
-          <el-checkbox v-model="checked">{{ $t('test_track.sync_add_api_load') }}</el-checkbox>
-        </div>
-        <ms-dialog-header @cancel="close" v-loading="isSaving" @confirm="save"/>
-      </div>
-    </template>
 
     <template v-slot:aside>
       <select-menu
@@ -26,7 +14,7 @@
 
     <slot></slot>
 
-    <!--    <template v-slot:footer>
+        <template v-slot:footer>
 
           <div v-if="$slots.footer">
             <slot name="footer"></slot>
@@ -37,14 +25,14 @@
             </div>
             <ms-dialog-footer @cancel="close" v-loading="isSaving" @confirm="save"/>
           </div>
-        </template>-->
+        </template>
 
   </relevance-dialog>
 </template>
 
 <script>
 
-import MsDialogHeader from '../../../../../common/components/MsDialogHeader'
+import MsDialogFooter from '../../../../../common/components/MsDialogFooter'
 import SelectMenu from "../../../../common/SelectMenu";
   import RelevanceDialog from "./RelevanceDialog";
   import {getCurrentProjectID, getCurrentUserId, getCurrentWorkspaceId} from "@/common/js/utils";
@@ -54,7 +42,7 @@ import SelectMenu from "../../../../common/SelectMenu";
     components: {
       RelevanceDialog,
       SelectMenu,
-      MsDialogHeader,
+      MsDialogFooter,
     },
     data() {
       return {

From f919c8604ef26ac73545e5272fbf04823f9eac85 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 8 Dec 2021 15:34:39 +0800
Subject: [PATCH 080/256] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=90=9C=E7=B4=A2=E6=A1=86=E5=A4=B1=E7=84=A6=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/common/components/MsTableSearchBar.vue   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/business/components/common/components/MsTableSearchBar.vue b/frontend/src/business/components/common/components/MsTableSearchBar.vue
index 9fd4c03a3e..788b25bdc4 100644
--- a/frontend/src/business/components/common/components/MsTableSearchBar.vue
+++ b/frontend/src/business/components/common/components/MsTableSearchBar.vue
@@ -7,7 +7,6 @@
       :placeholder="tip"
       prefix-icon="el-icon-search"
       @change="search"
-      @blur="search"
       maxlength="60"
       v-model="condition.name" clearable/>
 

From 62dd5d18ec2d75e377665868900cd9281d3b0831 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Wed, 8 Dec 2021 16:26:28 +0800
Subject: [PATCH 081/256] =?UTF-8?q?fix(=E5=8A=9F=E8=83=BD=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8Bxmind=E5=AF=BC=E5=85=A5):=20=E4=BF=AE=E5=A4=8Dxmind?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E6=97=B6?=
 =?UTF-8?q?id=E4=BA=8E=E7=94=A8=E4=BE=8B=E5=9C=A8xmind=E7=9A=84=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E4=B8=8D=E7=AC=A6=EF=BC=8C=E4=B8=BA=E5=80=92=E5=BA=8F?=
 =?UTF-8?q?ID=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008530 --user=宋天阳
【github#6867】通过XMIND导入用例时，生成的用例ID与实际XMIND编排的用例顺序不符，为倒序ID，请修改
https://www.tapd.cn/55049933/s/1078804
---
 .../main/java/io/metersphere/track/service/TestCaseService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 6705aca5f1..64ca694789 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -662,7 +662,7 @@ public class TestCaseService {
                 testcase.setUpdateTime(System.currentTimeMillis());
                 testcase.setNodeId(nodePathMap.get(testcase.getNodePath()));
                 testcase.setSort(sort.getAndIncrement());
-                int number = num.decrementAndGet();
+                int number = num.incrementAndGet();
                 testcase.setNum(number);
                 if (project.getCustomNum() && StringUtils.isBlank(testcase.getCustomNum())) {
                     testcase.setCustomNum(String.valueOf(number));

From a777c95fc08b61c0230606f2abbfdbb912e3ee2e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 8 Dec 2021 17:38:19 +0800
Subject: [PATCH 082/256] =?UTF-8?q?refactor(=E7=8E=AF=E5=A2=83=E7=BB=84):?=
 =?UTF-8?q?=20=E5=88=9B=E5=BB=BA=E5=89=8D=E8=BF=9B=E8=A1=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/EnvironmentGroupService.java      | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java b/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
index 4fd4cac6c1..28e064ff2f 100644
--- a/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
+++ b/backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
@@ -75,15 +75,32 @@ public class EnvironmentGroupService {
         if (CollectionUtils.isEmpty(envGroupProject)) {
             return;
         }
-        // todo 项目重复校验
+        List<Project> projects = projectMapper.selectByExample(new ProjectExample());
+        List<String> projectIds = projects.stream().map(Project::getId).collect(Collectors.toList());
+        List<ApiTestEnvironment> environments = apiTestEnvironmentMapper.selectByExample(new ApiTestEnvironmentExample());
+        List<String> environmentIds = environments.stream().map(ApiTestEnvironment::getId).collect(Collectors.toList());
+
         for (EnvironmentGroupProject egp : envGroupProject) {
             String projectId = egp.getProjectId();
             String environmentId = egp.getEnvironmentId();
             if (StringUtils.isBlank(projectId) || StringUtils.isBlank(environmentId)) {
                 continue;
             }
+
+            if (!projectIds.contains(projectId) || !environmentIds.contains(environmentId)) {
+                continue;
+            }
+
+            EnvironmentGroupProjectExample example = new EnvironmentGroupProjectExample();
+            example.createCriteria()
+                    .andEnvironmentGroupIdEqualTo(request.getId())
+                    .andProjectIdEqualTo(projectId);
+            List<EnvironmentGroupProject> environmentGroupProjects = environmentGroupProjectMapper.selectByExample(example);
+            if (CollectionUtils.isNotEmpty(environmentGroupProjects)) {
+                continue;
+            }
+
             EnvironmentGroupProject e = new EnvironmentGroupProject();
-            // todo 检查 项目｜环境 是否存在
             e.setId(UUID.randomUUID().toString());
             e.setEnvironmentGroupId(request.getId());
             e.setProjectId(projectId);
@@ -119,9 +136,7 @@ public class EnvironmentGroupService {
         example.createCriteria().andWorkspaceIdEqualTo(workspaceId);
         List<EnvironmentGroup> environmentGroups = environmentGroupMapper.selectByExample(example);
         if (CollectionUtils.isNotEmpty(environmentGroups)) {
-            environmentGroups.forEach(environmentGroup -> {
-                delete(environmentGroup.getId());
-            });
+            environmentGroups.forEach(environmentGroup -> delete(environmentGroup.getId()));
         }
     }
 

From 7d877f775061e8056f42ea0f3848298667f055f8 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 8 Dec 2021 16:24:33 +0800
Subject: [PATCH 083/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89-CASE?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8B=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=EF=BC=8C=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【接口测试-接口定义-CASE模块下的接口用例，执行结果筛选功能失效，请确认并修改】https://www.tapd.cn/33805590/bugtrace/bugs/view?bug_id=1133805590001008658
---
 .../metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml  | 8 +++++++-
 .../common/components/search/search-components.js         | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index 6dbe512d44..76a96db5c3 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -205,7 +205,7 @@
             </if>
         </if>
         <if test="${condition}.status != null">
-            and t2.status
+            and t1.status
             <include refid="condition">
                 <property name="object" value="${condition}.status"/>
             </include>
@@ -389,6 +389,12 @@
                                 #{value}
                             </foreach>
                         </when>
+                        <when test="key=='execResult' or key=='exec_result'">
+                            and t1.STATUS in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                (#{value})
+                            </foreach>
+                        </when>
                     </choose>
                 </if>
                 <if test="request.toUpdate == null || request.toUpdate == false ">
diff --git a/frontend/src/business/components/common/components/search/search-components.js b/frontend/src/business/components/common/components/search/search-components.js
index 6c3c1bc4da..7e5a345adb 100644
--- a/frontend/src/business/components/common/components/search/search-components.js
+++ b/frontend/src/business/components/common/components/search/search-components.js
@@ -165,7 +165,8 @@ export const API_CASE_RESULT = {
   },
   options: [
     {value: 'success', label: 'api_test.automation.success'},
-    {value: 'error', label: 'api_test.automation.fail'}
+    {value: 'error', label: 'api_test.automation.fail'},
+    {value: '', label: 'api_test.home_page.detail_card.unexecute'}
   ],
   props: { // 尾部控件的props，一般为element ui控件的props
     multiple: true

From 338817aebc9f517ffe5241b6dcbc2bca77629491 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 9 Dec 2021 10:51:41 +0800
Subject: [PATCH 084/256] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=89=8D=E7=AB=AF=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scenario/testplan/TestPlanList.vue        |  3 +--
 .../components/project/menu/EditProject.vue   |  3 +--
 .../components/project/menu/Member.vue        |  2 --
 .../components/settings/CreateBox.vue         | 26 -------------------
 .../settings/system/SystemWorkspace.vue       |  2 --
 .../settings/system/TestResourcePool.vue      |  3 +--
 .../components/settings/system/User.vue       |  2 --
 .../settings/workspace/MsProject.vue          |  3 +--
 .../settings/workspace/WorkspaceMember.vue    |  3 +--
 .../track/case/components/TestCaseList.vue    |  2 --
 .../track/plan/components/TestPlanList.vue    |  3 +--
 .../review/components/TestCaseReviewList.vue  |  2 --
 frontend/src/business/components/xpack        |  2 +-
 13 files changed, 7 insertions(+), 49 deletions(-)
 delete mode 100644 frontend/src/business/components/settings/CreateBox.vue

diff --git a/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue b/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue
index 8cb8869c8a..c59d03d77b 100644
--- a/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue
+++ b/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue
@@ -147,7 +147,6 @@
 </template>
 
 <script>
-import MsCreateBox from '../../../../settings/CreateBox';
 import MsTablePagination from '../../../../../components/common/pagination/TablePagination';
 import MsTableHeader from "../../../../common/components/MsTableHeader";
 import MsDialogFooter from "../../../../common/components/MsDialogFooter";
@@ -177,7 +176,7 @@ export default {
     TestReportTemplateList,
     PlanStageTableItem,
     PlanStatusTableItem,
-    MsTableOperator, MsTableOperatorButton, MsDialogFooter, MsTableHeader, MsCreateBox, MsTablePagination, EnvPopover
+    MsTableOperator, MsTableOperatorButton, MsDialogFooter, MsTableHeader, MsTablePagination, EnvPopover
   },
   props: {
     row: Set,
diff --git a/frontend/src/business/components/project/menu/EditProject.vue b/frontend/src/business/components/project/menu/EditProject.vue
index ec4f4058b5..b4d579fca1 100644
--- a/frontend/src/business/components/project/menu/EditProject.vue
+++ b/frontend/src/business/components/project/menu/EditProject.vue
@@ -99,7 +99,6 @@ import MsDeleteConfirm from "@/business/components/common/components/MsDeleteCon
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
 import MsContainer from "@/business/components/common/components/MsContainer";
 import MsTableOperator from "@/business/components/common/components/MsTableOperator";
-import MsCreateBox from "@/business/components/settings/CreateBox";
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import MsTableHeader from "@/business/components/common/components/MsTableHeader";
 import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
@@ -117,7 +116,7 @@ export default {
     MsTableOperatorButton,
     MsDeleteConfirm,
     MsMainContainer,
-    MsContainer, MsTableOperator, MsCreateBox, MsTablePagination, MsTableHeader, MsDialogFooter
+    MsContainer, MsTableOperator, MsTablePagination, MsTableHeader, MsDialogFooter
   },
   data() {
     return {
diff --git a/frontend/src/business/components/project/menu/Member.vue b/frontend/src/business/components/project/menu/Member.vue
index 51a01ff117..6c53433cc3 100644
--- a/frontend/src/business/components/project/menu/Member.vue
+++ b/frontend/src/business/components/project/menu/Member.vue
@@ -85,7 +85,6 @@
 import MsRolesTag from "@/business/components/common/components/MsRolesTag";
 import MsTableOperator from "@/business/components/common/components/MsTableOperator";
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
-import MsCreateBox from "@/business/components/settings/CreateBox";
 import MsTableHeader from "@/business/components/common/components/MsTableHeader";
 import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
 import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
@@ -105,7 +104,6 @@ export default {
     MsRolesTag,
     MsTableOperator,
     MsTablePagination,
-    MsCreateBox,
     MsTableHeader,
     MsDialogFooter,
     MsTableHeaderSelectPopover,
diff --git a/frontend/src/business/components/settings/CreateBox.vue b/frontend/src/business/components/settings/CreateBox.vue
deleted file mode 100644
index f602794b0d..0000000000
--- a/frontend/src/business/components/settings/CreateBox.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <span class="box">
-   <el-tooltip class="item" effect="dark" :content="tips" placement="right">
-    <el-button @click="exec()" type="primary" size="mini" circle>
-      <font-awesome-icon :icon="['fas', 'plus']"/>
-    </el-button>
-  </el-tooltip>
-  </span>
-</template>
-
-<script>
-  export default {
-    name: "MsCreateBox",
-    props: {
-      tips: String,
-      exec: Function
-    }
-  }
-</script>
-
-<style scoped>
-  .box {
-    margin-left: 5px;
-    margin-right: 5px;
-  }
-</style>
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index e4751085e6..0bc2136bb1 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -152,7 +152,6 @@
 </template>
 
 <script>
-import MsCreateBox from "../CreateBox";
 import {Message} from "element-ui";
 import MsTablePagination from "../../common/pagination/TablePagination";
 import MsTableHeader from "../../common/components/MsTableHeader";
@@ -173,7 +172,6 @@ export default {
   name: "MsSystemWorkspace",
   components: {
     MsDeleteConfirm,
-    MsCreateBox,
     MsTablePagination,
     MsTableHeader,
     MsRolesTag,
diff --git a/frontend/src/business/components/settings/system/TestResourcePool.vue b/frontend/src/business/components/settings/system/TestResourcePool.vue
index aa6cf7fba4..81a166ed34 100644
--- a/frontend/src/business/components/settings/system/TestResourcePool.vue
+++ b/frontend/src/business/components/settings/system/TestResourcePool.vue
@@ -230,7 +230,6 @@
 </template>
 
 <script>
-import MsCreateBox from "../CreateBox";
 import MsTablePagination from "../../common/pagination/TablePagination";
 import MsTableHeader from "../../common/components/MsTableHeader";
 import MsTableOperator from "../../common/components/MsTableOperator";
@@ -240,7 +239,7 @@ import BatchAddResource from "@/business/components/settings/system/components/B
 
 export default {
   name: "MsTestResourcePool",
-  components: {BatchAddResource, MsCreateBox, MsTablePagination, MsTableHeader, MsTableOperator, MsDialogFooter},
+  components: {BatchAddResource, MsTablePagination, MsTableHeader, MsTableOperator, MsDialogFooter},
   data() {
     return {
       result: {},
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index dbdeb0ab7c..e70472a9ff 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -107,7 +107,6 @@
 </template>
 
 <script>
-import MsCreateBox from "../CreateBox";
 import MsTablePagination from "../../common/pagination/TablePagination";
 import MsTableHeader from "../../common/components/MsTableHeader";
 import MsTableOperator from "../../common/components/MsTableOperator";
@@ -141,7 +140,6 @@ export default {
     WorkspaceCascader,
     GroupCascader,
     EditUser,
-    MsCreateBox,
     MsTablePagination,
     MsTableHeader,
     MsTableOperator,
diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue
index 44006eed79..9888c42a6d 100644
--- a/frontend/src/business/components/settings/workspace/MsProject.vue
+++ b/frontend/src/business/components/settings/workspace/MsProject.vue
@@ -251,7 +251,6 @@
 </template>
 
 <script>
-import MsCreateBox from "../CreateBox";
 import {Message} from "element-ui";
 import MsTablePagination from "../../common/pagination/TablePagination";
 import MsTableHeader from "../../common/components/MsTableHeader";
@@ -295,7 +294,7 @@ export default {
     MsTableOperatorButton,
     MsDeleteConfirm,
     MsMainContainer, MsRolesTag,
-    MsContainer, MsTableOperator, MsCreateBox, MsTablePagination, MsTableHeader, MsDialogFooter,
+    MsContainer, MsTableOperator, MsTablePagination, MsTableHeader, MsDialogFooter,
     AddMember
   },
   inject: [
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index 5e3914acbc..dfbb9a4792 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@@ -93,7 +93,6 @@
 </template>
 
 <script>
-import MsCreateBox from "../CreateBox";
 import MsTablePagination from "../../common/pagination/TablePagination";
 import MsTableHeader from "../../common/components/MsTableHeader";
 import MsRolesTag from "../../common/components/MsRolesTag";
@@ -125,7 +124,7 @@ export default {
   name: "MsMember",
   components: {
     BatchToProjectGroupCascader, GroupCascader,
-    AddMember, MsCreateBox, MsTablePagination, MsTableHeader, MsRolesTag, MsTableOperator, MsDialogFooter,
+    AddMember, MsTablePagination, MsTableHeader, MsRolesTag, MsTableOperator, MsDialogFooter,
     MsTableHeaderSelectPopover, UserCascader, ShowMoreBtn
   },
   data() {
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 168bb033dc..7f51297e42 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -203,7 +203,6 @@
 
 <script>
 
-import MsCreateBox from '../../../settings/CreateBox';
 import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
 import TestCaseImport from '../components/TestCaseImport';
 import TestCaseExport from '../components/TestCaseExport';
@@ -266,7 +265,6 @@ export default {
     MethodTableItem,
     TypeTableItem,
     PriorityTableItem,
-    MsCreateBox,
     TestCaseImport,
     TestCaseExport,
     MsTablePagination,
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index f60335fe1a..3c7857e761 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -282,7 +282,6 @@
 </template>
 
 <script>
-import MsCreateBox from '../../../settings/CreateBox';
 import MsTablePagination from '../../../../components/common/pagination/TablePagination';
 import MsTableHeader from "../../../common/components/MsTableHeader";
 import MsDialogFooter from "../../../common/components/MsDialogFooter";
@@ -329,7 +328,7 @@ export default {
     PlanStatusTableItem,
     MsTestPlanScheduleMaintain,
     MsTableOperator, MsTableOperatorButton,
-    MsDialogFooter, MsTableHeader, MsCreateBox,
+    MsDialogFooter, MsTableHeader,
     MsTablePagination, PlanRunModeWithEnv, MsTaskCenter
   },
   data() {
diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
index f2df7e04b6..feea0e3d68 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
@@ -137,7 +137,6 @@ import MsTableOperator from "../../../common/components/MsTableOperator";
 import MsTableOperatorButton from "../../../common/components/MsTableOperatorButton";
 import MsDialogFooter from "../../../common/components/MsDialogFooter";
 import MsTableHeader from "../../../common/components/MsTableHeader";
-import MsCreateBox from "../../../settings/CreateBox";
 import MsTablePagination from "../../../common/pagination/TablePagination";
 import {getCurrentProjectID, getCurrentUser, getCurrentWorkspaceId} from "@/common/js/utils";
 import {_filter, _sort, deepClone, getLabel, getLastTableSortField,saveLastTableSortField} from "@/common/js/tableUtils";
@@ -159,7 +158,6 @@ export default {
     MsTableOperatorButton,
     MsDialogFooter,
     MsTableHeader,
-    MsCreateBox,
     MsTablePagination,
     PlanStatusTableItem
   },
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 433c1b7e4d..3c4b301986 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 433c1b7e4dcf67ada7ca75219c10fdaaacd8c83a
+Subproject commit 3c4b3019861281c13d50dce7d1ebee65cfab4ce7

From afb0328a8b2ba62e76960b75c9b9262790d3057c Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 9 Dec 2021 11:30:24 +0800
Subject: [PATCH 085/256] chore: sync

---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 3c4b301986..abb1eae9af 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 3c4b3019861281c13d50dce7d1ebee65cfab4ce7
+Subproject commit abb1eae9aff953ca0be49bfb413454e435d627ee

From 43eb75c26fa839db081c5f14e610ad6aa0555f6d Mon Sep 17 00:00:00 2001
From: ZJH <junhong.zhou@fit2cloud.com>
Date: Thu, 9 Dec 2021 14:31:52 +0800
Subject: [PATCH 086/256] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89):=20Swagger=20URL=20=E5=AF=BC=E5=85=A5=E6=88=96?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3=E6=97=B6?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=B7=BB=E5=8A=A0=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1007799 --user=周骏弘 [Github#7602]当Swagger URL存在登录验证或其它认证机制时，通过Swagger URL的方式导入API接口，报错解析失败，请优化 #7602 https://www.tapd.cn/55049933/s/1079026
---
 .../api/dto/ApiTestImportRequest.java         |   8 ++
 .../dto/definition/parse/Swagger2Parser.java  |  55 +++++++-
 .../dto/definition/parse/Swagger3Parser.java  |  59 +++++++-
 .../api/service/ApiDefinitionService.java     |  25 +++-
 .../base/domain/SwaggerUrlProject.java        |   5 +-
 .../base/mapper/SwaggerUrlProjectMapper.java  |   9 +-
 .../base/mapper/SwaggerUrlProjectMapper.xml   | 126 +++++++++++++-----
 .../ext/ExtSwaggerUrlScheduleMapper.xml       |   1 +
 .../controller/request/ScheduleRequest.java   |   8 ++
 .../job/sechedule/SwaggerUrlImportJob.java    |  32 ++++-
 .../db/migration/V102__v1.15.4_release.sql    |   2 +
 .../components/auth/ApiAuthConfig.vue         |  44 ++++--
 .../complete/EditCompleteHTTPApi.vue          |   2 +-
 .../components/import/ApiImport.vue           |  60 ++++++++-
 .../components/import/ApiSchedule.vue         |  70 +++++++++-
 frontend/src/i18n/en-US.js                    |   2 +
 frontend/src/i18n/zh-CN.js                    |   2 +
 frontend/src/i18n/zh-TW.js                    |   2 +
 18 files changed, 438 insertions(+), 74 deletions(-)
 create mode 100644 backend/src/main/resources/db/migration/V102__v1.15.4_release.sql

diff --git a/backend/src/main/java/io/metersphere/api/dto/ApiTestImportRequest.java b/backend/src/main/java/io/metersphere/api/dto/ApiTestImportRequest.java
index dcad5bebc0..f23e1c766b 100644
--- a/backend/src/main/java/io/metersphere/api/dto/ApiTestImportRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/ApiTestImportRequest.java
@@ -1,7 +1,10 @@
 package io.metersphere.api.dto;
 
+import io.metersphere.api.dto.definition.request.auth.MsAuthManager;
+import io.metersphere.api.dto.scenario.KeyValue;
 import lombok.Getter;
 import lombok.Setter;
+import java.util.List;
 
 @Setter
 @Getter
@@ -24,4 +27,9 @@ public class ApiTestImportRequest {
     private String type;
     // 是否开启自定义ID
     private Boolean openCustomNum = false;
+    // 鉴权相关
+    private List<KeyValue> headers;
+    private List<KeyValue> arguments;
+    private MsAuthManager authManager;
+
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java
index 196ed26a13..fb1b41846c 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java
@@ -14,13 +14,13 @@ import io.metersphere.base.domain.ApiDefinitionWithBLOBs;
 import io.metersphere.base.domain.ApiModule;
 import io.metersphere.commons.constants.SwaggerParameterType;
 import io.swagger.models.*;
+import io.swagger.models.auth.AuthorizationValue;
 import io.swagger.models.parameters.*;
 import io.swagger.models.properties.*;
 import io.swagger.parser.SwaggerParser;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
-
 import java.io.InputStream;
 import java.util.*;
 
@@ -32,24 +32,69 @@ public class Swagger2Parser extends SwaggerAbstractParser {
     public ApiDefinitionImport parse(InputStream source, ApiTestImportRequest request) {
         Swagger swagger;
         String sourceStr = "";
+        List<AuthorizationValue> auths = setAuths(request);
         if (StringUtils.isNotBlank(request.getSwaggerUrl())) {  //  使用 url 导入 swagger
-            swagger = new SwaggerParser().read(request.getSwaggerUrl());
+            swagger = new SwaggerParser().read(request.getSwaggerUrl(), auths, true);
         } else {
             sourceStr = getApiTestStr(source);  //  导入的二进制文件转换为 String
-            swagger = new SwaggerParser().readWithInfo(sourceStr).getSwagger();
+            swagger = new SwaggerParser().readWithInfo(sourceStr, auths, true).getSwagger();
         }
-
         if (swagger == null || swagger.getSwagger() == null) {  //  不是 2.0 版本，则尝试转换 3.0
             Swagger3Parser swagger3Parser = new Swagger3Parser();
+
             return swagger3Parser.parse(sourceStr, request);
         }
-
         ApiDefinitionImport definitionImport = new ApiDefinitionImport();
         this.projectId = request.getProjectId();
         definitionImport.setData(parseRequests(swagger, request));
         return definitionImport;
     }
 
+    // 鉴权设置
+    private List<AuthorizationValue> setAuths(ApiTestImportRequest request) {
+        List<AuthorizationValue> auths = new ArrayList<>();
+        // 如果有 BaseAuth 参数，base64 编码后转换成 headers
+        if(request.getAuthManager() != null
+                && StringUtils.isNotBlank(request.getAuthManager().getUsername())
+                && StringUtils.isNotBlank(request.getAuthManager().getPassword())
+                && request.getAuthManager().getVerification().equals("Basic Auth")){
+            AuthorizationValue authorizationValue = new AuthorizationValue();
+            authorizationValue.setType("header");
+            authorizationValue.setKeyName("Authorization");
+            String authValue = "Basic " + Base64.getUrlEncoder().encodeToString((request.getAuthManager().getUsername()
+                    + ":" + request.getAuthManager().getPassword()).getBytes());
+            authorizationValue.setValue(authValue);
+            auths.add(authorizationValue);
+        }
+        // 设置 headers
+        if(!CollectionUtils.isEmpty(request.getHeaders())){
+            for(KeyValue keyValue : request.getHeaders()){
+                // 当有 key 时才进行设置
+                if(StringUtils.isNotBlank(keyValue.getName())){
+                    AuthorizationValue authorizationValue = new AuthorizationValue();
+                    authorizationValue.setType("header");
+                    authorizationValue.setKeyName(keyValue.getName());
+                    authorizationValue.setValue(keyValue.getValue());
+                    auths.add(authorizationValue);
+                }
+            }
+        }
+        // 设置 query 参数
+        if(!CollectionUtils.isEmpty(request.getArguments())){
+            for(KeyValue keyValue : request.getArguments()){
+                if(StringUtils.isNotBlank(keyValue.getName())){
+                    AuthorizationValue authorizationValue = new AuthorizationValue();
+                    authorizationValue.setType("query");
+                    authorizationValue.setKeyName(keyValue.getName());
+                    authorizationValue.setValue(keyValue.getValue());
+                    auths.add(authorizationValue);
+                }
+            }
+        }
+        return CollectionUtils.size(auths) == 0 ? null : auths;
+    }
+
+
     private List<ApiDefinitionWithBLOBs> parseRequests(Swagger swagger, ApiTestImportRequest importRequest) {
         Map<String, Path> paths = swagger.getPaths();
         Set<String> pathNames = paths.keySet();
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java
index 00d3ac43ad..847673ec68 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java
@@ -27,12 +27,12 @@ import io.swagger.v3.oas.models.media.*;
 import io.swagger.v3.oas.models.parameters.*;
 import io.swagger.v3.oas.models.responses.ApiResponse;
 import io.swagger.v3.oas.models.responses.ApiResponses;
+import io.swagger.v3.parser.core.models.AuthorizationValue;
 import io.swagger.v3.parser.core.models.SwaggerParseResult;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpMethod;
-
 import java.io.InputStream;
 import java.util.*;
 
@@ -51,29 +51,74 @@ public class Swagger3Parser extends SwaggerAbstractParser {
     }
 
     public ApiDefinitionImport parse(String sourceStr, ApiTestImportRequest request) {
+
+        List<AuthorizationValue> auths = setAuths(request);
         SwaggerParseResult result;
         if (StringUtils.isNotBlank(request.getSwaggerUrl())) {
-            result = new OpenAPIParser().readLocation(request.getSwaggerUrl(), null, null);
+            result = new OpenAPIParser().readLocation(request.getSwaggerUrl(), auths, null);
         } else {
-            result = new OpenAPIParser().readContents(sourceStr, null, null);
+            result = new OpenAPIParser().readContents(sourceStr, auths, null);
         }
-
         if (result == null) {
             MSException.throwException("解析失败，请确认选择的是 swagger 格式！");
         }
-
         OpenAPI openAPI = result.getOpenAPI();
-
         if (result.getMessages() != null) {
             result.getMessages().forEach(msg -> LogUtil.error(msg)); // validation errors and warnings
         }
-
         ApiDefinitionImport definitionImport = new ApiDefinitionImport();
         this.projectId = request.getProjectId();
         definitionImport.setData(parseRequests(openAPI, request));
         return definitionImport;
     }
 
+
+    // 鉴权设置
+    private List<AuthorizationValue> setAuths(ApiTestImportRequest request) {
+        List<AuthorizationValue> auths = new ArrayList<>();
+        // 如果有 BaseAuth 参数，base64 编码后转换成 headers
+        if(request.getAuthManager() != null
+                && StringUtils.isNotBlank(request.getAuthManager().getUsername())
+                && StringUtils.isNotBlank(request.getAuthManager().getPassword())
+                && request.getAuthManager().getVerification().equals("Basic Auth")){
+            AuthorizationValue authorizationValue = new AuthorizationValue();
+            authorizationValue.setType("header");
+            authorizationValue.setKeyName("Authorization");
+            String authValue = "Basic " + Base64.getUrlEncoder().encodeToString((request.getAuthManager().getUsername()
+                    + ":" + request.getAuthManager().getPassword()).getBytes());
+            authorizationValue.setValue(authValue);
+            auths.add(authorizationValue);
+        }
+        // 设置 headers
+        if(!CollectionUtils.isEmpty(request.getHeaders())){
+            for(KeyValue keyValue : request.getHeaders()){
+                // 当有 key 时才进行设置
+                if(StringUtils.isNotBlank(keyValue.getName())){
+                    AuthorizationValue authorizationValue = new AuthorizationValue();
+                    authorizationValue.setType("header");
+                    authorizationValue.setKeyName(keyValue.getName());
+                    authorizationValue.setValue(keyValue.getValue());
+                    auths.add(authorizationValue);
+                }
+            }
+        }
+        // 设置 query 参数
+        if(!CollectionUtils.isEmpty(request.getArguments())){
+            for(KeyValue keyValue : request.getArguments()){
+                if(StringUtils.isNotBlank(keyValue.getName())){
+                    AuthorizationValue authorizationValue = new AuthorizationValue();
+                    authorizationValue.setType("query");
+                    authorizationValue.setKeyName(keyValue.getName());
+                    authorizationValue.setValue(keyValue.getValue());
+                    auths.add(authorizationValue);
+                }
+            }
+        }
+        return CollectionUtils.size(auths) == 0 ? null : auths;
+    }
+
+
+
     private List<ApiDefinitionWithBLOBs> parseRequests(OpenAPI openAPI, ApiTestImportRequest importRequest) {
         Paths paths = openAPI.getPaths();
 
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index 378a72447e..6b827f1fc0 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -66,7 +66,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.multipart.MultipartFile;
 import sun.security.util.Cache;
-
 import javax.annotation.Resource;
 import java.net.MalformedURLException;
 import java.util.*;
@@ -1351,10 +1350,13 @@ public class ApiDefinitionService {
 
     /*swagger定时导入*/
     public void createSchedule(ScheduleRequest request) {
+        String config = setAuthParams(request);
         /*保存swaggerUrl*/
         SwaggerUrlProject swaggerUrlProject = new SwaggerUrlProject();
         BeanUtils.copyBean(swaggerUrlProject, request);
         swaggerUrlProject.setId(UUID.randomUUID().toString());
+        // 设置鉴权信息
+        swaggerUrlProject.setConfig(config);
         scheduleService.addSwaggerUrlSchedule(swaggerUrlProject);
 
         request.setResourceId(swaggerUrlProject.getId());
@@ -1375,8 +1377,11 @@ public class ApiDefinitionService {
     }
 
     public void updateSchedule(ScheduleRequest request) {
+        String config = setAuthParams(request);
         SwaggerUrlProject swaggerUrlProject = new SwaggerUrlProject();
         BeanUtils.copyBean(swaggerUrlProject, request);
+        // 设置鉴权信息
+        swaggerUrlProject.setConfig(config);
         scheduleService.updateSwaggerUrlSchedule(swaggerUrlProject);
         // 只修改表达式和名称
         Schedule schedule = new Schedule();
@@ -1394,6 +1399,24 @@ public class ApiDefinitionService {
         this.addOrUpdateSwaggerImportCronJob(request);
     }
 
+
+    // 设置 SwaggerUrl 同步鉴权参数
+    public String setAuthParams(ScheduleRequest request){
+        // list 数组转化成 json 字符串
+        JSONObject configObj = new JSONObject();
+        configObj.put("headers", request.getHeaders());
+        configObj.put("arguments", request.getArguments());
+        // 设置 BaseAuth 参数
+        if(request.getAuthManager() != null
+                && StringUtils.isNotBlank(request.getAuthManager().getUsername())
+                && StringUtils.isNotBlank(request.getAuthManager().getPassword())){
+            configObj.put("authManager", request.getAuthManager());
+        }
+        return JSONObject.toJSONString(configObj);
+    }
+
+
+
     /**
      * 列表开关切换
      *
diff --git a/backend/src/main/java/io/metersphere/base/domain/SwaggerUrlProject.java b/backend/src/main/java/io/metersphere/base/domain/SwaggerUrlProject.java
index 025660bfbc..82bdf9865d 100644
--- a/backend/src/main/java/io/metersphere/base/domain/SwaggerUrlProject.java
+++ b/backend/src/main/java/io/metersphere/base/domain/SwaggerUrlProject.java
@@ -1,8 +1,7 @@
 package io.metersphere.base.domain;
 
-import lombok.Data;
-
 import java.io.Serializable;
+import lombok.Data;
 
 @Data
 public class SwaggerUrlProject implements Serializable {
@@ -18,5 +17,7 @@ public class SwaggerUrlProject implements Serializable {
 
     private String modeId;
 
+    private String config;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.java b/backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.java
index 3984f00183..62fe4f7f9a 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.java
@@ -2,9 +2,8 @@ package io.metersphere.base.mapper;
 
 import io.metersphere.base.domain.SwaggerUrlProject;
 import io.metersphere.base.domain.SwaggerUrlProjectExample;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface SwaggerUrlProjectMapper {
     long countByExample(SwaggerUrlProjectExample example);
@@ -17,15 +16,21 @@ public interface SwaggerUrlProjectMapper {
 
     int insertSelective(SwaggerUrlProject record);
 
+    List<SwaggerUrlProject> selectByExampleWithBLOBs(SwaggerUrlProjectExample example);
+
     List<SwaggerUrlProject> selectByExample(SwaggerUrlProjectExample example);
 
     SwaggerUrlProject selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") SwaggerUrlProject record, @Param("example") SwaggerUrlProjectExample example);
 
+    int updateByExampleWithBLOBs(@Param("record") SwaggerUrlProject record, @Param("example") SwaggerUrlProjectExample example);
+
     int updateByExample(@Param("record") SwaggerUrlProject record, @Param("example") SwaggerUrlProjectExample example);
 
     int updateByPrimaryKeySelective(SwaggerUrlProject record);
 
+    int updateByPrimaryKeyWithBLOBs(SwaggerUrlProject record);
+
     int updateByPrimaryKey(SwaggerUrlProject record);
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
index 6fe4cf1452..2db45dd488 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
@@ -2,12 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.base.mapper.SwaggerUrlProjectMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.base.domain.SwaggerUrlProject">
-    <id column="id" jdbcType="VARCHAR" property="id"/>
-    <result column="project_id" jdbcType="VARCHAR" property="projectId"/>
-    <result column="swagger_url" jdbcType="VARCHAR" property="swaggerUrl"/>
-    <result column="module_id" jdbcType="VARCHAR" property="moduleId"/>
-    <result column="module_path" jdbcType="VARCHAR" property="modulePath"/>
-    <result column="mode_id" jdbcType="VARCHAR" property="modeId"/>
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="project_id" jdbcType="VARCHAR" property="projectId" />
+    <result column="swagger_url" jdbcType="VARCHAR" property="swaggerUrl" />
+    <result column="module_id" jdbcType="VARCHAR" property="moduleId" />
+    <result column="module_path" jdbcType="VARCHAR" property="modulePath" />
+    <result column="mode_id" jdbcType="VARCHAR" property="modeId" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.SwaggerUrlProject">
+    <result column="config" jdbcType="LONGVARCHAR" property="config" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -70,43 +73,64 @@
   <sql id="Base_Column_List">
     id, project_id, swagger_url, module_id, module_path, mode_id
   </sql>
-  <select id="selectByExample" parameterType="io.metersphere.base.domain.SwaggerUrlProjectExample"
-          resultMap="BaseResultMap">
+  <sql id="Blob_Column_List">
+    config
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.base.domain.SwaggerUrlProjectExample" resultMap="ResultMapWithBLOBs">
     select
     <if test="distinct">
       distinct
     </if>
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
     from swagger_url_project
     <if test="_parameter != null">
-      <include refid="Example_Where_Clause"/>
+      <include refid="Example_Where_Clause" />
     </if>
     <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.base.domain.SwaggerUrlProjectExample" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List"/>
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from swagger_url_project
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
     from swagger_url_project
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete
-    from swagger_url_project
+    delete from swagger_url_project
     where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="io.metersphere.base.domain.SwaggerUrlProjectExample">
     delete from swagger_url_project
     <if test="_parameter != null">
-      <include refid="Example_Where_Clause"/>
+      <include refid="Example_Where_Clause" />
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.base.domain.SwaggerUrlProject">
-    insert into swagger_url_project (id, project_id, swagger_url,
-                                     module_id, module_path, mode_id)
-    values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{swaggerUrl,jdbcType=VARCHAR},
-            #{moduleId,jdbcType=VARCHAR}, #{modulePath,jdbcType=VARCHAR}, #{modeId,jdbcType=VARCHAR})
+    insert into swagger_url_project (id, project_id, swagger_url, 
+      module_id, module_path, mode_id, 
+      config)
+    values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{swaggerUrl,jdbcType=VARCHAR}, 
+      #{moduleId,jdbcType=VARCHAR}, #{modulePath,jdbcType=VARCHAR}, #{modeId,jdbcType=VARCHAR}, 
+      #{config,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.SwaggerUrlProject">
     insert into swagger_url_project
@@ -129,6 +153,9 @@
       <if test="modeId != null">
         mode_id,
       </if>
+      <if test="config != null">
+        config,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -149,13 +176,15 @@
       <if test="modeId != null">
         #{modeId,jdbcType=VARCHAR},
       </if>
+      <if test="config != null">
+        #{config,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="io.metersphere.base.domain.SwaggerUrlProjectExample"
-          resultType="java.lang.Long">
+  <select id="countByExample" parameterType="io.metersphere.base.domain.SwaggerUrlProjectExample" resultType="java.lang.Long">
     select count(*) from swagger_url_project
     <if test="_parameter != null">
-      <include refid="Example_Where_Clause"/>
+      <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
@@ -179,21 +208,37 @@
       <if test="record.modeId != null">
         mode_id = #{record.modeId,jdbcType=VARCHAR},
       </if>
+      <if test="record.config != null">
+        config = #{record.config,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause"/>
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update swagger_url_project
+    set id = #{record.id,jdbcType=VARCHAR},
+      project_id = #{record.projectId,jdbcType=VARCHAR},
+      swagger_url = #{record.swaggerUrl,jdbcType=VARCHAR},
+      module_id = #{record.moduleId,jdbcType=VARCHAR},
+      module_path = #{record.modulePath,jdbcType=VARCHAR},
+      mode_id = #{record.modeId,jdbcType=VARCHAR},
+      config = #{record.config,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
     update swagger_url_project
     set id = #{record.id,jdbcType=VARCHAR},
-    project_id = #{record.projectId,jdbcType=VARCHAR},
-    swagger_url = #{record.swaggerUrl,jdbcType=VARCHAR},
-    module_id = #{record.moduleId,jdbcType=VARCHAR},
-    module_path = #{record.modulePath,jdbcType=VARCHAR},
-    mode_id = #{record.modeId,jdbcType=VARCHAR}
+      project_id = #{record.projectId,jdbcType=VARCHAR},
+      swagger_url = #{record.swaggerUrl,jdbcType=VARCHAR},
+      module_id = #{record.moduleId,jdbcType=VARCHAR},
+      module_path = #{record.modulePath,jdbcType=VARCHAR},
+      mode_id = #{record.modeId,jdbcType=VARCHAR}
     <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause"/>
+      <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.SwaggerUrlProject">
@@ -214,16 +259,29 @@
       <if test="modeId != null">
         mode_id = #{modeId,jdbcType=VARCHAR},
       </if>
+      <if test="config != null">
+        config = #{config,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.SwaggerUrlProject">
+    update swagger_url_project
+    set project_id = #{projectId,jdbcType=VARCHAR},
+      swagger_url = #{swaggerUrl,jdbcType=VARCHAR},
+      module_id = #{moduleId,jdbcType=VARCHAR},
+      module_path = #{modulePath,jdbcType=VARCHAR},
+      mode_id = #{modeId,jdbcType=VARCHAR},
+      config = #{config,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.SwaggerUrlProject">
     update swagger_url_project
-    set project_id  = #{projectId,jdbcType=VARCHAR},
-        swagger_url = #{swaggerUrl,jdbcType=VARCHAR},
-        module_id   = #{moduleId,jdbcType=VARCHAR},
-        module_path = #{modulePath,jdbcType=VARCHAR},
-        mode_id     = #{modeId,jdbcType=VARCHAR}
+    set project_id = #{projectId,jdbcType=VARCHAR},
+      swagger_url = #{swaggerUrl,jdbcType=VARCHAR},
+      module_id = #{moduleId,jdbcType=VARCHAR},
+      module_path = #{modulePath,jdbcType=VARCHAR},
+      mode_id = #{modeId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtSwaggerUrlScheduleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtSwaggerUrlScheduleMapper.xml
index 7799b2f8d4..e803a7256b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtSwaggerUrlScheduleMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtSwaggerUrlScheduleMapper.xml
@@ -9,6 +9,7 @@
                sup.mode_id,
                sup.module_id,
                sup.project_id,
+               sup.config,
                sch.value as rule,
                sch.enable,
                sch.id as taskId
diff --git a/backend/src/main/java/io/metersphere/controller/request/ScheduleRequest.java b/backend/src/main/java/io/metersphere/controller/request/ScheduleRequest.java
index 901519fe19..6dd3360e1a 100644
--- a/backend/src/main/java/io/metersphere/controller/request/ScheduleRequest.java
+++ b/backend/src/main/java/io/metersphere/controller/request/ScheduleRequest.java
@@ -1,8 +1,11 @@
 package io.metersphere.controller.request;
 
+import io.metersphere.api.dto.definition.request.auth.MsAuthManager;
+import io.metersphere.api.dto.scenario.KeyValue;
 import io.metersphere.base.domain.Schedule;
 import lombok.Getter;
 import lombok.Setter;
+import java.util.List;
 
 /**
  * @author song.tianyang
@@ -28,4 +31,9 @@ public class ScheduleRequest extends Schedule {
 
     private String taskId;
 
+    // 鉴权相关
+    private List<KeyValue> headers;
+    private List<KeyValue> arguments;
+    private MsAuthManager authManager;
+
 }
diff --git a/backend/src/main/java/io/metersphere/job/sechedule/SwaggerUrlImportJob.java b/backend/src/main/java/io/metersphere/job/sechedule/SwaggerUrlImportJob.java
index 45f1872eb8..de9912e51b 100644
--- a/backend/src/main/java/io/metersphere/job/sechedule/SwaggerUrlImportJob.java
+++ b/backend/src/main/java/io/metersphere/job/sechedule/SwaggerUrlImportJob.java
@@ -1,14 +1,21 @@
 package io.metersphere.job.sechedule;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import io.metersphere.api.dto.ApiTestImportRequest;
+import io.metersphere.api.dto.definition.request.auth.MsAuthManager;
+import io.metersphere.api.dto.scenario.KeyValue;
 import io.metersphere.api.service.ApiDefinitionService;
 import io.metersphere.base.domain.SwaggerUrlProject;
 import io.metersphere.commons.constants.ScheduleGroup;
 import io.metersphere.commons.utils.CommonBeanFactory;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.quartz.JobDataMap;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobKey;
 import org.quartz.TriggerKey;
+import java.util.List;
 
 public class SwaggerUrlImportJob extends MsScheduleJob {
     private ApiDefinitionService apiDefinitionService;
@@ -21,8 +28,11 @@ public class SwaggerUrlImportJob extends MsScheduleJob {
     void businessExecute(JobExecutionContext context) {
         JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
         String resourceId = jobDataMap.getString("resourceId");
-        SwaggerUrlProject swaggerUrlProject=apiDefinitionService.getSwaggerInfo(resourceId);
+        SwaggerUrlProject swaggerUrlProject = apiDefinitionService.getSwaggerInfo(resourceId);
         ApiTestImportRequest request = new ApiTestImportRequest();
+        // 获取鉴权设置
+        String config = swaggerUrlProject.getConfig();
+        setAuthInfo(config, request);
         request.setProjectId(swaggerUrlProject.getProjectId());
         request.setSwaggerUrl(swaggerUrlProject.getSwaggerUrl());
         request.setModuleId(swaggerUrlProject.getModuleId());
@@ -41,4 +51,24 @@ public class SwaggerUrlImportJob extends MsScheduleJob {
     public static TriggerKey getTriggerKey(String resourceId) {
         return new TriggerKey(resourceId, ScheduleGroup.SWAGGER_IMPORT.name());
     }
+
+    public void setAuthInfo(String config, ApiTestImportRequest request){
+        // 获取鉴权设置
+        if(StringUtils.isNotBlank(config)){
+            JSONObject configObj = JSON.parseObject(config);
+            List<KeyValue> headers = JSONObject.parseArray(configObj.getString("headers"), KeyValue.class);
+            if(CollectionUtils.isNotEmpty(headers)){
+                request.setHeaders(headers);
+            }
+            List<KeyValue> arguments = JSONObject.parseArray(configObj.getString("arguments"), KeyValue.class);
+            if(CollectionUtils.isNotEmpty(arguments)){
+                request.setArguments(arguments);
+            }
+            MsAuthManager msAuthManager = JSONObject.parseObject(configObj.getString("authManager"), MsAuthManager.class);
+            if(msAuthManager != null){
+                request.setAuthManager(msAuthManager);
+            }
+        }
+    }
+
 }
diff --git a/backend/src/main/resources/db/migration/V102__v1.15.4_release.sql b/backend/src/main/resources/db/migration/V102__v1.15.4_release.sql
new file mode 100644
index 0000000000..b2247a93b2
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V102__v1.15.4_release.sql
@@ -0,0 +1,2 @@
+-- 新增字段
+ALTER TABLE `swagger_url_project` ADD COLUMN `config` longtext COMMENT '鉴权配置信息' AFTER `mode_id`;
\ No newline at end of file
diff --git a/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue b/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue
index 907c105d33..2accb865a6 100644
--- a/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue
+++ b/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue
@@ -34,7 +34,7 @@
     </el-tab-pane>
 
     <!--加密-->
-    <el-tab-pane :label="$t('api_test.definition.request.encryption')" name="encryption">
+    <el-tab-pane :label="$t('api_test.definition.request.encryption')" name="encryption" v-if="encryptShow">
       <el-form :model="authConfig" size="small" :rules="rule"
                ref="authConfig">
 
@@ -62,19 +62,18 @@ export default {
   components: {},
   props: {
     request: {},
+    encryptShow: {
+      type: Boolean,
+      default: true,
+    }
+  },
+  watch: {
+    request() {
+      this.initData();
+    }
   },
   created() {
-    if (this.request.hashTree) {
-      for (let index in this.request.hashTree) {
-        if (this.request.hashTree[index].type == 'AuthManager') {
-          this.request.authManager = this.request.hashTree[index];
-          this.request.hashTree.splice(index, 1);
-        }
-      }
-    }
-    if (this.request.authManager) {
-      this.authConfig = this.request.authManager;
-    }
+    this.initData();
   },
   data() {
     return {
@@ -91,8 +90,14 @@ export default {
         let authManager = createComponent("AuthManager");
         authManager.verification = "Basic Auth";
         authManager.environment = this.request.useEnvironment;
+        if(this.request.hashTree == undefined){
+          this.request.hashTree = [];
+        }
         this.request.hashTree.push(authManager);
-        this.authConfig = authManager;
+        // 这里做个判断，如果原来有值则不覆盖
+        if(this.authConfig.username == undefined && this.authConfig.password == undefined){
+          this.authConfig = authManager;
+        }
       } else {
         for (let index in this.request.hashTree) {
           if (this.request.hashTree[index].type === "AuthManager") {
@@ -102,6 +107,19 @@ export default {
         this.request.authManager = {};
       }
       this.request.authManager = this.authConfig;
+    },
+    initData(){
+      if (this.request.hashTree) {
+        for (let index in this.request.hashTree) {
+          if (this.request.hashTree[index].type == 'AuthManager') {
+            this.request.authManager = this.request.hashTree[index];
+            this.request.hashTree.splice(index, 1);
+          }
+        }
+      }
+      if (this.request.authManager) {
+        this.authConfig = this.request.authManager;
+      }
     }
   }
 }
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
index 2c0b66d697..4375579bb1 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
@@ -144,7 +144,7 @@
     components: {
       ApiOtherInfo,
       MsFormDivider,
-      MsJsr233Processor, MsResponseText, MsApiRequestForm, MsInputTag, MsSelectTree,MsChangeHistory},
+      MsJsr233Processor, MsResponseText, MsApiRequestForm, MsInputTag, MsSelectTree, MsChangeHistory},
     data() {
       let validateURL = (rule, value, callback) => {
         if (!this.httpForm.path.startsWith("/") || this.httpForm.path.match(/\s/) != null) {
diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
index 11613cd086..dd0b698e83 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :close-on-click-modal="false" :title="$t('api_test.api_import.title')" width="30%"
+  <el-dialog :close-on-click-modal="false" :title="$t('api_test.api_import.title')" width="90%"
              :visible.sync="visible" class="api-import" v-loading="result.loading" @close="close"
              :destroy-on-close="true">
 
@@ -23,7 +23,7 @@
 
     <el-form :model="formData" :rules="rules" label-width="100px" v-loading="result.loading" ref="form">
       <el-row>
-        <el-col :span="11">
+        <el-col :span="8">
           <el-form-item :label="$t('commons.import_module')" prop="moduleId">
             <ms-select-tree size="small" :data="moduleOptions" :defaultKey="formData.moduleId" @getValue="setModule" :obj="moduleObj" clearable checkStrictly/>
           </el-form-item>
@@ -49,11 +49,32 @@
         <el-col :span="1">
           <el-divider direction="vertical"/>
         </el-col>
-        <el-col :span="12" v-show="isSwagger2 && swaggerUrlEnable" style="margin-top: 40px">
+
+        <el-col :span="14" v-show="isSwagger2 && swaggerUrlEnable" style="margin-top: 40px">
           <el-form-item :label="'Swagger URL'" prop="swaggerUrl" class="swagger-url">
             <el-input size="small" v-model="formData.swaggerUrl" clearable show-word-limit/>
           </el-form-item>
+          <el-switch v-model="authEnable" :active-text="$t('api_test.api_import.add_request_params')"></el-switch>
         </el-col>
+
+        <el-col :span="14" v-show="isSwagger2 && authEnable && swaggerUrlEnable">
+            <!--请求头 -->
+            <div style="margin-top: 15px;">
+              <span>{{$t('api_test.request.headers')}}{{$t('api_test.api_import.optional')}}：</span>
+            </div>
+            <ms-api-key-value :show-desc="true" :isShowEnable="isShowEnable" :suggestions="headerSuggestions" :items="headers"/>
+            <!--query 参数-->
+            <div style="margin-top: 10px">
+              <span>{{$t('api_test.definition.request.query_param')}}{{$t('api_test.api_import.optional')}}：</span>
+            </div>
+            <ms-api-variable :with-mor-setting="true" :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :parameters="queryArguments"/>
+            <!--认证配置-->
+            <div style="margin-top: 10px">
+              <span>{{$t('api_test.definition.request.auth_config')}}{{$t('api_test.api_import.optional')}}：</span>
+            </div>
+            <ms-api-auth-config :is-read-only="isReadOnly" :request="authConfig" :encryptShow="false"/>
+        </el-col>
+
         <el-col :span="12"
                 v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEnable)">
           <el-upload
@@ -98,10 +119,20 @@
   import MsDialogFooter from "../../../../common/components/MsDialogFooter";
   import {listenGoBack, removeGoBackListener, hasLicense, getCurrentProjectID} from "@/common/js/utils";
   import MsSelectTree from "../../../../common/select-tree/SelectTree";
+  import MsApiKeyValue from "../ApiKeyValue";
+  import MsApiVariable from "../ApiVariable";
+  import MsApiAuthConfig from "../auth/ApiAuthConfig";
+  import {REQUEST_HEADERS} from "@/common/js/constants";
+  import {ELEMENT_TYPE, TYPE_TO_C} from "@/business/components/api/automation/scenario/Setting";
 
   export default {
     name: "ApiImport",
-    components: {MsDialogFooter, MsSelectTree},
+    components: {
+      MsDialogFooter,
+      MsSelectTree,
+      MsApiKeyValue,
+      MsApiVariable,
+      MsApiAuthConfig},
     props: {
       saved: {
         type: Boolean,
@@ -118,8 +149,10 @@
       return {
         visible: false,
         swaggerUrlEnable: false,
+        authEnable: false,
         showEnvironmentSelect: true,
         showXpackCompnent:false,
+        headerSuggestions: REQUEST_HEADERS,
         moduleObj: {
           id: 'id',
           label: 'name',
@@ -189,7 +222,7 @@
           file: undefined,
           swaggerUrl: '',
           modeId: 'incrementalMerge',
-          moduleId: '',
+          moduleId: ''
         },
         rules: {
           modeId: [
@@ -197,7 +230,14 @@
           ],
         },
         currentModule: {},
-        fileList: []
+        fileList: [],
+        isShowEnable: true,
+        isReadOnly: false,
+        headers: [],
+        queryArguments: [],
+        authConfig: {
+          hashTree: []
+        }
       }
     },
     created() {
@@ -341,6 +381,14 @@
         param.projectId = this.projectId;
         if (!this.swaggerUrlEnable) {
           param.swaggerUrl = undefined;
+        }else{
+          // 设置请求头
+          param.headers = this.headers;
+          // 设置 query 参数
+          param.arguments = this.queryArguments;
+          // 设置 BaseAuth 参数
+          this.authConfig.authManager.clazzName = TYPE_TO_C.get("AuthManager");
+          param.authManager = this.authConfig.authManager;
         }
         return param;
       },
diff --git a/frontend/src/business/components/api/definition/components/import/ApiSchedule.vue b/frontend/src/business/components/api/definition/components/import/ApiSchedule.vue
index 970123ae98..a582e6418a 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiSchedule.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiSchedule.vue
@@ -30,6 +30,29 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+          <el-col :span="12" style="margin-left: 50px">
+            <el-switch v-model="authEnable" :active-text="$t('api_test.api_import.add_request_params')"></el-switch>
+          </el-col>
+
+          <el-col :span="19" v-show="authEnable" style="margin-top: 10px; margin-left: 50px" class="request-tabs">
+            <!-- 请求头 -->
+            <div>
+              <span>{{$t('api_test.request.headers')}}{{$t('api_test.api_import.optional')}}：</span>
+            </div>
+            <ms-api-key-value :label="$t('api_test.definition.request.auth_config')"
+                              :show-desc="true" :isShowEnable="isShowEnable" :suggestions="headerSuggestions" :items="headers"/>
+            <!--query 参数-->
+            <div style="margin-top: 10px">
+              <span>{{$t('api_test.definition.request.query_param')}}{{$t('api_test.api_import.optional')}}：</span>
+            </div>
+            <ms-api-variable :with-mor-setting="true" :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :parameters="queryArguments"/>
+            <!--认证配置-->
+            <div style="margin-top: 10px">
+              <span>{{$t('api_test.definition.request.auth_config')}}{{$t('api_test.api_import.optional')}}：</span>
+            </div>
+            <ms-api-auth-config :is-read-only="isReadOnly" :request="authConfig" :encryptShow="false"/>
+          </el-col>
         </el-row>
 
         <el-form-item class="expression-link">
@@ -100,11 +123,17 @@ import {cronValidate} from "@/common/js/cron";
 import {getCurrentProjectID, getCurrentUser, getCurrentWorkspaceId} from "@/common/js/utils";
 import SelectTree from "@/business/components/common/select-tree/SelectTree";
 import SwaggerTaskNotification from "@/business/components/api/definition/components/import/SwaggerTaskNotification";
+import MsApiKeyValue from "../ApiKeyValue";
+import MsApiVariable from "../ApiVariable";
+import MsApiAuthConfig from "../auth/ApiAuthConfig";
+import {REQUEST_HEADERS} from "@/common/js/constants";
+import {KeyValue} from "../../model/ApiTestModel";
+import {ELEMENT_TYPE, TYPE_TO_C} from "@/business/components/api/automation/scenario/Setting";
 
 export default {
   name: "ApiSchedule",
   components: {
-    SwaggerTaskNotification, SelectTree, MsFormDivider, SwaggerTaskList, CrontabResult, Crontab
+    SwaggerTaskNotification, SelectTree, MsFormDivider, SwaggerTaskList, CrontabResult, Crontab, MsApiKeyValue, MsApiVariable, MsApiAuthConfig
   },
   props: {
     customValidate: {
@@ -118,7 +147,7 @@ export default {
       default: false
     },
     moduleOptions: Array,
-    param: Object,
+    param: Object
   },
 
   watch: {
@@ -180,6 +209,14 @@ export default {
         id: 'id',
         label: 'name',
       },
+      isShowEnable: true,
+      authEnable: false,
+      headerSuggestions: REQUEST_HEADERS,
+      headers: [],
+      queryArguments: [],
+      authConfig: {
+        hashTree: []
+      }
     };
   },
 
@@ -209,6 +246,7 @@ export default {
       if (!this.formData.rule) {
         this.$refs.crontabResult.resultList = [];
       }
+      this.clearAuthInfo();
       this.$nextTick(() => {
         this.$refs.selectTree.init();
       });
@@ -241,6 +279,12 @@ export default {
       this.formData.projectId = getCurrentProjectID();
       this.formData.workspaceId = getCurrentWorkspaceId();
       this.formData.value = this.formData.rule;
+      // 设置请求头或 query 参数
+      this.formData.headers = this.headers;
+      this.formData.arguments = this.queryArguments;
+      // 设置 BaseAuth 参数
+      this.authConfig.authManager.clazzName = TYPE_TO_C.get("AuthManager");
+      this.formData.authManager = this.authConfig.authManager;
       let url = '';
       if (this.formData.id) {
         url = '/api/definition/schedule/update';
@@ -275,10 +319,32 @@ export default {
       this.formData.modulePath = data.path;
     },
     handleRowClick(row) {
+      // 如果认证信息不为空，进行转化
+      if(row.config != null || row.config != undefined){
+        this.authEnable = true;
+        let config = JSON.parse(row.config);
+        this.headers = config.headers;
+        this.queryArguments = config.arguments;
+        if(config.authManager != null || config.authManager != undefined){
+          this.authConfig = config;
+        }else {
+          this.authConfig = {hashTree: [], authManager: {}};
+        }
+      }else {
+        this.clearAuthInfo();
+      }
       Object.assign(this.formData, row);
       this.$nextTick(() => {
         this.$refs.selectTree.init();
       });
+    },
+    clearAuthInfo(){
+      this.headers = [];
+      this.queryArguments = [];
+      this.headers.push(new KeyValue({enable: true}));
+      this.queryArguments.push(new KeyValue({enable: true}));
+      this.authConfig = {hashTree: [], authManager: {}};
+      this.authEnable = false;
     }
 
   },
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 97a5b92da7..ef136c2193 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1464,6 +1464,8 @@ export default {
       jmeter_tip: "JMX files supporting JMeter 5.2-5.4",
       suffixFormatErr: "The file format does not meet the requirements",
       swagger_url_import: "Import using URL",
+      add_request_params: "Add request Parameters",
+      optional: "（optional）",
       timing_synchronization: "Timing synchronization",
       next_synchronization_time: "Next synchronization time",
       ms_env_import_file_limit: "It only supports JSON format files exported through metersphere",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 493c2cece9..a01c89ac05 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1475,6 +1475,8 @@ export default {
       jmeter_tip: "支持 JMeter5.2-5.4版本的JMX文件",
       suffixFormatErr: "文件格式不符合要求",
       swagger_url_import: "使用URL导入",
+      add_request_params: "添加请求参数",
+      optional: "（可选）",
       timing_synchronization: "定时同步",
       next_synchronization_time: "下次同步时间",
       ms_env_import_file_limit: "仅支持通过MeterSphere导出的json格式文件",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 2e9220b71e..623d699163 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1473,6 +1473,8 @@ export default {
       jmeter_tip: "支持 JMeter5.2-5.4版本的JMX文件",
       suffixFormatErr: "文件格式不符合要求",
       swagger_url_import: "使用URL導入",
+      add_request_params: "添加請求參數",
+      optional: "（可選）",
       timing_synchronization: "定時同步",
       next_synchronization_time: "下次同步時間",
       ms_env_import_file_limit: "僅支持通過MeterSphere導出的json格式文件",

From 291116755c7acf9110f05293edb739671fc5e093 Mon Sep 17 00:00:00 2001
From: ZJH <junhong.zhou@fit2cloud.com>
Date: Thu, 9 Dec 2021 15:06:49 +0800
Subject: [PATCH 087/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89):=20Swagger=20URL=20=E5=AF=BC=E5=85=A5=E6=88=96?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3=E6=97=B6?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=B7=BB=E5=8A=A0=E8=AE=A4=E8=AF=81=EF=BC=88?=
 =?UTF-8?q?flyway=20=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{V102__v1.15.4_release.sql => V102__v1.16_release.sql}        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename backend/src/main/resources/db/migration/{V102__v1.15.4_release.sql => V102__v1.16_release.sql} (100%)

diff --git a/backend/src/main/resources/db/migration/V102__v1.15.4_release.sql b/backend/src/main/resources/db/migration/V102__v1.16_release.sql
similarity index 100%
rename from backend/src/main/resources/db/migration/V102__v1.15.4_release.sql
rename to backend/src/main/resources/db/migration/V102__v1.16_release.sql

From 65d60bc18234006a1fa7f2678ddcc2b9820238bf Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 9 Dec 2021 18:24:05 +0800
Subject: [PATCH 088/256] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E6=8E=A5=E5=8F=A3=E3=80=81=E4=BF=AE=E6=94=B9=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/UserController.java            |  8 +-
 .../metersphere/service/UserGroupService.java | 14 ++--
 .../io/metersphere/service/UserService.java   | 79 +++++++++----------
 3 files changed, 46 insertions(+), 55 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/UserController.java b/backend/src/main/java/io/metersphere/controller/UserController.java
index 196f103879..a8f9ebb971 100644
--- a/backend/src/main/java/io/metersphere/controller/UserController.java
+++ b/backend/src/main/java/io/metersphere/controller/UserController.java
@@ -110,15 +110,9 @@ public class UserController {
         userService.updateCurrentUserByResourceId(resourceId);
     }
 
-    @PostMapping("/switch/source/org/{sourceId}")
-    public UserDTO switchOrganization(@PathVariable(value = "sourceId") String sourceId) {
-        userService.switchUserRole("organization", sourceId);
-        return SessionUtils.getUser();
-    }
-
     @PostMapping("/switch/source/ws/{sourceId}")
     public UserDTO switchWorkspace(@PathVariable(value = "sourceId") String sourceId) {
-        userService.switchUserRole("workspace", sourceId);
+        userService.switchUserResource("workspace", sourceId);
         return SessionUtils.getUser();
     }
 
diff --git a/backend/src/main/java/io/metersphere/service/UserGroupService.java b/backend/src/main/java/io/metersphere/service/UserGroupService.java
index 7399ee53b0..dbd6b2b208 100644
--- a/backend/src/main/java/io/metersphere/service/UserGroupService.java
+++ b/backend/src/main/java/io/metersphere/service/UserGroupService.java
@@ -24,18 +24,18 @@ public class UserGroupService {
         userRoleExample.createCriteria().andUserIdEqualTo(userId);
         List<UserGroup> userGroups = userGroupMapper.selectByExample(userRoleExample);
         List<String> collect = userGroups.stream()
-                .map(userRole -> userRole.getGroupId())
+                .map(UserGroup::getGroupId)
                 .distinct()
                 .collect(Collectors.toList());
-        for (int i = 0; i < collect.size(); i++) {
+        for (String id : collect) {
             Map<String, Object> map = new HashMap<>(2);
-            map.put("id", collect.get(i));
+            map.put("id", id);
             map.put("ids", new ArrayList<>());
-            for (int j = 0; j < userGroups.size(); j++) {
-                String role = userGroups.get(j).getGroupId();
-                if (StringUtils.equals(role, collect.get(i))) {
+            for (UserGroup userGroup : userGroups) {
+                String groupId = userGroup.getGroupId();
+                if (StringUtils.equals(groupId, id)) {
                     List ids = (List) map.get("ids");
-                    ids.add(userGroups.get(j).getSourceId());
+                    ids.add(userGroup.getSourceId());
                 }
             }
             list.add(map);
diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
index 7473fbe825..c02fe22255 100644
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -107,22 +107,20 @@ public class UserService {
         return extUserMapper.queryName();
     }
 
-    public UserDTO insert(UserRequest user) {
-        checkUserParam(user);
-        //
-        String id = user.getId();
-        User user1 = userMapper.selectByPrimaryKey(id);
-        if (user1 != null) {
+    public UserDTO insert(UserRequest userRequest) {
+        checkUserParam(userRequest);
+        String id = userRequest.getId();
+        User user = userMapper.selectByPrimaryKey(id);
+        if (user != null) {
             MSException.throwException(Translator.get("user_id_already_exists"));
         } else {
-            createUser(user);
+            createUser(userRequest);
         }
-
-        List<Map<String, Object>> groups = user.getGroups();
+        List<Map<String, Object>> groups = userRequest.getGroups();
         if (!groups.isEmpty()) {
-            insertUserGroup(groups, user.getId());
+            insertUserGroup(groups, userRequest.getId());
         }
-        return getUserDTO(user.getId());
+        return getUserDTO(userRequest.getId());
     }
 
     public void insertUserGroup(List<Map<String, Object>> groups, String userId) {
@@ -385,14 +383,13 @@ public class UserService {
         }
     }
 
-    public void switchUserRole(String sign, String sourceId) {
+    public void switchUserResource(String sign, String sourceId) {
         SessionUser sessionUser = SessionUtils.getUser();
         // 获取最新UserDTO
         UserDTO user = getUserDTO(sessionUser.getId());
         User newUser = new User();
 
         if (StringUtils.equals("workspace", sign)) {
-            Workspace workspace = workspaceMapper.selectByPrimaryKey(sourceId);
             user.setLastWorkspaceId(sourceId);
             List<Project> projects = getProjectListByWsAndUserId(sourceId);
             if (projects.size() > 0) {
@@ -417,15 +414,13 @@ public class UserService {
         userGroupExample.createCriteria().andUserIdEqualTo(useId);
         List<UserGroup> userGroups = userGroupMapper.selectByExample(userGroupExample);
         List<Project> projectList = new ArrayList<>();
-        userGroups.forEach(userGroup -> {
-            projects.forEach(project -> {
-                if (StringUtils.equals(userGroup.getSourceId(), project.getId())) {
-                    if (!projectList.contains(project)) {
-                        projectList.add(project);
-                    }
+        userGroups.forEach(userGroup -> projects.forEach(project -> {
+            if (StringUtils.equals(userGroup.getSourceId(), project.getId())) {
+                if (!projectList.contains(project)) {
+                    projectList.add(project);
                 }
-            });
-        });
+            }
+        }));
         return projectList;
     }
 
@@ -632,7 +627,7 @@ public class UserService {
                     .collect(Collectors.toList());
             if (workspaces.size() > 0) {
                 String wsId = workspaces.get(0).getSourceId();
-                switchUserRole("workspace", wsId);
+                switchUserResource("workspace", wsId);
             }
         } else {
             UserGroup userGroup = project.stream().filter(p -> StringUtils.isNotBlank(p.getSourceId()))
@@ -952,7 +947,6 @@ public class UserService {
         if (CollectionUtils.isEmpty(userGroups)) {
             return userGroupPermissionDTO;
         }
-        // 设置 user_role
         userGroupPermissionDTO.setUserGroups(userGroups);
 
         List<String> groupId = userGroups.stream().map(UserGroup::getGroupId).collect(Collectors.toList());
@@ -1088,24 +1082,27 @@ public class UserService {
     }
 
     public void addProjectMember(AddMemberRequest request) {
-        if (!CollectionUtils.isEmpty(request.getUserIds())) {
-            for (String userId : request.getUserIds()) {
-                UserGroupExample userGroupExample = new UserGroupExample();
-                userGroupExample.createCriteria().andUserIdEqualTo(userId).andSourceIdEqualTo(request.getProjectId());
-                List<UserGroup> userGroups = userGroupMapper.selectByExample(userGroupExample);
-                if (userGroups.size() > 0) {
-                    MSException.throwException(Translator.get("user_already_exists"));
-                } else {
-                    for (String groupId : request.getGroupIds()) {
-                        UserGroup userGroup = new UserGroup();
-                        userGroup.setGroupId(groupId);
-                        userGroup.setSourceId(request.getProjectId());
-                        userGroup.setUserId(userId);
-                        userGroup.setId(UUID.randomUUID().toString());
-                        userGroup.setUpdateTime(System.currentTimeMillis());
-                        userGroup.setCreateTime(System.currentTimeMillis());
-                        userGroupMapper.insertSelective(userGroup);
-                    }
+        if (CollectionUtils.isEmpty(request.getUserIds())) {
+            LogUtil.info("add project member warning, request param user id list empty!");
+            return;
+        }
+
+        for (String userId : request.getUserIds()) {
+            UserGroupExample userGroupExample = new UserGroupExample();
+            userGroupExample.createCriteria().andUserIdEqualTo(userId).andSourceIdEqualTo(request.getProjectId());
+            List<UserGroup> userGroups = userGroupMapper.selectByExample(userGroupExample);
+            if (userGroups.size() > 0) {
+                MSException.throwException(Translator.get("user_already_exists"));
+            } else {
+                for (String groupId : request.getGroupIds()) {
+                    UserGroup userGroup = new UserGroup();
+                    userGroup.setGroupId(groupId);
+                    userGroup.setSourceId(request.getProjectId());
+                    userGroup.setUserId(userId);
+                    userGroup.setId(UUID.randomUUID().toString());
+                    userGroup.setUpdateTime(System.currentTimeMillis());
+                    userGroup.setCreateTime(System.currentTimeMillis());
+                    userGroupMapper.insertSelective(userGroup);
                 }
             }
         }

From ffbac715dd3f3c53abcd298a539e85e20d14b84d Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 9 Dec 2021 20:05:54 +0800
Subject: [PATCH 089/256] =?UTF-8?q?fix:=20=E7=94=A8=E4=BE=8B=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E4=BA=BA=E6=98=AF=E7=94=A8=E6=88=B7ID=20--bug=3D1008336=20--us?=
 =?UTF-8?q?er=3D=E9=99=88=E5=BB=BA=E6=98=9F=20=E3=80=90github#8045?=
 =?UTF-8?q?=E3=80=91=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=8C=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E4=BA=BA=E5=BA=94=E8=AF=A5=E5=B1=95=E7=A4=BA=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=AE=9E=E9=99=85=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7ID=20#8045=20https://www.tapd.cn/55049933/s/1?=
 =?UTF-8?q?0793866?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/track/dto/TestReviewCaseDTO.java   | 1 +
 .../io/metersphere/track/service/TestReviewTestCaseService.java | 1 +
 .../track/review/view/components/TestReviewTestCaseList.vue     | 2 +-
 frontend/src/common/js/default-table-header.js                  | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/dto/TestReviewCaseDTO.java b/backend/src/main/java/io/metersphere/track/dto/TestReviewCaseDTO.java
index 4820a4a128..650395cfa2 100644
--- a/backend/src/main/java/io/metersphere/track/dto/TestReviewCaseDTO.java
+++ b/backend/src/main/java/io/metersphere/track/dto/TestReviewCaseDTO.java
@@ -11,6 +11,7 @@ import java.util.List;
 public class TestReviewCaseDTO extends TestCaseWithBLOBs {
     private String reviewer;
     private String reviewerName;
+    private String maintainerName;
     private String reviewStatus;
     private String results;
     private String reviewId;
diff --git a/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
index 90d5415c73..1662c7690c 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
@@ -71,6 +71,7 @@ public class TestReviewTestCaseService {
             String reviewId = item.getReviewId();
             List<String> userIds = getReviewUserIds(reviewId);
             item.setReviewerName(getReviewName(userIds, userMap));
+            item.setMaintainerName(userMap.get(item.getMaintainer()));
         });
         return list;
     }
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
index 0d5f6b5ea7..a2ec9e9fdf 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
@@ -79,7 +79,7 @@
         </ms-table-column>
 
         <ms-table-column
-          prop="maintainer"
+          prop="maintainerName"
           :field="item"
           :fields-width="fieldsWidth"
           :label="$t('custom_field.case_maintainer')"
diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js
index 88228cf8aa..dabfc9d66e 100644
--- a/frontend/src/common/js/default-table-header.js
+++ b/frontend/src/common/js/default-table-header.js
@@ -101,7 +101,7 @@ export let CUSTOM_TABLE_HEADER = {
     {id: 'reviewerName', key: '7', label: 'test_track.review.reviewer'},
     {id: 'reviewStatus', key: '8', label: 'test_track.case.status'},
     {id: 'updateTime', key: '9', label: 'commons.update_time'},
-    {id: 'maintainer', key: 'a', label: 'custom_field.case_maintainer'},
+    {id: 'maintainerName', key: 'a', label: 'custom_field.case_maintainer'},
   ],
   //测试计划
   TEST_PLAN_LIST: [

From 5ee3b2c24139c2a2483cb57ae69627383c299f67 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 10 Dec 2021 10:43:25 +0800
Subject: [PATCH 090/256] =?UTF-8?q?fix=20(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E5=88=87=E6=8D=A2=E5=9C=BA=E6=99=AF=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=94=B9SQL=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E7=8E=AF=E5=A2=83=E5=92=8C=E6=95=B0=E6=8D=AE=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008390 --user=赵勇 【接口测试】场景引用sql接口或接口用例，修改接口环境，没有自动填充数据源【+github#8086】 https://www.tapd.cn/55049933/s/1079452
---
 .../automation/scenario/EditApiScenario.vue   |  5 ++
 .../scenario/component/ApiComponent.vue       | 55 ++++++++++---------
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 0078f72c2b..aaa02a0228 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -559,6 +559,11 @@ export default {
             if (data.hashTree) {
               this.sort(data.hashTree);
               this.scenarioDefinition = data.hashTree;
+              if (this.$store.state.currentApiCase) {
+                this.$store.state.currentApiCase.resetDataSource = getUUID();
+              } else {
+                this.$store.state.currentApiCase = {resetDataSource: getUUID()};
+              }
             }
           }
         })
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 2087f2b008..998d3d1ed9 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -14,8 +14,8 @@
       :title="displayTitle">
 
       <template v-slot:afterTitle v-if="(request.refType==='API'|| request.refType==='CASE')&&isSameSpace">
-        <span v-if="isShowNum" @click = "clickResource(request)">{{"（ ID: "+request.num+"）"}}</span>
-        <span v-else >
+        <span v-if="isShowNum" @click="clickResource(request)">{{ "（ ID: " + request.num + "）" }}</span>
+        <span v-else>
           <el-tooltip class="ms-num" effect="dark" :content="request.refType==='API'?$t('api_test.automation.scenario.api_none'):$t('api_test.automation.scenario.case_none')" placement="top">
             <i class="el-icon-warning"/>
           </el-tooltip>
@@ -201,8 +201,8 @@ export default {
       reqSuccess: true,
       envType: this.environmentType,
       environmentMap: this.envMap,
-      isShowNum:false,
-      isSameSpace:true,
+      isShowNum: false,
+      isSameSpace: true,
     }
   },
   created() {
@@ -218,7 +218,7 @@ export default {
       this.request.projectId = getCurrentProjectID();
     }
     this.request.customizeReq = this.isCustomizeReq;
-    if(this.request.num){
+    if (this.request.num) {
       this.isShowNum = true;
     }
     // 加载引用对象数据
@@ -255,7 +255,12 @@ export default {
     },
     environmentType(val) {
       this.envType = val;
-    }
+    },
+    '$store.state.currentApiCase.resetDataSource'() {
+      if (this.request.id && this.request.referenced !== 'REF') {
+        this.initDataSource();
+      }
+    },
   },
   computed: {
     displayColor() {
@@ -290,7 +295,7 @@ export default {
     },
     displayTitle() {
       if (this.isApiImport) {
-        return this.request.refType==='API'?'API':'CASE';
+        return this.request.refType === 'API' ? 'API' : 'CASE';
       } else if (this.isExternalImport) {
         return this.$t('api_test.automation.external_import');
       } else if (this.isCustomizeReq) {
@@ -359,7 +364,7 @@ export default {
           }
         }
       }
-      if (databaseConfigsOptions.length > 0 && this.request.environmentId !== this.environment.id) {
+      if (databaseConfigsOptions.length > 0) {
         this.request.dataSourceId = databaseConfigsOptions[0].id;
         this.request.environmentId = this.environment.id;
       }
@@ -436,7 +441,7 @@ export default {
             } else {
               this.request.requestResult = requestResult;
             }
-            if(response.data.num){
+            if (response.data.num) {
               this.request.num = response.data.num;
               this.getWorkspaceId(response.data.projectId);
             }
@@ -449,27 +454,26 @@ export default {
               this.request.hashTree = hashTree;
               this.mergeHashTree(req.hashTree);
             }
-            this.reload();
+            this.initDataSource();
             this.sort();
+            this.reload();
           }
         })
-      }
-      else if(this.request.id && this.request.referenced === 'Copy'){
-        if(this.request.refType==='CASE'){
+      } else if (this.request.id && this.request.referenced === 'Copy') {
+        if (this.request.refType === 'CASE') {
           this.$get("/api/testcase/get/" + this.request.id, response => {
             if (response.data) {
-              if(response.data.num){
+              if (response.data.num) {
                 this.request.num = response.data.num;
                 this.getWorkspaceId(response.data.projectId);
               }
               this.request.id = response.data.id;
             }
           })
-        }
-        else if(this.request.refType==='API'){
+        } else if (this.request.refType === 'API') {
           this.$get("/api/definition/get/" + this.request.id, response => {
             if (response.data) {
-              if(response.data.num){
+              if (response.data.num) {
                 this.request.num = response.data.num;
                 this.getWorkspaceId(response.data.projectId);
               }
@@ -634,13 +638,13 @@ export default {
     },
 
     clickResource(resource) {
-      if(resource.refType&&resource.refType==='API'){
+      if (resource.refType && resource.refType === 'API') {
         let definitionData = this.$router.resolve({
           name: 'ApiDefinition',
-          params: {redirectID: getUUID(), dataType: "api", dataSelectRange: 'edit:' + resource.id,projectId:resource.projectId,type:resource.protocol}
+          params: {redirectID: getUUID(), dataType: "api", dataSelectRange: 'edit:' + resource.id, projectId: resource.projectId, type: resource.protocol}
         });
         window.open(definitionData.href, '_blank');
-      }else if(resource.refType&&resource.refType==='CASE'){
+      } else if (resource.refType && resource.refType === 'CASE') {
         this.$get("/api/testcase/findById/" + resource.id, response => {
           if (response.data) {
             response.data.sourceId = resource.resourceId;
@@ -679,12 +683,12 @@ export default {
       let element = document.getElementById(id);
       element.parentNode.removeChild(element);
     },
-    getWorkspaceId(projectId){
+    getWorkspaceId(projectId) {
       this.$get("/project/get/" + projectId, response => {
-        if(response.data){
-          if(response.data.workspaceId===getCurrentWorkspaceId()){
+        if (response.data) {
+          if (response.data.workspaceId === getCurrentWorkspaceId()) {
             this.isShowNum = true;
-          }else {
+          } else {
             this.isSameSpace = false;
           }
         }
@@ -760,7 +764,8 @@ export default {
   border-color: #EE6161;
   color: white;
 }
-.ms-num{
+
+.ms-num {
   margin-left: 1rem;
   font-size: 15px;
   color: #de9d1c;

From b8237b4cbd7171b63c987132442d805acdef7b5f Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 10 Dec 2021 13:10:28 +0800
Subject: [PATCH 091/256] =?UTF-8?q?fix=20(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E8=87=AA=E5=AE=9A=E4=B9=89=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=9C=AA=E6=98=BE=E7=A4=BA=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001008720
---
 .../src/business/components/api/automation/scenario/Setting.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/automation/scenario/Setting.js b/frontend/src/business/components/api/automation/scenario/Setting.js
index 255ef1abea..cc391bd659 100644
--- a/frontend/src/business/components/api/automation/scenario/Setting.js
+++ b/frontend/src/business/components/api/automation/scenario/Setting.js
@@ -23,7 +23,7 @@ export function STEP() {
     ['CustomizeReq', getDefaultSamplerMenu()],
     ['MaxSamplerProxy', getDefaultSamplerMenu()],
     ['GenericController', getAll()],
-    ['AllSamplerProxy', ["HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "Sampler", "AbstractSampler"]],
+    ['AllSamplerProxy', ["HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "Sampler", "AbstractSampler","JSR223Processor"]],
     ['DEFINITION', ["HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler"]],
     ['AllCanExecType', ["HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "JSR223Processor", "AbstractSampler"]]]);
   return map

From 4e384680ff8f8f82851c670cab0d4c96b2946098 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 10 Dec 2021 13:19:28 +0800
Subject: [PATCH 092/256] =?UTF-8?q?fix=20(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BF=AE=E5=A4=8D=E8=AF=B7=E6=B1=82=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008475 --user=赵勇 【github#8035】当接口请求中存在一个数字超出integer范围时，会被转换为字符串的形式，不支持大数 https://www.tapd.cn/55049933/s/1079557
---
 .../java/io/metersphere/commons/json/JSONSchemaGenerator.java   | 2 +-
 .../java/io/metersphere/commons/json/JSONSchemaRunTest.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/commons/json/JSONSchemaGenerator.java b/backend/src/main/java/io/metersphere/commons/json/JSONSchemaGenerator.java
index fd423fb09d..dccdf3008d 100644
--- a/backend/src/main/java/io/metersphere/commons/json/JSONSchemaGenerator.java
+++ b/backend/src/main/java/io/metersphere/commons/json/JSONSchemaGenerator.java
@@ -139,7 +139,7 @@ public class JSONSchemaGenerator {
                     try {
                         Number value = object.get("mock").getAsJsonObject().get("mock").getAsNumber();
                         if (value.toString().indexOf(".") == -1) {
-                            concept.put(propertyName, value.intValue());
+                            concept.put(propertyName, value.longValue());
                         } else {
                             concept.put(propertyName, value.floatValue());
                         }
diff --git a/backend/src/main/java/io/metersphere/commons/json/JSONSchemaRunTest.java b/backend/src/main/java/io/metersphere/commons/json/JSONSchemaRunTest.java
index 25cfc4e82f..c67f1356ab 100644
--- a/backend/src/main/java/io/metersphere/commons/json/JSONSchemaRunTest.java
+++ b/backend/src/main/java/io/metersphere/commons/json/JSONSchemaRunTest.java
@@ -88,7 +88,7 @@ public class JSONSchemaRunTest {
                     if (object.has("mock") && object.get("mock").getAsJsonObject() != null && StringUtils.isNotEmpty(object.get("mock").getAsJsonObject().get("mock").getAsString())) {
                         Number value = object.get("mock").getAsJsonObject().get("mock").getAsNumber();
                         if (value.toString().indexOf(".") == -1) {
-                            concept.put(propertyName, value.intValue());
+                            concept.put(propertyName, value.longValue());
                         } else {
                             concept.put(propertyName, value.floatValue());
                         }

From ac128c2fbaa247e04a20e992081854258d3c0202 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 10 Dec 2021 14:35:57 +0800
Subject: [PATCH 093/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E4=B8=ADcase?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/api/service/ApiDefinitionService.java  | 1 +
 .../components/common/components/search/search-components.js   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index 6b827f1fc0..5866d35a31 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -821,6 +821,7 @@ public class ApiDefinitionService {
         apiTestCase.setUpdateUserId(SessionUtils.getUserId());
         if (sameCase == null) {
             apiTestCase.setId(UUID.randomUUID().toString());
+            apiTestCase.setStatus("");
             apiTestCase.setNum(apiTestCaseService.getNextNum(apiTestCase.getApiDefinitionId(), apiDefinition.getNum()));
             apiTestCase.setCreateTime(System.currentTimeMillis());
             apiTestCase.setUpdateTime(System.currentTimeMillis());
diff --git a/frontend/src/business/components/common/components/search/search-components.js b/frontend/src/business/components/common/components/search/search-components.js
index 7e5a345adb..99ebf0d019 100644
--- a/frontend/src/business/components/common/components/search/search-components.js
+++ b/frontend/src/business/components/common/components/search/search-components.js
@@ -166,7 +166,8 @@ export const API_CASE_RESULT = {
   options: [
     {value: 'success', label: 'api_test.automation.success'},
     {value: 'error', label: 'api_test.automation.fail'},
-    {value: '', label: 'api_test.home_page.detail_card.unexecute'}
+    {value: '', label: 'api_test.home_page.detail_card.unexecute'},
+    {value: 'Running', label: 'commons.testing'}
   ],
   props: { // 尾部控件的props，一般为element ui控件的props
     multiple: true

From a9e9223716cc998d6bcb9b375d0df9842d887de3 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Fri, 10 Dec 2021 14:52:27 +0800
Subject: [PATCH 094/256] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E4=B8=AD=E7=9A=84=20top5=20errors=20=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008531 --user=刘瑞斌
【github#6914】导出的性能测试报告pdf文档中没有CPU、内存、磁盘空间等数据显示，只有错误日志，功能实现不完整，请修改
https://www.tapd.cn/55049933/s/1079336

Closes #6914
---
 .../report/PerformanceReportExport.vue        |   8 +
 .../report/PerformanceReportView.vue          |   2 +-
 .../report/components/ErrorLog.vue            | 139 +++++++-----------
 3 files changed, 65 insertions(+), 84 deletions(-)

diff --git a/frontend/src/business/components/performance/report/PerformanceReportExport.vue b/frontend/src/business/components/performance/report/PerformanceReportExport.vue
index a11299247d..97dd631ffc 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportExport.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportExport.vue
@@ -24,6 +24,12 @@
       </template>
       <ms-report-error-log :report="report" ref="errorLog"/>
     </el-card>
+    <el-card id="monitorCard" title="'monitorCard'">
+      <template v-slot:header>
+        <span class="title">{{ $t('report.test_monitor_details') }}</span>
+      </template>
+      <monitor-card :report="report"/>
+    </el-card>
   </ms-report-export-template>
 </template>
 
@@ -36,11 +42,13 @@ import MsReportTestOverview from './components/TestOverview';
 import MsReportTitle from "../../common/components/report/MsReportTitle";
 import MsReportExportTemplate from "../../common/components/report/MsReportExportTemplate";
 import MsReportTestDetails from "@/business/components/performance/report/components/TestDetails";
+import MonitorCard from "@/business/components/performance/report/components/MonitorCard";
 
 
 export default {
   name: "MsPerformanceReportExport",
   components: {
+    MonitorCard,
     MsReportExportTemplate,
     MsReportTitle,
     MsReportErrorLog,
diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index 05ebc88ac7..69be5a8980 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportView.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue
@@ -333,7 +333,7 @@ export default {
 
       this.$nextTick(function () {
         setTimeout(() => {
-          let ids = ['testOverview', 'testDetails', 'requestStatistics', 'errorLog'];
+          let ids = ['testOverview', 'testDetails', 'requestStatistics', 'errorLog', 'monitorCard'];
           let promises = [];
           ids.forEach(id => {
             let promise = html2canvas(document.getElementById(id), {scale: 2});
diff --git a/frontend/src/business/components/performance/report/components/ErrorLog.vue b/frontend/src/business/components/performance/report/components/ErrorLog.vue
index bdab8df34d..1366b371e4 100644
--- a/frontend/src/business/components/performance/report/components/ErrorLog.vue
+++ b/frontend/src/business/components/performance/report/components/ErrorLog.vue
@@ -14,16 +14,19 @@
         sortable>
       </el-table-column>
       <el-table-column
+        width="200"
         prop="errorNumber"
         label="Number of errors"
         sortable>
       </el-table-column>
       <el-table-column
+        width="200"
         prop="percentOfErrors"
         label="% in errors"
         sortable>
       </el-table-column>
       <el-table-column
+        width="200"
         prop="percentOfAllSamples"
         label="% in all samples"
         sortable>
@@ -38,21 +41,9 @@
       style="width: 100%"
       show-summary
     >
-      <el-table-column
-        prop="sample"
-        label="Sample"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="samples"
-        label="#Samples"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="errorsAllSize"
-        label="All Errors"
-      >
-      </el-table-column>
+      <el-table-column prop="sample" label="Sample"/>
+      <el-table-column prop="samples" label="#Samples"/>
+      <el-table-column prop="errorsAllSize" label="All Errors"/>
     </el-table>
 
     <span class="table-title">#1 Error</span>
@@ -62,16 +53,9 @@
       stripe
       style="width: 100%"
     >
-      <el-table-column
-        prop="error1"
-        label="#1 Error"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="error1Size"
-        label="#1 Errors Count"
-      >
-      </el-table-column>
+      <el-table-column prop="sample" label="Sample"/>
+      <el-table-column prop="error1" label="#1 Error"/>
+      <el-table-column prop="error1Size" label="#1 Errors Count" width="200"/>
     </el-table>
 
     <span class="table-title">#2 Error</span>
@@ -81,16 +65,9 @@
       stripe
       style="width: 100%"
     >
-      <el-table-column
-        prop="error2"
-        label="#2 Error"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="error2Size"
-        label="#2 Errors Count"
-      >
-      </el-table-column>
+      <el-table-column prop="sample" label="Sample"/>
+      <el-table-column prop="error2" label="#2 Error"/>
+      <el-table-column prop="error2Size" label="#2 Errors Count" width="200"/>
     </el-table>
 
     <span class="table-title">#3 Error</span>
@@ -100,16 +77,9 @@
       stripe
       style="width: 100%"
     >
-      <el-table-column
-        prop="error3"
-        label="#3 Error"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="error3Size"
-        label="#3 Errors Count"
-      >
-      </el-table-column>
+      <el-table-column prop="sample" label="Sample"/>
+      <el-table-column prop="error3" label="#3 Error"/>
+      <el-table-column prop="error3Size" label="#3 Errors Count" width="200"/>
     </el-table>
 
     <span class="table-title">#4 Error</span>
@@ -119,16 +89,9 @@
       stripe
       style="width: 100%"
     >
-      <el-table-column
-        prop="error4"
-        label="#4 Error"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="error4Size"
-        label="#4 Errors Count"
-      >
-      </el-table-column>
+      <el-table-column prop="sample" label="Sample"/>
+      <el-table-column prop="error4" label="#4 Error"/>
+      <el-table-column prop="error4Size" label="#4 Errors Count" width="200"/>
     </el-table>
 
     <span class="table-title">#5 Error</span>
@@ -138,24 +101,19 @@
       stripe
       style="width: 100%"
     >
-      <el-table-column
-        prop="error5"
-        label="#5 Error"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="error5Size"
-        label="#5 Errors Count"
-      >
-      </el-table-column>
+      <el-table-column prop="sample" label="Sample"/>
+      <el-table-column prop="error5" label="#5 Error"/>
+      <el-table-column prop="error5Size" label="#5 Errors Count" width="200"/>
     </el-table>
   </div>
 </template>
 
 <script>
 import {
-  getPerformanceReportErrorsContent, getPerformanceReportErrorsTop5,
-  getSharePerformanceReportErrorsContent, getSharePerformanceReportErrorsTop5
+  getPerformanceReportErrorsContent,
+  getPerformanceReportErrorsTop5,
+  getSharePerformanceReportErrorsContent,
+  getSharePerformanceReportErrorsTop5
 } from "@/network/load-test";
 
 export default {
@@ -178,7 +136,7 @@ export default {
       if (this.planReportTemplate) {
         this.tableData = this.planReportTemplate.reportErrors;
         this.handleGetTop5(this.planReportTemplate.reportErrorsTop5);
-      } else if (this.isShare){
+      } else if (this.isShare) {
         getSharePerformanceReportErrorsContent(this.shareId, this.id).then(res => {
           this.tableData = res.data.data;
         });
@@ -200,21 +158,36 @@ export default {
       if (!data) {
         return;
       }
-      this.errorTop1 = data.map(e => {
-        return {error1: e.error1, error1Size: e.error1Size};
-      });
-      this.errorTop2 = data.map(e => {
-        return {error2: e.error2, error2Size: e.error2Size};
-      });
-      this.errorTop3 = data.map(e => {
-        return {error3: e.error3, error3Size: e.error3Size};
-      });
-      this.errorTop4 = data.map(e => {
-        return {error4: e.error4, error4Size: e.error4Size};
-      });
-      this.errorTop5 = data.map(e => {
-        return {error5: e.error5, error5Size: e.error5Size};
-      });
+      this.errorTop1 = data
+        .map(e => {
+          return {sample: e.sample, error1: e.error1, error1Size: e.error1Size};
+        })
+        .filter(e => e.error1Size > 0);
+
+      this.errorTop2 = data
+        .map(e => {
+          return {sample: e.sample, error2: e.error2, error2Size: e.error2Size};
+        })
+        .filter(e => e.error2Size > 0);
+
+      this.errorTop3 = data
+        .map(e => {
+          return {sample: e.sample, error3: e.error3, error3Size: e.error3Size};
+        })
+        .filter(e => e.error3Size > 0);
+
+      this.errorTop4 = data
+        .map(e => {
+          return {sample: e.sample, error4: e.error4, error4Size: e.error4Size};
+        })
+        .filter(e => e.error4Size > 0);
+
+      this.errorTop5 = data
+        .map(e => {
+          return {sample: e.sample, error5: e.error5, error5Size: e.error5Size};
+        })
+        .filter(e => e.error5Size > 0);
+
       this.errorSummary = data.map(e => {
         return {sample: e.sample, samples: e.samples, errorsAllSize: e.errorsAllSize};
       });

From 1f2b0b7de9a3d6b125393dbe2d94e82fe893435a Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Fri, 10 Dec 2021 15:14:20 +0800
Subject: [PATCH 095/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=8A=A5=E5=91=8A):=20=E4=BF=AE=E5=A4=8D=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5=E5=91=8A=E4=B8=AD=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=97=B6=E6=98=BE=E7=A4=BA=E6=9C=AA=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复测试计划报告中性能测试用例执行成功时显示未执行的问题
---
 .../io/metersphere/api/cache/TestPlanReportExecuteCatch.java | 5 +++++
 .../io/metersphere/track/service/TestPlanReportService.java  | 1 +
 .../view/comonents/report/detail/component/LoadResult.vue    | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/api/cache/TestPlanReportExecuteCatch.java b/backend/src/main/java/io/metersphere/api/cache/TestPlanReportExecuteCatch.java
index 518556b70f..d1161c02fb 100644
--- a/backend/src/main/java/io/metersphere/api/cache/TestPlanReportExecuteCatch.java
+++ b/backend/src/main/java/io/metersphere/api/cache/TestPlanReportExecuteCatch.java
@@ -1,5 +1,8 @@
 package io.metersphere.api.cache;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -8,6 +11,7 @@ import java.util.Map;
  * @Date 2021/8/20 3:29 下午
  */
 public class TestPlanReportExecuteCatch {
+    private static Logger testPlanLog = LoggerFactory.getLogger("testPlanExecuteLog");
     private static Map<String, TestPlanExecuteInfo> testPlanReportMap = new HashMap<>();
 
     private TestPlanReportExecuteCatch() {
@@ -88,6 +92,7 @@ public class TestPlanReportExecuteCatch {
     }
 
     public static void finishAllTask(String planReportId) {
+        testPlanLog.info("ReportId["+planReportId+"] finish task!");
         if(testPlanReportMap.containsKey(planReportId)){
             testPlanReportMap.get(planReportId).finishAllTask();
         }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
index dd4c4da761..7d4d05ab7f 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
@@ -1239,6 +1239,7 @@ public class TestPlanReportService {
             //20分钟没有案例执行结果更新，则定位超时
             long lastCountTime = executeInfo.getLastFinishedNumCountTime();
             long nowTime = System.currentTimeMillis();
+            testPlanLog.info("ReportId: ["+planReportId+"];  timeCount:"+ (nowTime - lastCountTime));
             if (nowTime - lastCountTime > 1200000) {
                 return true;
             }
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadResult.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadResult.vue
index 1203ed26bd..2d7bd983b1 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadResult.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadResult.vue
@@ -21,7 +21,10 @@ export default {
     return {
       caseDataMap: new Map([
         ["success", {name: this.$t('test_track.plan_view.pass'), itemStyle: {color: '#67C23A'}}],
+        ["Success", {name: this.$t('test_track.plan_view.pass'), itemStyle: {color: '#67C23A'}}],
+        ["SUCCESS", {name: this.$t('test_track.plan_view.pass'), itemStyle: {color: '#67C23A'}}],
         ["error", {name: this.$t('test_track.plan_view.failure'), itemStyle: {color: '#F56C6C'}}],
+        ["Error", {name: this.$t('test_track.plan_view.failure'), itemStyle: {color: '#F56C6C'}}],
         ["run", {name: this.$t('运行中'), itemStyle: {color: '#DEDE10'}}],
         ["Prepare", {name: this.$t('api_test.home_page.detail_card.unexecute'), itemStyle: {color: '#909399'}}],
       ]),

From 1a20ebac8d4db50e2a6190fa6b84900e2a41cfad Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 10 Dec 2021 15:38:53 +0800
Subject: [PATCH 096/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E5=85=81=E8=AE=B8=E8=AF=B7=E6=B1=82=E5=A4=B4Cook?=
 =?UTF-8?q?ie=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008713 --user=赵勇 [github#7410] 请求头配置多个不同值的Cookie，执行测试后发现请求头信息中没有自动合并多个Cookie的值 #7410 https://www.tapd.cn/55049933/s/1079707
---
 .../api/dto/definition/request/sampler/MsHTTPSamplerProxy.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
index e8e30606b4..3c957206e5 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
@@ -770,7 +770,7 @@ public class MsHTTPSamplerProxy extends MsTestElement {
                 for (int i = 0; i < headerManager.getHeaders().size(); i++) {
                     Header header = headerManager.getHeader(i);
                     String headName = header.getName();
-                    if (StringUtils.equals(headName, keyValue.getName())) {
+                    if (StringUtils.equals(headName, keyValue.getName()) && !StringUtils.equals(headName, "Cookie")) {
                         hasHead = true;
                         break;
                     }

From d9abf622c34a8e0f079cf45f7c99bd787bd02030 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 10 Dec 2021 16:26:55 +0800
Subject: [PATCH 097/256] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E5=9C=BA=E6=99=AF=E5=AF=BC=E5=85=A5=E3=80=81?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=88=97=E8=A1=A8=E5=AF=BC=E5=85=A5=20?=
 =?UTF-8?q?=E5=B0=86=E5=A4=8D=E5=88=B6=E5=92=8C=E5=BC=95=E7=94=A8=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=94=BE=E5=88=B0=E5=8F=B3=E4=B8=8A=E8=A7=92=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=AB=98=E5=BA=A6=E6=94=BE=E5=A4=A7=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=A4=9A=E6=98=BE=E7=A4=BA=E5=87=A0=E8=A1=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1004210 --user=王孝刚 6.场景导入、接口列表导入 将复制和引用按钮放到右上角 列表高度放大可以多显示几行数据
https://www.tapd.cn/55049933/s/1079739
---
 .../automation/scenario/api/ApiRelevance.vue  |  6 +--
 .../scenario/api/ScenarioRelevance.vue        |  6 +--
 .../common/components/MsDialogHeader.vue      |  5 ++-
 .../comonents/base/TestCaseRelevanceBase.vue  | 39 ++++++++++++-------
 4 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
index f5da2c9789..b2ff0179e6 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
@@ -32,11 +32,11 @@
       @isApiListEnableChange="isApiListEnableChange"
       ref="apiCaseList"/>
 
-    <template v-slot:footer>
-      <el-button type="primary" @click="copy" :loading="buttonIsWorking" @keydown.enter.native.prevent>
+    <template v-slot:headerBtn>
+      <el-button type="primary" @click="copy" :loading="buttonIsWorking" @keydown.enter.native.prevent size="mini">
         {{ $t('commons.copy') }}
       </el-button>
-      <el-button v-if="!isApiListEnable" type="primary" :loading="buttonIsWorking" @click="reference"
+      <el-button v-if="!isApiListEnable" type="primary" :loading="buttonIsWorking" @click="reference" size="mini"
                  @keydown.enter.native.prevent>
         {{ $t('api_test.scenario.reference') }}
       </el-button>
diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
index 21a1ff2a8b..d746036c1e 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
@@ -25,11 +25,11 @@
       :custom-num="customNum"
       ref="apiScenarioList"/>
 
-    <template v-slot:footer>
-      <el-button type="primary" @click="copy" :loading="buttonIsWorking" @keydown.enter.native.prevent>
+    <template v-slot:headerBtn>
+      <el-button type="primary" @click="copy" :loading="buttonIsWorking" @keydown.enter.native.prevent size="mini">
         {{ $t('commons.copy') }}
       </el-button>
-      <el-button type="primary" @click="reference" :loading="buttonIsWorking" @keydown.enter.native.prevent>
+      <el-button type="primary" @click="reference" :loading="buttonIsWorking" @keydown.enter.native.prevent size="mini">
         {{ $t('api_test.scenario.reference') }}
       </el-button>
     </template>
diff --git a/frontend/src/business/components/common/components/MsDialogHeader.vue b/frontend/src/business/components/common/components/MsDialogHeader.vue
index aab4670cc2..73f586233f 100644
--- a/frontend/src/business/components/common/components/MsDialogHeader.vue
+++ b/frontend/src/business/components/common/components/MsDialogHeader.vue
@@ -5,7 +5,10 @@
     <el-button type="primary" @click="confirm" @keydown.enter.native.prevent :size="btnSize">
       {{ $t('commons.confirm') }}
     </el-button>
-    <el-button type="primary" v-if="isShow" @click="saveAsEdit" @keydown.enter.native.prevent>{{ title }}</el-button>
+    <el-button type="primary" v-if="isShow" @click="saveAsEdit" @keydown.enter.native.prevent :size="btnSize">{{
+        title
+      }}
+    </el-button>
   </div>
 
 </template>
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
index b3cc41dbb2..eb53f9a9c3 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
@@ -1,6 +1,19 @@
 <template>
   <relevance-dialog :width="width" :title="dialogTitle" ref="relevanceDialog">
 
+    <template v-slot:headerBtn>
+
+      <div v-if="$slots.headerBtn">
+        <slot name="headerBtn"></slot>
+      </div>
+      <div v-else>
+        <div style="margin-bottom: 5px" v-if="flag">
+          <el-checkbox v-model="checked">{{ $t('test_track.sync_add_api_load') }}</el-checkbox>
+        </div>
+        <ms-dialog-header @cancel="close" v-loading="isSaving" @confirm="save"/>
+      </div>
+    </template>
+
     <template v-slot:aside>
       <select-menu
         :data="projects"
@@ -14,25 +27,25 @@
 
     <slot></slot>
 
-        <template v-slot:footer>
+    <!--        <template v-slot:footer>
 
-          <div v-if="$slots.footer">
-            <slot name="footer"></slot>
-          </div>
-          <div v-else>
-            <div style="margin-bottom: 15px" v-if="flag">
-              <el-checkbox v-model="checked">{{ $t('test_track.sync_add_api_load') }}</el-checkbox>
-            </div>
-            <ms-dialog-footer @cancel="close" v-loading="isSaving" @confirm="save"/>
-          </div>
-        </template>
+              <div v-if="$slots.footer">
+                <slot name="footer"></slot>
+              </div>
+              <div v-else>
+                <div style="margin-bottom: 15px" v-if="flag">
+                  <el-checkbox v-model="checked">{{ $t('test_track.sync_add_api_load') }}</el-checkbox>
+                </div>
+                <ms-dialog-footer @cancel="close" v-loading="isSaving" @confirm="save"/>
+              </div>
+            </template>-->
 
   </relevance-dialog>
 </template>
 
 <script>
 
-import MsDialogFooter from '../../../../../common/components/MsDialogFooter'
+import MsDialogHeader from '../../../../../common/components/MsDialogHeader'
 import SelectMenu from "../../../../common/SelectMenu";
   import RelevanceDialog from "./RelevanceDialog";
   import {getCurrentProjectID, getCurrentUserId, getCurrentWorkspaceId} from "@/common/js/utils";
@@ -42,7 +55,7 @@ import SelectMenu from "../../../../common/SelectMenu";
     components: {
       RelevanceDialog,
       SelectMenu,
-      MsDialogFooter,
+      MsDialogHeader,
     },
     data() {
       return {

From 84425adcf1ace862a793ce20579ba997e3313ff8 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 10 Dec 2021 17:38:09 +0800
Subject: [PATCH 098/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E9=A6=96=E9=A1=B5=E7=BC=BA=E9=99=B7=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008738 --user=lyh
【测试跟踪】首页缺陷统计，测试计划列表里统计重复的问题
https://www.tapd.cn/55049933/s/1079772
---
 .../java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index cebcf428b6..4fa702d073 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -440,7 +440,7 @@
         group by tc.maintainer
     </select>
     <select id="getTestPlanBug" resultType="int">
-        select count(tci.issues_id) from test_plan_test_case tptc join test_case_issues tci on tptc.case_id = tci.test_case_id join issues on tci.issues_id  = issues.id
+        select count(distinct (tci.issues_id)) from test_plan_test_case tptc join test_case_issues tci on tptc.case_id = tci.test_case_id join issues on tci.issues_id  = issues.id
         where tptc.plan_id = #{planId} and (issues.status != 'closed' or issues.status is null);
     </select>
     <select id="getTestPlanCase" resultType="int">

From d230853e86f2fed2fc66055ba33a7dacae04fcb7 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 10 Dec 2021 16:44:33 +0800
Subject: [PATCH 099/256] =?UTF-8?q?fix(=E5=8A=9F=E8=83=BD=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B):=20=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008538 --user=lyh
【github#7696】在功能用例模块批量更新用例的输入框类型自定义字段时，“更新后属性值为”为空下拉框，也无法编辑
https://www.tapd.cn/55049933/s/1079744
---
 .../CustomFieldTemplateController.java        | 12 ++++---
 .../service/CustomFieldTemplateService.java   |  9 ++++++
 .../testcase/TestCaseBatchRequest.java        |  1 +
 .../track/service/TestCaseService.java        |  9 ++++--
 .../template/CustomFiledComponent.vue         |  8 ++---
 .../track/case/components/BatchEdit.vue       | 31 +++++++++++++++++--
 .../track/case/components/TestCaseList.vue    |  8 +++--
 frontend/src/common/js/tableUtils.js          |  3 +-
 8 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/CustomFieldTemplateController.java b/backend/src/main/java/io/metersphere/controller/CustomFieldTemplateController.java
index 9ed5ac9b1e..1c2be24d60 100644
--- a/backend/src/main/java/io/metersphere/controller/CustomFieldTemplateController.java
+++ b/backend/src/main/java/io/metersphere/controller/CustomFieldTemplateController.java
@@ -1,12 +1,10 @@
 package io.metersphere.controller;
 
+import io.metersphere.base.domain.CustomField;
 import io.metersphere.base.domain.CustomFieldTemplate;
 import io.metersphere.dto.CustomFieldTemplateDao;
 import io.metersphere.service.CustomFieldTemplateService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -27,4 +25,10 @@ public class CustomFieldTemplateController {
     public void update(@RequestBody CustomFieldTemplate request) {
         customFieldTemplateService.update(request);
     }
+
+    @GetMapping("/{id}")
+    public CustomField get(@PathVariable String id) {
+        return customFieldTemplateService.getCustomField(id);
+    }
+
 }
diff --git a/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java b/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java
index e0c75a13d6..ad3eac645e 100644
--- a/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java
+++ b/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java
@@ -4,6 +4,7 @@ package io.metersphere.service;
 import io.metersphere.base.domain.CustomField;
 import io.metersphere.base.domain.CustomFieldTemplate;
 import io.metersphere.base.domain.CustomFieldTemplateExample;
+import io.metersphere.base.mapper.CustomFieldMapper;
 import io.metersphere.base.mapper.CustomFieldTemplateMapper;
 import io.metersphere.base.mapper.ext.ExtCustomFieldTemplateMapper;
 import io.metersphere.dto.CustomFieldTemplateDao;
@@ -33,6 +34,8 @@ public class CustomFieldTemplateService {
     SqlSessionFactory sqlSessionFactory;
     @Resource
     CustomFieldService customFieldService;
+    @Resource
+    private CustomFieldMapper customFieldMapper;
 
     public List<String> getCustomFieldIds(String templateId) {
         return extCustomFieldTemplateMapper.getCustomFieldIds(templateId);
@@ -121,4 +124,10 @@ public class CustomFieldTemplateService {
     public void update(CustomFieldTemplate request) {
         customFieldTemplateMapper.updateByPrimaryKeySelective(request);
     }
+
+    public CustomField getCustomField(String id) {
+        CustomFieldTemplate customFieldTemplate = customFieldTemplateMapper.selectByPrimaryKey(id);
+        String fieldId = customFieldTemplate.getFieldId();
+        return customFieldMapper.selectByPrimaryKey(fieldId);
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/TestCaseBatchRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/TestCaseBatchRequest.java
index f6203c7f81..fccf7caa43 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/TestCaseBatchRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/TestCaseBatchRequest.java
@@ -15,6 +15,7 @@ public class TestCaseBatchRequest extends TestCaseWithBLOBs {
     private String projectId;
     private CustomFiledRequest customField;
     private QueryTestCaseRequest condition;
+    private String customTemplateFieldId;
 
     @Getter
     @Setter
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 64ca694789..3442390b4b 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -1268,15 +1268,18 @@ public class TestCaseService {
                 }
 
                 boolean hasField = false;
-                for (int i = 0; i < fields.size(); i++) {
-                    TestCaseBatchRequest.CustomFiledRequest field = fields.get(i);
-                    if (StringUtils.equals(request.getCustomField().getName(), field.getName())) {
+                for (TestCaseBatchRequest.CustomFiledRequest field : fields) {
+                    if (StringUtils.equals(request.getCustomTemplateFieldId(), field.getId())) {
                         field.setValue(request.getCustomField().getValue());
                         hasField = true;
                         break;
                     }
                 }
                 if (!hasField) {
+                    TestCaseBatchRequest.CustomFiledRequest customField = request.getCustomField();
+                    customField.setId(request.getCustomTemplateFieldId());
+                    customField.setName(request.getCustomField().getName());
+                    customField.setValue(request.getCustomField().getValue());
                     fields.add(request.getCustomField());
                 }
                 if (StringUtils.equals(request.getCustomField().getName(), "用例等级")) {
diff --git a/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue b/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
index 06d502d935..f0549057eb 100644
--- a/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
+++ b/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
@@ -114,11 +114,9 @@ export default {
     };
   },
   mounted() {
-    if (this.data.type === 'member' || this.data.type === 'multipleMember') {
-      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
-        this.memberOptions = response.data;
-      });
-    }
+    this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
+      this.memberOptions = response.data;
+    });
   },
   methods: {
     getTranslateOption(item) {
diff --git a/frontend/src/business/components/track/case/components/BatchEdit.vue b/frontend/src/business/components/track/case/components/BatchEdit.vue
index 77550cc490..73552c9153 100644
--- a/frontend/src/business/components/track/case/components/BatchEdit.vue
+++ b/frontend/src/business/components/track/case/components/BatchEdit.vue
@@ -12,7 +12,7 @@
       <el-form :model="form" label-position="right" label-width="150px" size="medium" ref="form" :rules="rules">
         <el-form-item :label="$t('test_track.case.batch_update', [size])" prop="type">
           <el-select v-model="form.type" style="width: 80%" @change="changeType">
-            <el-option v-for="(type, index) in typeArr" :key="index" :value="type.id" :label="type.name"/>
+            <el-option v-for="(type, index) in typeArr" :key="index" :value="type.custom ? type.custom : type.id" :label="type.name"/>
           </el-select>
         </el-form-item>
         <el-form-item  v-if="form.type === 'projectEnv'" :label="$t('test_track.case.updated_attr_value')">
@@ -27,6 +27,9 @@
                        @setEnvGroup="setEnvGroup"
                        ref="envPopover"/>
         </el-form-item>
+        <el-form-item v-else-if="fieldType === 'custom'" :label="$t('test_track.case.updated_attr_value')">
+          <custom-filed-component :data="customField" prop="defaultValue"/>
+        </el-form-item>
         <el-form-item v-else :label="$t('test_track.case.updated_attr_value')" prop="value">
           <el-select v-model="form.value" style="width: 80%" :filterable="filterable">
             <el-option v-for="(option, index) in options" :key="index" :value="option.id" :label="option.name">
@@ -51,9 +54,11 @@
   import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
   import EnvPopover from "@/business/components/api/automation/scenario/EnvPopover";
   import {ENV_TYPE} from "@/common/js/constants";
+  import CustomFiledComponent from "@/business/components/settings/workspace/template/CustomFiledComponent";
   export default {
     name: "BatchEdit",
     components: {
+      CustomFiledComponent,
       EnvPopover,
       MsDialogFooter
     },
@@ -88,7 +93,9 @@
         isScenario: '',
         result: {},
         environmentType: ENV_TYPE.JSON,
-        envGroupId: ""
+        envGroupId: "",
+        customField: {},
+        fieldType: ""
       }
     },
     computed: {
@@ -107,6 +114,10 @@
               }
               this.form.map = this.map;
             }
+            // 处理自定义字段
+            if (this.form.type.startsWith("custom")) {
+              this.form.customField = this.customField;
+            }
             this.form.environmentType = this.environmentType;
             this.form.envGroupId = this.envGroupId;
             this.$emit("batchEdit", this.form);
@@ -150,9 +161,25 @@
       handleClose() {
         this.form = {};
         this.options = [];
+        this.fieldType = "";
         removeGoBackListener(this.handleClose);
       },
+      _handleCustomField(val) {
+        // custom template field id
+        let id = val.slice(6);
+        this.fieldType = "custom";
+        this.$get("/custom/field/template/" + id, res => {
+          this.customField = res ? res.data : {};
+          this.customField.options = JSON.parse(this.customField.options);
+          if (this.customField.type === 'checkbox' || this.customField.type === 'multipleMember') {
+            this.customField.defaultValue = [];
+          }
+        })
+      },
       changeType(val) {
+        if (val && val.startsWith("custom")) {
+          this._handleCustomField(val);
+        }
         this.$set(this.form, "value", "");
         if (val === 'projectEnv' && this.isScenario !== '') {
           this.projectIds.clear();
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 7f51297e42..2977e130e9 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -866,10 +866,14 @@ export default {
     batchEdit(form) {
       let ids = this.$refs.table.selectIds;
       let param = {};
-      param.customField = form;
-      param.customField.name = form.type;
       param.ids = ids;
+      param.customTemplateFieldId = form.type.slice(6);
       param.condition = this.condition;
+      param.customField = {
+        id: form.customField.id,
+        name: form.customField.name,
+        value: form.customField.defaultValue
+      };
       this.$post('/test/case/batch/edit', param, () => {
         this.$success(this.$t('commons.save_success'));
         this.refresh();
diff --git a/frontend/src/common/js/tableUtils.js b/frontend/src/common/js/tableUtils.js
index 38a1603dbc..d0be4a8d67 100644
--- a/frontend/src/common/js/tableUtils.js
+++ b/frontend/src/common/js/tableUtils.js
@@ -511,7 +511,8 @@ export function getCustomFieldBatchEditOption(customFields, typeArr, valueArr, m
       typeArr.push({
         id: item.name,
         name: item.name,
-        uuid: item.id
+        uuid: item.id,
+        custom: "custom" + item.id
       });
 
       let options = [];

From bc5381a7c4538f332bf7a8d5c8e8ebedfe319805 Mon Sep 17 00:00:00 2001
From: junhong <junhong.zhou@fit2cloud.com>
Date: Fri, 10 Dec 2021 19:17:11 +0800
Subject: [PATCH 100/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89):=20Swagger=20URL=20=E5=AF=BC=E5=85=A5=E6=88=96?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/definition/components/import/ApiImport.vue          | 6 ++++--
 .../api/definition/components/import/ApiSchedule.vue        | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
index dd0b698e83..eb5b9ba00f 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@@ -387,8 +387,10 @@
           // 设置 query 参数
           param.arguments = this.queryArguments;
           // 设置 BaseAuth 参数
-          this.authConfig.authManager.clazzName = TYPE_TO_C.get("AuthManager");
-          param.authManager = this.authConfig.authManager;
+          if(this.authConfig.authManager != undefined){
+            this.authConfig.authManager.clazzName = TYPE_TO_C.get("AuthManager");
+            param.authManager = this.authConfig.authManager;
+          }
         }
         return param;
       },
diff --git a/frontend/src/business/components/api/definition/components/import/ApiSchedule.vue b/frontend/src/business/components/api/definition/components/import/ApiSchedule.vue
index a582e6418a..0aaf01c5f9 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiSchedule.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiSchedule.vue
@@ -283,8 +283,10 @@ export default {
       this.formData.headers = this.headers;
       this.formData.arguments = this.queryArguments;
       // 设置 BaseAuth 参数
-      this.authConfig.authManager.clazzName = TYPE_TO_C.get("AuthManager");
-      this.formData.authManager = this.authConfig.authManager;
+      if(this.authConfig.authManager != undefined){
+        this.authConfig.authManager.clazzName = TYPE_TO_C.get("AuthManager");
+        this.formData.authManager = this.authConfig.authManager;
+      }
       let url = '';
       if (this.formData.id) {
         url = '/api/definition/schedule/update';

From a3ccff06490900747b81054d6b1726486320ec42 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 10 Dec 2021 22:04:02 +0800
Subject: [PATCH 101/256] =?UTF-8?q?feat:=20jira=E6=94=AF=E6=8C=81=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=8E=B7=E5=8F=96=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/base/domain/Project.java   |   6 +-
 .../base/domain/ProjectExample.java           | 132 +++++++++++++++-
 .../metersphere/base/mapper/ProjectMapper.xml |  75 ++++++---
 .../base/mapper/ext/ExtIssuesMapper.xml       |   4 -
 .../base/mapper/ext/ExtProjectMapper.xml      |   3 +-
 .../track/issue/AbstractIssuePlatform.java    |   5 +-
 .../track/issue/IssuesPlatform.java           |   7 +
 .../metersphere/track/issue/JiraPlatform.java |  87 ++++++----
 .../issue/client/JiraAbstractClient.java      |  36 ++++-
 .../jira/JiraCreateMetadataResponse.java      |  61 +++++++
 .../track/issue/domain/jira/JiraUser.java     |  13 ++
 .../request/testcase/IssuesUpdateRequest.java |   2 +
 backend/src/main/java/io/metersphere/xpack    |   2 +-
 .../db/migration/V102__v1.16_release.sql      |  11 +-
 .../components/project/menu/EditProject.vue   |  84 ++++++----
 .../settings/workspace/MsProject.vue          | 149 +-----------------
 .../template/CustomFiledComponent.vue         |  42 ++++-
 .../workspace/template/IssueTemplateEdit.vue  |   5 +-
 .../workspace/template/IssuesTemplateList.vue |   2 +-
 .../workspace/template/TemplateSelect.vue     |  30 +++-
 .../case/components/FormRichTextItem.vue      | 131 +--------------
 .../track/case/components/IssueRelateList.vue |   3 +-
 .../track/case/components/MsMarkDownText.vue  | 137 ++++++++++++++++
 .../track/case/components/TestCaseEdit.vue    |  10 +-
 .../case/components/TestCaseIssueRelate.vue   |   3 +-
 .../track/issue/IssueEditDetail.vue           |  87 +++++++---
 .../components/track/issue/IssueList.vue      |  64 +++++---
 .../functional/FunctionalTestCaseEdit.vue     |   2 +-
 .../components/TestReviewTestCaseEdit.vue     |   2 +-
 frontend/src/business/components/xpack        |   2 +-
 frontend/src/common/js/constants.js           |   1 +
 frontend/src/common/js/custom_field.js        |  10 +-
 frontend/src/common/js/table-constants.js     |  19 ++-
 frontend/src/common/js/tableUtils.js          |  10 +-
 frontend/src/i18n/en-US.js                    |   4 +-
 frontend/src/i18n/zh-CN.js                    |   4 +-
 frontend/src/i18n/zh-TW.js                    |   4 +-
 frontend/src/network/Issue.js                 |  16 ++
 frontend/src/network/project.js               |  10 ++
 39 files changed, 819 insertions(+), 456 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/track/issue/domain/jira/JiraCreateMetadataResponse.java
 create mode 100644 backend/src/main/java/io/metersphere/track/issue/domain/jira/JiraUser.java
 create mode 100644 frontend/src/business/components/track/case/components/MsMarkDownText.vue
 create mode 100644 frontend/src/network/project.js

diff --git a/backend/src/main/java/io/metersphere/base/domain/Project.java b/backend/src/main/java/io/metersphere/base/domain/Project.java
index f85eadf639..57c42ac558 100644
--- a/backend/src/main/java/io/metersphere/base/domain/Project.java
+++ b/backend/src/main/java/io/metersphere/base/domain/Project.java
@@ -45,5 +45,9 @@ public class Project implements Serializable {
 
     private String azureFilterId;
 
+    private String platform;
+
+    private Boolean thirdPartTemplate;
+
     private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}
diff --git a/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java b/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java
index 7f42ebe850..5530581f3d 100644
--- a/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java
@@ -1433,6 +1433,136 @@ public class ProjectExample {
             addCriterion("azure_filter_id not between", value1, value2, "azureFilterId");
             return (Criteria) this;
         }
+
+        public Criteria andPlatformIsNull() {
+            addCriterion("platform is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformIsNotNull() {
+            addCriterion("platform is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformEqualTo(String value) {
+            addCriterion("platform =", value, "platform");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformNotEqualTo(String value) {
+            addCriterion("platform <>", value, "platform");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformGreaterThan(String value) {
+            addCriterion("platform >", value, "platform");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformGreaterThanOrEqualTo(String value) {
+            addCriterion("platform >=", value, "platform");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformLessThan(String value) {
+            addCriterion("platform <", value, "platform");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformLessThanOrEqualTo(String value) {
+            addCriterion("platform <=", value, "platform");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformLike(String value) {
+            addCriterion("platform like", value, "platform");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformNotLike(String value) {
+            addCriterion("platform not like", value, "platform");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformIn(List<String> values) {
+            addCriterion("platform in", values, "platform");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformNotIn(List<String> values) {
+            addCriterion("platform not in", values, "platform");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformBetween(String value1, String value2) {
+            addCriterion("platform between", value1, value2, "platform");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlatformNotBetween(String value1, String value2) {
+            addCriterion("platform not between", value1, value2, "platform");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdPartTemplateIsNull() {
+            addCriterion("third_part_template is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdPartTemplateIsNotNull() {
+            addCriterion("third_part_template is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdPartTemplateEqualTo(Boolean value) {
+            addCriterion("third_part_template =", value, "thirdPartTemplate");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdPartTemplateNotEqualTo(Boolean value) {
+            addCriterion("third_part_template <>", value, "thirdPartTemplate");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdPartTemplateGreaterThan(Boolean value) {
+            addCriterion("third_part_template >", value, "thirdPartTemplate");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdPartTemplateGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("third_part_template >=", value, "thirdPartTemplate");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdPartTemplateLessThan(Boolean value) {
+            addCriterion("third_part_template <", value, "thirdPartTemplate");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdPartTemplateLessThanOrEqualTo(Boolean value) {
+            addCriterion("third_part_template <=", value, "thirdPartTemplate");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdPartTemplateIn(List<Boolean> values) {
+            addCriterion("third_part_template in", values, "thirdPartTemplate");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdPartTemplateNotIn(List<Boolean> values) {
+            addCriterion("third_part_template not in", values, "thirdPartTemplate");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdPartTemplateBetween(Boolean value1, Boolean value2) {
+            addCriterion("third_part_template between", value1, value2, "thirdPartTemplate");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdPartTemplateNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("third_part_template not between", value1, value2, "thirdPartTemplate");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
@@ -1527,4 +1657,4 @@ public class ProjectExample {
             this(condition, value, secondValue, null);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml
index e02df82cce..82bab88ff3 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml
@@ -22,6 +22,8 @@
     <result column="mock_tcp_port" jdbcType="INTEGER" property="mockTcpPort" />
     <result column="is_mock_tcp_open" jdbcType="BIT" property="isMockTcpOpen" />
     <result column="azure_filter_id" jdbcType="VARCHAR" property="azureFilterId" />
+    <result column="platform" jdbcType="VARCHAR" property="platform" />
+    <result column="third_part_template" jdbcType="BIT" property="thirdPartTemplate" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -82,9 +84,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, workspace_id, `name`, description, create_time, update_time, tapd_id, jira_key, 
-    zentao_id, azure_devops_id, `repeatable`, case_template_id, issue_template_id, custom_num, 
-    scenario_custom_num, create_user, system_id, mock_tcp_port, is_mock_tcp_open, azure_filter_id
+    id, workspace_id, `name`, description, create_time, update_time, tapd_id, jira_key,
+    zentao_id, azure_devops_id, `repeatable`, case_template_id, issue_template_id, custom_num,
+    scenario_custom_num, create_user, system_id, mock_tcp_port, is_mock_tcp_open, azure_filter_id,
+    platform, third_part_template
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.base.domain.ProjectExample" resultMap="BaseResultMap">
     select
@@ -101,7 +104,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from project
     where id = #{id,jdbcType=VARCHAR}
@@ -117,20 +120,22 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.base.domain.Project">
-    insert into project (id, workspace_id, `name`, 
-      description, create_time, update_time, 
-      tapd_id, jira_key, zentao_id, 
-      azure_devops_id, `repeatable`, case_template_id, 
-      issue_template_id, custom_num, scenario_custom_num, 
-      create_user, system_id, mock_tcp_port, 
-      is_mock_tcp_open, azure_filter_id)
-    values (#{id,jdbcType=VARCHAR}, #{workspaceId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
-      #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
-      #{tapdId,jdbcType=VARCHAR}, #{jiraKey,jdbcType=VARCHAR}, #{zentaoId,jdbcType=VARCHAR}, 
-      #{azureDevopsId,jdbcType=VARCHAR}, #{repeatable,jdbcType=BIT}, #{caseTemplateId,jdbcType=VARCHAR}, 
-      #{issueTemplateId,jdbcType=VARCHAR}, #{customNum,jdbcType=BIT}, #{scenarioCustomNum,jdbcType=BIT}, 
-      #{createUser,jdbcType=VARCHAR}, #{systemId,jdbcType=VARCHAR}, #{mockTcpPort,jdbcType=INTEGER}, 
-      #{isMockTcpOpen,jdbcType=BIT}, #{azureFilterId,jdbcType=VARCHAR})
+    insert into project (id, workspace_id, `name`,
+      description, create_time, update_time,
+      tapd_id, jira_key, zentao_id,
+      azure_devops_id, `repeatable`, case_template_id,
+      issue_template_id, custom_num, scenario_custom_num,
+      create_user, system_id, mock_tcp_port,
+      is_mock_tcp_open, azure_filter_id, platform,
+      third_part_template)
+    values (#{id,jdbcType=VARCHAR}, #{workspaceId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
+      #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT},
+      #{tapdId,jdbcType=VARCHAR}, #{jiraKey,jdbcType=VARCHAR}, #{zentaoId,jdbcType=VARCHAR},
+      #{azureDevopsId,jdbcType=VARCHAR}, #{repeatable,jdbcType=BIT}, #{caseTemplateId,jdbcType=VARCHAR},
+      #{issueTemplateId,jdbcType=VARCHAR}, #{customNum,jdbcType=BIT}, #{scenarioCustomNum,jdbcType=BIT},
+      #{createUser,jdbcType=VARCHAR}, #{systemId,jdbcType=VARCHAR}, #{mockTcpPort,jdbcType=INTEGER},
+      #{isMockTcpOpen,jdbcType=BIT}, #{azureFilterId,jdbcType=VARCHAR}, #{platform,jdbcType=VARCHAR},
+      #{thirdPartTemplate,jdbcType=BIT})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.Project">
     insert into project
@@ -195,6 +200,12 @@
       <if test="azureFilterId != null">
         azure_filter_id,
       </if>
+      <if test="platform != null">
+        platform,
+      </if>
+      <if test="thirdPartTemplate != null">
+        third_part_template,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -257,6 +268,12 @@
       <if test="azureFilterId != null">
         #{azureFilterId,jdbcType=VARCHAR},
       </if>
+      <if test="platform != null">
+        #{platform,jdbcType=VARCHAR},
+      </if>
+      <if test="thirdPartTemplate != null">
+        #{thirdPartTemplate,jdbcType=BIT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.base.domain.ProjectExample" resultType="java.lang.Long">
@@ -328,6 +345,12 @@
       <if test="record.azureFilterId != null">
         azure_filter_id = #{record.azureFilterId,jdbcType=VARCHAR},
       </if>
+      <if test="record.platform != null">
+        platform = #{record.platform,jdbcType=VARCHAR},
+      </if>
+      <if test="record.thirdPartTemplate != null">
+        third_part_template = #{record.thirdPartTemplate,jdbcType=BIT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -354,7 +377,9 @@
       system_id = #{record.systemId,jdbcType=VARCHAR},
       mock_tcp_port = #{record.mockTcpPort,jdbcType=INTEGER},
       is_mock_tcp_open = #{record.isMockTcpOpen,jdbcType=BIT},
-      azure_filter_id = #{record.azureFilterId,jdbcType=VARCHAR}
+      azure_filter_id = #{record.azureFilterId,jdbcType=VARCHAR},
+      platform = #{record.platform,jdbcType=VARCHAR},
+      third_part_template = #{record.thirdPartTemplate,jdbcType=BIT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -419,6 +444,12 @@
       <if test="azureFilterId != null">
         azure_filter_id = #{azureFilterId,jdbcType=VARCHAR},
       </if>
+      <if test="platform != null">
+        platform = #{platform,jdbcType=VARCHAR},
+      </if>
+      <if test="thirdPartTemplate != null">
+        third_part_template = #{thirdPartTemplate,jdbcType=BIT},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -442,7 +473,9 @@
       system_id = #{systemId,jdbcType=VARCHAR},
       mock_tcp_port = #{mockTcpPort,jdbcType=INTEGER},
       is_mock_tcp_open = #{isMockTcpOpen,jdbcType=BIT},
-      azure_filter_id = #{azureFilterId,jdbcType=VARCHAR}
+      azure_filter_id = #{azureFilterId,jdbcType=VARCHAR},
+      platform = #{platform,jdbcType=VARCHAR},
+      third_part_template = #{thirdPartTemplate,jdbcType=BIT}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
index 744e29c80d..c5a69c1ef2 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
@@ -59,10 +59,6 @@
         from issues
         left join
         test_case_issues on issues.id = test_case_issues.issues_id
-        <if test="request.projectId != null||request.workspaceId != null">
-            left join
-            project on issues.project_id = project.id
-        </if>
         <include refid="queryWhereCondition"/>
         and (test_case_issues.test_case_id is null or test_case_issues.test_case_id != #{request.caseId})
         and (issues.platform_status != 'delete' or issues.platform_status is NULL)
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml
index 5ea046fa25..b7de3d3e37 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml
@@ -52,7 +52,8 @@
                user.name          AS createUserName,
                p.mock_tcp_port    AS mockTcpPort,
                p.is_mock_tcp_open AS isMockTcpOpen,
-               p.scenario_custom_num
+               p.scenario_custom_num,
+               p.platform, p.third_part_template
         FROM project p
                      JOIN workspace w ON p.workspace_id = w.id
                      LEFT JOIN user ON user.id = p.create_user
diff --git a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
index d5682f3d0a..299e29b64d 100644
--- a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
@@ -12,6 +12,7 @@ import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
 import io.metersphere.controller.request.IntegrationRequest;
 import io.metersphere.dto.CustomFieldItemDTO;
+import io.metersphere.dto.IssueTemplateDao;
 import io.metersphere.dto.UserDTO;
 import io.metersphere.service.*;
 import io.metersphere.track.request.testcase.IssuesRequest;
@@ -363,7 +364,6 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
         });
     }
 
-
     protected String syncIssueCustomField(String customFieldsStr, JSONObject issue) {
         List<CustomFieldItemDTO> customFields = CustomFieldService.getCustomFields(customFieldsStr);
         customFields.forEach(item -> {
@@ -395,6 +395,9 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
     @Override
     public void syncAllIssues(Project project) {}
 
+    @Override
+    public IssueTemplateDao getThirdPartTemplate() {return null;}
+
     protected List<IssuesWithBLOBs> getIssuesByPlatformIds(List<String> platformIds) {
         IssuesService issuesService = CommonBeanFactory.getBean(IssuesService.class);
         return issuesService.getIssuesByPlatformIds(platformIds, projectId);
diff --git a/backend/src/main/java/io/metersphere/track/issue/IssuesPlatform.java b/backend/src/main/java/io/metersphere/track/issue/IssuesPlatform.java
index 99248caed4..e25202161f 100644
--- a/backend/src/main/java/io/metersphere/track/issue/IssuesPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/IssuesPlatform.java
@@ -3,6 +3,7 @@ package io.metersphere.track.issue;
 import io.metersphere.base.domain.IssuesDao;
 import io.metersphere.base.domain.IssuesWithBLOBs;
 import io.metersphere.base.domain.Project;
+import io.metersphere.dto.IssueTemplateDao;
 import io.metersphere.dto.UserDTO;
 import io.metersphere.track.dto.DemandDTO;
 import io.metersphere.track.issue.domain.PlatformUser;
@@ -71,4 +72,10 @@ public interface IssuesPlatform {
      * @param project
      */
     void syncAllIssues(Project project);
+
+    /**
+     * 获取第三方平台缺陷模板
+     * @return
+     */
+    IssueTemplateDao getThirdPartTemplate();
 }
diff --git a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
index 4933644f23..239eab5eeb 100644
--- a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
@@ -20,6 +20,7 @@ import io.metersphere.track.issue.domain.jira.JiraConfig;
 import io.metersphere.track.issue.domain.jira.JiraIssue;
 import io.metersphere.track.request.testcase.IssuesRequest;
 import io.metersphere.track.request.testcase.IssuesUpdateRequest;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.commonmark.node.Node;
 import org.commonmark.parser.Parser;
@@ -148,9 +149,7 @@ public class JiraPlatform extends AbstractIssuePlatform {
 
         List<File> imageFiles = getImageFiles(issuesRequest.getDescription());
 
-        imageFiles.forEach(img -> {
-            jiraClientV2.uploadAttachment(result.getKey(), img);
-        });
+        imageFiles.forEach(img -> jiraClientV2.uploadAttachment(result.getKey(), img));
 
         String status = getStatus(issues.getFields());
         issuesRequest.setPlatformStatus(status);
@@ -184,50 +183,78 @@ public class JiraPlatform extends AbstractIssuePlatform {
 
         JSONObject issuetype = new JSONObject();
         issuetype.put("name", issuetypeStr);
-
-        fields.put("summary", issuesRequest.getTitle());
-//        fields.put("description", new JiraIssueDescription(desc));
-        fields.put("description", desc);
         fields.put("issuetype", issuetype);
 
         JSONObject addJiraIssueParam = new JSONObject();
         addJiraIssueParam.put("fields", fields);
 
+        if (issuesRequest.isThirdPartPlatform()) {
+            parseCustomFiled(issuesRequest, fields);
+            issuesRequest.setTitle(fields.getString("summary"));
+        } else {
+            fields.put("summary", issuesRequest.getTitle());
+            fields.put("description", desc);
+            parseCustomFiled(issuesRequest, fields);
+        }
+
+        return addJiraIssueParam;
+    }
+
+    private void parseCustomFiled(IssuesUpdateRequest issuesRequest, JSONObject fields) {
         List<CustomFieldItemDTO> customFields = CustomFieldService.getCustomFields(issuesRequest.getCustomFields());
 
         customFields.forEach(item -> {
             String fieldName = item.getCustomData();
             if (StringUtils.isNotBlank(fieldName)) {
                 if (item.getValue() != null) {
-                    if (StringUtils.isNotBlank(item.getType()) &&
-                            StringUtils.equalsAny(item.getType(), "select", "radio", "member")) {
-                        JSONObject param = new JSONObject();
-                        if (fieldName.equals("assignee") || fieldName.equals("reporter")) {
-                            param.put("name", item.getValue());
+                    if (StringUtils.isNotBlank(item.getType())) {
+                        if (StringUtils.equalsAny(item.getType(), "select", "radio", "member")) {
+                            JSONObject param = new JSONObject();
+                            if (fieldName.equals("assignee") || fieldName.equals("reporter")) {
+                                if (issuesRequest.isThirdPartPlatform()) {
+                                    param.put("id", item.getValue());
+                                } else {
+                                    param.put("name", item.getValue());
+                                }
+                            } else {
+                                param.put("id", item.getValue());
+                            }
+                            fields.put(fieldName, param);
+                        } else if (StringUtils.equalsAny(item.getType(),  "multipleSelect", "checkbox", "multipleMember")) {
+                            JSONArray attrs = new JSONArray();
+                            if (item.getValue() != null) {
+                                JSONArray values = (JSONArray)item.getValue();
+                                values.forEach(v -> {
+                                    JSONObject param = new JSONObject();
+                                    param.put("id", v);
+                                    attrs.add(param);
+                                });
+                            }
+                            fields.put(fieldName, attrs);
+                        } else if (StringUtils.equalsAny(item.getType(),  "cascadingSelect")) {
+                            if (item.getValue() != null) {
+                                JSONArray values = (JSONArray)item.getValue();
+                                JSONObject attr = new JSONObject();
+                                if (CollectionUtils.isNotEmpty(values)) {
+                                    if (values.size() > 0) {
+                                        attr.put("id", values.get(0));
+                                    }
+                                    if (values.size() > 1) {
+                                        JSONObject param = new JSONObject();
+                                        param.put("id", values.get(1));
+                                        attr.put("child", param);
+                                    }
+                                }
+                                fields.put(fieldName, attr);
+                            }
                         } else {
-                            param.put("id", item.getValue());
+                            fields.put(fieldName, item.getValue());
                         }
-                        fields.put(fieldName, param);
-                    } else if (StringUtils.isNotBlank(item.getType()) &&
-                            StringUtils.equalsAny(item.getType(),  "multipleSelect", "checkbox", "multipleMember")) {
-                        JSONArray attrs = new JSONArray();
-                        if (item.getValue() != null) {
-                            JSONArray values = (JSONArray)item.getValue();
-                            values.forEach(v -> {
-                                JSONObject param = new JSONObject();
-                                param.put("id", v);
-                                attrs.add(param);
-                            });
-                        }
-                        fields.put(fieldName, attrs);
-                    } else {
-                        fields.put(fieldName, item.getValue());
                     }
+
                 }
             }
         });
-
-        return addJiraIssueParam;
     }
 
     @Override
diff --git a/backend/src/main/java/io/metersphere/track/issue/client/JiraAbstractClient.java b/backend/src/main/java/io/metersphere/track/issue/client/JiraAbstractClient.java
index 3c810ed40c..4ccf497d3b 100644
--- a/backend/src/main/java/io/metersphere/track/issue/client/JiraAbstractClient.java
+++ b/backend/src/main/java/io/metersphere/track/issue/client/JiraAbstractClient.java
@@ -4,11 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.LogUtil;
-import io.metersphere.track.issue.domain.jira.JiraAddIssueResponse;
-import io.metersphere.track.issue.domain.jira.JiraConfig;
-import io.metersphere.track.issue.domain.jira.JiraField;
-import io.metersphere.track.issue.domain.jira.JiraIssue;
-import io.metersphere.track.issue.domain.jira.JiraIssueListResponse;
+import io.metersphere.track.issue.domain.jira.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.*;
@@ -16,7 +12,9 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public abstract class JiraAbstractClient extends BaseClient {
 
@@ -35,6 +33,34 @@ public abstract class JiraAbstractClient extends BaseClient {
         return  (JiraIssue) getResultForObject(JiraIssue.class, responseEntity);
     }
 
+    public Map<String, JiraCreateMetadataResponse.Field> getCreateMetadata(String projectKey, String issueType) {
+        String url = getBaseUrl() + "/issue/createmeta?projectKeys={1}&issuetypeNames={2}&expand=projects.issuetypes.fields";
+        ResponseEntity<String> response = null;
+        try {
+            response = restTemplate.exchange(url, HttpMethod.GET, getAuthHttpEntity(), String.class, projectKey, issueType);
+        } catch (Exception e) {
+            LogUtil.error(e.getMessage(), e);
+            MSException.throwException(e.getMessage());
+        }
+        Map<String, JiraCreateMetadataResponse.Field> fields = ((JiraCreateMetadataResponse) getResultForObject(JiraCreateMetadataResponse.class, response))
+                .getProjects().get(0).getIssuetypes().get(0).getFields();
+        fields.remove("project");
+        fields.remove("issuetype");
+        return fields;
+    }
+
+    public List<JiraUser> getAssignableUser(String projectKey) {
+        String url = getBaseUrl() + "/user/assignable/search?project={1}";
+        ResponseEntity<String> response = null;
+        try {
+            response = restTemplate.exchange(url, HttpMethod.GET, getAuthHttpEntity(), String.class, projectKey);
+        } catch (Exception e) {
+            LogUtil.error(e.getMessage(), e);
+            MSException.throwException(e.getMessage());
+        }
+        return (List<JiraUser>) getResultForList(JiraUser.class, response);
+    }
+
     public JSONArray getDemands(String projectKey, String issueType, int startAt, int maxResults) {
         String jql = getBaseUrl() + "/search?jql=project=" + projectKey + "+AND+issuetype=" + issueType
                 + "&maxResults=" + maxResults + "&startAt=" + startAt + "&fields=summary,issuetype";
diff --git a/backend/src/main/java/io/metersphere/track/issue/domain/jira/JiraCreateMetadataResponse.java b/backend/src/main/java/io/metersphere/track/issue/domain/jira/JiraCreateMetadataResponse.java
new file mode 100644
index 0000000000..f63458398f
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/issue/domain/jira/JiraCreateMetadataResponse.java
@@ -0,0 +1,61 @@
+package io.metersphere.track.issue.domain.jira;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+public class JiraCreateMetadataResponse {
+    private List<Projects> projects;
+
+    @Setter
+    @Getter
+    public static class Projects {
+        private List<Issuetypes> issuetypes;
+    }
+
+    @Setter
+    @Getter
+    public static class Issuetypes {
+        private Map<String, Field> fields;
+    }
+
+    @Setter
+    @Getter
+    public static class Field {
+        private boolean required;
+        private Schema schema;
+        private String name;
+        private String key;
+        private String autoCompleteUrl;
+        private boolean hasDefaultValue;
+        private Object defaultValue;
+        private List<AllowedValues> allowedValues;
+    }
+
+    @Setter
+    @Getter
+    public static class Schema {
+        private String type;
+        private String items;
+        private String custom;
+        private int customId;
+    }
+
+    @Setter
+    @Getter
+    public static class AllowedValues {
+        private String self;
+        private String id;
+        private String description;
+        private String name;
+        private String value;
+        private boolean subtask;
+        private int avatarId;
+        private int hierarchyLevel;
+        private List<AllowedValues> children;
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/track/issue/domain/jira/JiraUser.java b/backend/src/main/java/io/metersphere/track/issue/domain/jira/JiraUser.java
new file mode 100644
index 0000000000..84e0dc5f22
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/issue/domain/jira/JiraUser.java
@@ -0,0 +1,13 @@
+package io.metersphere.track.issue.domain.jira;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class JiraUser {
+    private String accountId;
+    private String displayName;
+    private String emailAddress;
+    private Boolean active;
+}
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java
index 8c1c145e84..afc96dcafd 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java
@@ -25,5 +25,7 @@ public class IssuesUpdateRequest extends IssuesWithBLOBs {
     private List<String> zentaoBuilds;
     private List<String> testCaseIds;
 
+    private boolean thirdPartPlatform;
+
     private List<String> follows;
 }
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 269d23d500..a99681fe94 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 269d23d5004ee49a9e82a977027ca72757d3056a
+Subproject commit a99681fe94107d42ff340f4e8dcdca95195cf884
diff --git a/backend/src/main/resources/db/migration/V102__v1.16_release.sql b/backend/src/main/resources/db/migration/V102__v1.16_release.sql
index b2247a93b2..04c7b7d9e8 100644
--- a/backend/src/main/resources/db/migration/V102__v1.16_release.sql
+++ b/backend/src/main/resources/db/migration/V102__v1.16_release.sql
@@ -1,2 +1,11 @@
 -- 新增字段
-ALTER TABLE `swagger_url_project` ADD COLUMN `config` longtext COMMENT '鉴权配置信息' AFTER `mode_id`;
\ No newline at end of file
+ALTER TABLE `swagger_url_project` ADD COLUMN `config` longtext COMMENT '鉴权配置信息' AFTER `mode_id`;
+
+-- 第三方平台模板
+ALTER TABLE project ADD platform varchar(20) DEFAULT 'Local' NOT NULL COMMENT '项目使用哪个平台的模板';
+ALTER TABLE project ADD third_part_template tinyint(1) DEFAULT 0 NULL COMMENT '是否使用第三方平台缺陷模板';
+
+-- 处理历史数据
+UPDATE issue_template SET platform = 'Local' WHERE platform = 'metersphere';
+UPDATE project p JOIN issue_template it on p.issue_template_id = it.id SET p.platform = it.platform;
+UPDATE custom_field SET `type` = 'date' WHERE `type` = 'data';
diff --git a/frontend/src/business/components/project/menu/EditProject.vue b/frontend/src/business/components/project/menu/EditProject.vue
index b4d579fca1..c80110a96f 100644
--- a/frontend/src/business/components/project/menu/EditProject.vue
+++ b/frontend/src/business/components/project/menu/EditProject.vue
@@ -7,11 +7,23 @@
           <el-input v-model="form.name" autocomplete="off"></el-input>
         </el-form-item>
 
+        <el-form-item v-if="platformOptions.length > 1" :label-width="labelWidth" :label="$t('集成第三方平台')" prop="platform">
+          <el-select filterable v-model="form.platform">
+            <el-option v-for="item in platformOptions" :key="item.value" :label="item.text" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
         <el-form-item :label-width="labelWidth" :label="$t('workspace.case_template_manage')" prop="caseTemplateId">
           <template-select :data="form" scene="API_CASE" prop="caseTemplateId" ref="caseTemplate"/>
         </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('workspace.issue_template_manage')" prop="issueTemplateId">
-          <template-select :data="form" scene="ISSUE" prop="issueTemplateId" ref="issueTemplate"/>
+
+        <el-form-item v-if="xpackEable" :label-width="labelWidth" :label="$t('使用第三方平台模板')" prop="scenarioCustomNum">
+          <el-switch v-model="form.thirdPartTemplate"></el-switch>
+        </el-form-item>
+
+        <el-form-item v-if="!xpackEable || !form.thirdPartTemplate" :label-width="labelWidth" :label="$t('workspace.issue_template_manage')" prop="issueTemplateId">
+          <template-select :platform="form.platform" :data="form" scene="ISSUE" prop="issueTemplateId" ref="issueTemplate"/>
         </el-form-item>
 
         <el-form-item :label-width="labelWidth" label="TCP Mock Port">
@@ -79,12 +91,12 @@
 import {
   getCurrentProjectID,
   getCurrentUser, getCurrentUserId,
-  getCurrentWorkspaceId,
+  getCurrentWorkspaceId, hasLicense,
   listenGoBack,
   removeGoBackListener
 } from "@/common/js/utils";
 
-import {PROJECT_ID} from "@/common/js/constants";
+import {AZURE_DEVOPS, JIRA, PROJECT_ID, TAPD, ZEN_TAO} from "@/common/js/constants";
 import {PROJECT_CONFIGS} from "@/business/components/common/components/search/search-components";
 import MsInstructionsIcon from "@/business/components/common/components/MsInstructionsIcon";
 import TemplateSelect from "@/business/components/settings/workspace/template/TemplateSelect";
@@ -102,9 +114,10 @@ import MsTableOperator from "@/business/components/common/components/MsTableOper
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import MsTableHeader from "@/business/components/common/components/MsTableHeader";
 import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
+import {ISSUE_PLATFORM_OPTION} from "@/common/js/table-constants";
 
 export default {
-  name: "MsProject",
+  name: "EditProject",
   components: {
     MsInstructionsIcon,
     TemplateSelect,
@@ -126,10 +139,6 @@ export default {
       title: this.$t('project.create'),
       condition: {components: PROJECT_CONFIGS},
       items: [],
-      tapd: false,
-      jira: false,
-      zentao: false,
-      azuredevops: false,
       form: {},
       currentPage: 1,
       pageSize: 10,
@@ -147,7 +156,9 @@ export default {
         // issueTemplateId: [{required: true}],
       },
       screenHeight: 'calc(100vh - 195px)',
-      labelWidth: '150px'
+      labelWidth: '150px',
+      platformOptions: [],
+      xpackEable: false
     };
   },
   props: {
@@ -161,11 +172,24 @@ export default {
       this.create();
       this.$router.replace('/setting/project/all');
     }
+    this.xpackEable = hasLicense();
   },
   computed: {
     currentUser: () => {
       return getCurrentUser();
-    }
+    },
+    tapd() {
+      return this.form.platform === TAPD && this.platformOptions.map(i => i.value).indexOf(TAPD) > -1;
+    },
+    jira() {
+      return this.form.platform === JIRA && this.platformOptions.map(i => i.value).indexOf(JIRA) > -1;
+    },
+    zentao() {
+      return this.form.platform === ZEN_TAO && this.platformOptions.map(i => i.value).indexOf(ZEN_TAO) > -1;
+    },
+    azuredevops() {
+      return this.form.platform === AZURE_DEVOPS && this.platformOptions.map(i => i.value).indexOf(AZURE_DEVOPS) > -1;
+    },
   },
   inject: [
     'reload'
@@ -187,24 +211,32 @@ export default {
       this.getOptions();
       this.createVisible = true;
       listenGoBack(this.handleClose);
-      this.form = Object.assign({}, row);
+      if (row) {
+        this.form = Object.assign({}, row);
+      } else {
+        this.form = {};
+      }
+      this.platformOptions = [];
+      this.platformOptions.push(...ISSUE_PLATFORM_OPTION);
       this.$get("/service/integration/all/" + getCurrentUser().lastWorkspaceId, response => {
         let data = response.data;
         let platforms = data.map(d => d.platform);
-        if (platforms.indexOf("Tapd") !== -1) {
-          this.tapd = true;
-        }
-        if (platforms.indexOf("Jira") !== -1) {
-          this.jira = true;
-        }
-        if (platforms.indexOf("Zentao") !== -1) {
-          this.zentao = true;
-        }
-        if (platforms.indexOf("AzureDevops") !== -1) {
-          this.azuredevops = true;
-        }
+        this.filterPlatformOptions(platforms, TAPD);
+        this.filterPlatformOptions(platforms, JIRA);
+        this.filterPlatformOptions(platforms, ZEN_TAO);
+        this.filterPlatformOptions(platforms, AZURE_DEVOPS);
       });
     },
+    filterPlatformOptions(platforms, platform) {
+      if (platforms.indexOf(platform) === -1) {
+        for (let i = 0; i < this.platformOptions.length; i++) {
+          if (this.platformOptions[i].value === platform) {
+            this.platformOptions.splice(1, i);
+            break;
+          }
+        }
+      }
+    },
     submit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -254,10 +286,6 @@ export default {
     handleClose() {
       removeGoBackListener(this.handleClose);
       this.createVisible = false;
-      this.tapd = false;
-      this.jira = false;
-      this.zentao = false;
-      this.azuredevops = false;
     },
     chengeMockTcpSwitch(value){
       if(value && this.form.mockTcpPort === 0){
diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue
index 9888c42a6d..69ef6e7bc5 100644
--- a/frontend/src/business/components/settings/workspace/MsProject.vue
+++ b/frontend/src/business/components/settings/workspace/MsProject.vue
@@ -93,77 +93,7 @@
                            :total="total"/>
     </el-card>
 
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="createVisible" destroy-on-close
-               @close="handleClose">
-      <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="80px" size="small">
-        <el-form-item :label-width="labelWidth" :label="$t('commons.name')" prop="name">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
-        </el-form-item>
-
-
-        <el-form-item :label-width="labelWidth" :label="$t('用例模板')" prop="caseTemplateId">
-          <template-select :data="form" scene="API_CASE" prop="caseTemplateId" ref="caseTemplate"/>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('缺陷模板')" prop="issueTemplateId">
-          <template-select :data="form" scene="ISSUE" prop="issueTemplateId" ref="issueTemplate"/>
-        </el-form-item>
-
-        <el-form-item :label-width="labelWidth" label="TCP Mock Port">
-          <el-input-number v-model="form.mockTcpPort" :controls="false"
-                           style="width: 37%;margin-right: 30px"></el-input-number>
-          <el-switch v-model="form.isMockTcpOpen" @change="chengeMockTcpSwitch"></el-switch>
-        </el-form-item>
-
-        <el-form-item :label-width="labelWidth" :label="$t('commons.description')" prop="description">
-          <el-input :autosize="{ minRows: 2, maxRows: 4}" type="textarea" v-model="form.description" ></el-input>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.tapd_id')" v-if="tapd">
-          <el-input v-model="form.tapdId" autocomplete="off" ></el-input>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.jira_key')" v-if="jira">
-          <el-input v-model="form.jiraKey" autocomplete="off" />
-          <ms-instructions-icon effect="light">
-            <template>
-              <img class="jira-image" src="../../../../assets/jira-key.png"/>
-            </template>
-          </ms-instructions-icon>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.zentao_id')" v-if="zentao">
-          <el-input v-model="form.zentaoId" autocomplete="off" ></el-input>
-          <ms-instructions-icon effect="light">
-            <template>
-              禅道流程：产品-项目 | 产品-迭代 | 产品-冲刺 | 项目-迭代 | 项目-冲刺 <br/><br/>
-              根据 "后台 -> 自定义 -> 流程" 查看对应流程，根据流程填写ID <br/><br/>
-              产品-项目 | 产品-迭代 | 产品-冲刺 需要填写产品ID <br/><br/>
-              项目-迭代 | 项目-冲刺 需要填写项目ID
-            </template>
-          </ms-instructions-icon>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.azureDevops_id')" v-if="azuredevops">
-          <el-input v-model="form.azureDevopsId" autocomplete="off" ></el-input>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.azureDevops_filter_id')" v-if="azuredevops">
-          <el-input v-model="form.azureFilterId" autocomplete="off"/>
-          <ms-instructions-icon content="非必填项，用例关联需求时，可以只筛选出，所填的 workItem 下的选项" effect="light"/>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.repeatable')" prop="repeatable">
-          <el-switch v-model="form.repeatable"></el-switch>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.test_case_custom_id')" prop="customNum">
-          <el-switch v-model="form.customNum"></el-switch>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.scenario_custom_id')" prop="scenarioCustomNum">
-          <el-switch v-model="form.scenarioCustomNum"></el-switch>
-        </el-form-item>
-      </el-form>
-      <template v-slot:footer>
-        <div class="dialog-footer">
-          <ms-dialog-footer
-            @cancel="createVisible = false"
-            @confirm="submit('form')"/>
-        </div>
-      </template>
-    </el-dialog>
+    <edit-project ref="editProject"/>
 
     <el-dialog :close-on-click-modal="false" :visible.sync="memberVisible" width="70%" :destroy-on-close="true"
                @close="close"
@@ -280,10 +210,12 @@ import {PROJECT_CONFIGS} from "@/business/components/common/components/search/se
 import MsRolesTag from "@/business/components/common/components/MsRolesTag";
 import AddMember from "@/business/components/settings/common/AddMember";
 import MsInstructionsIcon from "@/business/components/common/components/MsInstructionsIcon";
+import EditProject from "@/business/components/project/menu/EditProject";
 
 export default {
   name: "MsProject",
   components: {
+    EditProject,
     MsInstructionsIcon,
     TemplateSelect,
     MsResourceFiles,
@@ -302,7 +234,6 @@ export default {
   ],
   data() {
     return {
-      createVisible: false,
       updateVisible: false,
       dialogMemberVisible: false,
       result: {},
@@ -310,10 +241,6 @@ export default {
       title: this.$t('project.create'),
       condition: {components: PROJECT_CONFIGS},
       items: [],
-      tapd: false,
-      jira: false,
-      zentao: false,
-      azuredevops: false,
       form: {},
       currentPage: 1,
       pageSize: 10,
@@ -371,9 +298,6 @@ export default {
       return getCurrentWorkspaceId();
     }
   },
-  destroyed() {
-    this.createVisible = false;
-  },
   methods: {
     jumpPage(row) {
       this.currentWorkspaceRow = row;
@@ -383,7 +307,6 @@ export default {
         projectId: row.id
       };
       this.wsId = row.id;
-      let path = "/user/project/member/list";
       this.result = this.$post("/user/project/member/list", param, res => {
         let data = res.data;
         this.memberLineData = data;
@@ -398,7 +321,6 @@ export default {
 
     },
     getMaintainerOptions() {
-      let workspaceId = getCurrentWorkspaceId();
       this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
         this.userFilters = response.data.map(u => {
           return {text: u.name, value: u.id};
@@ -407,73 +329,17 @@ export default {
     },
     create() {
       let workspaceId = getCurrentWorkspaceId();
-      this.getOptions();
       if (!workspaceId) {
         this.$warning(this.$t('project.please_choose_workspace'));
         return false;
       }
       this.title = this.$t('project.create');
       // listenGoBack(this.handleClose);
-      this.createVisible = true;
       this.form = {};
-    },
-    getOptions() {
-
-      if (this.$refs.issueTemplate) {
-        this.$refs.issueTemplate.getTemplateOptions();
-      }
-      if (this.$refs.caseTemplate) {
-        this.$refs.caseTemplate.getTemplateOptions();
-      }
+      this.$refs.editProject.edit();
     },
     edit(row) {
-      this.title = this.$t('project.edit');
-      this.getOptions();
-      this.createVisible = true;
-      listenGoBack(this.handleClose);
-      this.form = Object.assign({}, row);
-      this.$get("/service/integration/all/" + getCurrentWorkspaceId(), response => {
-        let data = response.data;
-        let platforms = data.map(d => d.platform);
-        if (platforms.indexOf("Tapd") !== -1) {
-          this.tapd = true;
-        }
-        if (platforms.indexOf("Jira") !== -1) {
-          this.jira = true;
-        }
-        if (platforms.indexOf("Zentao") !== -1) {
-          this.zentao = true;
-        }
-        if (platforms.indexOf("AzureDevops") !== -1) {
-          this.azuredevops = true;
-        }
-      });
-    },
-    submit(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          let saveType = "add";
-          if (this.form.id) {
-            saveType = "update";
-          }
-          var protocol = document.location.protocol;
-          protocol = protocol.substring(0, protocol.indexOf(":"));
-          this.form.protocal = protocol;
-          this.form.workspaceId = getCurrentWorkspaceId();
-          this.form.createUser = getCurrentUserId();
-          this.result = this.$post("/project/" + saveType, this.form, () => {
-            this.createVisible = false;
-            Message.success(this.$t('commons.save_success'));
-            if (saveType === 'add') {
-              this.reloadTopMenus();
-            } else {
-              this.list();
-            }
-          });
-        } else {
-          return false;
-        }
-      });
+      this.$refs.editProject.edit(row);
     },
     openJarConfig() {
       this.$refs.jarConfig.open();
@@ -507,11 +373,6 @@ export default {
     },
     handleClose() {
       removeGoBackListener(this.handleClose);
-      this.createVisible = false;
-      this.tapd = false;
-      this.jira = false;
-      this.zentao = false;
-      this.azuredevops = false;
     },
     search() {
       this.list();
diff --git a/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue b/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
index f0549057eb..56ed29a447 100644
--- a/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
+++ b/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
@@ -14,6 +14,14 @@
       </el-option>
     </el-select>
 
+    <el-cascader
+      v-else-if="data.type === 'cascadingSelect'"
+      expand-trigger="hover"
+      @change="handleChange"
+      :options="data.options"
+      v-model="data[prop]">
+    </el-cascader>
+
     <el-input
       v-else-if="data.type === 'textarea'"
       type="textarea"
@@ -52,21 +60,21 @@
       v-else-if="data.type === 'int'"
       v-model="data[prop]"
       :disabled="disabled"
-      @change="handleChange"></el-input-number>
+      @change="handleChange"/>
 
     <el-input-number
       v-else-if="data.type === 'float'"
       :disabled="disabled"
       @change="handleChange"
-      v-model="data[prop]" :precision="2" :step="0.1"></el-input-number>
+      v-model="data[prop]" :precision="2" :step="0.1"/>
 
      <el-date-picker
        class="custom-with"
        @change="handleChange"
-       v-else-if="data.type === 'data'"
+       v-else-if="data.type === 'date' || data.type === 'datetime'"
        :disabled="disabled"
        v-model="data[prop]"
-       type="date"
+       :type="data.type === 'date' ? 'date' : 'datetime'"
        :placeholder="$t('commons.select_date')">
     </el-date-picker>
 
@@ -84,10 +92,16 @@
     </el-select>
 
     <ms-input-tag v-else-if="data.type === 'multipleInput'"
+                  @input="handleChange"
                   :read-only="disabled" :currentScenario="data" :prop="prop"/>
 
+    <ms-mark-down-text v-else-if="data.type === 'richText'"
+                       :prop="prop"
+                       @change="handleChange"
+                       :data="data" :disabled="disabled"/>
+
     <el-input class="custom-with"
-              @change="handleChange"
+              @input="handleChange"
               :disabled="disabled"
               v-else v-model="data[prop]"/>
 
@@ -97,11 +111,12 @@
 
 <script>
 import MsTableColumn from "@/business/components/common/components/table/MsTableColumn";
-import {getCurrentProjectID, getCurrentWorkspaceId} from "@/common/js/utils";
+import {getCurrentProjectID} from "@/common/js/utils";
 import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
+import MsMarkDownText from "@/business/components/track/case/components/MsMarkDownText";
 export default {
   name: "CustomFiledComponent",
-  components: {MsInputTag, MsTableColumn},
+  components: {MsMarkDownText, MsInputTag, MsTableColumn},
   props: [
     'data',
     'prop',
@@ -113,6 +128,9 @@ export default {
       memberOptions: [],
     };
   },
+  created() {
+    this.initOption(this.data.options);
+  },
   mounted() {
     this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
       this.memberOptions = response.data;
@@ -125,7 +143,15 @@ export default {
     handleChange() {
       if (this.form) {
         this.$set(this.form, this.data.name, this.data[this.prop]);
-        this.$emit('reload');
+      }
+    },
+    initOption(options) {
+      if (options) {
+        options.forEach(i => {
+          i.label = i.text;
+          this.$set(i, 'label', i.text);
+          this.initOption(i.children);
+        });
       }
     }
   }
diff --git a/frontend/src/business/components/settings/workspace/template/IssueTemplateEdit.vue b/frontend/src/business/components/settings/workspace/template/IssueTemplateEdit.vue
index dd556fa57d..5135a6560f 100644
--- a/frontend/src/business/components/settings/workspace/template/IssueTemplateEdit.vue
+++ b/frontend/src/business/components/settings/workspace/template/IssueTemplateEdit.vue
@@ -47,6 +47,7 @@ import CustomFieldFormList from "@/business/components/settings/workspace/templa
 import CustomFieldRelateList from "@/business/components/settings/workspace/template/CustomFieldRelateList";
 import FieldTemplateEdit from "@/business/components/settings/workspace/template/FieldTemplateEdit";
 import FormRIchTextItem from "@/business/components/track/case/components/FormRichTextItem";
+import {LOCAL} from "@/common/js/constants";
 
 export default {
   name: "IssueTemplateEdit",
@@ -64,7 +65,7 @@ export default {
       showDialog: false,
       form: {
         name: "",
-        platform: 'metersphere',
+        platform: LOCAL,
         description: '',
         title: '',
         content: '',
@@ -106,7 +107,7 @@ export default {
         this.form = {
           id: "",
           name: "",
-          platform: 'metersphere',
+          platform: LOCAL,
           description: '',
           title: '',
           content: '',
diff --git a/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue b/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue
index f55a1d5ac6..464c03ad21 100644
--- a/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue
+++ b/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue
@@ -105,7 +105,7 @@ export default {
       currentPage: 1,
       result: {},
       issuePlatformMap:{
-        metersphere: 'Metersphere',
+        Local: 'Metersphere',
         Jira: 'JIRA',
         Tapd: 'Tapd',
         Zentao: '禅道',
diff --git a/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue b/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
index 860fe628b8..0f7c63cabe 100644
--- a/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
+++ b/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
@@ -1,7 +1,7 @@
 <template>
   <el-select filterable v-model="data[prop]">
     <el-option
-      v-for="(item, index) in templateOptions"
+      v-for="(item, index) in templateFilterOptions"
       :key="index"
       :label="item.name"
       :value="item.id">
@@ -17,6 +17,7 @@ export default {
   props: {
     scene: String,
     prop: String,
+    platform: String,
     data: {
       type: Object,
       default() {
@@ -29,12 +30,18 @@ export default {
   },
   data() {
     return {
-      templateOptions: []
+      templateOptions: [],
+      templateFilterOptions: [],
     };
   },
   mounted() {
     this.getTemplateOptions();
   },
+  watch: {
+    platform() {
+      this.filter();
+    }
+  },
   methods: {
     getTemplateOptions() {
       let url = 'field/template/case/option/';
@@ -43,6 +50,7 @@ export default {
       }
       this.$get(url + getCurrentWorkspaceId(), (response) => {
         this.templateOptions = response.data;
+        this.templateFilterOptions = this.templateOptions;
         if (!this.data[this.prop]) {
           for (let item of this.templateOptions) {
             if (this.scene !== 'ISSUE') {
@@ -59,7 +67,25 @@ export default {
 
           }
         }
+        this.filter();
       });
+    },
+    filter() {
+      if (this.platform) {
+        let hasTemplate = false;
+        this.templateFilterOptions = [];
+        this.templateOptions.forEach(i => {
+          if (i.platform === this.platform) {
+            this.templateFilterOptions.push(i);
+            if (i.id === this.data[this.prop])
+              hasTemplate = true;
+          }
+        });
+        if (!hasTemplate)
+          this.data[this.prop] = null;
+      } else {
+        this.templateFilterOptions = this.templateOptions;
+      }
     }
   }
 };
diff --git a/frontend/src/business/components/track/case/components/FormRichTextItem.vue b/frontend/src/business/components/track/case/components/FormRichTextItem.vue
index 7856841fa4..c677491d9a 100644
--- a/frontend/src/business/components/track/case/components/FormRichTextItem.vue
+++ b/frontend/src/business/components/track/case/components/FormRichTextItem.vue
@@ -1,138 +1,17 @@
 <template>
-  <el-form-item v-loading="result.loading" :disable="true" :label="title" :prop="prop" :label-width="labelWidth">
-    <mavon-editor :id="id" v-if="active" :editable="!disabled" @imgAdd="imgAdd" :default-open="defaultOpen" class="mavon-editor"
-                  :xss-options="xssOptions"
-                  :subfield="false" :toolbars="toolbars" :language="language" :toolbarsFlag="disabled ? false : true" @imgDel="imgDel" v-model="data[prop]"  ref="md"/>
+  <el-form-item :disable="true" :label="title" :prop="prop" :label-width="labelWidth">
+    <ms-mark-down-text :prop="prop" :data="data" :disabled="disabled"/>
   </el-form-item>
 </template>
 
 <script>
-import {getCurrentUser, getUUID} from "@/common/js/utils";
+import MsMarkDownText from "@/business/components/track/case/components/MsMarkDownText";
 export default {
   name: "FormRichTextItem",
-  components: {},
-  props: ['data', 'title', 'prop', 'disabled', 'labelWidth'],
-  data() {
-    return {
-      result: {loading: false},
-      id: getUUID(),
-      xssOptions: {
-        whiteList: {
-          img: ["src", "alt", "width", "height"],
-        },
-        stripIgnoreTagBody: true
-      },
-      defaultOpen: 'preview',
-      toolbars: {
-        bold: true, // 粗体
-        italic: true, // 斜体
-        header: true, // 标题
-        underline: true, // 下划线
-        strikethrough: true, // 中划线
-        mark: true, // 标记
-        superscript: true, // 上角标
-        subscript: true, // 下角标
-        quote: true, // 引用
-        ol: true, // 有序列表
-        ul: true, // 无序列表
-        link: true, // 链接
-        imagelink: true, // 图片链接
-        code: true, // code
-        table: true, // 表格
-        fullscreen: true, // 全屏编辑
-        readmodel: true, // 沉浸式阅读
-        htmlcode: true, // 展示html源码
-        help: true, // 帮助
-        /* 1.3.5 */
-        undo: true, // 上一步
-        redo: true, // 下一步
-        trash: true, // 清空
-        save: false, // 保存（触发events中的save事件）
-        /* 1.4.2 */
-        navigation: true, // 导航目录
-        /* 2.1.8 */
-        alignleft: true, // 左对齐
-        aligncenter: true, // 居中
-        alignright: true, // 右对齐
-        /* 2.2.1 */
-        subfield: true, // 单双栏模式
-        preview: true, // 预览
-      }
-    }
-  },
-  computed: {
-    active() {
-      if (this.data[this.prop] !== undefined) {
-        return true;
-      }
-      return false;
-    },
-    language() {
-      const user = getCurrentUser();
-      const language = user.language;
-      switch (language) {
-        case 'zh_CN':
-          return 'zh-CN';
-        case 'zh_TW':
-          return 'zh-TW';
-        case 'en_US':
-          return 'en';
-        default:
-          return 'zh-CN';
-      }
-    }
-  },
-  mounted() {
-    // 点击编辑，失去焦点展示
-    let el = document.getElementById(this.id);
-    if (el) {
-      el.addEventListener('click', () => {
-        let imagePreview = el.getElementsByClassName('v-note-img-wrapper');
-        if (imagePreview.length > 0) { // 图片预览的时候不切换到编辑模式
-          this.defaultOpen = 'preview';
-        } else {
-          this.defaultOpen = null;
-        }
-      });
-      let input = el.getElementsByClassName('auto-textarea-input');
-      input[0].addEventListener('blur', () => {
-        this.defaultOpen = 'preview';
-      });
-    }
-  },
-  methods: {
-    imgAdd(pos, file){
-      let param = {
-        id: getUUID().substring(0, 8)
-      };
-      file.prefix = param.id;
-      this.result.loading = true;
-      // 带括号和空格，可能无法展示
-      param.fileName = file.name.replace("(", "").replace(")", "").replace(" ", "");
-      this.$fileUpload('/resource/md/upload', file, null, param, () => {
-        this.$success(this.$t('commons.save_success'));
-        this.$refs.md.$img2Url(pos, '/resource/md/get/'  + param.id + '_' + param.fileName);
-        this.result.loading = false;
-      });
-      this.$emit('imgAdd', file);
-    },
-    imgDel(file) {
-      if (file) {
-        this.$get('/resource/md/delete/' + file[1].prefix + "_" + file[1].name);
-      }
-    },
-  }
+  components: {MsMarkDownText},
+  props: ['data', 'title', 'prop', 'disabled', 'labelWidth']
 }
 </script>
 
 <style scoped>
-
-.mavon-editor {
-  min-height: 20px;
-}
-
-/deep/ .v-note-wrapper {
-  position: initial;
-}
-
 </style>
diff --git a/frontend/src/business/components/track/case/components/IssueRelateList.vue b/frontend/src/business/components/track/case/components/IssueRelateList.vue
index 3cfa423058..cbd0918781 100644
--- a/frontend/src/business/components/track/case/components/IssueRelateList.vue
+++ b/frontend/src/business/components/track/case/components/IssueRelateList.vue
@@ -73,6 +73,7 @@ import MsTablePagination from "@/business/components/common/pagination/TablePagi
 import {getPageInfo} from "@/common/js/tableUtils";
 import {getCurrentProjectID} from "@/common/js/utils";
 import {getIssueTemplate} from "../../../../../network/custom-field-template";
+import {LOCAL} from "@/common/js/constants";
 export default {
   name: "IssueRelateList",
   components: {MsTablePagination, IssueDescriptionTableItem, MsTableColumn, MsTable, MsEditDialog},
@@ -95,7 +96,7 @@ export default {
   created() {
     getIssueTemplate()
       .then((template) => {
-        if (template.platform === 'metersphere') {
+        if (template.platform === LOCAL) {
           this.isThirdPart = false;
         } else {
           this.isThirdPart = true;
diff --git a/frontend/src/business/components/track/case/components/MsMarkDownText.vue b/frontend/src/business/components/track/case/components/MsMarkDownText.vue
new file mode 100644
index 0000000000..913246e17b
--- /dev/null
+++ b/frontend/src/business/components/track/case/components/MsMarkDownText.vue
@@ -0,0 +1,137 @@
+<template>
+    <mavon-editor :id="id" v-if="active" :editable="!disabled" @imgAdd="imgAdd" :default-open="defaultOpen" class="mavon-editor"
+                  :xss-options="xssOptions"
+                  @change="$emit('change')"
+                  :subfield="false" :toolbars="toolbars" :language="language" :toolbarsFlag="disabled ? false : true" @imgDel="imgDel" v-model="data[prop]"  ref="md"/>
+</template>
+
+<script>
+import {getCurrentUser, getUUID} from "@/common/js/utils";
+export default {
+  name: "MsMarkDownText",
+  components: {},
+  props: ['data', 'prop', 'disabled'],
+  data() {
+    return {
+      result: {loading: false},
+      id: getUUID(),
+      xssOptions: {
+        whiteList: {
+          img: ["src", "alt", "width", "height"],
+        },
+        stripIgnoreTagBody: true
+      },
+      defaultOpen: 'preview',
+      toolbars: {
+        bold: true, // 粗体
+        italic: true, // 斜体
+        header: true, // 标题
+        underline: true, // 下划线
+        strikethrough: true, // 中划线
+        mark: true, // 标记
+        superscript: true, // 上角标
+        subscript: true, // 下角标
+        quote: true, // 引用
+        ol: true, // 有序列表
+        ul: true, // 无序列表
+        link: true, // 链接
+        imagelink: true, // 图片链接
+        code: true, // code
+        table: true, // 表格
+        fullscreen: true, // 全屏编辑
+        readmodel: true, // 沉浸式阅读
+        htmlcode: true, // 展示html源码
+        help: true, // 帮助
+        /* 1.3.5 */
+        undo: true, // 上一步
+        redo: true, // 下一步
+        trash: true, // 清空
+        save: false, // 保存（触发events中的save事件）
+        /* 1.4.2 */
+        navigation: true, // 导航目录
+        /* 2.1.8 */
+        alignleft: true, // 左对齐
+        aligncenter: true, // 居中
+        alignright: true, // 右对齐
+        /* 2.2.1 */
+        subfield: true, // 单双栏模式
+        preview: true, // 预览
+      }
+    }
+  },
+  computed: {
+    active() {
+      if (this.data[this.prop] !== undefined) {
+        return true;
+      }
+      return false;
+    },
+    language() {
+      const user = getCurrentUser();
+      const language = user.language;
+      switch (language) {
+        case 'zh_CN':
+          return 'zh-CN';
+        case 'zh_TW':
+          return 'zh-TW';
+        case 'en_US':
+          return 'en';
+        default:
+          return 'zh-CN';
+      }
+    }
+  },
+  mounted() {
+    // 点击编辑，失去焦点展示
+    let el = document.getElementById(this.id);
+    if (el) {
+      el.addEventListener('click', () => {
+        let imagePreview = el.getElementsByClassName('v-note-img-wrapper');
+        if (imagePreview.length > 0) { // 图片预览的时候不切换到编辑模式
+          this.defaultOpen = 'preview';
+        } else {
+          this.defaultOpen = null;
+        }
+      });
+      let input = el.getElementsByClassName('auto-textarea-input');
+      input[0].addEventListener('blur', () => {
+        this.defaultOpen = 'preview';
+      });
+    }
+  },
+  methods: {
+    imgAdd(pos, file){
+      let param = {
+        id: getUUID().substring(0, 8)
+      };
+      file.prefix = param.id;
+      this.result.loading = true;
+      // 带括号和空格，可能无法展示
+      param.fileName = file.name.replace("(", "").replace(")", "").replace(" ", "");
+      this.$fileUpload('/resource/md/upload', file, null, param, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.$refs.md.$img2Url(pos, '/resource/md/get/'  + param.id + '_' + param.fileName);
+        this.result.loading = false;
+      });
+      this.$emit('imgAdd', file);
+    },
+    imgDel(file) {
+      if (file) {
+        this.$get('/resource/md/delete/' + file[1].prefix + "_" + file[1].name);
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+.mavon-editor {
+  min-height: 20px;
+}
+
+/deep/ .v-note-wrapper {
+  position: initial;
+}
+
+</style>
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 381c9bca51..7ddb8df6ca 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -260,7 +260,7 @@ export default {
         // remark: [{max: 1000, message: this.$t('test_track.length_less_than') + '1000', trigger: 'blur'}]
       },
       customFieldRules: {},
-      customFieldForm: {},
+      customFieldForm: null,
       formLabelWidth: "100px",
       operationType: '',
       isCreateContinue: false,
@@ -433,7 +433,7 @@ export default {
       }
       if (this.type === 'add') {
         //设置自定义熟悉默认值
-        parseCustomField(this.form, this.testCaseTemplate, this.customFieldForm, this.customFieldRules);
+        this.customFieldForm = parseCustomField(this.form, this.testCaseTemplate, this.customFieldRules);
         this.form.name = this.testCaseTemplate.caseName;
         this.form.stepDescription = this.testCaseTemplate.stepDescription;
         this.form.expectedResult = this.testCaseTemplate.expectedResult;
@@ -539,7 +539,7 @@ export default {
           this.setTestCaseExtInfo(testCase);
           this.getSelectOptions();
           //设置自定义熟悉默认值
-          parseCustomField(this.form, this.testCaseTemplate, this.customFieldForm, this.customFieldRules, buildTestCaseOldFields(this.form));
+          this.customFieldForm = parseCustomField(this.form, this.testCaseTemplate, this.customFieldRules, buildTestCaseOldFields(this.form));
           this.reload();
         } else {
           this.initTestCases(testCase);
@@ -559,7 +559,7 @@ export default {
         this.form.maintainer = user.id;
         this.form.tags = [];
         this.getSelectOptions();
-        parseCustomField(this.form, this.testCaseTemplate, this.customFieldForm, this.customFieldRules);
+        this.customFieldForm = parseCustomField(this.form, this.testCaseTemplate, this.customFieldRules);
         this.reload();
       }
     },
@@ -634,7 +634,7 @@ export default {
       }
       this.form.module = testCase.nodeId;
       //设置自定义熟悉默认值
-      parseCustomField(this.form, this.testCaseTemplate, this.customFieldForm, this.customFieldRules, testCase ? buildTestCaseOldFields(this.form) : null);
+      this.customFieldForm = parseCustomField(this.form, this.testCaseTemplate, this.customFieldRules, testCase ? buildTestCaseOldFields(this.form) : null);
       this.setDefaultValue();
       // 重新渲染，显示自定义字段的必填校验
       this.reloadForm();
diff --git a/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue b/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
index 25fe61b8a6..2dbf8e7671 100644
--- a/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
@@ -100,6 +100,7 @@ import IssueRelateList from "@/business/components/track/case/components/IssueRe
 import {deleteIssueRelate, getIssuesByCaseId} from "@/network/Issue";
 import {getIssueTemplate} from "@/network/custom-field-template";
 import {getCustomFieldValue, getTableHeaderWithCustomFields} from "@/common/js/tableUtils";
+import {LOCAL} from "@/common/js/constants";
 export default {
   name: "TestCaseIssueRelate",
   components: {IssueRelateList, IssueDescriptionTableItem, MsTableColumn, MsTable, TestPlanIssueEdit},
@@ -134,7 +135,7 @@ export default {
     getIssueTemplate()
       .then((template) => {
         this.issueTemplate = template;
-        if (this.issueTemplate.platform === 'metersphere') {
+        if (this.issueTemplate.platform === LOCAL) {
           this.isThirdPart = false;
         } else {
           this.isThirdPart = true;
diff --git a/frontend/src/business/components/track/issue/IssueEditDetail.vue b/frontend/src/business/components/track/issue/IssueEditDetail.vue
index 275121b27a..3637da0e8a 100644
--- a/frontend/src/business/components/track/issue/IssueEditDetail.vue
+++ b/frontend/src/business/components/track/issue/IssueEditDetail.vue
@@ -3,7 +3,7 @@
     <el-scrollbar>
       <el-form :model="form" :rules="rules" label-position="right" label-width="80px" ref="form">
 
-        <el-form-item :label="$t('commons.title')" prop="title">
+        <el-form-item v-if="!enableThirdPartTemplate" :label="$t('commons.title')" prop="title">
           <el-input v-model="form.title" autocomplete="off" class="top-input-class"></el-input>
           <el-tooltip :content="$t('commons.follow')" placement="bottom"  effect="dark" v-if="!showFollow">
             <i class="el-icon-star-off" style="color: #783987; font-size: 25px; margin-left: 15px;cursor: pointer;position: relative;top: 5px" @click="saveFollow" />
@@ -14,21 +14,31 @@
         </el-form-item>
 
         <!-- 自定义字段 -->
-        <el-form v-if="isFormAlive" :model="customFieldForm" :rules="customFieldRules" ref="customFieldForm"
+        <el-form :model="customFieldForm" :rules="customFieldRules" ref="customFieldForm"
                  class="case-form">
           <el-row class="custom-field-row">
-            <el-col :span="8" v-for="(item, index) in issueTemplate.customFields" :key="index">
-              <el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
-                            :label-width="formLabelWidth">
-                <custom-filed-component @reload="reloadForm" :data="item" :form="customFieldForm" prop="defaultValue"/>
-              </el-form-item>
-            </el-col>
+            <span class="custom-item" v-for="(item, index) in issueTemplate.customFields" :key="index">
+               <el-col :span="8" v-if="item.type !== 'richText'">
+                <el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
+                              :label-width="formLabelWidth">
+                  <custom-filed-component :data="item" :form="customFieldForm" prop="defaultValue"/>
+                </el-form-item>
+              </el-col>
+              <div v-else>
+                <el-col :span="24">
+                   <el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
+                                 :label-width="formLabelWidth">
+                     <custom-filed-component :data="item" :form="customFieldForm" prop="defaultValue"/>
+                  </el-form-item>
+                </el-col>
+              </div>
+            </span>
           </el-row>
         </el-form>
 
-        <form-rich-text-item :title="$t('custom_field.issue_content')" :data="form" prop="description"/>
+        <form-rich-text-item v-if="!enableThirdPartTemplate" :title="$t('custom_field.issue_content')" :data="form" prop="description"/>
 
-        <el-row class="custom-field-row">
+        <el-row v-if="!enableThirdPartTemplate" class="custom-field-row">
           <el-col :span="8" v-if="hasTapdId">
             <el-form-item :label-width="formLabelWidth" :label="$t('test_track.issue.tapd_current_owner')"
                           prop="tapdUsers">
@@ -85,8 +95,17 @@ import {buildCustomFields, parseCustomField} from "@/common/js/custom_field";
 import CustomFiledComponent from "@/business/components/settings/workspace/template/CustomFiledComponent";
 import TestCaseIssueList from "@/business/components/track/issue/TestCaseIssueList";
 import IssueEditDetail from "@/business/components/track/issue/IssueEditDetail";
-import {getCurrentProjectID, getCurrentUser, getCurrentUserId, getCurrentWorkspaceId} from "@/common/js/utils";
+import {
+  getCurrentProjectID,
+  getCurrentUser,
+  getCurrentUserId,
+  getCurrentWorkspaceId,
+  hasLicense
+} from "@/common/js/utils";
 import {getIssueTemplate} from "@/network/custom-field-template";
+import {getIssueThirdPartTemplate} from "@/network/Issue";
+import {getCurrentProject} from "@/network/project";
+import {JIRA} from "@/common/js/constants";
 
 export default {
   name: "IssueEditDetail",
@@ -105,11 +124,10 @@ export default {
       issueId:'',
       result: {},
       relateFields: [],
-      isFormAlive: true,
       showFollow:false,
       formLabelWidth: "150px",
       issueTemplate: {},
-      customFieldForm: {},
+      customFieldForm: null,
       customFieldRules: {},
       rules: {
         title: [
@@ -131,7 +149,8 @@ export default {
       zentaoUsers: [],
       Builds: [],
       hasTapdId: false,
-      hasZentaoId: false
+      hasZentaoId: false,
+      currentProject: null
     };
   },
   props: {
@@ -153,17 +172,35 @@ export default {
     },
     projectId() {
       return getCurrentProjectID();
-    }
+    },
+    enableThirdPartTemplate() {
+      return hasLicense() && this.currentProject && this.currentProject.thirdPartTemplate && this.currentProject.platform === JIRA;
+    },
   },
   methods: {
     open(data) {
       let initAddFuc = this.initEdit;
-      getIssueTemplate()
-        .then((template) => {
-          this.issueTemplate = template;
-          this.getThirdPartyInfo();
-          initAddFuc(data);
+      getCurrentProject((responseData) => {
+        this.currentProject = responseData;
+        this.$nextTick(() => {
+          if (this.enableThirdPartTemplate) {
+            getIssueThirdPartTemplate()
+              .then((template) => {
+                this.issueTemplate = template;
+                this.getThirdPartyInfo();
+                initAddFuc(data);
+              });
+          } else {
+            getIssueTemplate()
+              .then((template) => {
+                this.issueTemplate = template;
+                this.getThirdPartyInfo();
+                initAddFuc(data);
+              });
+          }
         });
+      });
+
       if(data&&data.id){
         this.$get('/issues/follow/' + data.id, response => {
           this.form.follows = response.data;
@@ -218,7 +255,7 @@ export default {
           this.form.options = data.options ? JSON.parse(data.options) : [];
         }
         if (data.id) {
-          this.issueId  = data.id
+          this.issueId = data.id
           this.url = 'issues/update';
         } else {
           //copy
@@ -238,17 +275,13 @@ export default {
           this.form.creator = getCurrentUserId();
         }
       }
-      parseCustomField(this.form, this.issueTemplate, this.customFieldForm, this.customFieldRules);
+      this.customFieldForm = parseCustomField(this.form, this.issueTemplate, this.customFieldRules);
       this.$nextTick(() => {
         if (this.$refs.testCaseIssueList) {
           this.$refs.testCaseIssueList.initTableData();
         }
       });
     },
-    reloadForm() {
-      this.isFormAlive = false;
-      this.$nextTick(() => (this.isFormAlive = true));
-    },
     save() {
       let isValidate = true;
       this.$refs['form'].validate((valid) => {
@@ -281,6 +314,8 @@ export default {
       if (this.planId) {
         param.resourceId = this.planId;
       }
+
+      param.thirdPartPlatform = this.enableThirdPartTemplate;
       return param;
     },
     _save() {
diff --git a/frontend/src/business/components/track/issue/IssueList.vue b/frontend/src/business/components/track/issue/IssueList.vue
index b093fb1935..a16425c551 100644
--- a/frontend/src/business/components/track/issue/IssueList.vue
+++ b/frontend/src/business/components/track/issue/IssueList.vue
@@ -168,7 +168,7 @@ import {
 import MsTableHeader from "@/business/components/common/components/MsTableHeader";
 import IssueDescriptionTableItem from "@/business/components/track/issue/IssueDescriptionTableItem";
 import IssueEdit from "@/business/components/track/issue/IssueEdit";
-import {getIssues, syncIssues} from "@/network/Issue";
+import {getIssues, getIssueThirdPartTemplate, syncIssues} from "@/network/Issue";
 import {
   getCustomFieldValue,
   getCustomTableWidth,
@@ -176,9 +176,11 @@ import {
 } from "@/common/js/tableUtils";
 import MsContainer from "@/business/components/common/components/MsContainer";
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
-import {getCurrentProjectID, getCurrentWorkspaceId} from "@/common/js/utils";
+import {getCurrentProjectID, getCurrentWorkspaceId, hasLicense} from "@/common/js/utils";
 import {getIssueTemplate} from "@/network/custom-field-template";
 import {getProjectMember} from "@/network/user";
+import {JIRA, LOCAL} from "@/common/js/constants";
+import {getCurrentProject} from "@/network/project";
 
 export default {
   name: "IssueList",
@@ -215,7 +217,8 @@ export default {
       issueTemplate: {},
       members: [],
       isThirdPart: false,
-      creatorFilters: []
+      creatorFilters: [],
+      currentProject: null
     };
   },
   watch: {
@@ -229,25 +232,21 @@ export default {
     getProjectMember((data) => {
       this.members = data;
     });
-    getIssueTemplate()
-      .then((template) => {
-        this.issueTemplate = template;
-        if (this.issueTemplate.platform === 'metersphere') {
-          this.isThirdPart = false;
-        } else {
-          this.isThirdPart = true;
-        }
-        this.fields = getTableHeaderWithCustomFields('ISSUE_LIST', this.issueTemplate.customFields);
-        if (!this.isThirdPart) {
-          for (let i = 0; i < this.fields.length; i++) {
-            if (this.fields[i].id === 'platformStatus') {
-              this.fields.splice(i, 1);
-              break;
-            }
-          }
-        }
-        if (this.$refs.table) this.$refs.table.reloadTable();
-      });
+
+    getCurrentProject((responseData) => {
+      this.currentProject = responseData;
+      if (hasLicense() && this.currentProject.thirdPartTemplate && this.currentProject.platform === JIRA) {
+        getIssueThirdPartTemplate()
+          .then((template) => {
+            this.initFields(template);
+          });
+      } else {
+        getIssueTemplate()
+          .then((template) => {
+            this.initFields(template);
+          });
+      }
+    });
     this.getIssues();
   },
   computed: {
@@ -277,6 +276,24 @@ export default {
     getCustomFieldValue(row, field) {
       return getCustomFieldValue(row, field, this.members);
     },
+    initFields(template) {
+      this.issueTemplate = template;
+      if (this.issueTemplate.platform === LOCAL) {
+        this.isThirdPart = false;
+      } else {
+        this.isThirdPart = true;
+      }
+      this.fields = getTableHeaderWithCustomFields('ISSUE_LIST', this.issueTemplate.customFields);
+      if (!this.isThirdPart) {
+        for (let i = 0; i < this.fields.length; i++) {
+          if (this.fields[i].id === 'platformStatus') {
+            this.fields.splice(i, 1);
+            break;
+          }
+        }
+      }
+      if (this.$refs.table) this.$refs.table.reloadTable();
+    },
     getIssues() {
       this.page.condition.projectId = this.projectId;
       this.page.condition.workspaceId= this.workspaceId;
@@ -311,9 +328,6 @@ export default {
       });
     },
     btnDisable(row) {
-      if (this.issueTemplate.platform == "metersphere" && row.platform == 'Local') {
-        return false;
-      }
       if (this.issueTemplate.platform !== row.platform) {
         return true;
       }
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
index bcf3381cfd..22279e3353 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
@@ -391,7 +391,7 @@ export default {
           }
         }
         this.testCase = item;
-        parseCustomField(this.testCase, this.testCaseTemplate, null, null, buildTestCaseOldFields(this.testCase));
+        parseCustomField(this.testCase, this.testCaseTemplate, null, buildTestCaseOldFields(this.testCase));
         this.isCustomFiledActive = true;
         if (!this.testCase.actualResult) {
           // 如果没值,使用模板的默认值
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
index 0da5298af3..aa19e34aa6 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
@@ -327,7 +327,7 @@ export default {
         if (!item.stepModel) {
           item.stepModel = 'STEP';
         }
-        parseCustomField(item, this.testCaseTemplate, null, null, buildTestCaseOldFields(item));
+        parseCustomField(item, this.testCaseTemplate, null, buildTestCaseOldFields(item));
         this.isCustomFiledActive = true;
         this.testCase = item;
         if (!this.testCase.actualResult) {
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index abb1eae9af..275aff0cda 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit abb1eae9aff953ca0be49bfb413454e435d627ee
+Subproject commit 275aff0cdaf7556e02c0fc479cb19d2f962695c2
diff --git a/frontend/src/common/js/constants.js b/frontend/src/common/js/constants.js
index 4a8ac0aa85..626fea123f 100644
--- a/frontend/src/common/js/constants.js
+++ b/frontend/src/common/js/constants.js
@@ -38,6 +38,7 @@ export const EN_US = 'en_US';
 export const TAPD = 'Tapd';
 export const JIRA = 'Jira';
 export const ZEN_TAO = 'Zentao';
+export const LOCAL = 'Local';
 export const AZURE_DEVOPS = 'AzureDevops';
 
 export const GROUP_SYSTEM = 'SYSTEM';
diff --git a/frontend/src/common/js/custom_field.js b/frontend/src/common/js/custom_field.js
index 0df46ad37e..a0d0bdba38 100644
--- a/frontend/src/common/js/custom_field.js
+++ b/frontend/src/common/js/custom_field.js
@@ -14,7 +14,7 @@ function setDefaultValue(item, value) {
  * @param rules 自定义表单的校验规则
  * @param oldFields 用于兼容旧版本数据
  */
-export function parseCustomField(data, template, customFieldForm, rules, oldFields) {
+export function parseCustomField(data, template, rules, oldFields) {
   let hasOldData = false;
   if (!data.customFields) {
     // 旧数据
@@ -25,6 +25,8 @@ export function parseCustomField(data, template, customFieldForm, rules, oldFiel
     data.customFields = JSON.parse(data.customFields);
   }
 
+  let customFieldForm = {};
+
   // 设置页面显示的默认值
   template.customFields.forEach(item => {
 
@@ -82,10 +84,10 @@ export function parseCustomField(data, template, customFieldForm, rules, oldFiel
       }
     }
 
-    if (customFieldForm) {
-      customFieldForm[item.name] = item.defaultValue;
-    }
+    customFieldForm[item.name] = item.defaultValue;
   });
+
+  return customFieldForm;
 }
 
 // 将template的属性值设置给customFields
diff --git a/frontend/src/common/js/table-constants.js b/frontend/src/common/js/table-constants.js
index 319d51dc17..b3811d456c 100644
--- a/frontend/src/common/js/table-constants.js
+++ b/frontend/src/common/js/table-constants.js
@@ -1,5 +1,6 @@
 // 模板
 import i18n from "@/i18n/i18n";
+import {AZURE_DEVOPS, JIRA, LOCAL, TAPD, ZEN_TAO} from "@/common/js/constants";
 
 export const CUSTOM_FIELD_TYPE_OPTION = [
   {value: 'input',text: i18n.t('workspace.custom_filed.input')},
@@ -10,7 +11,9 @@ export const CUSTOM_FIELD_TYPE_OPTION = [
   {value: 'checkbox',text: i18n.t('workspace.custom_filed.checkbox')},
   {value: 'member',text: i18n.t('workspace.custom_filed.member')},
   {value: 'multipleMember',text: i18n.t('workspace.custom_filed.multipleMember')},
-  {value: 'data',text: i18n.t('workspace.custom_filed.data')},
+  {value: 'date',text: i18n.t('workspace.custom_filed.date')},
+  {value: 'datetime',text: i18n.t('workspace.custom_filed.datetime')},
+  {value: 'richText',text: i18n.t('workspace.custom_filed.richText')},
   {value: 'int',text: i18n.t('workspace.custom_filed.int')},
   {value: 'float',text: i18n.t('workspace.custom_filed.float')},
   {value: 'multipleInput',text: i18n.t('workspace.custom_filed.multipleInput')}
@@ -26,11 +29,11 @@ export const CASE_TYPE_OPTION = [
 ];
 
 export const ISSUE_PLATFORM_OPTION = [
-  {value: 'Local',text: 'Metersphere'},
-  {value: 'Jira',text: 'JIRA'},
-  {value: 'Tapd',text: 'Tapd'},
-  {value: 'Zentao',text: '禅道'},
-  {value: 'AzureDevops',text: 'Azure Devops'},
+  {value: LOCAL, text: 'Metersphere'},
+  {value: TAPD, text: 'Tapd'},
+  {value: JIRA, text: 'JIRA'},
+  {value: ZEN_TAO, text: '禅道'},
+  {value: AZURE_DEVOPS, text: 'Azure Devops'},
 ];
 
 export const FIELD_TYPE_MAP = {
@@ -42,7 +45,9 @@ export const FIELD_TYPE_MAP = {
   checkbox: 'workspace.custom_filed.checkbox',
   member: 'workspace.custom_filed.member',
   multipleMember: 'workspace.custom_filed.multipleMember',
-  data: 'workspace.custom_filed.data',
+  date: 'workspace.custom_filed.date',
+  datetime: 'workspace.custom_filed.datetime',
+  richText: 'workspace.custom_filed.richText',
   int: 'workspace.custom_filed.int',
   float: 'workspace.custom_filed.float',
   multipleInput: 'workspace.custom_filed.multipleInput'
diff --git a/frontend/src/common/js/tableUtils.js b/frontend/src/common/js/tableUtils.js
index d0be4a8d67..ec1be24498 100644
--- a/frontend/src/common/js/tableUtils.js
+++ b/frontend/src/common/js/tableUtils.js
@@ -459,10 +459,12 @@ export function getCustomFieldValue(row, field, members) {
             return values;
           }
         } else if (['radio', 'select'].indexOf(field.type) > -1) {
-          for (let j = 0; j < field.options.length; j++) {
-            let option = field.options[j];
-            if (option.value === item.value) {
-              return field.system ? i18n.t(option.text) : option.text;
+          if (field.options) {
+            for (let j = 0; j < field.options.length; j++) {
+              let option = field.options[j];
+              if (option.value === item.value) {
+                return field.system ? i18n.t(option.text) : option.text;
+              }
             }
           }
         }
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index ef136c2193..66ee672a26 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -494,7 +494,9 @@ export default {
       checkbox: 'Checkbox',
       member: 'Member',
       multipleMember: 'MultipleMember',
-      data: 'Data',
+      date: 'DatePicker',
+      datetime: 'DateTimePicker',
+      richText: 'RichText',
       int: 'Int',
       float: 'Float',
       multipleInput: 'MultipleInput'
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index a01c89ac05..82ca73fa9c 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -496,7 +496,9 @@ export default {
       checkbox: '多选框',
       member: '单选成员',
       multipleMember: '多选成员',
-      data: '日期',
+      date: '日期选择器',
+      datetime: '日期时间选择器',
+      richText: '富文本框',
       int: '整型',
       float: '浮点型',
       multipleInput: '多值输入框'
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 623d699163..560d490f3c 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -495,7 +495,9 @@ export default {
       checkbox: '多選框',
       member: '單選成員',
       multipleMember: '多選成員',
-      data: '日期',
+      date: '日期選擇器',
+      datetime: '日期時間選擇器',
+      richText: '富文本框',
       int: '整型',
       float: '浮點型',
       multipleInput: '多值輸入框'
diff --git a/frontend/src/network/Issue.js b/frontend/src/network/Issue.js
index afa802d984..60c58f8645 100644
--- a/frontend/src/network/Issue.js
+++ b/frontend/src/network/Issue.js
@@ -92,3 +92,19 @@ export function syncIssues(success) {
 export function deleteIssueRelate(param, callback) {
   return basePost('/issues/delete/relate', param, callback);
 }
+
+export function getIssueThirdPartTemplate() {
+  return new Promise(resolve => {
+    baseGet('/xpack/issue/template/' + getCurrentProjectID(), (data) => {
+      let template = data;
+      if (template.customFields) {
+        template.customFields.forEach(item => {
+          if (item.options) {
+            item.options = JSON.parse(item.options);
+          }
+        });
+      }
+      resolve(template);
+    })
+  });
+}
diff --git a/frontend/src/network/project.js b/frontend/src/network/project.js
new file mode 100644
index 0000000000..e6e4c59b86
--- /dev/null
+++ b/frontend/src/network/project.js
@@ -0,0 +1,10 @@
+import {baseGet} from "@/network/base-network";
+import {getCurrentProjectID} from "@/common/js/utils";
+
+export function getProject(projectId, callback) {
+  return projectId ? baseGet('/project/get/' + projectId, callback) : {};
+}
+
+export function getCurrentProject(callback) {
+  return getProject(getCurrentProjectID(), callback);
+}

From c68b4f7f74ddfda7ee94faa5be6a3b959d404997 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 10 Dec 2021 22:09:01 +0800
Subject: [PATCH 102/256] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/track/issue/client/JiraAbstractClient.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/track/issue/client/JiraAbstractClient.java b/backend/src/main/java/io/metersphere/track/issue/client/JiraAbstractClient.java
index 4ccf497d3b..44073a1e6f 100644
--- a/backend/src/main/java/io/metersphere/track/issue/client/JiraAbstractClient.java
+++ b/backend/src/main/java/io/metersphere/track/issue/client/JiraAbstractClient.java
@@ -12,7 +12,6 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

From 6cb0e18f154dc38856c63b98d9cf8f601da0d2e6 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 13 Dec 2021 14:05:48 +0800
Subject: [PATCH 103/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B0=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92-=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=EF=BC=8C=E8=B4=9F?=
 =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E6=98=AF=E5=8D=95=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008478 --user=lyh
【github#6762】场景-批量添加到测试计划-创建测试计划，负责人是单选的
https://www.tapd.cn/55049933/s/1080045
---
 .../scenario/testplan/TestPlanList.vue        |   4 +-
 .../scenario/testplan/TestPlansEdit.vue       | 265 ------------------
 .../track/plan/components/TestPlanEdit.vue    |   1 +
 3 files changed, 2 insertions(+), 268 deletions(-)
 delete mode 100644 frontend/src/business/components/api/automation/scenario/testplan/TestPlansEdit.vue

diff --git a/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue b/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue
index c59d03d77b..3bbbca9ab2 100644
--- a/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue
+++ b/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue
@@ -129,7 +129,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <test-plans-edit ref="testPlanEditDialog" @refresh="initTableData"></test-plans-edit>
+    <test-plan-edit ref="testPlanEditDialog" @refresh="initTableData"></test-plan-edit>
     <ms-table-pagination :change="initTableData" :current-page.sync="currentPage" :page-size.sync="pageSize"
                          :total="total"/>
 
@@ -162,14 +162,12 @@ import {getCurrentProjectID} from "../../../../../../common/js/utils";
 import {_filter, _sort} from "@/common/js/tableUtils";
 import EnvPopover from "@/business/components/api/automation/scenario/EnvPopover";
 import TestPlanEdit from "@/business/components/track/plan/components/TestPlanEdit";
-import TestPlansEdit from "@/business/components/api/automation/scenario/testplan/TestPlansEdit";
 import {ENV_TYPE} from "@/common/js/constants";
 import {getPlanStageOption} from "@/network/test-plan";
 
 export default {
   name: "TestPlanList",
   components: {
-    TestPlansEdit,
     TestPlanEdit,
     MsDeleteConfirm,
     TestCaseReportView,
diff --git a/frontend/src/business/components/api/automation/scenario/testplan/TestPlansEdit.vue b/frontend/src/business/components/api/automation/scenario/testplan/TestPlansEdit.vue
deleted file mode 100644
index 4dd7eb8d3d..0000000000
--- a/frontend/src/business/components/api/automation/scenario/testplan/TestPlansEdit.vue
+++ /dev/null
@@ -1,265 +0,0 @@
-<template>
-
-  <div>
-
-    <el-dialog
-      :title="$t('test_track.plan.create_plan')"
-      :visible.sync="dialogFormVisible"
-      @close="close"
-      width="65%"
-      append-to-body>
-
-      <el-form :model="form" :rules="rules" ref="planFrom" v-if="isStepTableAlive">
-
-        <el-row>
-          <el-col :span="8" :offset="1">
-            <el-form-item
-              :label="$t('test_track.plan.plan_name')"
-              :label-width="formLabelWidth"
-              prop="name">
-              <el-input v-model="form.name" :placeholder="$t('test_track.plan.input_plan_name')"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item :label="$t('commons.tag')" :label-width="formLabelWidth" prop="tag">
-              <ms-input-tag :currentScenario="form" ref="tag"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="10" :offset="1">
-            <el-form-item :label="$t('test_track.plan.plan_principal')" :label-width="formLabelWidth" prop="principal">
-              <el-select v-model="form.principal" :placeholder="$t('test_track.plan.input_plan_principal')" filterable>
-                <el-option
-                  v-for="(item) in principalOptions"
-                  :key="item.id"
-                  :label="item.name + '(' + item.id + ')'"
-                  :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item :label="$t('test_track.plan.plan_stage')" :label-width="formLabelWidth" prop="stage">
-              <el-select v-model="form.stage" clearable :placeholder="$t('test_track.plan.input_plan_stage')">
-                <el-option :label="$t('test_track.plan.smoke_test')" value="smoke"></el-option>
-                <el-option :label="$t('test_track.plan.system_test')" value="system"></el-option>
-                <el-option :label="$t('test_track.plan.regression_test')" value="regression"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!--start:xuxm增加自定义‘计划开始’，‘计划结束’时间字段-->
-        <el-row>
-          <el-col :span="8" :offset="1">
-            <el-form-item
-              :label="$t('test_track.plan.planned_start_time')"
-              :label-width="formLabelWidth"
-              prop="plannedStartTime">
-              <el-date-picker :placeholder="$t('test_track.plan.planned_start_time')" v-model="form.plannedStartTime"
-                              type="datetime" value-format="timestamp"></el-date-picker>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="11" :offset="2">
-            <el-form-item
-              :label="$t('test_track.plan.planned_end_time')"
-              :label-width="formLabelWidth"
-              prop="plannedEndTime">
-              <el-date-picker :placeholder="$t('test_track.plan.planned_end_time')" v-model="form.plannedEndTime"
-                              type="datetime" value-format="timestamp"></el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!--end:xuxm增加自定义‘计划开始’，‘计划结束’时间字段-->
-
-        <el-row>
-          <el-col :span="8" :offset="1">
-            <el-form-item
-              :label="$t('自动更新状态')"
-              :label-width="formLabelWidth"
-              prop="automaticStatusUpdate">
-              <el-switch v-model="form.automaticStatusUpdate"/>
-              <ms-instructions-icon :content="'当功能用例关联的接口或性能用例在测试计划执行后，自动更新功能用例的状态'"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row type="flex" justify="left" style="margin-top: 10px;">
-          <el-col :span="23" :offset="1">
-            <el-form-item :label="$t('commons.description')" :label-width="formLabelWidth" prop="description">
-              <el-input v-model="form.description"
-                        type="textarea"
-                        :autosize="{ minRows: 2, maxRows: 4}"
-                        :rows="2"
-                        :placeholder="$t('commons.input_content')"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row v-if="operationType === 'edit'" type="flex" justify="left" style="margin-top: 10px;">
-          <el-col :span="19" :offset="1">
-            <el-form-item :label="$t('test_track.plan.plan_status')" :label-width="formLabelWidth" prop="status">
-              <test-plan-status-button :status="form.status" @statusChange="statusChange"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-      </el-form>
-
-      <template v-slot:footer>
-
-        <div class="dialog-footer">
-          <el-button
-            @click="dialogFormVisible = false">
-            {{ $t('test_track.cancel') }}
-          </el-button>
-          <el-button
-            type="primary"
-            @click="savePlan">
-            {{ $t('test_track.confirm') }}
-          </el-button>
-        </div>
-      </template>
-    </el-dialog>
-
-  </div>
-
-
-</template>
-
-<script>
-import MsInstructionsIcon from "@/business/components/common/components/MsInstructionsIcon";
-import TestPlanStatusButton from "@/business/components/track/plan/common/TestPlanStatusButton";
-import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
-import {getCurrentProjectID, getCurrentWorkspaceId, listenGoBack, removeGoBackListener} from "@/common/js/utils";
-
-export default {
-  name: "TestPlansEdit",
-  components: {MsInstructionsIcon, TestPlanStatusButton, MsInputTag},
-  data() {
-    return {
-      isStepTableAlive: true,
-      dialogFormVisible: false,
-      form: {
-        name: '',
-        projectIds: [],
-        principal: '',
-        stage: '',
-        description: '',
-        plannedStartTime: '',
-        plannedEndTime: '',
-        automaticStatusUpdate: false
-      },
-      rules: {
-        name: [
-          {required: true, message: this.$t('test_track.plan.input_plan_name'), trigger: 'blur'},
-          {max: 30, message: this.$t('test_track.length_less_than') + '30', trigger: 'blur'}
-        ],
-        principal: [{required: true, message: this.$t('test_track.plan.input_plan_principal'), trigger: 'change'}],
-        stage: [{required: true, message: this.$t('test_track.plan.input_plan_stage'), trigger: 'change'}],
-        description: [{max: 200, message: this.$t('test_track.length_less_than') + '200', trigger: 'blur'}]
-      },
-      formLabelWidth: "100px",
-      operationType: '',
-      principalOptions: []
-    };
-  },
-  created() {
-    //设置“测试阶段”和“负责人”的默认值
-    this.form.stage = 'smoke';
-    const adminToken = JSON.parse(localStorage.getItem("Admin-Token"));
-    this.form.principal = adminToken.id;
-  },
-  methods: {
-    reload() {
-      this.isStepTableAlive = false;
-      this.$nextTick(() => (this.isStepTableAlive = true));
-    },
-    openTestPlanEditDialog() {
-      this.resetForm();
-      this.setPrincipalOptions();
-      this.form.tags = [];
-      listenGoBack(this.close);
-      this.dialogFormVisible = true;
-      this.reload();
-    },
-    savePlan() {
-      this.$refs['planFrom'].validate((valid) => {
-        if (valid) {
-          let param = {};
-          Object.assign(param, this.form);
-          param.name = param.name.trim();
-          if (param.name === '') {
-            this.$warning(this.$t('test_track.plan.input_plan_name'));
-            return;
-          }
-          param.workspaceId = getCurrentWorkspaceId();
-          if (this.form.tags instanceof Array) {
-            this.form.tags = JSON.stringify(this.form.tags);
-          }
-          param.tags = this.form.tags;
-          this.$post('/test/plan/add', param, () => {
-            this.$success(this.$t('commons.save_success'));
-            this.dialogFormVisible = false;
-            this.$emit("refresh");
-          });
-        } else {
-          return false;
-        }
-      });
-    },
-    validate(param) {
-      if (param.name === '') {
-        this.$warning(this.$t('test_track.plan.input_plan_name'));
-        return false;
-      }
-      if (param.plannedStartTime > param.plannedEndTime) {
-        this.$warning(this.$t('commons.date.data_time_error'));
-        return false;
-      }
-      return true;
-    },
-    setPrincipalOptions() {
-      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
-        this.principalOptions = response.data;
-      });
-    },
-    statusChange(status) {
-      this.form.status = status;
-      this.$forceUpdate();
-    },
-    close() {
-      removeGoBackListener(this.close);
-      this.dialogFormVisible = false;
-    },
-    resetForm() {
-      //防止点击修改后，点击新建触发校验
-      if (this.$refs['planFrom']) {
-        this.$refs['planFrom'].validate(() => {
-          this.$refs['planFrom'].resetFields();
-          this.form.name = '';
-          this.form.projectIds = [];
-          const adminToken = JSON.parse(localStorage.getItem("Admin-Token"));
-          this.form.principal = adminToken.id;
-          this.form.stage = 'smoke';
-          this.form.description = '';
-          this.form.status = null;
-          this.form.plannedStartTime = null;
-          this.form.plannedEndTime = null;
-          return true;
-        });
-      }
-    }
-  }
-};
-</script>
-
-<style scoped>
-.instructions-icon {
-  margin-left: 10px;
-}
-</style>
diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
index 94c6aed827..7833c42d85 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@@ -5,6 +5,7 @@
     <el-dialog v-loading="result.loading"
                :close-on-click-modal="false"
                :destroy-on-close="true"
+               append-to-body
                :title="operationType === 'edit' ? $t('test_track.plan.edit_plan') : $t('test_track.plan.create_plan')"
                :visible.sync="dialogFormVisible"
                @close="close"

From 6c4d5456cc9f3902db5cef0e1b27cb90eb26aa91 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 13 Dec 2021 13:38:22 +0800
Subject: [PATCH 104/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E9=A6=96=E9=A1=B5=E5=8D=A1=E7=89=87=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/homepage/components/SceneInfoCard.vue        | 2 +-
 .../components/api/homepage/components/ScheduleTaskInfoCard.vue | 2 +-
 .../components/api/homepage/components/TestCaseInfoCard.vue     | 2 +-
 frontend/src/i18n/en-US.js                                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/api/homepage/components/SceneInfoCard.vue b/frontend/src/business/components/api/homepage/components/SceneInfoCard.vue
index b15a58e1d4..0ceb1ec7df 100644
--- a/frontend/src/business/components/api/homepage/components/SceneInfoCard.vue
+++ b/frontend/src/business/components/api/homepage/components/SceneInfoCard.vue
@@ -50,7 +50,7 @@
       </el-row>
       </el-header>
       <el-main style="padding: 5px 5px 0px 5px;margin-top: 10px">
-        <el-container style="height: 100px;margin-top: 10px">
+        <el-container>
           <el-aside width="60%" class="count-number-show" style="margin-bottom: 0px;margin-top: 0px">
             <el-container style="height: 50px;margin-top: 10px">
               <el-aside width="50%" style="line-height: 40px;">
diff --git a/frontend/src/business/components/api/homepage/components/ScheduleTaskInfoCard.vue b/frontend/src/business/components/api/homepage/components/ScheduleTaskInfoCard.vue
index 11169edeb9..3c0ea50eda 100644
--- a/frontend/src/business/components/api/homepage/components/ScheduleTaskInfoCard.vue
+++ b/frontend/src/business/components/api/homepage/components/ScheduleTaskInfoCard.vue
@@ -44,7 +44,7 @@
         </el-row>
       </el-header>
       <el-main style="padding: 5px;margin-top: 10px">
-        <el-container style="height: 96px;margin-top: 10px">
+        <el-container>
           <el-aside width="60%" class="count-number-show" style="margin-bottom: 0px;margin-top: 0px">
             <el-container>
               <el-aside width="30%">
diff --git a/frontend/src/business/components/api/homepage/components/TestCaseInfoCard.vue b/frontend/src/business/components/api/homepage/components/TestCaseInfoCard.vue
index f58fc29dbe..14345471e8 100644
--- a/frontend/src/business/components/api/homepage/components/TestCaseInfoCard.vue
+++ b/frontend/src/business/components/api/homepage/components/TestCaseInfoCard.vue
@@ -94,7 +94,7 @@
         </el-row>
       </el-header>
       <el-main style="padding: 5px;margin-top: 10px">
-        <el-container style="height: 96px;margin-top: 10px">
+        <el-container>
           <el-aside width="60%" class="count-number-show" style="margin-bottom: 0px;margin-top: 0px">
             <el-container>
               <el-aside width="30%">
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 66ee672a26..329bd321e1 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1518,7 +1518,7 @@ export default {
           completion: "Completion rate",
           coverage: "Coverage",
           pass: "Pass rate",
-          success: "Success rate",
+          success: "Success",
           interface_coverage: "Interface coverage",
         },
       },

From 07f728f57addee82d4f96ff161bea0aea21f6451 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 13 Dec 2021 17:31:30 +0800
Subject: [PATCH 105/256] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE):=20=E7=BB=9F=E4=B8=80=E5=B7=A6=E4=BE=A7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/settings/SettingMenu.vue       | 47 +++++++------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/frontend/src/business/components/settings/SettingMenu.vue b/frontend/src/business/components/settings/SettingMenu.vue
index 66559be314..031ecb467e 100644
--- a/frontend/src/business/components/settings/SettingMenu.vue
+++ b/frontend/src/business/components/settings/SettingMenu.vue
@@ -5,42 +5,28 @@
         <font-awesome-icon class="icon account" :icon="['far', 'address-card']" size="lg"/>
         <span>{{ $t('commons.system') }}</span>
       </template>
-      <el-menu-item v-for="menu in systems" :key="menu.index" v-permission="menu.permissions" :index="menu.index"
-                    class="setting-item">
+      <el-menu-item v-for="menu in systems" :key="menu.index" v-permission="menu.permissions"
+                    :index="menu.index" class="setting-item">
         {{ $t(menu.title) }}
       </el-menu-item>
     </el-submenu>
-
-    <el-submenu index="3"
-                v-permission="workspacePermission">
+    <el-submenu index="2" v-permission="workspacePermission">
       <template v-slot:title>
         <font-awesome-icon class="icon workspace" :icon="['far', 'list-alt']" size="lg"/>
         <span>{{ $t('commons.workspace') }}</span>
       </template>
-      <el-menu-item v-for="menu in workspaces" v-permission="menu.permissions" :key="menu.index" :index="menu.index"
-                    class="setting-item">
+      <el-menu-item v-for="menu in workspaces" v-permission="menu.permissions" :key="menu.index"
+                    :index="menu.index" class="setting-item">
         {{ $t(menu.title) }}
       </el-menu-item>
-      <el-submenu index="3-1"
-                  v-permission="['WORKSPACE_TEMPLATE:READ']">
+      <el-submenu index="2-1" v-permission="['WORKSPACE_TEMPLATE:READ']" class="lower_submenu_title">
         <template slot="title">{{ $t('workspace.template_manage') }}</template>
-        <el-menu-item v-for="menu in workspaceTemplate" v-permission="menu.permissions" :key="menu.index" :index="menu.index" class="setting-item">
+        <el-menu-item v-for="menu in workspaceTemplate" v-permission="menu.permissions" :key="menu.index"
+                      :index="menu.index" class="setting-item">
           {{ $t(menu.title) }}
         </el-menu-item>
       </el-submenu>
     </el-submenu>
-
-<!--    <el-submenu index="5">
-      <template v-slot:title>
-        <font-awesome-icon class="icon" :icon="['far', 'user']" size="lg"/>
-        <span>{{ $t('commons.personal_info') }}</span>
-      </template>
-      <el-menu-item v-for="menu in persons" :key="menu.index" :index="menu.index" class="setting-item">
-        {{ $t(menu.title) }}
-      </el-menu-item>
-    </el-submenu>-->
-
-
   </el-menu>
 </template>
 
@@ -70,17 +56,15 @@ export default {
     };
     return {
       systems: getMenus('system'),
-      organizations: getMenus('organization'),
       workspaces: getMenus('workspace'),
-     /* persons: getMenus('person'),*/
       project: getMenus('project'),
       workspaceTemplate: getMenus('workspaceTemplate'),
       systemPermission: [
-        'SYSTEM_USER:READ','SYSTEM_ORGANIZATION:READ', 'SYSTEM_GROUP:READ',
-        'ORGANIZATION_GROUP:READ', 'SYSTEM_WORKSPACE:READ','SYSTEM_TEST_POOL:READ',
-        'SYSTEM_SETTING:READ','SYSTEM_QUOTA:READ','SYSTEM_AUTH:READ'
+        'SYSTEM_USER:READ', 'SYSTEM_ORGANIZATION:READ', 'SYSTEM_GROUP:READ',
+        'ORGANIZATION_GROUP:READ', 'SYSTEM_WORKSPACE:READ', 'SYSTEM_TEST_POOL:READ',
+        'SYSTEM_SETTING:READ', 'SYSTEM_QUOTA:READ', 'SYSTEM_AUTH:READ'
       ],
-      workspacePermission: ['WORKSPACE_USER:READ','WORKSPACE_SERVICE:READ','WORKSPACE_MESSAGE:READ',
+      workspacePermission: ['WORKSPACE_USER:READ', 'WORKSPACE_SERVICE:READ', 'WORKSPACE_MESSAGE:READ',
         'WORKSPACE_PROJECT_MANAGER:READ', 'WORKSPACE_PROJECT_ENVIRONMENT:READ',
         'WORKSPACE_OPERATING_LOG:READ', 'WORKSPACE_TEMPLATE:READ']
     };
@@ -89,7 +73,7 @@ export default {
     valid() {
       Promise.all([component.default.valid(this)]).then(() => {
         let license = localStorage.getItem(LicenseKey);
-        if (license != "valid") {
+        if (license !== "valid") {
           this.systems.forEach(item => {
             if (item.valid === true) {
               this.systems.splice(this.systems.indexOf(item), 1);
@@ -127,8 +111,9 @@ export default {
   color: #5a78f0;
 }
 
-.organization {
-  color: #b33a5b;
+.lower_submenu_title >>> .el-submenu__title {
+  height: 40px;
+  line-height: 40px;
 }
 
 .workspace {

From d0f622ab6f2a3ded8ed2b30a1c8fa53ee6a93fbb Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 13 Dec 2021 18:05:32 +0800
Subject: [PATCH 106/256] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BC=98=E5=8C=96=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=9C=AC=E5=9C=B0=E8=B0=83=E8=AF=95=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/utils/LocalAddressUtils.java      | 41 +++++++++++++++++++
 .../engine/docker/DockerTestEngine.java       | 11 +++--
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 3 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/commons/utils/LocalAddressUtils.java

diff --git a/backend/src/main/java/io/metersphere/commons/utils/LocalAddressUtils.java b/backend/src/main/java/io/metersphere/commons/utils/LocalAddressUtils.java
new file mode 100644
index 0000000000..de1f50bea1
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/commons/utils/LocalAddressUtils.java
@@ -0,0 +1,41 @@
+package io.metersphere.commons.utils;
+
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+public class LocalAddressUtils {
+
+    /**
+     * 这个过滤了 是回路的地址
+     */
+    public static Map<String, String> getIpAddresses() {
+        Enumeration<NetworkInterface> netInterfaces;
+        Map<String, String> result = new HashMap<>();
+        try {
+            // 拿到所有网卡
+            netInterfaces = NetworkInterface.getNetworkInterfaces();
+            InetAddress ip;
+            // 遍历每个网卡，拿到ip
+            while (netInterfaces.hasMoreElements()) {
+                NetworkInterface ni = netInterfaces.nextElement();
+                Enumeration<InetAddress> addresses = ni.getInetAddresses();
+                while (addresses.hasMoreElements()) {
+                    ip = addresses.nextElement();
+                    if (!ip.isLoopbackAddress() && ip.getHostAddress().indexOf(':') == -1) {
+                        result.put(ni.getName(), ip.getHostAddress());
+                    }
+                }
+            }
+        } catch (Exception e) {
+        }
+        return result;
+    }
+
+    public static String getIpAddress(String name) {
+        return getIpAddresses().get(name);
+    }
+
+}
diff --git a/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java b/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
index 611c91533b..8ae1a52b89 100644
--- a/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
+++ b/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
@@ -9,6 +9,7 @@ import io.metersphere.commons.constants.ReportKeys;
 import io.metersphere.commons.constants.ResourceStatusEnum;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.commons.utils.LocalAddressUtils;
 import io.metersphere.commons.utils.UrlTestUtils;
 import io.metersphere.config.KafkaProperties;
 import io.metersphere.controller.ResultHolder;
@@ -85,10 +86,14 @@ public class DockerTestEngine extends AbstractEngine {
         if (baseInfo != null) {
             metersphereUrl = baseInfo.getUrl();
         }
+        // docker 不能从 localhost 中下载文件, 本地开发
+        if (StringUtils.contains(metersphereUrl, "http://localhost") ||
+                StringUtils.contains(metersphereUrl, "http://127.0.0.1")) {
+            metersphereUrl = "http://" + LocalAddressUtils.getIpAddress("en0") + ":8081";
+        }
+
         String jmeterPingUrl = metersphereUrl + "/jmeter/ping"; // 检查下载地址是否正确
-        // docker 不能从 localhost 中下载文件
-        if (StringUtils.contains(metersphereUrl, "http://localhost")
-                || !UrlTestUtils.testUrlWithTimeOut(jmeterPingUrl, 1000)) {
+        if (!UrlTestUtils.testUrlWithTimeOut(jmeterPingUrl, 1000)) {
             MSException.throwException(Translator.get("run_load_test_file_init_error"));
         }
 
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index a99681fe94..8bd3730267 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit a99681fe94107d42ff340f4e8dcdca95195cf884
+Subproject commit 8bd3730267a6c1b383a781b3c4ef8526e5414d82

From ef6fe018e2026e547390493c04e130bbe5269b9d Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 13 Dec 2021 18:53:42 +0800
Subject: [PATCH 107/256] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE):=20=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/test/components/jar/JarConfigList.vue       | 2 +-
 frontend/src/business/components/project/menu/UserGroup.vue    | 2 +-
 .../business/components/project/menu/file/ResourceManage.vue   | 3 +--
 .../business/components/settings/system/group/UserGroup.vue    | 2 +-
 .../business/components/settings/workspace/JarConfigList.vue   | 2 +-
 .../components/settings/workspace/template/CustomFieldList.vue | 2 +-
 .../settings/workspace/template/IssuesTemplateList.vue         | 2 +-
 .../settings/workspace/template/TestCaseTemplateList.vue       | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/jar/JarConfigList.vue b/frontend/src/business/components/api/test/components/jar/JarConfigList.vue
index 23d26872e4..4191e94daf 100644
--- a/frontend/src/business/components/api/test/components/jar/JarConfigList.vue
+++ b/frontend/src/business/components/api/test/components/jar/JarConfigList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="jar-config-list">
-    <el-card style="height: 100%;">
+    <el-card style="height: 100%;" class="table-card">
       <template v-slot:header>
         <ms-table-header :show-create="false" :condition.sync="condition"
                          @search="getJarConfigs"
diff --git a/frontend/src/business/components/project/menu/UserGroup.vue b/frontend/src/business/components/project/menu/UserGroup.vue
index 1b48912714..74af7bb019 100644
--- a/frontend/src/business/components/project/menu/UserGroup.vue
+++ b/frontend/src/business/components/project/menu/UserGroup.vue
@@ -2,7 +2,7 @@
   <ms-container>
     <ms-main-container>
       <div v-loading="result.loading">
-        <el-card>
+        <el-card class="table-card">
           <template v-slot:header>
             <ms-table-header :create-permission="['PROJECT_GROUP:READ+CREATE']"
                              :condition.sync="condition" @search="initData" @create="create"
diff --git a/frontend/src/business/components/project/menu/file/ResourceManage.vue b/frontend/src/business/components/project/menu/file/ResourceManage.vue
index 25a27a483c..98e6cba3a4 100644
--- a/frontend/src/business/components/project/menu/file/ResourceManage.vue
+++ b/frontend/src/business/components/project/menu/file/ResourceManage.vue
@@ -1,11 +1,10 @@
 <template>
-  <el-card v-loading="result.loading">
+  <el-card v-loading="result.loading" class="table-card">
     <template v-slot:header>
       <ms-table-header title="" :condition.sync="condition" @search="getProjectFiles"
                        :show-create="false">
         <template v-slot:button>
           <el-upload
-            style="margin-bottom: 10px;"
             accept=".jmx,.jar,.csv,.json,.pdf,.jpg,.png,.jpeg,.doc,.docx,.xlsx,.txt"
             action=""
             :limit="fileNumLimit"
diff --git a/frontend/src/business/components/settings/system/group/UserGroup.vue b/frontend/src/business/components/settings/system/group/UserGroup.vue
index f033124dcb..68231ddc56 100644
--- a/frontend/src/business/components/settings/system/group/UserGroup.vue
+++ b/frontend/src/business/components/settings/system/group/UserGroup.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-loading="result.loading">
-    <el-card>
+    <el-card class="table-card">
       <template v-slot:header>
         <ms-table-header :create-permission="['SYSTEM_GROUP:READ+CREATE']"
                          :condition.sync="condition" @search="initData" @create="create"
diff --git a/frontend/src/business/components/settings/workspace/JarConfigList.vue b/frontend/src/business/components/settings/workspace/JarConfigList.vue
index b32821d108..a54d8c641f 100644
--- a/frontend/src/business/components/settings/workspace/JarConfigList.vue
+++ b/frontend/src/business/components/settings/workspace/JarConfigList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="jar-config-list">
-    <el-card style="height: 100%;">
+    <el-card style="height: 100%;" class="table-card">
       <template v-slot:header>
         <ms-table-header :show-create="false" :condition.sync="condition"
                          @search="getJarConfigs"
diff --git a/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue b/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue
index eb032e7690..5610cfa6a9 100644
--- a/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue
+++ b/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-card>
+  <el-card class="table-card">
 
     <template v-slot:header>
       <ms-table-header :condition.sync="condition" @search="getCustomFields" @create="handleCreate"
diff --git a/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue b/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue
index 464c03ad21..d4956ddedd 100644
--- a/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue
+++ b/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-card>
+  <el-card class="table-card">
 
     <template v-slot:header>
       <ms-table-header :condition.sync="condition" @search="initTableData" @create="handleCreate"
diff --git a/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue b/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue
index e6f0469c22..505685f6ad 100644
--- a/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue
+++ b/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-card>
+  <el-card class="table-card">
 
     <template v-slot:header>
       <ms-table-header :condition.sync="condition" @search="initTableData" @create="handleCreate"

From 7708a394164401963f34529b0675950847f42053 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 13 Dec 2021 19:34:36 +0800
Subject: [PATCH 108/256] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E4=B8=AD=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=9A=84=E7=94=A8=E4=BE=8B=E6=89=A7=E8=A1=8C=E5=AE=8C?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApiDefinitionExecResultService.java       | 30 ++++++++++
 .../api/service/ApiScenarioReportService.java | 34 ++++++++---
 .../api/service/RemakeReportService.java      | 18 ++++--
 .../api/service/TestResultService.java        | 60 ++-----------------
 .../base/domain/ApiScenarioReport.java        |  2 -
 .../mapper/ext/ExtTestPlanTestCaseMapper.java |  2 -
 .../mapper/ext/ExtTestPlanTestCaseMapper.xml  |  9 ---
 .../track/service/TestPlanApiCaseService.java |  6 ++
 .../service/TestPlanTestCaseService.java      |  8 ---
 9 files changed, 81 insertions(+), 88 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index e0d8626eb1..eb56654f4f 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -15,14 +15,17 @@ import io.metersphere.base.mapper.TestCaseReviewApiCaseMapper;
 import io.metersphere.base.mapper.ext.ExtApiDefinitionExecResultMapper;
 import io.metersphere.commons.constants.*;
 import io.metersphere.commons.utils.DateUtils;
+import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.notice.sender.NoticeModel;
 import io.metersphere.notice.service.NoticeSendService;
 import io.metersphere.track.dto.TestPlanDTO;
 import io.metersphere.track.request.testcase.QueryTestPlanRequest;
+import io.metersphere.track.request.testcase.TrackCount;
 import io.metersphere.track.service.TestCaseReviewApiCaseService;
 import io.metersphere.track.service.TestPlanApiCaseService;
 import io.metersphere.track.service.TestPlanService;
+import io.metersphere.track.service.TestPlanTestCaseService;
 import org.apache.commons.beanutils.BeanMap;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -61,6 +64,12 @@ public class ApiDefinitionExecResultService {
     @Resource
     private NoticeSendService noticeSendService;
 
+    @Resource
+    private TestPlanTestCaseService testPlanTestCaseService;
+
+    @Resource
+    private ApiTestCaseService apiTestCaseService;
+
     public ApiDefinitionExecResult getInfo(String id) {
         return apiDefinitionExecResultMapper.selectByPrimaryKey(id);
     }
@@ -131,6 +140,9 @@ public class ApiDefinitionExecResultService {
                             } else {
                                 apiDefinitionExecResultMapper.updateByPrimaryKeyWithBLOBs(saveResult);
                             }
+
+                            updateTestCaseStates(saveResult.getResourceId());
+
                             apiDefinitionService.removeCache(result.getTestId());
                             if (StringUtils.isNotEmpty(result.getTestId())) {
                                 MessageCache.caseExecResourceLock.remove(result.getTestId());
@@ -144,6 +156,7 @@ public class ApiDefinitionExecResultService {
         }
     }
 
+
     private void sendNotice(ApiDefinitionExecResult result) {
         String resourceId = result.getResourceId();
         ApiTestCaseWithBLOBs apiTestCaseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(resourceId);
@@ -348,6 +361,8 @@ public class ApiDefinitionExecResultService {
                                 testCaseReviewApiCaseService.setExecResult(caseId, status, item.getStartTime());
                             }
 
+                            updateTestCaseStates(caseId);
+
                             if (StringUtils.isNotEmpty(caseId)) {
                                 apiIdResultMap.put(caseId, item.isSuccess() ? TestPlanApiExecuteStatus.SUCCESS.name() : TestPlanApiExecuteStatus.FAILD.name());
                             }
@@ -364,6 +379,21 @@ public class ApiDefinitionExecResultService {
         TestPlanReportExecuteCatch.updateTestPlanReport(testPlanReportId, caseReportMap, null);
     }
 
+    /**
+     * 更新测试计划中, 关联接口测试的功能用例的状态
+     *
+     */
+    public void updateTestCaseStates(String testPlanApiCaseId) {
+        try {
+            TestPlanApiCase testPlanApiCase = testPlanApiCaseService.getById(testPlanApiCaseId);
+            if (testPlanApiCase == null) return;
+            ApiTestCaseWithBLOBs apiTestCase = apiTestCaseService.get(testPlanApiCase.getApiCaseId());
+            testPlanTestCaseService.updateTestCaseStates(apiTestCase.getId(), apiTestCase.getName(), testPlanApiCase.getTestPlanId(), TrackCount.TESTCASE);
+        } catch (Exception e) {
+            LogUtil.error(e.getMessage(), e);
+        }
+    }
+
     public void deleteByResourceId(String resourceId) {
         ApiDefinitionExecResultExample example = new ApiDefinitionExecResultExample();
         example.createCriteria().andResourceIdEqualTo(resourceId);
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
index 9e948eb98d..1240b958ae 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
@@ -22,10 +22,7 @@ import io.metersphere.base.mapper.ext.ExtApiScenarioReportDetailMapper;
 import io.metersphere.base.mapper.ext.ExtApiScenarioReportMapper;
 import io.metersphere.commons.constants.*;
 import io.metersphere.commons.exception.MSException;
-import io.metersphere.commons.utils.DateUtils;
-import io.metersphere.commons.utils.LogUtil;
-import io.metersphere.commons.utils.ServiceUtils;
-import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.commons.utils.*;
 import io.metersphere.dto.ApiReportCountDTO;
 import io.metersphere.dto.NodeDTO;
 import io.metersphere.dto.UserDTO;
@@ -37,6 +34,8 @@ import io.metersphere.log.vo.api.ModuleReference;
 import io.metersphere.notice.sender.NoticeModel;
 import io.metersphere.notice.service.NoticeSendService;
 import io.metersphere.service.UserService;
+import io.metersphere.track.request.testcase.TrackCount;
+import io.metersphere.track.service.TestPlanTestCaseService;
 import org.apache.commons.beanutils.BeanMap;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -46,6 +45,7 @@ import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -86,6 +86,12 @@ public class ApiScenarioReportService {
     private EnvironmentGroupMapper environmentGroupMapper;
     @Resource
     private ApiTestEnvironmentMapper apiTestEnvironmentMapper;
+    @Resource
+    @Lazy
+    private TestPlanTestCaseService testPlanTestCaseService;
+    @Resource
+    @Lazy
+    private ApiAutomationService apiAutomationService;
 
     public ApiScenarioReport complete(TestResult result, String runMode) {
         // 更新场景
@@ -269,7 +275,6 @@ public class ApiScenarioReportService {
                 String passRate = new DecimalFormat("0%").format((float) scenarioResult.getSuccess() / (scenarioResult.getSuccess() + scenarioResult.getError()));
                 testPlanApiScenario.setPassRate(passRate);
                 testPlanApiScenario.setReportId(report.getId());
-                report.setTestPlanScenarioId(testPlanApiScenario.getId());
                 report.setEndTime(System.currentTimeMillis());
                 testPlanApiScenario.setUpdateTime(report.getCreateTime());
                 testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
@@ -294,6 +299,8 @@ public class ApiScenarioReportService {
                     // 发送通知
 //                    sendNotice(scenario);
                 }
+
+                updatePlanTestCaseStates(testPlanApiScenario);
             }
             returnReport = report;
             reportIds.add(report.getId());
@@ -353,8 +360,6 @@ public class ApiScenarioReportService {
                 if(testPlanApiScenario != null){
                     //更新测试计划场景相关状态
                     report.setScenarioId(testPlanApiScenario.getApiScenarioId());
-                    report.setTestPlanScenarioId(planScenarioId);
-
                     if (scenarioResult.getError() > 0) {
                         scenarioAndErrorMap.put(testPlanApiScenario.getId(), TestPlanApiExecuteStatus.FAILD.name());
                         testPlanApiScenario.setLastResult(ScenarioStatus.Fail.name());
@@ -367,6 +372,8 @@ public class ApiScenarioReportService {
                     testPlanApiScenario.setUpdateTime(System.currentTimeMillis());
                     testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
                     scenarioIdList.add(testPlanApiScenario.getApiScenarioId());
+
+                    updatePlanTestCaseStates(testPlanApiScenario);
                 }else {
                     LogUtil.info("TestPlanReport_Id is null. scenario report id : ["+report.getId()+"]; planScenarioIdArr:["+report.getScenarioId()+"] DATA:"+JSON.toJSONString(scenarioResult));
                 }
@@ -420,6 +427,19 @@ public class ApiScenarioReportService {
         return lastReport;
     }
 
+    /**
+     * 更新测试计划，关联产经测试的功能用例的状态
+     *
+     */
+    public void updatePlanTestCaseStates(TestPlanApiScenario testPlanApiScenario) {
+        try {
+            ApiScenarioWithBLOBs apiScenario = apiAutomationService.getApiScenario(testPlanApiScenario.getApiScenarioId());
+            testPlanTestCaseService.updateTestCaseStates(apiScenario.getId(), apiScenario.getName(), testPlanApiScenario.getTestPlanId(), TrackCount.AUTOMATION);
+        } catch (Exception e) {
+            LogUtil.error(e.getMessage(), e);
+        }
+    }
+
     /**
      * 批量更新状态，防止重复刷新报告
      *
diff --git a/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java b/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java
index 2aa18b87fb..632dbe8dd2 100644
--- a/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java
@@ -9,6 +9,7 @@ import io.metersphere.base.mapper.*;
 import io.metersphere.commons.constants.APITestStatus;
 import io.metersphere.commons.constants.ApiRunMode;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -29,6 +30,12 @@ public class RemakeReportService {
     private TestCaseReviewApiCaseMapper testCaseReviewApiCaseMapper;
     @Resource
     private TestPlanApiScenarioMapper testPlanApiScenarioMapper;
+    @Resource
+    @Lazy
+    private ApiScenarioReportService apiScenarioReportService;
+    @Resource
+    @Lazy
+    private ApiDefinitionExecResultService apiDefinitionExecResultService;
 
     public void remake(RunRequest runRequest, RunModeConfig config, String reportId) {
         if (config != null && config.getAmassReport() != null && MessageCache.cache.get(config.getAmassReport()) != null
@@ -50,6 +57,7 @@ public class RemakeReportService {
                         testPlanApiCase.setStatus("error");
                         testPlanApiCase.setUpdateTime(System.currentTimeMillis());
                         testPlanApiCaseMapper.updateByPrimaryKeySelective(testPlanApiCase);
+                        apiDefinitionExecResultService.updateTestCaseStates(testPlanApiCase.getId());
                     }
                     TestCaseReviewApiCase testCaseReviewApiCase = testCaseReviewApiCaseMapper.selectByPrimaryKey(runRequest.getTestId());
                     if (testCaseReviewApiCase != null) {
@@ -71,10 +79,10 @@ public class RemakeReportService {
                         testPlanApiScenario.setReportId(report.getId());
                         testPlanApiScenario.setUpdateTime(report.getCreateTime());
                         testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
-
-                        report.setTestPlanScenarioId(testPlanApiScenario.getId());
                     }
                     apiScenarioReportMapper.updateByPrimaryKey(report);
+
+                    apiScenarioReportService.updatePlanTestCaseStates(testPlanApiScenario);
                 }
             } else if (StringUtils.equalsAny(runRequest.getRunMode(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
                 ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(reportId);
@@ -85,7 +93,6 @@ public class RemakeReportService {
                     TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(planScenarioId);
                     if (testPlanApiScenario != null) {
                         report.setScenarioId(testPlanApiScenario.getApiScenarioId());
-                        report.setTestPlanScenarioId(planScenarioId);
                         report.setEndTime(System.currentTimeMillis());
 
                         testPlanApiScenario.setLastResult(ScenarioStatus.Fail.name());
@@ -95,6 +102,8 @@ public class RemakeReportService {
                         testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
                     }
                     apiScenarioReportMapper.updateByPrimaryKeySelective(report);
+
+                    apiScenarioReportService.updatePlanTestCaseStates(testPlanApiScenario);
                 }
             } else {
                 ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(reportId);
@@ -129,7 +138,6 @@ public class RemakeReportService {
             TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(testId);
             if (testPlanApiScenario != null) {
                 report.setScenarioId(scenarioWithBLOBs.getId());
-                report.setTestPlanScenarioId(testId);
                 report.setEndTime(System.currentTimeMillis());
 
                 testPlanApiScenario.setLastResult(ScenarioStatus.Fail.name());
@@ -137,6 +145,8 @@ public class RemakeReportService {
                 testPlanApiScenario.setReportId(report.getId());
                 testPlanApiScenario.setUpdateTime(report.getCreateTime());
                 testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
+
+                apiScenarioReportService.updatePlanTestCaseStates(testPlanApiScenario);
             }
         } else {
             scenarioWithBLOBs.setLastResult("Fail");
diff --git a/backend/src/main/java/io/metersphere/api/service/TestResultService.java b/backend/src/main/java/io/metersphere/api/service/TestResultService.java
index c866024815..0852dd4ffd 100644
--- a/backend/src/main/java/io/metersphere/api/service/TestResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/TestResultService.java
@@ -3,7 +3,10 @@ package io.metersphere.api.service;
 import io.metersphere.api.dto.automation.ApiTestReportVariable;
 import io.metersphere.api.jmeter.TestResult;
 import io.metersphere.base.domain.*;
-import io.metersphere.commons.constants.*;
+import io.metersphere.commons.constants.ApiRunMode;
+import io.metersphere.commons.constants.NoticeConstants;
+import io.metersphere.commons.constants.ReportTriggerMode;
+import io.metersphere.commons.constants.TriggerMode;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.DateUtils;
 import io.metersphere.commons.utils.LogUtil;
@@ -12,19 +15,13 @@ import io.metersphere.i18n.Translator;
 import io.metersphere.notice.sender.NoticeModel;
 import io.metersphere.notice.service.NoticeSendService;
 import io.metersphere.service.SystemParameterService;
-import io.metersphere.track.request.testcase.TrackCount;
-import io.metersphere.track.service.TestPlanApiCaseService;
-import io.metersphere.track.service.TestPlanScenarioCaseService;
-import io.metersphere.track.service.TestPlanTestCaseService;
 import org.apache.commons.beanutils.BeanMap;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Service
@@ -40,16 +37,10 @@ public class TestResultService {
     private ApiTestCaseService apiTestCaseService;
     @Resource
     private ApiAutomationService apiAutomationService;
-    @Resource
-    private TestPlanApiCaseService testPlanApiCaseService;
-    @Resource
-    private TestPlanTestCaseService testPlanTestCaseService;
 
     public void saveResult(TestResult testResult, String runMode, String debugReportId, String testId) {
         try {
-            ApiTestReport report = null;
             ApiTestReportVariable reportTask = null;
-            String planScenarioId = null;
             if (StringUtils.equals(runMode, ApiRunMode.DEFINITION.name())) {
                 // 调试操作，不需要存储结果
                 apiDefinitionService.addResult(testResult);
@@ -118,16 +109,6 @@ public class TestResultService {
                     SystemParameterService systemParameterService = CommonBeanFactory.getBean(SystemParameterService.class);
                     assert systemParameterService != null;
                     testResult.setTestId(scenarioReport.getScenarioId());
-                    planScenarioId = scenarioReport.getTestPlanScenarioId();
-                }
-            }
-            updateTestCaseStates(testResult, planScenarioId, runMode);
-            List<String> ids = testPlanTestCaseService.getTestPlanTestCaseIds(testResult.getTestId());
-            if (CollectionUtils.isNotEmpty(ids)) {
-                if (StringUtils.equals(APITestStatus.Success.name(), report.getStatus())) {
-                    testPlanTestCaseService.updateTestCaseStates(ids, TestPlanTestCaseStatus.Pass.name());
-                } else {
-                    testPlanTestCaseService.updateTestCaseStates(ids, TestPlanTestCaseStatus.Failure.name());
                 }
             }
             if (reportTask != null) {
@@ -141,39 +122,6 @@ public class TestResultService {
         }
     }
 
-
-    /**
-     * 更新测试计划关联接口测试的功能用例的状态
-     *
-     * @param testResult
-     */
-    private void updateTestCaseStates(TestResult testResult, String testPlanScenarioId, String runMode) {
-        try {
-            if (StringUtils.equalsAny(runMode, ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name(),
-                    ApiRunMode.JENKINS_API_PLAN.name(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
-                testResult.getScenarios().forEach(scenarioResult -> {
-                    if (scenarioResult != null && CollectionUtils.isNotEmpty(scenarioResult.getRequestResults())) {
-                        scenarioResult.getRequestResults().forEach(item -> {
-                            if (StringUtils.equalsAny(runMode, ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name(),
-                                    ApiRunMode.JENKINS_API_PLAN.name())) {
-                                TestPlanApiCase testPlanApiCase = testPlanApiCaseService.getById(item.getName());
-                                ApiTestCaseWithBLOBs apiTestCase = apiTestCaseService.get(testPlanApiCase.getApiCaseId());
-                                testPlanTestCaseService.updateTestCaseStates(apiTestCase.getId(), apiTestCase.getName(), testPlanApiCase.getTestPlanId(), TrackCount.TESTCASE);
-                            } else {
-                                TestPlanScenarioCaseService testPlanScenarioCaseService = CommonBeanFactory.getBean(TestPlanScenarioCaseService.class);
-                                TestPlanApiScenario testPlanApiScenario = testPlanScenarioCaseService.get(testPlanScenarioId);
-                                ApiScenarioWithBLOBs apiScenario = apiAutomationService.getApiScenario(testPlanApiScenario.getApiScenarioId());
-                                testPlanTestCaseService.updateTestCaseStates(apiScenario.getId(), apiScenario.getName(), testPlanApiScenario.getTestPlanId(), TrackCount.AUTOMATION);
-                            }
-                        });
-                    }
-                });
-            }
-        } catch (Exception e) {
-            LogUtil.error(e.getMessage(), e);
-        }
-    }
-
     private void sendTask(ApiTestReportVariable report, TestResult testResult) {
         if (report == null) {
             return;
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReport.java b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReport.java
index 2119c627b7..60c928d4b8 100644
--- a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReport.java
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReport.java
@@ -34,8 +34,6 @@ public class ApiScenarioReport implements Serializable {
 
     private String description;
 
-    private String testPlanScenarioId;
-
     private Long endTime;
 
     private static final long serialVersionUID = 1L;
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
index 97e38d189d..5d5656de06 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
@@ -34,8 +34,6 @@ public interface ExtTestPlanTestCaseMapper {
 
     int updateTestCaseStates(@Param("ids") List<String> ids, @Param("reportStatus") String reportStatus);
 
-    List<String> getTestPlanTestCaseIds(String testId);
-
     /**
      * 根据项目 ids 查询 TestPlanCaseDTO 列表
      * @param ids project id list
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index beebd732c8..f24e852243 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -359,15 +359,6 @@
         from test_plan_test_case
         where plan_id = #{planId}
     </select>
-    <select id="getTestPlanTestCaseIds" resultType="java.lang.String">
-        select c.id from test_case a left join test_plan_test_case c on a.id=c.case_id
-        <where>
-            <if test="testId!=null">
-                and a.test_id=#{testId}
-            </if>
-        </where>
-    </select>
-
     <select id="get" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
         select test_case.remark,
                test_plan_test_case.id as id,
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
index 9a241ced81..2ad5b53622 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
@@ -206,6 +206,12 @@ public class TestPlanApiCaseService {
         return testPlanApiCaseMapper.selectByExample(example);
     }
 
+    public List<TestPlanApiCase> getCases(String planId) {
+        TestPlanApiCaseExample example = new TestPlanApiCaseExample();
+        example.createCriteria().andTestPlanIdEqualTo(planId);
+        return testPlanApiCaseMapper.selectByExample(example);
+    }
+
     public TestPlanApiCase getById(String id) {
         return testPlanApiCaseMapper.selectByPrimaryKey(id);
     }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
index 83cea2585f..c27744c890 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
@@ -217,14 +217,6 @@ public class TestPlanTestCaseService {
         testPlanTestCaseMapper.deleteByExample(example);
     }
 
-    public List<String> getTestPlanTestCaseIds(String testId) {
-        return extTestPlanTestCaseMapper.getTestPlanTestCaseIds(testId);
-    }
-
-    public int updateTestCaseStates(List<String> ids, String reportStatus) {
-        return extTestPlanTestCaseMapper.updateTestCaseStates(ids, reportStatus);
-    }
-
     /**
      * 更新测试计划关联接口测试的功能用例的状态
      *

From 378426795e580914d6693568e4ea213d0df7964f Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 13 Dec 2021 20:57:09 +0800
Subject: [PATCH 109/256] =?UTF-8?q?fix:=20=E9=85=8D=E7=BD=AEjira=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IssueTemplateService.java         | 28 ++++++++++++++++
 .../io/metersphere/service/UserService.java   |  2 +-
 .../metersphere/track/issue/JiraPlatform.java | 22 +++++++------
 .../track/service/IssuesService.java          | 26 +++------------
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 .../settings/components/PersonRouter.vue      |  2 +-
 .../track/issue/IssueEditDetail.vue           | 32 +++++++++----------
 7 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/service/IssueTemplateService.java b/backend/src/main/java/io/metersphere/service/IssueTemplateService.java
index cc55a8d0d6..9a9731ff43 100644
--- a/backend/src/main/java/io/metersphere/service/IssueTemplateService.java
+++ b/backend/src/main/java/io/metersphere/service/IssueTemplateService.java
@@ -225,6 +225,34 @@ public class IssueTemplateService extends TemplateBaseService {
         } else {
             issueTemplate = getDefaultTemplate(project.getWorkspaceId());
         }
+        if (!project.getPlatform().equals(issueTemplate.getPlatform())) {
+            MSException.throwException("请在项目中配置缺陷模板");
+        }
+        BeanUtils.copyBean(issueTemplateDao, issueTemplate);
+        List<CustomFieldDao> result = customFieldService.getCustomFieldByTemplateId(issueTemplate.getId());
+        issueTemplateDao.setCustomFields(result);
+        return issueTemplateDao;
+    }
+
+    public IssueTemplateDao getTemplate(String projectId, boolean thirdPartTemplate) {
+        Project project = projectService.getProjectById(projectId);
+        if (thirdPartTemplate) {
+
+        }
+        String issueTemplateId = project.getIssueTemplateId();
+        IssueTemplate issueTemplate;
+        IssueTemplateDao issueTemplateDao = new IssueTemplateDao();
+        if (StringUtils.isNotBlank(issueTemplateId)) {
+            issueTemplate = issueTemplateMapper.selectByPrimaryKey(issueTemplateId);
+            if (issueTemplate == null) {
+                issueTemplate = getDefaultTemplate(project.getWorkspaceId());
+            }
+        } else {
+            issueTemplate = getDefaultTemplate(project.getWorkspaceId());
+        }
+        if (!project.getPlatform().equals(issueTemplate.getPlatform())) {
+            MSException.throwException("请在项目中配置缺陷模板");
+        }
         BeanUtils.copyBean(issueTemplateDao, issueTemplate);
         List<CustomFieldDao> result = customFieldService.getCustomFieldByTemplateId(issueTemplate.getId());
         issueTemplateDao.setCustomFields(result);
diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
index c02fe22255..950d0b1595 100644
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -1255,7 +1255,7 @@ public class UserService {
     public UserDTO.PlatformInfo getCurrentPlatformInfo(String workspaceId) {
         User user = userMapper.selectByPrimaryKey(SessionUtils.getUserId());
         String platformInfoStr = user.getPlatformInfo();
-        if (StringUtils.isBlank(workspaceId) || StringUtils.isBlank(platformInfoStr)) {
+        if (StringUtils.isBlank(workspaceId) || StringUtils.isBlank(platformInfoStr) || platformInfoStr.equals("null")) {
             return null;
         }
         JSONObject platformInfos = JSONObject.parseObject(platformInfoStr);
diff --git a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
index 239eab5eeb..c7cb031edb 100644
--- a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
@@ -233,17 +233,21 @@ public class JiraPlatform extends AbstractIssuePlatform {
                             fields.put(fieldName, attrs);
                         } else if (StringUtils.equalsAny(item.getType(),  "cascadingSelect")) {
                             if (item.getValue() != null) {
-                                JSONArray values = (JSONArray)item.getValue();
                                 JSONObject attr = new JSONObject();
-                                if (CollectionUtils.isNotEmpty(values)) {
-                                    if (values.size() > 0) {
-                                        attr.put("id", values.get(0));
-                                    }
-                                    if (values.size() > 1) {
-                                        JSONObject param = new JSONObject();
-                                        param.put("id", values.get(1));
-                                        attr.put("child", param);
+                                if (item.getValue() instanceof JSONArray) {
+                                    JSONArray values = (JSONArray) item.getValue();
+                                    if (CollectionUtils.isNotEmpty(values)) {
+                                        if (values.size() > 0) {
+                                            attr.put("id", values.get(0));
+                                        }
+                                        if (values.size() > 1) {
+                                            JSONObject param = new JSONObject();
+                                            param.put("id", values.get(1));
+                                            attr.put("child", param);
+                                        }
                                     }
+                                } else {
+                                    attr.put("id", item.getValue());
                                 }
                                 fields.put(fieldName, attr);
                             }
diff --git a/backend/src/main/java/io/metersphere/track/service/IssuesService.java b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
index 83240c91d1..bc96fee8e8 100644
--- a/backend/src/main/java/io/metersphere/track/service/IssuesService.java
+++ b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
@@ -128,12 +128,10 @@ public class IssuesService {
         List<String> platforms = new ArrayList<>();
         if (StringUtils.isNotBlank(updateRequest.getTestCaseId())) {
             // 测试计划关联
-            String p = getPlatformsByCaseId(updateRequest.getTestCaseId());
-            platforms.add(p);
+            platforms.add(getPlatformsByCaseId(updateRequest.getTestCaseId()));
         } else {
             // 缺陷管理关联
-            String t = getIssueTemplate(updateRequest.getProjectId());
-            platforms.add(t);
+            platforms.add(getPlatform(updateRequest.getProjectId()));
         }
 
         if (CollectionUtils.isEmpty(platforms)) {
@@ -193,26 +191,12 @@ public class IssuesService {
     public String getPlatformsByCaseId(String caseId) {
         TestCaseWithBLOBs testCase = testCaseService.getTestCase(caseId);
         Project project = projectService.getProjectById(testCase.getProjectId());
-        return getIssueTemplate(project.getId());
+        return getPlatform(project.getId());
     }
 
-    public String getIssueTemplate(String projectId) {
+    public String getPlatform(String projectId) {
         Project project = projectService.getProjectById(projectId);
-        IssueTemplate issueTemplate;
-        String id = project.getIssueTemplateId();
-        if (StringUtils.isBlank(id)) {
-            issueTemplate = issueTemplateService.getDefaultTemplate(project.getWorkspaceId());
-        } else {
-            issueTemplate = issueTemplateMapper.selectByPrimaryKey(id);
-        }
-        if (issueTemplate == null) {
-            MSException.throwException("project issue template id is null.");
-        }
-        String platform = issueTemplate.getPlatform();
-        if (StringUtils.equals(platform, "metersphere")) {
-            return IssuesManagePlatform.Local.name();
-        }
-        return platform;
+        return project.getPlatform();
     }
 
     public List<String> getPlatforms(Project project) {
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 8bd3730267..cf8337c9a6 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 8bd3730267a6c1b383a781b3c4ef8526e5414d82
+Subproject commit cf8337c9a6341d8c9eb7f5c9bef897083b0d2951
diff --git a/frontend/src/business/components/settings/components/PersonRouter.vue b/frontend/src/business/components/settings/components/PersonRouter.vue
index 744e898a32..43e1de7215 100644
--- a/frontend/src/business/components/settings/components/PersonRouter.vue
+++ b/frontend/src/business/components/settings/components/PersonRouter.vue
@@ -120,7 +120,7 @@
       },
       getPlatformInfo(row) {
         let orgId = getCurrentWorkspaceId();
-        if (row.platformInfo) {
+        if (row.platformInfo && row.platformInfo !== 'null') {
           this.form = row;
           if (!row.platformInfo[orgId]) {
             this.form.platformInfo = JSON.parse(row.platformInfo);
diff --git a/frontend/src/business/components/track/issue/IssueEditDetail.vue b/frontend/src/business/components/track/issue/IssueEditDetail.vue
index 3637da0e8a..168b826721 100644
--- a/frontend/src/business/components/track/issue/IssueEditDetail.vue
+++ b/frontend/src/business/components/track/issue/IssueEditDetail.vue
@@ -182,23 +182,21 @@ export default {
       let initAddFuc = this.initEdit;
       getCurrentProject((responseData) => {
         this.currentProject = responseData;
-        this.$nextTick(() => {
-          if (this.enableThirdPartTemplate) {
-            getIssueThirdPartTemplate()
-              .then((template) => {
-                this.issueTemplate = template;
-                this.getThirdPartyInfo();
-                initAddFuc(data);
-              });
-          } else {
-            getIssueTemplate()
-              .then((template) => {
-                this.issueTemplate = template;
-                this.getThirdPartyInfo();
-                initAddFuc(data);
-              });
-          }
-        });
+        if (hasLicense() && this.currentProject && this.currentProject.thirdPartTemplate && this.currentProject.platform === JIRA) {
+          getIssueThirdPartTemplate()
+            .then((template) => {
+              this.issueTemplate = template;
+              this.getThirdPartyInfo();
+              initAddFuc(data);
+            });
+        } else {
+          getIssueTemplate()
+            .then((template) => {
+              this.issueTemplate = template;
+              this.getThirdPartyInfo();
+              initAddFuc(data);
+            });
+        }
       });
 
       if(data&&data.id){

From 5ee058d3a9aa8b91b0ed6f7bca20ea6b7384808b Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 13 Dec 2021 21:05:32 +0800
Subject: [PATCH 110/256] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IssueTemplateService.java         | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/service/IssueTemplateService.java b/backend/src/main/java/io/metersphere/service/IssueTemplateService.java
index 9a9731ff43..a2b1e5347c 100644
--- a/backend/src/main/java/io/metersphere/service/IssueTemplateService.java
+++ b/backend/src/main/java/io/metersphere/service/IssueTemplateService.java
@@ -234,31 +234,6 @@ public class IssueTemplateService extends TemplateBaseService {
         return issueTemplateDao;
     }
 
-    public IssueTemplateDao getTemplate(String projectId, boolean thirdPartTemplate) {
-        Project project = projectService.getProjectById(projectId);
-        if (thirdPartTemplate) {
-
-        }
-        String issueTemplateId = project.getIssueTemplateId();
-        IssueTemplate issueTemplate;
-        IssueTemplateDao issueTemplateDao = new IssueTemplateDao();
-        if (StringUtils.isNotBlank(issueTemplateId)) {
-            issueTemplate = issueTemplateMapper.selectByPrimaryKey(issueTemplateId);
-            if (issueTemplate == null) {
-                issueTemplate = getDefaultTemplate(project.getWorkspaceId());
-            }
-        } else {
-            issueTemplate = getDefaultTemplate(project.getWorkspaceId());
-        }
-        if (!project.getPlatform().equals(issueTemplate.getPlatform())) {
-            MSException.throwException("请在项目中配置缺陷模板");
-        }
-        BeanUtils.copyBean(issueTemplateDao, issueTemplate);
-        List<CustomFieldDao> result = customFieldService.getCustomFieldByTemplateId(issueTemplate.getId());
-        issueTemplateDao.setCustomFields(result);
-        return issueTemplateDao;
-    }
-
     public String getLogDetails(String id, List<CustomFieldTemplate>newCustomFieldTemplates) {
         List<DetailColumn> columns = new LinkedList<>();
         IssueTemplate templateWithBLOBs = issueTemplateMapper.selectByPrimaryKey(id);

From 5c3408a807428b6af41a165fc49c79deadfde291 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 13 Dec 2021 17:06:40 +0800
Subject: [PATCH 111/256] =?UTF-8?q?fix(=E6=88=91=E7=9A=84=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0):=20=E6=88=91=E7=9A=84=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008790 --user=郭雨琦 【ID1008790】我的工作台首页图表显示问题
---
 .../business/components/common/components/MsBorderPieChart.vue   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/business/components/common/components/MsBorderPieChart.vue b/frontend/src/business/components/common/components/MsBorderPieChart.vue
index 410981d26f..da4af3dba2 100644
--- a/frontend/src/business/components/common/components/MsBorderPieChart.vue
+++ b/frontend/src/business/components/common/components/MsBorderPieChart.vue
@@ -28,7 +28,6 @@ export default {
         },
         series: [
           {
-            name: 'Access From',
             type: 'pie',
             radius: this.radius,
             itemStyle: {

From 245c507269c1394ff22d4fd2f2d5932217313a1e Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 13 Dec 2021 17:07:05 +0800
Subject: [PATCH 112/256] =?UTF-8?q?chore(=E6=88=91=E7=9A=84=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0):=20sync?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008790 --user=郭雨琦 【ID1008790】我的工作台首页图表显示问题
---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 275aff0cda..8142d4f9e1 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 275aff0cdaf7556e02c0fc479cb19d2f962695c2
+Subproject commit 8142d4f9e15802034cdc2c98a6af88af5fedf480

From 97a4d31184f96a46c6e51dc8a380601b5722cf54 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 13 Dec 2021 18:35:23 +0800
Subject: [PATCH 113/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E4=B8=8D=E5=90=8C=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 不同协议类型跳转问题
---
 .../api/automation/scenario/component/ApiComponent.vue         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 998d3d1ed9..8d50114218 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -639,6 +639,9 @@ export default {
 
     clickResource(resource) {
       if (resource.refType && resource.refType === 'API') {
+        if(resource.protocol==='dubbo://'){
+          resource.protocol = 'DUBBO'
+        }
         let definitionData = this.$router.resolve({
           name: 'ApiDefinition',
           params: {redirectID: getUUID(), dataType: "api", dataSelectRange: 'edit:' + resource.id, projectId: resource.projectId, type: resource.protocol}

From 3a929fed2935ef09762ab8bbb30bae44f0ec810a Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 13 Dec 2021 19:03:53 +0800
Subject: [PATCH 114/256] =?UTF-8?q?fix(=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1):=20=E5=88=9B=E5=BB=BA=E6=96=87=E6=9C=AC=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 创建文本显示
---
 .../api/automation/schedule/ScheduleNotification.vue         | 5 ++++-
 frontend/src/i18n/en-US.js                                   | 1 +
 frontend/src/i18n/zh-CN.js                                   | 1 +
 frontend/src/i18n/zh-TW.js                                   | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
index 7b89f73188..0766e26a68 100644
--- a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
+++ b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
@@ -190,7 +190,10 @@ export default {
           label:'id',
           value:'id',
         },
-        'reportUrl',
+        {
+          label:this.$t('load_test.report.url'),
+          value:'reportUrl',
+        },
         {
           label:this.$t('project.id'),
           value:'projectId',
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 329bd321e1..d64471c3b1 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -961,6 +961,7 @@ export default {
       LatencyChart: 'Latency',
       BytesThroughputChart: 'Bytes',
       Network: 'Network',
+      url:'URL'
     },
   },
   api_test: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 82ca73fa9c..5886bd103d 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -968,6 +968,7 @@ export default {
       LatencyChart: '延迟',
       BytesThroughputChart: '字节数',
       Network: '网络',
+      url:'路径'
     },
     project_file_update_type_error: '更新的文件类型必须一致',
   },
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 560d490f3c..f634c4ed6a 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -965,6 +965,7 @@ export default {
       LatencyChart: '延遲',
       BytesThroughputChart: '字節數',
       Network: '網絡',
+      url:'路徑',
     },
     project_file_update_type_error: '更新的文件類型必須一致',
   },

From 16e837e5cdf4ca7f84ee1071ec8b2180749825bf Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 13 Dec 2021 19:03:58 +0800
Subject: [PATCH 115/256] =?UTF-8?q?fix(=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1):=20sync?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 创建文本显示
---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index cf8337c9a6..269d23d500 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit cf8337c9a6341d8c9eb7f5c9bef897083b0d2951
+Subproject commit 269d23d5004ee49a9e82a977027ca72757d3056a

From fdee6c370fd1dd227582c1905f24a21a4f1a193a Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Tue, 14 Dec 2021 10:41:42 +0800
Subject: [PATCH 116/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=94=AF=E6=8C=81=E5=8F=98=E9=87=8F=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008640 --user=刘瑞斌 [github #8353]测试跟踪定时任务邮件模板变量部分获取不到 #8353
https://www.tapd.cn/55049933/s/1080460

Closes #8353
---
 backend/src/main/java/io/metersphere/xpack    |   2 +-
 .../plan/components/ScheduleMaintain.vue      |   2 +-
 .../plan/components/ScheduleNotification.vue  | 384 ++++++++++++++++++
 frontend/src/business/components/xpack        |   2 +-
 4 files changed, 387 insertions(+), 3 deletions(-)
 create mode 100644 frontend/src/business/components/track/plan/components/ScheduleNotification.vue

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 269d23d500..cf8337c9a6 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 269d23d5004ee49a9e82a977027ca72757d3056a
+Subproject commit cf8337c9a6341d8c9eb7f5c9bef897083b0d2951
diff --git a/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue b/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue
index 23335ac491..4010ad5cca 100644
--- a/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue
+++ b/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue
@@ -129,7 +129,7 @@ import {
 import Crontab from "@/business/components/common/cron/Crontab";
 import CrontabResult from "@/business/components/common/cron/CrontabResult";
 import {cronValidate} from "@/common/js/cron";
-import MsScheduleNotification from "@/business/components/api/automation/schedule/ScheduleNotification";
+import MsScheduleNotification from "./ScheduleNotification";
 import ScheduleSwitch from "@/business/components/api/automation/schedule/ScheduleSwitch";
 
 function defaultCustomValidate() {
diff --git a/frontend/src/business/components/track/plan/components/ScheduleNotification.vue b/frontend/src/business/components/track/plan/components/ScheduleNotification.vue
new file mode 100644
index 0000000000..23bec87f1c
--- /dev/null
+++ b/frontend/src/business/components/track/plan/components/ScheduleNotification.vue
@@ -0,0 +1,384 @@
+<template>
+  <div>
+    <el-row>
+      <el-col :span="10">
+        <el-button icon="el-icon-circle-plus-outline" plain size="mini"
+                   @click="handleAddTaskModel">
+          {{ $t('organization.message.create_new_notification') }}
+        </el-button>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <el-table
+          :data="scheduleTask"
+          class="tb-edit"
+          border
+          :cell-style="rowClass"
+          :header-cell-style="headClass">
+          <el-table-column :label="$t('schedule.event')" prop="events" min-width="13%">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.event" size="mini"
+                         :placeholder="$t('organization.message.select_events')"
+                         prop="events" :disabled="!scope.row.isSet">
+                <el-option
+                  v-for="item in scheduleEventOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('schedule.receiver')" prop="userIds" min-width="18%">
+            <template v-slot:default="{row}">
+              <el-select v-model="row.userIds" filterable multiple size="mini"
+                         :placeholder="$t('commons.please_select')" style="width: 100%;" :disabled="!row.isSet">
+                <el-option
+                  v-for="item in scheduleReceiverOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('schedule.receiving_mode')" prop="type" min-width="15%">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.type" :placeholder="$t('organization.message.select_receiving_method')"
+                         size="mini"
+                         :disabled="!scope.row.isSet" @change="handleEdit(scope.$index, scope.row)"
+              >
+                <el-option
+                  v-for="item in receiveTypeOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="webhook" min-width="20%" prop="webhook">
+            <template v-slot:default="scope">
+              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+                        :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('commons.operating')" prop="result" min-width="25%">
+            <template v-slot:default="scope">
+              <ms-tip-button
+                circle
+                type="success"
+                size="mini"
+                v-if="scope.row.isSet"
+                v-xpack
+                @click="handleTemplate(scope.$index,scope.row)"
+                :tip="$t('organization.message.template')"
+                icon="el-icon-tickets"/>
+              <ms-tip-button
+                circle
+                type="primary"
+                size="mini"
+                v-show="scope.row.isSet"
+                @click="handleAddTask(scope.$index,scope.row)"
+                :tip="$t('commons.add')"
+                icon="el-icon-check"/>
+              <ms-tip-button
+                circle
+                size="mini"
+                v-show="scope.row.isSet"
+                @click="removeRowTask(scope.$index,scheduleTask)"
+                :tip="$t('commons.cancel')"
+                icon="el-icon-refresh-left"/>
+              <ms-tip-button
+                el-button
+                circle
+                type="primary"
+                size="mini"
+                icon="el-icon-edit"
+                v-show="!scope.row.isSet"
+                :tip="$t('commons.edit')"
+                @click="handleEditTask(scope.$index,scope.row)"
+                v-permission="['WORKSPACE_MESSAGE:READ+EDIT']"/>
+              <ms-tip-button
+                circle
+                type="danger"
+                icon="el-icon-delete"
+                size="mini"
+                v-show="!scope.row.isSet"
+                @click="deleteRowTask(scope.$index,scope.row)"
+                :tip="$t('commons.delete')"
+                v-permission="['WORKSPACE_MESSAGE:READ+EDIT']"/>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+    <notice-template v-xpack ref="noticeTemplate" :variables="variables"/>
+  </div>
+</template>
+
+<script>
+import {hasLicense} from "@/common/js/utils";
+import MsCodeEdit from "@/business/components/api/definition/components/MsCodeEdit";
+import MsTipButton from "@/business/components/common/components/MsTipButton";
+
+const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+const noticeTemplate = requireComponent.keys().length > 0 ? requireComponent("./notice/NoticeTemplate.vue") : {};
+
+export default {
+  name: "ScheduleNotification",
+  components: {
+    MsTipButton,
+    MsCodeEdit,
+    "NoticeTemplate": noticeTemplate.default
+  },
+  props: {
+    testId: String,
+    scheduleReceiverOptions: Array,
+    isTesterPermission: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      modes: ['text', 'html'],
+      title: '<!DOCTYPE html>\n' +
+        '<html lang="en">\n' +
+        '<head>\n' +
+        '    <meta charset="UTF-8">\n' +
+        '    <title>MeterSphere</title>\n' +
+        '</head>\n' +
+        '<body>\n' +
+        '<div>\n' +
+        '    <div style="margin-left: 100px">\n' +
+        '        ${operator}执行接口测试成功: ${name}, 报告: ${reportUrl}' +
+        '    </div>\n' +
+        '\n' +
+        '</div>\n' +
+        '</body>\n' +
+        '</html>',
+      robotTitle: "${operator}执行接口测试成功: ${name}, 报告: ${reportUrl}",
+      scheduleTask: [{
+        taskType: "scheduleTask",
+        event: "",
+        userIds: [],
+        type: [],
+        webhook: "",
+        isSet: true,
+        identification: "",
+        isReadOnly: false,
+        testId: this.testId,
+      }],
+      scheduleEventOptions: [
+        {value: 'EXECUTE_SUCCESSFUL', label: this.$t('schedule.event_success')},
+        {value: 'EXECUTE_FAILED', label: this.$t('schedule.event_failed')}
+      ],
+      receiveTypeOptions: [
+        {value: 'EMAIL', label: this.$t('organization.message.mail')},
+        {value: 'NAIL_ROBOT', label: this.$t('organization.message.nail_robot')},
+        {value: 'WECHAT_ROBOT', label: this.$t('organization.message.enterprise_wechat_robot')},
+        {value: 'LARK', label: this.$t('organization.message.lark')}
+      ],
+      variables: [
+        {
+          label:this.$t('group.operator'),
+          value:'operator',
+        },
+        {
+          label:'id',
+          value:'id',
+        },
+        {
+          label:this.$t('workspace.id'),
+          value:'workspaceId',
+        },
+        {
+          label:this.$t('report.id'),
+          value:'reportId',
+        },
+        {
+          label:this.$t('commons.name'),
+          value:'name',
+        },
+        {
+          label:this.$t('commons.description'),
+          value:'description',
+        },
+        {
+          label:this.$t('commons.status'),
+          value:'status',
+        },
+        {
+          label:this.$t('test_track.plan.plan_stage'),
+          value:'stage',
+        },
+        {
+          label:this.$t('test_track.case.match_rule'),
+          value:'testCaseMatchRule',
+        },
+        {
+          label:this.$t('test_track.plan.plan_stage'),
+          value:'executorMatchRule',
+        },
+        {
+          label:this.$t('commons.create_time'),
+          value:'createTime',
+        },
+        {
+          label:this.$t('commons.update_time'),
+          value:'updateTime',
+        },
+        {
+          label:this.$t('test_track.plan.actual_start_time'),
+          value:'actualStartTime',
+        },
+        {
+          label:this.$t('test_track.plan.actual_end_time'),
+          value:'actualEndTime',
+        },
+        {
+          label:this.$t('test_track.plan.planned_start_time'),
+          value:'plannedStartTime',
+        },
+        {
+          label:this.$t('test_track.plan.planned_end_time'),
+          value:'plannedEndTime',
+        },
+        {
+          label:this.$t('commons.create_user'),
+          value:'creator',
+        },
+        {
+          label:this.$t('project.id'),
+          value:'projectId',
+        },
+        {
+          label:this.$t('commons.execution_times'),
+          value:'executionTimes',
+        },
+        {
+          label:this.$t('test_track.automatic_status_update'),
+          value:'automaticStatusUpdate',
+        },
+      ],
+    };
+  },
+  mounted() {
+    this.initForm();
+  },
+  activated() {
+    this.initForm();
+  },
+  watch: {
+    testId() {
+      this.initForm();
+    }
+  },
+  methods: {
+    initForm() {
+      this.result = this.$get('/notice/search/message/' + this.testId, response => {
+        // console.log(response.data);
+        this.scheduleTask = response.data;
+      });
+    },
+    handleEdit(index, data) {
+      data.isReadOnly = true;
+      if (data.type === 'EMAIL') {
+        data.isReadOnly = !data.isReadOnly;
+        data.webhook = '';
+      }
+    },
+    handleAddTaskModel() {
+      let Task = {};
+      Task.event = '';
+      Task.userIds = [];
+      Task.type = '';
+      Task.webhook = '';
+      Task.isSet = true;
+      Task.identification = '';
+      Task.taskType = 'SCHEDULE_TASK';
+      Task.testId = this.testId;
+      this.scheduleTask.unshift(Task);
+    },
+    handleEditTask(index, data) {
+      data.isSet = true;
+      data.testId = this.testId;
+      if (data.type === 'EMAIL') {
+        data.isReadOnly = false;
+        data.webhook = '';
+      } else {
+        data.isReadOnly = true;
+      }
+    },
+    handleAddTask(index, data) {
+      if (data.event && data.userIds.length > 0 && data.type) {
+        // console.log(data.type)
+        if (data.type === 'NAIL_ROBOT' || data.type === 'WECHAT_ROBOT' || data.type === 'LARK') {
+          if (!data.webhook) {
+            this.$warning(this.$t('organization.message.message_webhook'));
+          } else {
+            this.addTask(data);
+          }
+        } else {
+          this.addTask(data);
+        }
+      } else {
+        this.$warning(this.$t('organization.message.message'));
+      }
+    },
+    addTask(data) {
+      this.result = this.$post("/notice/save/message/task", data, () => {
+        this.initForm();
+        this.$success(this.$t('commons.save_success'));
+      });
+    },
+    removeRowTask(index, data) { //移除
+      if (!data[index].identification) {
+        data.splice(index, 1);
+      } else {
+        data[index].isSet = false;
+      }
+    },
+    deleteRowTask(index, data) { //删除
+      this.result = this.$get("/notice/delete/message/" + data.identification, response => {
+        this.$success(this.$t('commons.delete_success'));
+        this.initForm();
+      });
+    },
+    rowClass() {
+      return "text-align:center";
+    },
+    headClass() {
+      return "text-align:center;background:'#ededed'";
+    },
+    handleTemplate(index, row) {
+      if (hasLicense()) {
+        let htmlTemplate = "";
+        let robotTemplate = "";
+        switch (row.event) {
+          case 'EXECUTE_SUCCESSFUL':
+            htmlTemplate = this.title;
+            robotTemplate = this.robotTitle;
+            break;
+          case 'EXECUTE_FAILED':
+            htmlTemplate = this.title.replace('成功', '失败');
+            robotTemplate = this.robotTitle.replace('成功', '失败');
+            break;
+          default:
+            break;
+        }
+        this.$refs.noticeTemplate.open(row, htmlTemplate, robotTemplate);
+      }
+    }
+  }
+};
+</script>
+
+<style scoped>
+.el-row {
+  margin-bottom: 10px;
+}
+</style>
+
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 8142d4f9e1..d7e0ac4ccb 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 8142d4f9e15802034cdc2c98a6af88af5fedf480
+Subproject commit d7e0ac4ccb6a1b5edefc7cb501a2c5c7b7a70dce

From a628ea36b4e0b8959de3e52cd8a96bb114f3abd5 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 14 Dec 2021 12:37:57 +0800
Subject: [PATCH 117/256] =?UTF-8?q?fix:=20jira=E6=A8=A1=E6=9D=BF=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/ExtCustomFieldTemplateMapper.java     |  3 ++
 .../ext/ExtCustomFieldTemplateMapper.xml      | 12 ++++++
 .../service/CustomFieldTemplateService.java   |  5 +++
 .../track/service/IssuesService.java          |  7 +++-
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 .../template/CustomFiledComponent.vue         | 13 +-----
 .../track/issue/IssueEditDetail.vue           | 40 ++++++++++---------
 frontend/src/common/js/custom_field.js        |  1 +
 8 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.java
index 117453706e..af2697c45e 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.java
@@ -1,6 +1,7 @@
 package io.metersphere.base.mapper.ext;
 
 import io.metersphere.base.domain.CustomFieldTemplate;
+import io.metersphere.dto.CustomFieldDao;
 import io.metersphere.dto.CustomFieldTemplateDao;
 import org.apache.ibatis.annotations.Param;
 
@@ -10,4 +11,6 @@ public interface ExtCustomFieldTemplateMapper {
     List<String> getCustomFieldIds(@Param("templateId") String templateId);
 
     List<CustomFieldTemplateDao> list(@Param("request") CustomFieldTemplate request);
+
+    List<CustomFieldDao> lisSimple(@Param("request") CustomFieldTemplate request);
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.xml
index e9400677ab..8739a7a80f 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.xml
@@ -19,4 +19,16 @@
             where cft.template_id = #{request.templateId}
         </if>
     </select>
+    <select id="lisSimple" resultType="io.metersphere.dto.CustomFieldDao">
+        select
+        template_id, required, default_value, custom_data,
+        cft.id as id,
+        cf.name as name, cf.type as type
+        from custom_field_template cft
+        inner join custom_field cf
+        on cft.field_id = cf.id
+        <if test="request.templateId != null">
+            where cft.template_id = #{request.templateId}
+        </if>
+    </select>
 </mapper>
diff --git a/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java b/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java
index ad3eac645e..c4f6cf5585 100644
--- a/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java
+++ b/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java
@@ -7,6 +7,7 @@ import io.metersphere.base.domain.CustomFieldTemplateExample;
 import io.metersphere.base.mapper.CustomFieldMapper;
 import io.metersphere.base.mapper.CustomFieldTemplateMapper;
 import io.metersphere.base.mapper.ext.ExtCustomFieldTemplateMapper;
+import io.metersphere.dto.CustomFieldDao;
 import io.metersphere.dto.CustomFieldTemplateDao;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -51,6 +52,10 @@ public class CustomFieldTemplateService {
         return extCustomFieldTemplateMapper.list(request);
     }
 
+    public List<CustomFieldDao> lisSimple(CustomFieldTemplate request) {
+        return extCustomFieldTemplateMapper.lisSimple(request);
+    }
+
     public void deleteByTemplateId(String templateId) {
         if (StringUtils.isNotBlank(templateId)) {
             CustomFieldTemplateExample example = new CustomFieldTemplateExample();
diff --git a/backend/src/main/java/io/metersphere/track/service/IssuesService.java b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
index bc96fee8e8..0c15cd1dad 100644
--- a/backend/src/main/java/io/metersphere/track/service/IssuesService.java
+++ b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
@@ -13,7 +13,7 @@ import io.metersphere.commons.constants.IssuesStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
 import io.metersphere.controller.request.IntegrationRequest;
-import io.metersphere.dto.CustomFieldTemplateDao;
+import io.metersphere.dto.CustomFieldDao;
 import io.metersphere.dto.IssueTemplateDao;
 import io.metersphere.log.utils.ReflexObjectUtil;
 import io.metersphere.log.vo.DetailColumn;
@@ -476,8 +476,11 @@ public class IssuesService {
         IssueTemplateDao template = issueTemplateService.getTemplate(projectId);
         CustomFieldTemplate request = new CustomFieldTemplate();
         request.setTemplateId(template.getId());
-        List<CustomFieldTemplateDao> customFields = customFieldTemplateService.list(request);
+        List<CustomFieldDao> customFields = customFieldTemplateService.lisSimple(request);
+        return getCustomFieldsValuesString(customFields);
+    }
 
+    public String getCustomFieldsValuesString(List<CustomFieldDao> customFields) {
         JSONArray fields = new JSONArray();
         customFields.forEach(item -> {
             JSONObject field = new JSONObject(true);
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index cf8337c9a6..a41ba52f54 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit cf8337c9a6341d8c9eb7f5c9bef897083b0d2951
+Subproject commit a41ba52f5495bc68f84a07643442d2b0e9524786
diff --git a/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue b/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
index 56ed29a447..7febad269f 100644
--- a/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
+++ b/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
@@ -18,6 +18,7 @@
       v-else-if="data.type === 'cascadingSelect'"
       expand-trigger="hover"
       @change="handleChange"
+      :props="{label: 'text'}"
       :options="data.options"
       v-model="data[prop]">
     </el-cascader>
@@ -128,9 +129,6 @@ export default {
       memberOptions: [],
     };
   },
-  created() {
-    this.initOption(this.data.options);
-  },
   mounted() {
     this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
       this.memberOptions = response.data;
@@ -145,15 +143,6 @@ export default {
         this.$set(this.form, this.data.name, this.data[this.prop]);
       }
     },
-    initOption(options) {
-      if (options) {
-        options.forEach(i => {
-          i.label = i.text;
-          this.$set(i, 'label', i.text);
-          this.initOption(i.children);
-        });
-      }
-    }
   }
 };
 </script>
diff --git a/frontend/src/business/components/track/issue/IssueEditDetail.vue b/frontend/src/business/components/track/issue/IssueEditDetail.vue
index 168b826721..0777c8481b 100644
--- a/frontend/src/business/components/track/issue/IssueEditDetail.vue
+++ b/frontend/src/business/components/track/issue/IssueEditDetail.vue
@@ -179,24 +179,22 @@ export default {
   },
   methods: {
     open(data) {
-      let initAddFuc = this.initEdit;
-      getCurrentProject((responseData) => {
-        this.currentProject = responseData;
-        if (hasLicense() && this.currentProject && this.currentProject.thirdPartTemplate && this.currentProject.platform === JIRA) {
-          getIssueThirdPartTemplate()
-            .then((template) => {
-              this.issueTemplate = template;
-              this.getThirdPartyInfo();
-              initAddFuc(data);
-            });
-        } else {
-          getIssueTemplate()
-            .then((template) => {
-              this.issueTemplate = template;
-              this.getThirdPartyInfo();
-              initAddFuc(data);
-            });
-        }
+      this.result.loading = true;
+      this.$nextTick(() => {
+        getCurrentProject((responseData) => {
+          this.currentProject = responseData;
+          if (hasLicense() && this.currentProject && this.currentProject.thirdPartTemplate && this.currentProject.platform === JIRA) {
+            getIssueThirdPartTemplate()
+              .then((template) => {
+                this.init(template, data);
+              });
+          } else {
+            getIssueTemplate()
+              .then((template) => {
+                this.init(template, data);
+              });
+          }
+        });
       });
 
       if(data&&data.id){
@@ -216,6 +214,12 @@ export default {
     currentUser: () => {
       return getCurrentUser();
     },
+    init(template, data) {
+      this.issueTemplate = template;
+      this.getThirdPartyInfo();
+      this.initEdit(data);
+      this.result.loading = false;
+    },
     getThirdPartyInfo() {
       let platform = this.issueTemplate.platform;
       if (platform === 'Zentao') {
diff --git a/frontend/src/common/js/custom_field.js b/frontend/src/common/js/custom_field.js
index a0d0bdba38..a6854039b3 100644
--- a/frontend/src/common/js/custom_field.js
+++ b/frontend/src/common/js/custom_field.js
@@ -117,6 +117,7 @@ export function buildCustomFields(data, param, template) {
           hasField = true;
           customFields[index].name = item.name;
           customFields[index].value = item.defaultValue;
+          customFields[index].type = item.type;
           break;
         }
       }

From c2931aea70048c1400924f0187a5f05d5bb6ca09 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Tue, 14 Dec 2021 14:47:18 +0800
Subject: [PATCH 118/256] =?UTF-8?q?style:=20=E9=80=9A=E7=9F=A5=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E4=B8=8A=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index d7e0ac4ccb..dd73a29ed2 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit d7e0ac4ccb6a1b5edefc7cb501a2c5c7b7a70dce
+Subproject commit dd73a29ed22916b8d7ff70d1062604a17177d3a5

From d305ee05cb192ab8d5721abb915afe25feca8a8b Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 14 Dec 2021 14:52:17 +0800
Subject: [PATCH 119/256] =?UTF-8?q?fix:=20=E8=84=91=E5=9B=BE=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E7=94=A8=E4=BE=8B=E6=8A=A5=E9=94=99=20--bug=3D1008755?=
 =?UTF-8?q?=20--user=3D=E9=99=88=E5=BB=BA=E6=98=9F=20=E3=80=90github#8424?=
 =?UTF-8?q?=E3=80=91=E5=9C=A8=E8=84=91=E5=9B=BE=E4=B8=AD=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=97=B6=E6=9C=AA=E6=89=93=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=9B=B4=E6=8E=A5=E4=BF=9D=E5=AD=98=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F=E5=90=8E?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E7=BC=96=E8=BE=91=E8=AF=A5=E6=9D=A1=E6=9C=AA?=
 =?UTF-8?q?=E6=89=93=E6=A0=87=E7=AD=BE=E7=9A=84=E7=94=A8=E4=BE=8B=E5=B9=B6?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=EF=BC=8C=E7=B3=BB=E7=BB=9F=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=20https://www.tapd.cn/55049933/s/1080504=20--bug=3D1008818=20-?=
 =?UTF-8?q?-user=3D=E9=99=88=E5=BB=BA=E6=98=9F=20=E3=80=90github#8438?=
 =?UTF-8?q?=E3=80=91=E7=BC=96=E8=BE=91Minder=E7=94=A8=E4=BE=8B=E6=9C=89?=
 =?UTF-8?q?=E6=97=B6=E4=BC=9A=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=20https://www.tapd.cn/55049933/s/1080624?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/common/minder/TestCaseMinder.vue         | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index c6271a4556..56ec703a88 100644
--- a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -252,11 +252,13 @@ name: "TestCaseMinder",
       if (data.isExtraNode) {
         // 如果是临时节点，打上了模块标签，则删除临时节点并新建模块
         this.pushDeleteNode(data);
+        module.id = null;
       }
 
       if (data.type === 'case') {
         // 如果是用例节点，打上了模块标签，则用例节点并新建模块
         this.pushDeleteNode(data);
+        module.id = null;
       }
 
       if (module.id && module.id.length > 20) {
@@ -301,11 +303,6 @@ name: "TestCaseMinder",
         throw new Error(tip);
       }
 
-      if (data.isExtraNode) {
-        // 如果是临时节点，打上了用例标签，则删除临时节点并新建用例节点
-        this.pushDeleteNode(data);
-      }
-
       let isChange = false;
 
       let nodeId = parent ? (parent.newId ? parent.newId : parent.id) : "";
@@ -360,6 +357,12 @@ name: "TestCaseMinder",
       }
       testCase.steps = JSON.stringify(steps);
 
+      if (data.isExtraNode) {
+        // 如果是临时节点，打上了用例标签，则删除临时节点并新建用例节点
+        this.pushDeleteNode(data);
+        testCase.id = null;
+      }
+
       if (isChange) {
 
         testCase.targetId = null; // 排序处理
@@ -425,6 +428,7 @@ name: "TestCaseMinder",
           nodeData.children.push(this._buildExtraNode(item));
         });
       }
+      data.isExtraNode = true;
       return nodeData;
     },
     tagEditCheck() {

From 217c30be671de63a5f9ea499d0a36e2771f14c48 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 14 Dec 2021 15:20:26 +0800
Subject: [PATCH 120/256] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE):=20=E6=88=90=E5=91=98=E7=9B=B8=E5=85=B3=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/settings/common/AddMember.vue  | 28 ++++--------
 .../settings/common/UserOptionItem.vue        | 45 +++++++++++++++++++
 .../settings/system/SystemWorkspace.vue       | 10 ++---
 .../settings/system/group/GroupMember.vue     | 36 ++++++---------
 .../settings/workspace/WorkspaceMember.vue    | 14 ------
 5 files changed, 71 insertions(+), 62 deletions(-)
 create mode 100644 frontend/src/business/components/settings/common/UserOptionItem.vue

diff --git a/frontend/src/business/components/settings/common/AddMember.vue b/frontend/src/business/components/settings/common/AddMember.vue
index 97ba699d87..d5c8f2e699 100644
--- a/frontend/src/business/components/settings/common/AddMember.vue
+++ b/frontend/src/business/components/settings/common/AddMember.vue
@@ -11,22 +11,19 @@
           filterable
           :filter-method="userFilter"
           :popper-append-to-body="false"
-          class="select-width"
+          class="member_select"
           :placeholder="$t('member.please_choose_member')">
           <el-option
             v-for="item in userList"
             :key="item.id"
             :label="item.id"
             :value="item.id">
-            <template>
-              <span class="user-select-left">{{ item.name }} ({{ item.id }})</span>
-              <span class="user-select-right">{{ item.email }}</span>
-            </template>
+            <user-option-item :user="item"/>
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('commons.group')" prop="groupIds">
-        <el-select v-model="form.groupIds" multiple :placeholder="$t('group.please_select_group')" class="select-width">
+        <el-select v-model="form.groupIds" multiple :placeholder="$t('group.please_select_group')" class="group_select">
           <el-option
             v-for="item in form.groups"
             :key="item.id"
@@ -39,7 +36,7 @@
     <template v-slot:footer>
       <div class="dialog-footer">
         <el-button @click="dialogVisible = false" size="medium">{{ $t('commons.cancel') }}</el-button>
-        <el-button type="primary" @click="submitForm('form')" @keydown.enter.native.prevent size="medium">
+        <el-button type="primary" @click="submitForm('form')" size="medium" @keydown.enter.native.prevent>
           {{ $t('commons.confirm') }}
         </el-button>
       </div>
@@ -49,8 +46,11 @@
 
 <script>
 
+import UserOptionItem from "@/business/components/settings/common/UserOptionItem";
+
 export default {
   name: "AddMember",
+  components: {UserOptionItem},
   data() {
     return {
       dialogVisible: false,
@@ -124,17 +124,7 @@ export default {
 </script>
 
 <style scoped>
-.user-select-left {
-  float: left;
-}
-
-.user-select-right {
-  float: right;
-  color: #8492a6;
-  font-size: 13px;
-}
-
-.select-width {
-  width: 85%;
+.member_select, .group_select {
+  display: block;
 }
 </style>
diff --git a/frontend/src/business/components/settings/common/UserOptionItem.vue b/frontend/src/business/components/settings/common/UserOptionItem.vue
new file mode 100644
index 0000000000..12b2985330
--- /dev/null
+++ b/frontend/src/business/components/settings/common/UserOptionItem.vue
@@ -0,0 +1,45 @@
+<template>
+  <div>
+    <span class="user-select-left">{{ user.name }} ({{ user.id }})</span>
+    <span class="user-select-right">{{ user.email }}</span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "UserOptionItem",
+  props: {
+    user: {
+      type: Object,
+      default() {
+        return {
+          id: "",
+          name: "",
+          email: ""
+        };
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.user-select-left {
+  float: left;
+  display: inline-block;
+  max-width: 180px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.user-select-left:hover {
+  overflow: visible;
+}
+
+.user-select-right {
+  float: right;
+  color: #8492a6;
+  font-size: 13px;
+}
+</style>
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index 0bc2136bb1..a65f714ad0 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -74,7 +74,7 @@
 
     <!-- dialog of workspace member -->
     <el-dialog :close-on-click-modal="false" :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true"
-               @close="closeWsMemberDialog" class="dialog-css">
+               @close="closeWsMemberDialog" class="dialog-css" top="15vh">
       <template v-slot:title>
         <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
                          :create-tip="$t('member.create')" :title="$t('commons.member')"/>
@@ -464,7 +464,6 @@ export default {
 }
 
 .member-size {
-  text-decoration: underline;
   cursor: pointer;
 }
 
@@ -484,9 +483,8 @@ export default {
 .form-input{
   width: 80%;
 }
-/*.dialog-css >>> .el-dialog__header {*/
-/*  padding: 0;*/
-/*}*/
-
+.dialog-css >>> .el-dialog__body {
+  padding-top: 0;
+}
 </style>
 
diff --git a/frontend/src/business/components/settings/system/group/GroupMember.vue b/frontend/src/business/components/settings/system/group/GroupMember.vue
index 19a138072b..088468ef29 100644
--- a/frontend/src/business/components/settings/system/group/GroupMember.vue
+++ b/frontend/src/business/components/settings/system/group/GroupMember.vue
@@ -2,8 +2,7 @@
   <div>
     <el-dialog :close-on-click-modal="false" :visible.sync="visible" width="65%" top="15vh"
                :destroy-on-close="true" @close="close" v-loading="result.loading"
-               class="group-member"
-    >
+               class="group-member">
       <template v-slot:title>
         <ms-table-header :condition.sync="condition" @create="addMemberBtn" @search="search"
                          :create-tip="$t('member.create')" :title="$t('commons.member')"/>
@@ -22,16 +21,14 @@
             <el-popover
               placement="top"
               width="250"
-              trigger="click"
-            >
+              trigger="click">
               <div v-loading="sourceResult.loading" style="height: 150px;overflow: auto;">
                 <el-tag
                   v-for="item in groupSource"
                   :key="item.id"
                   :type="item.name"
                   size="small"
-                  style="margin-left: 5px;margin-top: 5px;"
-                >
+                  style="margin-left: 5px;margin-top: 5px;">
                   {{ item.name }}
                 </el-tag>
               </div>
@@ -64,7 +61,7 @@
             multiple
             filterable
             :popper-append-to-body="false"
-            style="width: 90%"
+            class="member_select"
             :disabled="userSelectDisable"
             :placeholder="$t('member.please_choose_member')">
             <el-option
@@ -73,15 +70,14 @@
               :label="item.id"
               :value="item.id">
               <template>
-                <span class="user-select-left">{{ item.name }} ({{ item.id }})</span>
-                <span class="user-select-right">{{ item.email }}</span>
+                <user-option-item :user="item"/>
               </template>
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="typeLabel" v-if="showTypeLabel" prop="sourceIds">
-          <el-select v-model="form.sourceIds" :placeholder="typeLabel" style="width: 90%;" clearable multiple
-                     filterable>
+          <el-select v-model="form.sourceIds" :placeholder="typeLabel" class="other_source_select"
+                     clearable multiple filterable>
             <el-option v-for="item in sourceData" :key="item.id" :label="item.name" :value="item.id"/>
           </el-select>
         </el-form-item>
@@ -103,10 +99,12 @@ import MsTableHeader from "@/business/components/common/components/MsTableHeader
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import {GROUP_PROJECT, GROUP_SYSTEM, GROUP_WORKSPACE} from "@/common/js/constants";
 import MsTableOperator from "@/business/components/common/components/MsTableOperator";
+import UserOptionItem from "@/business/components/settings/common/UserOptionItem";
 
 export default {
   name: "GroupMember",
   components: {
+    UserOptionItem,
     MsTableHeader,
     MsTablePagination,
     MsTableOperator
@@ -287,18 +285,10 @@ export default {
 </script>
 
 <style scoped>
-/*.group-member >>> .el-dialog__header {*/
-/*  padding: 0;*/
-/*}*/
-
-.user-select-left {
-  float: left;
+.member_select, .other_source_select {
+  display: block;
 }
-
-.user-select-right {
-  float: right;
-  margin-right: 18px;
-  color: #8492a6;
-  font-size: 13px;
+.group-member >>> .el-dialog__body {
+  padding-top: 0;
 }
 </style>
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index dfbb9a4792..d3622b5b72 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@@ -367,20 +367,6 @@ export default {
   width: 80%;
 }
 
-.workspace-member-name {
-  float: left;
-}
-
-.workspace-member-email {
-  float: right;
-  color: #8492a6;
-  font-size: 13px;
-}
-
-.input-with-autocomplete {
-  width: 100%;
-}
-
 /deep/ .ms-select-all-fixed th:nth-child(2) .el-icon-arrow-down {
   top: -5px;
 }

From f0e6bed4d9e580f1032ad3e4d7dd0b2dd75e2f05 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 14 Dec 2021 14:58:23 +0800
Subject: [PATCH 121/256] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1):=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=8A=A5=E5=91=8A=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=AE=9E=E6=97=B6=E6=9F=A5=E8=AF=A2=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

项目报告定时任务可以实时查询图表
---
 backend/pom.xml                               |   5 +
 .../api/controller/ShareInfoController.java   |  22 ++-
 .../constants/PermissionConstants.java        |   1 +
 .../commons/constants/ScheduleGroup.java      |   3 +-
 .../metersphere/commons/utils/ShiroUtils.java |   8 +-
 .../controller/IndexController.java           |   7 +-
 .../reportstatistics/dto/HeadlessRequest.java |  11 ++
 .../service/ReportStatisticsService.java      | 142 ++++++++++++++----
 .../service/TestCaseCountService.java         |   7 +
 .../reportstatistics/utils/ChromeUtils.java   |  75 +++++++++
 backend/src/main/java/io/metersphere/xpack    |   2 +-
 backend/src/main/resources/permission.json    |   6 +
 .../automation/schedule/ScheduleMaintain.vue  |  13 ++
 .../casecount/TestCaseCountContainer.vue      |  22 ++-
 .../casecount/filter/TestCaseCountFilter.vue  |   3 -
 frontend/src/business/components/xpack        |   2 +-
 .../share/ShareEnterpriseReportTemplate.vue   | 109 ++++++++++++++
 .../share/share-enterprise-report.html        |  13 ++
 .../share/share-enterprise-report.js          |  40 +++++
 frontend/vue.config.js                        |  11 +-
 20 files changed, 454 insertions(+), 48 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/reportstatistics/dto/HeadlessRequest.java
 create mode 100644 backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java
 create mode 100644 frontend/src/template/enterprise/share/ShareEnterpriseReportTemplate.vue
 create mode 100644 frontend/src/template/enterprise/share/share-enterprise-report.html
 create mode 100644 frontend/src/template/enterprise/share/share-enterprise-report.js

diff --git a/backend/pom.xml b/backend/pom.xml
index ce7b3ed658..64044a1cf0 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -440,6 +440,11 @@
             <artifactId>xmindjbehaveplugin</artifactId>
             <version>0.8</version>
         </dependency>
+        <!-- selenium包  -->
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+        </dependency>
         <!-- 基础包 -->
         <dependency>
             <groupId>io.metersphere</groupId>
diff --git a/backend/src/main/java/io/metersphere/api/controller/ShareInfoController.java b/backend/src/main/java/io/metersphere/api/controller/ShareInfoController.java
index 4c66ed0b66..a9e5a831e7 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ShareInfoController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ShareInfoController.java
@@ -7,8 +7,11 @@ import io.metersphere.api.dto.share.ShareInfoDTO;
 import io.metersphere.api.service.ApiDefinitionService;
 import io.metersphere.api.service.ShareInfoService;
 import io.metersphere.base.domain.ApiDefinitionWithBLOBs;
+import io.metersphere.base.domain.ReportStatisticsWithBLOBs;
 import io.metersphere.base.domain.ShareInfo;
 import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.reportstatistics.dto.ReportStatisticsSaveRequest;
+import io.metersphere.reportstatistics.service.ReportStatisticsService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -29,6 +32,8 @@ public class ShareInfoController {
     ShareInfoService shareInfoService;
     @Resource
     ApiDefinitionService apiDefinitionService;
+    @Resource
+    ReportStatisticsService reportStatisticsService;
 
     @PostMapping("/selectApiSimpleInfo")
     public List<ApiDocumentInfoDTO> list(@RequestBody ApiDocumentRequest request) {
@@ -44,13 +49,13 @@ public class ShareInfoController {
     @PostMapping("/selectApiInfoByParam")
     public List<ApiDocumentInfoDTO> selectApiInfoByParam(@RequestBody ApiDocumentRequest request) {
         List<ApiDocumentInfoDTO> returnList = new ArrayList<>();
-        if(request.getApiIdList() != null){
+        if (request.getApiIdList() != null) {
             //要根据ids的顺序进行返回排序
             List<ApiDefinitionWithBLOBs> apiModels = apiDefinitionService.getBLOBs(request.getApiIdList());
-            Map<String,ApiDefinitionWithBLOBs> apiModelMaps = apiModels.stream().collect(Collectors.toMap(ApiDefinitionWithBLOBs :: getId,a->a,(k1,k2)->k1));
-            for(String id : request.getApiIdList()){
+            Map<String, ApiDefinitionWithBLOBs> apiModelMaps = apiModels.stream().collect(Collectors.toMap(ApiDefinitionWithBLOBs::getId, a -> a, (k1, k2) -> k1));
+            for (String id : request.getApiIdList()) {
                 ApiDefinitionWithBLOBs model = apiModelMaps.get(id);
-                if(model == null){
+                if (model == null) {
                     model = new ApiDefinitionWithBLOBs();
                     model.setId(id);
                     model.setName(id);
@@ -66,9 +71,9 @@ public class ShareInfoController {
     public ApiDocumentInfoDTO selectApiInfoById(@PathVariable String id) {
         ApiDefinitionWithBLOBs apiModel = apiDefinitionService.getBLOBs(id);
         ApiDocumentInfoDTO returnDTO = new ApiDocumentInfoDTO();
-        try{
+        try {
             returnDTO = shareInfoService.conversionModelToDTO(apiModel);
-        }catch (Exception e){
+        } catch (Exception e) {
             LogUtil.error(e);
         }
         returnDTO.setSelectedFlag(true);
@@ -88,4 +93,9 @@ public class ShareInfoController {
         ShareInfoDTO returnDTO = shareInfoService.conversionShareInfoToDTO(apiShare);
         return returnDTO;
     }
+
+    @PostMapping("/selectHistoryReportById")
+    public ReportStatisticsWithBLOBs selectById(@RequestBody ReportStatisticsSaveRequest request) {
+        return reportStatisticsService.selectById(request.getId());
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/commons/constants/PermissionConstants.java b/backend/src/main/java/io/metersphere/commons/constants/PermissionConstants.java
index 9fee89f756..b22a754cda 100644
--- a/backend/src/main/java/io/metersphere/commons/constants/PermissionConstants.java
+++ b/backend/src/main/java/io/metersphere/commons/constants/PermissionConstants.java
@@ -176,4 +176,5 @@ public class PermissionConstants {
     public static final String PROJECT_ENTERPRISE_REPORT_EDIT = "PROJECT_ENTERPRISE_REPORT:READ+EDIT";
     public static final String PROJECT_ENTERPRISE_REPORT_DELETE = "PROJECT_ENTERPRISE_REPORT:READ+DELETE";
     public static final String PROJECT_ENTERPRISE_REPORT_COPY = "PROJECT_ENTERPRISE_REPORT:READ+COPY";
+    public static final String PROJECT_ENTERPRISE_REPORT_SCHEDULE = "PROJECT_ENTERPRISE_REPORT:READ+SCHEDULE";
 }
diff --git a/backend/src/main/java/io/metersphere/commons/constants/ScheduleGroup.java b/backend/src/main/java/io/metersphere/commons/constants/ScheduleGroup.java
index 5034727411..93b531a245 100644
--- a/backend/src/main/java/io/metersphere/commons/constants/ScheduleGroup.java
+++ b/backend/src/main/java/io/metersphere/commons/constants/ScheduleGroup.java
@@ -1,5 +1,6 @@
 package io.metersphere.commons.constants;
 
 public enum ScheduleGroup {
-    API_TEST, PERFORMANCE_TEST, API_SCENARIO_TEST, TEST_PLAN_TEST, SWAGGER_IMPORT, ISSUE_SYNC
+    API_TEST, PERFORMANCE_TEST, API_SCENARIO_TEST, TEST_PLAN_TEST, SWAGGER_IMPORT, ISSUE_SYNC,
+    SCHEDULE_SEND_REPORT
 }
diff --git a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
index bc5a07ee4e..3c9eb6fe97 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
@@ -13,7 +13,7 @@ import java.util.Map;
 
 public class ShiroUtils {
 
-    public static void loadBaseFilterChain(Map<String, String> filterChainDefinitionMap){
+    public static void loadBaseFilterChain(Map<String, String> filterChainDefinitionMap) {
 
         filterChainDefinitionMap.put("/resource/**", "anon");
         filterChainDefinitionMap.put("/*.worker.js", "anon");
@@ -53,9 +53,11 @@ public class ShiroUtils {
         //分享相关接口
         filterChainDefinitionMap.put("/share/info/generateShareInfoWithExpired", "anon");
         filterChainDefinitionMap.put("/share/info/selectApiInfoByParam", "anon");
+        filterChainDefinitionMap.put("/share/info/selectHistoryReportById", "anon");
         filterChainDefinitionMap.put("/share/get/**", "anon");
         filterChainDefinitionMap.put("/share/info", "apikey, csrf, authc"); // 需要认证
         filterChainDefinitionMap.put("/document/**", "anon");
+        filterChainDefinitionMap.put("/echartPic/**", "anon");
         filterChainDefinitionMap.put("/share/**", "anon");
         filterChainDefinitionMap.put("/sharePlanReport", "anon");
 
@@ -82,14 +84,14 @@ public class ShiroUtils {
         filterChainDefinitionMap.put("/resource/md/get/**", "apikey, authc");
     }
 
-    public static Cookie getSessionIdCookie(){
+    public static Cookie getSessionIdCookie() {
         SimpleCookie sessionIdCookie = new SimpleCookie();
         sessionIdCookie.setPath("/");
         sessionIdCookie.setName("MS_SESSION_ID");
         return sessionIdCookie;
     }
 
-    public static SessionManager getSessionManager(Long sessionTimeout, CacheManager cacheManager){
+    public static SessionManager getSessionManager(Long sessionTimeout, CacheManager cacheManager) {
         DefaultWebSessionManager sessionManager = new CustomSessionManager();
         sessionManager.setSessionIdUrlRewritingEnabled(false);
         sessionManager.setDeleteInvalidSessions(true);
diff --git a/backend/src/main/java/io/metersphere/controller/IndexController.java b/backend/src/main/java/io/metersphere/controller/IndexController.java
index deeb139f66..e80f11b0c5 100644
--- a/backend/src/main/java/io/metersphere/controller/IndexController.java
+++ b/backend/src/main/java/io/metersphere/controller/IndexController.java
@@ -32,8 +32,13 @@ public class IndexController {
         return "document.html";
     }
 
+    @GetMapping(value = "/echartPic")
+    public String echartPic() {
+        return "share-enterprise-report.html";
+    }
+
     @GetMapping(value = "/sharePlanReport")
     public String shareRedirect() {
-        return  "share-plan-report.html";
+        return "share-plan-report.html";
     }
 }
diff --git a/backend/src/main/java/io/metersphere/reportstatistics/dto/HeadlessRequest.java b/backend/src/main/java/io/metersphere/reportstatistics/dto/HeadlessRequest.java
new file mode 100644
index 0000000000..90faa26654
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/reportstatistics/dto/HeadlessRequest.java
@@ -0,0 +1,11 @@
+package io.metersphere.reportstatistics.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class HeadlessRequest {
+    public String url;
+    public String driverPath;
+}
diff --git a/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java b/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
index 4ee848411c..f879d36bc4 100644
--- a/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
+++ b/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
@@ -6,16 +6,20 @@ import io.metersphere.base.domain.ReportStatistics;
 import io.metersphere.base.domain.ReportStatisticsExample;
 import io.metersphere.base.domain.ReportStatisticsWithBLOBs;
 import io.metersphere.base.mapper.ReportStatisticsMapper;
+import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.SessionUtils;
-import io.metersphere.reportstatistics.dto.ReportStatisticsSaveRequest;
-import io.metersphere.reportstatistics.dto.ReportStatisticsType;
-import io.metersphere.reportstatistics.dto.TestCaseCountTableDTO;
+import io.metersphere.dto.BaseSystemConfigDTO;
+import io.metersphere.reportstatistics.dto.*;
+import io.metersphere.reportstatistics.dto.charts.Series;
 import io.metersphere.reportstatistics.dto.table.TestCaseCountTableDataDTO;
 import io.metersphere.reportstatistics.dto.table.TestCaseCountTableItemDataDTO;
 import io.metersphere.reportstatistics.dto.table.TestCaseCountTableRowDTO;
+import io.metersphere.reportstatistics.utils.ChromeUtils;
+import io.metersphere.service.SystemParameterService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -31,19 +35,21 @@ import java.util.UUID;
 public class ReportStatisticsService {
     @Resource
     private ReportStatisticsMapper reportStatisticsMapper;
+    @Resource
+    private TestCaseCountService testCaseCountService;
 
     public ReportStatisticsWithBLOBs saveByRequest(ReportStatisticsSaveRequest request) {
         ReportStatisticsWithBLOBs model = new ReportStatisticsWithBLOBs();
         model.setId(UUID.randomUUID().toString());
 
         String name = "用例分析报表";
-        if(StringUtils.equalsIgnoreCase(ReportStatisticsType.TEST_CASE_COUNT.name(),request.getReportType())){
+        if (StringUtils.equalsIgnoreCase(ReportStatisticsType.TEST_CASE_COUNT.name(), request.getReportType())) {
             name = "用例统计报表";
             model.setReportType(ReportStatisticsType.TEST_CASE_COUNT.name());
-        }else {
+        } else {
             model.setReportType(ReportStatisticsType.TEST_CASE_ANALYSIS.name());
         }
-        if(StringUtils.isEmpty(request.getName())){
+        if (StringUtils.isEmpty(request.getName())) {
             request.setName(name);
         }
         model.setName(request.getName());
@@ -66,23 +72,81 @@ public class ReportStatisticsService {
     }
 
     public ReportStatisticsWithBLOBs selectById(String id) {
-        ReportStatisticsWithBLOBs blob =  reportStatisticsMapper.selectByPrimaryKey(id);
-        JSONObject dataOption = JSONObject.parseObject(blob.getDataOption());
+        ReportStatisticsWithBLOBs blob = reportStatisticsMapper.selectByPrimaryKey(id);
         JSONObject selectOption = JSONObject.parseObject(blob.getSelectOption());
-        if(!dataOption.containsKey("showTable")){
-            List<TestCaseCountTableDTO> dtos = JSONArray.parseArray(dataOption.getString("tableData"),TestCaseCountTableDTO.class);
-            TestCaseCountTableDataDTO showTable = this.countShowTable(selectOption.getString("xaxis"), JSONArray.parseArray(selectOption.getString("yaxis"),String.class),dtos);
-            dataOption.put("showTable",showTable);
+        JSONObject dataOption = JSONObject.parseObject(blob.getDataOption());
+        boolean isReportNeedUpdate = this.isReportNeedUpdate(blob);
+        if (isReportNeedUpdate) {
+            TestCaseCountRequest countRequest = JSONObject.parseObject(blob.getSelectOption(), TestCaseCountRequest.class);
+            JSONObject returnDataOption = this.reloadDatas(countRequest, dataOption.getString("chartType"));
+            if (returnDataOption != null) {
+                dataOption = returnDataOption;
+            }
+        }
+
+        if (!dataOption.containsKey("showTable")) {
+            List<TestCaseCountTableDTO> dtos = JSONArray.parseArray(dataOption.getString("tableData"), TestCaseCountTableDTO.class);
+            TestCaseCountTableDataDTO showTable = this.countShowTable(selectOption.getString("xaxis"), JSONArray.parseArray(selectOption.getString("yaxis"), String.class), dtos);
+            dataOption.put("showTable", showTable);
             blob.setDataOption(dataOption.toString());
         }
         return blob;
     }
+
+    private JSONObject reloadDatas(TestCaseCountRequest request, String chartType) {
+        if (StringUtils.isEmpty(chartType)) {
+            chartType = "bar";
+        }
+        JSONObject returnObject = new JSONObject();
+        TestCaseCountResponse testCaseCountResponse = testCaseCountService.getReport(request);
+        if (testCaseCountResponse.getBarChartDTO() != null) {
+            JSONObject loadOptionObject = new JSONObject();
+            loadOptionObject.put("legend", JSONObject.toJSON(testCaseCountResponse.getBarChartDTO().getLegend()));
+            loadOptionObject.put("xAxis", JSONObject.toJSON(testCaseCountResponse.getBarChartDTO().getXAxis()));
+            loadOptionObject.put("xaxis", JSONObject.toJSON(testCaseCountResponse.getBarChartDTO().getXAxis()));
+            loadOptionObject.put("yAxis", JSONObject.toJSON(testCaseCountResponse.getBarChartDTO().getYAxis()));
+            loadOptionObject.put("tooltip", new JSONObject());
+            loadOptionObject.put("lable", new JSONObject());
+            if (!CollectionUtils.isEmpty(testCaseCountResponse.getBarChartDTO().getSeries())) {
+                List<Series> list = testCaseCountResponse.getBarChartDTO().getSeries();
+                for (Series model : list) {
+                    model.setType(chartType);
+                }
+                loadOptionObject.put("series", JSONArray.toJSON(list));
+            }
+            loadOptionObject.put("grid", new JSONObject().put("bottom", "75px"));
+            returnObject.put("loadOption", loadOptionObject);
+        }
+        if (testCaseCountResponse.getPieChartDTO() != null) {
+            JSONObject pieOptionObject = new JSONObject();
+            pieOptionObject.put("title", JSONObject.toJSON(testCaseCountResponse.getPieChartDTO().getTitle()));
+            pieOptionObject.put("xAxis", JSONObject.toJSON(testCaseCountResponse.getPieChartDTO().getXAxis()));
+            if (!CollectionUtils.isEmpty(testCaseCountResponse.getPieChartDTO().getSeries())) {
+                List<Series> list = testCaseCountResponse.getPieChartDTO().getSeries();
+                for (Series model : list) {
+                    model.setType(chartType);
+                }
+                pieOptionObject.put("series", JSONArray.toJSON(list));
+            }
+            pieOptionObject.put("grid", new JSONObject().put("bottom", "75px"));
+            if (testCaseCountResponse.getPieChartDTO().getWidth() > 0) {
+                pieOptionObject.put("width", testCaseCountResponse.getPieChartDTO().getWidth());
+            }
+            returnObject.put("pieOption", pieOptionObject);
+        }
+        if (testCaseCountResponse.getTableDTOs() != null) {
+            returnObject.put("tableData", JSONArray.toJSON(testCaseCountResponse.getTableDTOs()));
+        }
+        returnObject.put("chartType", chartType);
+        return returnObject;
+    }
+
     private TestCaseCountTableDataDTO countShowTable(String groupName, List<String> yaxis, List<TestCaseCountTableDTO> dtos) {
-        if(yaxis == null){
+        if (yaxis == null) {
             yaxis = new ArrayList<>();
         }
         TestCaseCountTableDataDTO returnDTO = new TestCaseCountTableDataDTO();
-        String [] headers = new String[]{groupName,"总计","testCase","apiCase","scenarioCase","loadCaseCount"};
+        String[] headers = new String[]{groupName, "总计", "testCase", "apiCase", "scenarioCase", "loadCaseCount"};
 
         List<TestCaseCountTableItemDataDTO> heads = new ArrayList<>();
         boolean showTestCase = true;
@@ -91,19 +155,19 @@ public class ReportStatisticsService {
         boolean showLoad = true;
 
         for (String head : headers) {
-            if(StringUtils.equalsAnyIgnoreCase(head,groupName,"总计") || yaxis.contains(head)){
+            if (StringUtils.equalsAnyIgnoreCase(head, groupName, "总计") || yaxis.contains(head)) {
                 TestCaseCountTableItemDataDTO headData = new TestCaseCountTableItemDataDTO();
                 headData.setId(UUID.randomUUID().toString());
                 headData.setValue(head);
                 heads.add(headData);
-            }else {
-                if(StringUtils.equalsIgnoreCase(head,"testCase")){
+            } else {
+                if (StringUtils.equalsIgnoreCase(head, "testCase")) {
                     showTestCase = false;
-                }else if(StringUtils.equalsIgnoreCase(head,"apiCase")){
+                } else if (StringUtils.equalsIgnoreCase(head, "apiCase")) {
                     showApi = false;
-                }else if(StringUtils.equalsIgnoreCase(head,"scenarioCase")){
+                } else if (StringUtils.equalsIgnoreCase(head, "scenarioCase")) {
                     showScenario = false;
-                }else if(StringUtils.equalsIgnoreCase(head,"loadCaseCount")){
+                } else if (StringUtils.equalsIgnoreCase(head, "loadCaseCount")) {
                     showLoad = false;
                 }
             }
@@ -123,28 +187,28 @@ public class ReportStatisticsService {
             countData.setValue(data.getAllCount());
             rowDataList.add(countData);
 
-            if(showTestCase){
+            if (showTestCase) {
                 TestCaseCountTableItemDataDTO itemData = new TestCaseCountTableItemDataDTO();
                 itemData.setId(UUID.randomUUID().toString());
                 itemData.setValue(data.getTestCaseCount());
                 rowDataList.add(itemData);
             }
 
-            if(showApi){
+            if (showApi) {
                 TestCaseCountTableItemDataDTO itemData = new TestCaseCountTableItemDataDTO();
                 itemData.setId(UUID.randomUUID().toString());
                 itemData.setValue(data.getApiCaseCount());
                 rowDataList.add(itemData);
             }
 
-            if(showScenario){
+            if (showScenario) {
                 TestCaseCountTableItemDataDTO itemData = new TestCaseCountTableItemDataDTO();
                 itemData.setId(UUID.randomUUID().toString());
                 itemData.setValue(data.getScenarioCaseCount());
                 rowDataList.add(itemData);
             }
 
-            if(showLoad){
+            if (showLoad) {
                 TestCaseCountTableItemDataDTO itemData = new TestCaseCountTableItemDataDTO();
                 itemData.setId(UUID.randomUUID().toString());
                 itemData.setValue(data.getLoadCaseCount());
@@ -173,16 +237,38 @@ public class ReportStatisticsService {
     public List<ReportStatistics> selectByRequest(ReportStatisticsSaveRequest request) {
         ReportStatisticsExample example = new ReportStatisticsExample();
         ReportStatisticsExample.Criteria criteria = example.createCriteria();
-        if(StringUtils.isNotEmpty(request.getProjectId())){
+        if (StringUtils.isNotEmpty(request.getProjectId())) {
             criteria.andProjectIdEqualTo(request.getProjectId());
         }
-        if(StringUtils.isNotEmpty(request.getReportType())){
+        if (StringUtils.isNotEmpty(request.getReportType())) {
             criteria.andReportTypeEqualTo(request.getReportType());
         }
-        if(StringUtils.isNotEmpty(request.getName())){
+        if (StringUtils.isNotEmpty(request.getName())) {
             criteria.andNameLike(request.getName());
         }
         example.setOrderByClause("create_time DESC");
-        return  reportStatisticsMapper.selectByExample(example);
+        return reportStatisticsMapper.selectByExample(example);
+    }
+
+    public String getImageContentById(ReportStatisticsWithBLOBs reportRecordId) {
+        ChromeUtils chromeUtils = new ChromeUtils();
+        HeadlessRequest headlessRequest = new HeadlessRequest();
+
+        BaseSystemConfigDTO baseInfo = CommonBeanFactory.getBean(SystemParameterService.class).getBaseInfo();
+        // 占位符
+        String platformUrl = "http://localhost:8081";
+        if (baseInfo != null) {
+            platformUrl = baseInfo.getUrl();
+        }
+        platformUrl += "/echartPic?shareId=" + reportRecordId.getId();
+
+        headlessRequest.setUrl(platformUrl);
+        String imageData = chromeUtils.getImageInfo(headlessRequest);
+        return imageData;
+    }
+
+    public boolean isReportNeedUpdate(ReportStatisticsWithBLOBs model) {
+        JSONObject selectOption = JSONObject.parseObject(model.getSelectOption());
+        return selectOption.containsKey("timeType") && StringUtils.equalsIgnoreCase("dynamicTime", selectOption.getString("timeType"));
     }
 }
diff --git a/backend/src/main/java/io/metersphere/reportstatistics/service/TestCaseCountService.java b/backend/src/main/java/io/metersphere/reportstatistics/service/TestCaseCountService.java
index a4edfb8f74..1b1502c8ff 100644
--- a/backend/src/main/java/io/metersphere/reportstatistics/service/TestCaseCountService.java
+++ b/backend/src/main/java/io/metersphere/reportstatistics/service/TestCaseCountService.java
@@ -496,6 +496,13 @@ public class TestCaseCountService {
                 this.add("50%");
             }});
 
+            Map<String,Object> labelMap = new HashMap<>();
+            Map<String,Object> normalMap = new HashMap<>();
+            normalMap.put("show",true);
+            normalMap.put("formatter","{b}: {c}({d}%)");
+            labelMap.put("normal",normalMap);
+            series.setLabel(labelMap);
+
             Title title = new Title();
             title.setSubtext(summary.groupName);
             title.setLeft(leftPxStr);
diff --git a/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java b/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java
new file mode 100644
index 0000000000..5f73764e36
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java
@@ -0,0 +1,75 @@
+package io.metersphere.reportstatistics.utils;
+
+import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.reportstatistics.dto.HeadlessRequest;
+import org.apache.commons.lang3.StringUtils;
+import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeDriverService;
+import org.openqa.selenium.chrome.ChromeOptions;
+
+public class ChromeUtils {
+    private static final String DEFAULT_DRIVERPATH = "/Users/handsomesong/chromeDriver/chromedriver_mac64_m1/chromedriver";
+
+    private WebDriver genWebDriver(HeadlessRequest headlessRequest) {
+        String driverPath = headlessRequest.driverPath;
+        if (StringUtils.isEmpty(driverPath)) {
+            driverPath = DEFAULT_DRIVERPATH;
+        }
+        //初始化一个chrome浏览器实例driver
+        ChromeOptions options = new ChromeOptions();
+        options.addArguments("headless");
+        options.addArguments("no-sandbox");
+        options.addArguments("disable-gpu");
+        options.addArguments("disable-features=NetworkService");
+        options.addArguments("ignore-certificate-errors");
+        options.addArguments("silent-launch");
+        options.addArguments("disable-application-cache");
+        options.addArguments("disable-web-security");
+        options.addArguments("no-proxy-server");
+        options.addArguments("disable-dev-shm-usage");
+        options.addArguments("lang=zh_CN.UTF-8");
+        WebDriver driver = null;
+        try {
+            System.setProperty(ChromeDriverService.CHROME_DRIVER_EXE_PROPERTY, driverPath);
+            driver = new ChromeDriver(options);
+            driver.get(headlessRequest.url);
+            driver.manage().window().fullscreen();
+        }catch (Exception e){
+            if(driver != null){
+                driver.quit();
+                driver = null;
+            }
+            LogUtil.error(e);
+        }
+        return  driver;
+    }
+
+    public String getImageInfo(HeadlessRequest request){
+        WebDriver driver = this.genWebDriver(request);
+        String files = null;
+        if(driver != null){
+            try {
+                //预留echart动画的加载时间
+                Thread.sleep(3 * 1000);
+                String js = "var chartsCanvas = document.getElementById('picChart').getElementsByTagName('canvas')[0];" +
+                        "var imageUrl = null;" +
+                        "if (chartsCanvas!= null) {" +
+                        " imageUrl = chartsCanvas && chartsCanvas.toDataURL('image/png');"+
+                        "return imageUrl;" +
+                        "}";
+                files = ((JavascriptExecutor)driver).executeScript(js).toString();
+            }catch (Exception e){
+                LogUtil.error(e);
+            }finally {
+                driver.quit();
+            }
+        }
+        if(StringUtils.isNotEmpty(files)){
+            return files;
+        }else {
+            return null;
+        }
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index a41ba52f54..9dd0111eba 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit a41ba52f5495bc68f84a07643442d2b0e9524786
+Subproject commit 9dd0111ebafcdab7153a97ab3a3af39f5c69dac5
diff --git a/backend/src/main/resources/permission.json b/backend/src/main/resources/permission.json
index 60354593bf..1e4e1ca0e8 100644
--- a/backend/src/main/resources/permission.json
+++ b/backend/src/main/resources/permission.json
@@ -873,6 +873,12 @@
       "resourceId": "PROJECT_ENTERPRISE_REPORT",
       "license": true
     },
+    {
+      "id": "PROJECT_ENTERPRISE_REPORT:READ+SCHEDULE",
+      "name": "定时发送",
+      "resourceId": "PROJECT_ENTERPRISE_REPORT",
+      "license": true
+    },
     {
       "id": "PROJECT_ENTERPRISE_REPORT:READ+EDIT",
       "name": "修改报告",
diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
index 39a01b18b8..b07d7be391 100644
--- a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
+++ b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
@@ -165,6 +165,9 @@ export default {
         if (this.paramRow.redirectFrom == 'testPlan') {
           paramTestId = this.paramRow.id;
           this.scheduleTaskType = "TEST_PLAN_TEST";
+        } else if (this.paramRow.redirectFrom == 'enterpriseReport') {
+          paramTestId = this.paramRow.id;
+          this.scheduleTaskType = "ENTERPRISE_REPORT";
         } else {
           paramTestId = this.paramRow.id;
           this.scheduleTaskType = "API_SCENARIO_TEST";
@@ -192,6 +195,9 @@ export default {
       if (row.redirectFrom == 'testPlan') {
         paramTestId = row.id;
         this.scheduleTaskType = "TEST_PLAN_TEST";
+      } else if (row.redirectFrom == 'enterpriseReport') {
+        paramTestId = row.id;
+        this.scheduleTaskType = "ENTERPRISE_REPORT";
       } else {
         paramTestId = row.id;
         this.scheduleTaskType = "API_SCENARIO_TEST";
@@ -263,6 +269,13 @@ export default {
         if (param.id) {
           url = '/schedule/update';
         }
+      } else if (this.scheduleTaskType == 'ENTERPRISE_REPORT') {
+        param.scheduleFrom = "enterpriseReport";
+        //测试计划页面跳转的创建
+        url = '/schedule/create';
+        if (param.id) {
+          url = '/schedule/update';
+        }
       } else {
         param.scheduleFrom = "scenario";
         if (param.id) {
diff --git a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/TestCaseCountContainer.vue b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/TestCaseCountContainer.vue
index cb361a2f75..9f6203220e 100644
--- a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/TestCaseCountContainer.vue
+++ b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/TestCaseCountContainer.vue
@@ -94,6 +94,7 @@ export default {
         let data = response.data.barChartDTO;
         let pieData = response.data.pieChartDTO;
         let selectTableData = response.data.tableDTOs;
+        console.info(response.data);
         this.initPic(data, pieData, selectTableData);
       }, error => {
         this.loading = false;
@@ -101,6 +102,7 @@ export default {
     },
     initPic(barData, pieData, selectTableData) {
       this.loading = true;
+      this.resetOptions();
       if (barData) {
         this.loadOption.legend = barData.legend;
         this.loadOption.xAxis = barData.xaxis;
@@ -172,7 +174,7 @@ export default {
               let dataOptionObj = JSON.parse(reportData.dataOption);
               if (dataOptionObj.chartType) {
                 this.chartType = dataOptionObj.chartType;
-              }else {
+              } else {
                 this.chartType = "bar";
               }
               this.initPic(dataOptionObj.loadOption, dataOptionObj.pieOption, dataOptionObj.tableData);
@@ -207,6 +209,24 @@ export default {
         return "";
       }
     },
+    resetOptions() {
+      this.loadOption = {
+        legend: {},
+        xAxis: {},
+        yAxis: {},
+        label: {},
+        tooltip: {},
+        series: []
+      };
+      this.pieOption = {
+        legend: {},
+        label: {},
+        tooltip: {},
+        series: [],
+        title: [],
+      };
+      this.tableData = [];
+    },
     selectAndSaveReport(reportName) {
       let opt = this.$refs.countFilter.getOption();
       this.options = opt;
diff --git a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/filter/TestCaseCountFilter.vue b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/filter/TestCaseCountFilter.vue
index e88cc61aee..855a2a917f 100644
--- a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/filter/TestCaseCountFilter.vue
+++ b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/filter/TestCaseCountFilter.vue
@@ -269,9 +269,6 @@ export default {
       this.loading = true;
       this.option = opt;
       this.$nextTick(() => {
-        if(this.option.timeType === "dynamicTime"){
-          this.init();
-        }
         this.loading = false;
       });
     },
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index dd73a29ed2..249ac53686 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit dd73a29ed22916b8d7ff70d1062604a17177d3a5
+Subproject commit 249ac53686faf82906dcfabf76d66bdc8fda39db
diff --git a/frontend/src/template/enterprise/share/ShareEnterpriseReportTemplate.vue b/frontend/src/template/enterprise/share/ShareEnterpriseReportTemplate.vue
new file mode 100644
index 0000000000..14ba807d56
--- /dev/null
+++ b/frontend/src/template/enterprise/share/ShareEnterpriseReportTemplate.vue
@@ -0,0 +1,109 @@
+<template>
+  <report-chart v-if="!needReloading" :read-only="true" :need-full-screen="false" :chart-type="dataOption.chartType"
+                ref="analysisChart" :load-option="dataOption.loadOption" :pie-option="dataOption.pieOption"/>
+</template>
+
+<script>
+import ReportChart from "@/business/components/xpack/reportstatistics/projectreport/components/chart/ReportChart";
+import {getShareId} from "@/common/js/utils";
+
+export default {
+  name: "ShareEnterpriseReportTemplate",
+  components: {ReportChart},
+  data() {
+    return {
+      needReloading: false,
+      shareId: '',
+      dataOption: {
+        chartType: '',
+        loadOption: {
+          legend: {},
+          xAxis: {},
+          yAxis: {},
+          label: {},
+          tooltip: {},
+          series: []
+        },
+        pieOption: {
+          legend: {},
+          label: {},
+          tooltip: {},
+          series: [],
+          title: [],
+        },
+      },
+    }
+  },
+  created() {
+    this.initEchartData();
+  },
+  methods: {
+    initEchartData() {
+      this.shareId = getShareId();
+      let paramObj = {
+        id: this.shareId
+      };
+      this.resetOptions();
+      this.$post('/share/info/selectHistoryReportById', paramObj, response => {
+        let reportData = response.data;
+        if (reportData) {
+          let selectOption = JSON.parse(reportData.selectOption);
+          let data = JSON.parse(reportData.dataOption);
+          data.selectOption = selectOption;
+          this.dataOption = data;
+          console.info(this.dataOption);
+          this.reloadChart();
+        }
+      }, (error) => {
+        this.$error(this.$t('查找报告失败!'));
+        return false;
+      });
+    },
+    initPic(loadOptionParam, tableData) {
+      this.loading = true;
+      if (loadOptionParam) {
+        this.loadOption.legend = loadOptionParam.legend;
+        this.loadOption.xAxis = loadOptionParam.xaxis;
+        this.loadOption.series = loadOptionParam.series;
+        this.loadOption.grid = {
+          bottom: '75px',//距离下边距
+        }
+        this.loadOption.series.forEach(item => {
+          item.type = this.$refs.analysisChart.chartType;
+        })
+      }
+      if (tableData) {
+        this.tableData = tableData;
+      }
+      this.loading = false;
+    },
+    reloadChart() {
+      console.info("load data over, reload compnents.");
+      this.$refs.analysisChart.reload();
+    },
+    resetOptions() {
+      this.dataOption = {
+        chartType: '',
+        loadOption: {
+          legend: {},
+          xAxis: {},
+          yAxis: {},
+          label: {},
+          tooltip: {},
+          series: []
+        },
+        pieOption: {
+          legend: {},
+          label: {},
+          tooltip: {},
+          series: [],
+          title: [],
+        },
+      };
+    },
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/frontend/src/template/enterprise/share/share-enterprise-report.html b/frontend/src/template/enterprise/share/share-enterprise-report.html
new file mode 100644
index 0000000000..b3ec1c321f
--- /dev/null
+++ b/frontend/src/template/enterprise/share/share-enterprise-report.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico">
+  <title>Enterprise Report</title>
+</head>
+<body>
+<div id="shareEnterpriseReport"></div>
+</body>
+</html>
diff --git a/frontend/src/template/enterprise/share/share-enterprise-report.js b/frontend/src/template/enterprise/share/share-enterprise-report.js
new file mode 100644
index 0000000000..e4d9ff25f0
--- /dev/null
+++ b/frontend/src/template/enterprise/share/share-enterprise-report.js
@@ -0,0 +1,40 @@
+import ShareEnterpriseReportTemplate from "./ShareEnterpriseReportTemplate";
+
+import Vue from 'vue';
+import ElementUI, {Button, Col, Form, FormItem, Input, Row, Main, Card, Table, TableColumn} from 'element-ui';
+import '@/assets/theme/index.css';
+import '@/common/css/menu-header.css';
+import '@/common/css/main.css';
+import i18n from "@/i18n/i18n";
+import chart from "@/common/js/chart";
+import filters from "@/common/js/filter";
+import icon from "@/common/js/icon";
+import message from "@/common/js/message";
+import Ajax from "@/common/js/ajax";
+
+Vue.use(ElementUI, {
+  i18n: (key, value) => i18n.t(key, value)
+});
+
+Vue.use(Row);
+Vue.use(Col);
+Vue.use(Form);
+Vue.use(FormItem);
+Vue.use(Input);
+Vue.use(Button);
+Vue.use(chart);
+Vue.use(Main);
+Vue.use(Card);
+Vue.use(Ajax)
+Vue.use(TableColumn);
+Vue.use(Table);
+Vue.use(filters);
+Vue.use(icon);
+Vue.use(message);
+
+new Vue({
+  el: '#shareEnterpriseReport',
+  i18n,
+  render: h => h(ShareEnterpriseReportTemplate)
+});
+
diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index b02f3830fd..53d9753834 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -44,6 +44,11 @@ module.exports = {
       template: "src/template/report/plan/plan-report.html",
       filename: "plan-report.html",
     },
+    enterpriseReport: {
+      entry: "src/template/enterprise/share/share-enterprise-report.js",
+      template: "src/template/enterprise/share/share-enterprise-report.html",
+      filename: "share-enterprise-report.html",
+    },
   },
   configureWebpack: {
     devtool: 'source-map',
@@ -61,9 +66,9 @@ module.exports = {
         return args;
       });
     config.plugin('inline-source-html-planReport')
-        .after('html-planReport')
-        .use(HtmlWebpackInlineSourcePlugin);
-
+      .after('html-planReport')
+      .use(HtmlWebpackInlineSourcePlugin);
     config.plugins.delete('prefetch');
+
   }
 };

From 81b651afc3da8e3924de8969bd5e72aa31d5ef58 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 14 Dec 2021 17:03:23 +0800
Subject: [PATCH 122/256] =?UTF-8?q?fix(xpack=E7=89=88=E6=9C=AC):=20?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0xpack=E5=BC=95=E7=94=A8=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新xpack引用版本
---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 249ac53686..f5b0d929be 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 249ac53686faf82906dcfabf76d66bdc8fda39db
+Subproject commit f5b0d929be13f4a1e4fea6c14d2834fa78703b60

From 6340b786586bd4735d60ead85d4846f45f2c39bc Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 14 Dec 2021 20:11:42 +0800
Subject: [PATCH 123/256] =?UTF-8?q?refactor:=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=A1=A8=E5=8D=95=E9=A1=B9=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/form/CustomFiledFormItem.vue   | 58 +++++++++++++++++++
 .../track/case/components/TestCaseEdit.vue    | 22 ++-----
 .../track/issue/IssueEditDetail.vue           | 28 ++-------
 3 files changed, 68 insertions(+), 40 deletions(-)
 create mode 100644 frontend/src/business/components/common/components/form/CustomFiledFormItem.vue

diff --git a/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue b/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
new file mode 100644
index 0000000000..e06ba3d51b
--- /dev/null
+++ b/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
@@ -0,0 +1,58 @@
+<template>
+  <div>
+    <el-row v-for="(i) in (customFieldRowNums)" :key="i">
+    <span class="custom-item" v-for="(item, j) in issueTemplate.customFields" :key="j">
+      <span v-if="j >= i*3 && j < i*3+3">
+        <el-col :span="8" v-if="item.type !== 'richText'">
+          <el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
+                        :label-width="formLabelWidth">
+            <custom-filed-component :data="item" :form="form" prop="defaultValue"/>
+          </el-form-item>
+        </el-col>
+        <div v-else>
+          <el-col :span="24">
+            <el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
+                          :label-width="formLabelWidth">
+               <custom-filed-component :data="item" :form="form" prop="defaultValue"/>
+            </el-form-item>
+          </el-col>
+        </div>
+      </span>
+    </span>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import {SYSTEM_FIELD_NAME_MAP} from "@/common/js/table-constants";
+import CustomFiledComponent from "@/business/components/settings/workspace/template/CustomFiledComponent";
+
+export default {
+  name: "CustomFiledFormItem",
+  components: {CustomFiledComponent},
+  props: {
+    issueTemplate: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    formLabelWidth: String,
+    form: Object
+  },
+  computed: {
+    customFieldRowNums() {
+      let size = this.issueTemplate.customFields ? this.issueTemplate.customFields.length : 0
+      let val = parseInt(size / 3);
+      return size % 3 == 0 ? val : (val + 1);
+    },
+    systemNameMap() {
+      return SYSTEM_FIELD_NAME_MAP;
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 7ddb8df6ca..322d4e4490 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -40,7 +40,7 @@
         <el-form :model="form" :rules="rules" ref="caseFrom" v-loading="result.loading" class="case-form">
           <ms-form-divider :title="$t('test_track.plan_view.base_info')"/>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item
                 :placeholder="$t('test_track.case.input_name')"
                 :label="$t('test_track.case.name')"
@@ -50,14 +50,14 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item :label="$t('test_track.case.module')" :label-width="formLabelWidth" prop="module">
                 <ms-select-tree :disabled="readOnly" :data="treeNodes" :defaultKey="form.module" :obj="moduleObj"
                                 @getValue="setModule" clearable checkStrictly size="small"/>
               </el-form-item>
             </el-col>
 
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item :label="$t('commons.tag')" :label-width="formLabelWidth" prop="tag">
                 <ms-input-tag :read-only="readOnly" :currentScenario="form" v-if="showInputTag" ref="tag"
                               class="ms-case-input"/>
@@ -68,15 +68,7 @@
           <!-- 自定义字段 -->
           <el-form v-if="isFormAlive" :model="customFieldForm" :rules="customFieldRules" ref="customFieldForm"
                    class="case-form">
-            <el-row>
-              <el-col :span="7" v-for="(item, index) in testCaseTemplate.customFields" :key="index">
-                <el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
-                              :label-width="formLabelWidth">
-                  <custom-filed-component :disabled="readOnly" @reload="reloadForm" :data="item" :form="customFieldForm"
-                                          prop="defaultValue"/>
-                </el-form-item>
-              </el-col>
-            </el-row>
+            <custom-filed-form-item :form="customFieldForm" :form-label-width="formLabelWidth" :issue-template="testCaseTemplate"/>
           </el-form>
 
           <el-row v-if="isCustomNum">
@@ -172,7 +164,6 @@ import {
   getTemplate,
   parseCustomField
 } from "@/common/js/custom_field";
-import {SYSTEM_FIELD_NAME_MAP} from "@/common/js/table-constants";
 import MsFormDivider from "@/business/components/common/components/MsFormDivider";
 import TestCaseEditOtherInfo from "@/business/components/track/case/components/TestCaseEditOtherInfo";
 import FormRichTextItem from "@/business/components/track/case/components/FormRichTextItem";
@@ -180,10 +171,12 @@ import TestCaseStepItem from "@/business/components/track/case/components/TestCa
 import StepChangeItem from "@/business/components/track/case/components/StepChangeItem";
 import MsChangeHistory from "../../../history/ChangeHistory";
 import {getTestTemplate} from "@/network/custom-field-template";
+import CustomFiledFormItem from "@/business/components/common/components/form/CustomFiledFormItem";
 
 export default {
   name: "TestCaseEdit",
   components: {
+    CustomFiledFormItem,
     StepChangeItem,
     TestCaseStepItem,
     FormRichTextItem,
@@ -303,9 +296,6 @@ export default {
     moduleOptions() {
       return this.$store.state.testCaseModuleOptions;
     },
-    systemNameMap() {
-      return SYSTEM_FIELD_NAME_MAP;
-    },
     isCustomNum() {
       return this.$store.state.currentProjectIsCustomNum;
     },
diff --git a/frontend/src/business/components/track/issue/IssueEditDetail.vue b/frontend/src/business/components/track/issue/IssueEditDetail.vue
index 0777c8481b..c3df76ca3e 100644
--- a/frontend/src/business/components/track/issue/IssueEditDetail.vue
+++ b/frontend/src/business/components/track/issue/IssueEditDetail.vue
@@ -14,26 +14,8 @@
         </el-form-item>
 
         <!-- 自定义字段 -->
-        <el-form :model="customFieldForm" :rules="customFieldRules" ref="customFieldForm"
-                 class="case-form">
-          <el-row class="custom-field-row">
-            <span class="custom-item" v-for="(item, index) in issueTemplate.customFields" :key="index">
-               <el-col :span="8" v-if="item.type !== 'richText'">
-                <el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
-                              :label-width="formLabelWidth">
-                  <custom-filed-component :data="item" :form="customFieldForm" prop="defaultValue"/>
-                </el-form-item>
-              </el-col>
-              <div v-else>
-                <el-col :span="24">
-                   <el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
-                                 :label-width="formLabelWidth">
-                     <custom-filed-component :data="item" :form="customFieldForm" prop="defaultValue"/>
-                  </el-form-item>
-                </el-col>
-              </div>
-            </span>
-          </el-row>
+        <el-form :model="customFieldForm" :rules="customFieldRules" ref="customFieldForm" class="case-form">
+          <custom-filed-form-item :form="customFieldForm" :form-label-width="formLabelWidth" :issue-template="issueTemplate"/>
         </el-form>
 
         <form-rich-text-item v-if="!enableThirdPartTemplate" :title="$t('custom_field.issue_content')" :data="form" prop="description"/>
@@ -90,7 +72,6 @@ import MsFormDivider from "@/business/components/common/components/MsFormDivider
 import CustomFieldFormList from "@/business/components/settings/workspace/template/CustomFieldFormList";
 import CustomFieldRelateList from "@/business/components/settings/workspace/template/CustomFieldRelateList";
 import FormRichTextItem from "@/business/components/track/case/components/FormRichTextItem";
-import {SYSTEM_FIELD_NAME_MAP} from "@/common/js/table-constants";
 import {buildCustomFields, parseCustomField} from "@/common/js/custom_field";
 import CustomFiledComponent from "@/business/components/settings/workspace/template/CustomFiledComponent";
 import TestCaseIssueList from "@/business/components/track/issue/TestCaseIssueList";
@@ -106,10 +87,12 @@ import {getIssueTemplate} from "@/network/custom-field-template";
 import {getIssueThirdPartTemplate} from "@/network/Issue";
 import {getCurrentProject} from "@/network/project";
 import {JIRA} from "@/common/js/constants";
+import CustomFiledFormItem from "@/business/components/common/components/form/CustomFiledFormItem";
 
 export default {
   name: "IssueEditDetail",
   components: {
+    CustomFiledFormItem,
     IssueEditDetail,
     TestCaseIssueList,
     CustomFiledComponent,
@@ -167,9 +150,6 @@ export default {
     isSystem() {
       return this.form.system;
     },
-    systemNameMap() {
-      return SYSTEM_FIELD_NAME_MAP;
-    },
     projectId() {
       return getCurrentProjectID();
     },

From 8819e142125ff871214f325c08d09ac017dd293c Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 15 Dec 2021 11:09:12 +0800
Subject: [PATCH 124/256] =?UTF-8?q?feat:=20=E5=8A=9F=E8=83=BD=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E6=94=AF=E6=8C=81=E6=89=B9=E9=87=8F=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/ApiAutomationService.java     |   4 +-
 .../api/service/ApiDefinitionService.java     |   4 +-
 .../api/service/ApiTestCaseService.java       |   2 +-
 .../commons/utils/ServiceUtils.java           |  14 +-
 .../track/controller/TestCaseController.java  |   9 +
 .../track/service/TestCaseReviewService.java  |   2 +-
 .../track/service/TestCaseService.java        | 184 +++++++++++-------
 .../service/TestPlanLoadCaseService.java      |   2 +-
 .../track/case/components/TestCaseList.vue    |  22 ++-
 9 files changed, 153 insertions(+), 90 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 6af3bab094..20e74c03e6 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -2049,7 +2049,7 @@ public class ApiAutomationService {
                 testPlanApiScenario.setEnvironment(environmentJson);
             }
             testPlanApiScenario.setOrder(nextOrder);
-            nextOrder += 5000;
+            nextOrder += ServiceUtils.ORDER_STEP;
             testPlanApiScenarioMapper.insert(testPlanApiScenario);
         }
     }
@@ -2339,7 +2339,7 @@ public class ApiAutomationService {
         if (order == null) {
             order = ServiceUtils.getNextOrder(projectId, extApiScenarioMapper::getLastOrder);
         }
-        order = (order == null ? 0 : order) + 5000;
+        order = (order == null ? 0 : order) + ServiceUtils.ORDER_STEP;
         currentScenarioOrder.set(order);
         return order;
     }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index 5866d35a31..961d706d68 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -654,7 +654,7 @@ public class ApiDefinitionService {
         if (order == null) {
             order = ServiceUtils.getNextOrder(projectId, extApiDefinitionMapper::getLastOrder);
         }
-        order = (order == null ? 0 : order) + 5000;
+        order = (order == null ? 0 : order) + ServiceUtils.ORDER_STEP;
         currentApiOrder.set(order);
         return order;
     }
@@ -664,7 +664,7 @@ public class ApiDefinitionService {
         if (order == null) {
             order = ServiceUtils.getNextOrder(projectId, extApiTestCaseMapper::getLastOrder);
         }
-        order = (order == null ? 0 : order) + 5000;
+        order = (order == null ? 0 : order) + ServiceUtils.ORDER_STEP;
         currentApiCaseOrder.set(order);
         return order;
     }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
index ec9d2a642c..c5f6fa3ebf 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@@ -555,7 +555,7 @@ public class ApiTestCaseService {
             testPlanApiCase.setCreateTime(System.currentTimeMillis());
             testPlanApiCase.setUpdateTime(System.currentTimeMillis());
             testPlanApiCase.setOrder(nextOrder);
-            nextOrder += 5000;
+            nextOrder += ServiceUtils.ORDER_STEP;
             if (testPlanService.isAllowedRepeatCase(request.getPlanId())) {
                 batchBaseMapper.insert(testPlanApiCase);
             } else {
diff --git a/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java b/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java
index 8375dfa882..82a75165d1 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java
@@ -28,6 +28,8 @@ import java.util.stream.Collectors;
 
 public class ServiceUtils {
 
+    public static final int ORDER_STEP = 5000;
+
     public static List<OrderRequest> getDefaultOrder(List<OrderRequest> orders) {
         return getDefaultOrder(null, orders);
     }
@@ -154,7 +156,7 @@ public class ServiceUtils {
                     T item = clazz.newInstance();
                     setId.invoke(item, id);
                     setOrder.invoke(item, order);
-                    order += 5000;
+                    order += ServiceUtils.ORDER_STEP;
                     Method updateByPrimaryKeySelectiveFunc = mapper.getClass().getMethod("updateByPrimaryKeySelective", clazz);
                     updateByPrimaryKeySelectiveFunc.invoke(mapper, item);
                 }
@@ -184,8 +186,8 @@ public class ServiceUtils {
                               BiFunction<String, Long, Long> getPreOrderFunc,
                               BiFunction<String, Long, Long> getLastOrderFunc,
                               Consumer<T> updateByPrimaryKeySelectiveFuc) {
-        Long order = null;
-        Long lastOrPreOrder = null;
+        Long order;
+        Long lastOrPreOrder;
         try {
             Method getOrder = clazz.getMethod("getOrder");
             Method setId = clazz.getMethod("setId", String.class);
@@ -197,12 +199,12 @@ public class ServiceUtils {
 
             if (request.getMoveMode().equals(ResetOrderRequest.MoveMode.AFTER.name())) {
                 // 追加到参考对象的之后
-                order = targetOrder - 5000;
+                order = targetOrder - ServiceUtils.ORDER_STEP;
                 // ，因为是降序排，则查找比目标 order 小的一个order
                 lastOrPreOrder = getPreOrderFunc.apply(request.getGroupId(), targetOrder);
             } else {
                 // 追加到前面
-                order = targetOrder + 5000;
+                order = targetOrder + ServiceUtils.ORDER_STEP;
                 // 因为是降序排，则查找比目标 order 更大的一个order
                 lastOrPreOrder = getLastOrderFunc.apply(request.getGroupId(), targetOrder);
             }
@@ -230,7 +232,7 @@ public class ServiceUtils {
      */
     public static Long getNextOrder(String groupId, BiFunction<String, Long, Long> getLastOrderFunc) {
         Long lastOrder = getLastOrderFunc.apply(groupId, null);
-       return (lastOrder == null ? 0 : lastOrder) + 5000;
+       return (lastOrder == null ? 0 : lastOrder) + ServiceUtils.ORDER_STEP;
     }
 
     public static SqlSession getBatchSqlSession() {
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
index 3f86e2da75..74f07fa9b9 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
@@ -288,6 +288,15 @@ public class TestCaseController {
         testCaseService.editTestCaseBath(request);
     }
 
+    @PostMapping("/batch/copy")
+    @RequiresPermissions(PermissionConstants.PROJECT_TRACK_CASE_READ_EDIT)
+    @MsAuditLog(module = "track_test_case", type = OperLogConstants.BATCH_ADD, beforeEvent = "#msClass.getLogDetails(#request.ids)", content = "#msClass.getLogDetails(#request.ids)", msClass = TestCaseService.class)
+    @SendNotice(taskType = NoticeConstants.TaskType.TRACK_TEST_CASE_TASK, target = "#targetClass.findByBatchRequest(#request)", targetClass = TestCaseService.class,
+            event = NoticeConstants.Event.CREATE, mailTemplate = "track/TestCaseUpdate", subject = "测试用例通知")
+    public void copyTestCaseBath(@RequestBody TestCaseBatchRequest request) {
+        testCaseService.copyTestCaseBath(request);
+    }
+
     @PostMapping("/batch/delete")
     @RequiresPermissions(PermissionConstants.PROJECT_TRACK_CASE_READ_DELETE)
     @MsAuditLog(module = "track_test_case", type = OperLogConstants.BATCH_DEL, beforeEvent = "#msClass.getLogDetails(#request.ids)", msClass = TestCaseService.class)
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
index fd7090f3e4..8436ff2e77 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -385,7 +385,7 @@ public class TestCaseReviewService {
                 caseReview.setStatus(TestCaseReviewStatus.Prepare.name());
                 caseReview.setOrder(nextOrder);
                 batchMapper.insert(caseReview);
-                nextOrder += 5000;
+                nextOrder += ServiceUtils.ORDER_STEP;
             }
         }
 
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 3442390b4b..6eb410e6b0 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -650,32 +650,33 @@ public class TestCaseService {
         SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
         Project project = projectService.getProjectById(projectId);
         TestCaseMapper mapper = sqlSession.getMapper(TestCaseMapper.class);
-        Long nextOrder = ServiceUtils.getNextOrder(projectId, extTestCaseMapper::getLastOrder);
-        if (!testCases.isEmpty()) {
-            AtomicInteger sort = new AtomicInteger();
-            AtomicInteger num = new AtomicInteger();
-            num.set(getNextNum(projectId) + testCases.size());
-            for (TestCaseWithBLOBs testcase: testCases) {
-                testcase.setId(UUID.randomUUID().toString());
-                testcase.setCreateUser(SessionUtils.getUserId());
-                testcase.setCreateTime(System.currentTimeMillis());
-                testcase.setUpdateTime(System.currentTimeMillis());
-                testcase.setNodeId(nodePathMap.get(testcase.getNodePath()));
-                testcase.setSort(sort.getAndIncrement());
-                int number = num.incrementAndGet();
-                testcase.setNum(number);
-                if (project.getCustomNum() && StringUtils.isBlank(testcase.getCustomNum())) {
-                    testcase.setCustomNum(String.valueOf(number));
+        try {
+            Long nextOrder = ServiceUtils.getNextOrder(projectId, extTestCaseMapper::getLastOrder);
+            if (!testCases.isEmpty()) {
+                AtomicInteger sort = new AtomicInteger();
+                AtomicInteger num = new AtomicInteger();
+                num.set(getNextNum(projectId) + testCases.size());
+                for (TestCaseWithBLOBs testcase: testCases) {
+                    testcase.setId(UUID.randomUUID().toString());
+                    testcase.setCreateUser(SessionUtils.getUserId());
+                    testcase.setCreateTime(System.currentTimeMillis());
+                    testcase.setUpdateTime(System.currentTimeMillis());
+                    testcase.setNodeId(nodePathMap.get(testcase.getNodePath()));
+                    testcase.setSort(sort.getAndIncrement());
+                    int number = num.incrementAndGet();
+                    testcase.setNum(number);
+                    if (project.getCustomNum() && StringUtils.isBlank(testcase.getCustomNum())) {
+                        testcase.setCustomNum(String.valueOf(number));
+                    }
+                    testcase.setReviewStatus(TestCaseReviewStatus.Prepare.name());
+                    testcase.setStatus(TestCaseReviewStatus.Prepare.name());
+                    testcase.setOrder(nextOrder);
+                    mapper.insert(testcase);
+                    nextOrder += ServiceUtils.ORDER_STEP;
                 }
-                testcase.setReviewStatus(TestCaseReviewStatus.Prepare.name());
-                testcase.setStatus(TestCaseReviewStatus.Prepare.name());
-                testcase.setOrder(nextOrder);
-                mapper.insert(testcase);
-                nextOrder += 5000;
             }
-        }
-        sqlSession.flushStatements();
-        if (sqlSession != null && sqlSessionFactory != null) {
+            sqlSession.flushStatements();
+        } finally {
             SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
         }
     }
@@ -684,26 +685,27 @@ public class TestCaseService {
         Map<String, String> nodePathMap = testCaseNodeService.createNodeByTestCases(testCases, projectId);
         SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
         TestCaseMapper mapper = sqlSession.getMapper(TestCaseMapper.class);
-        if (!testCases.isEmpty()) {
-            AtomicInteger sort = new AtomicInteger();
-            AtomicInteger num = new AtomicInteger();
-            num.set(getNextNum(projectId) + testCases.size());
-            testCases.forEach(testcase -> {
-                TestCaseWithBLOBs oldCase = testCaseMapper.selectByPrimaryKey(testcase.getId());
-                String customFieldStr = this.updateCustomField(oldCase.getCustomFields(),testcase.getPriority());
-                testcase.setUpdateTime(System.currentTimeMillis());
-                testcase.setNodeId(nodePathMap.get(testcase.getNodePath()));
-                testcase.setSort(sort.getAndIncrement());
-                if (testcase.getNum() == null) {
-                    testcase.setNum(num.decrementAndGet());
-                }
-                testcase.setReviewStatus(TestCaseReviewStatus.Prepare.name());
-                testcase.setCustomFields(customFieldStr);
-                mapper.updateByPrimaryKeySelective(testcase);
-            });
-        }
-        sqlSession.flushStatements();
-        if (sqlSession != null && sqlSessionFactory != null) {
+        try {
+            if (!testCases.isEmpty()) {
+                AtomicInteger sort = new AtomicInteger();
+                AtomicInteger num = new AtomicInteger();
+                num.set(getNextNum(projectId) + testCases.size());
+                testCases.forEach(testcase -> {
+                    TestCaseWithBLOBs oldCase = testCaseMapper.selectByPrimaryKey(testcase.getId());
+                    String customFieldStr = this.updateCustomField(oldCase.getCustomFields(),testcase.getPriority());
+                    testcase.setUpdateTime(System.currentTimeMillis());
+                    testcase.setNodeId(nodePathMap.get(testcase.getNodePath()));
+                    testcase.setSort(sort.getAndIncrement());
+                    if (testcase.getNum() == null) {
+                        testcase.setNum(num.decrementAndGet());
+                    }
+                    testcase.setReviewStatus(TestCaseReviewStatus.Prepare.name());
+                    testcase.setCustomFields(customFieldStr);
+                    mapper.updateByPrimaryKeySelective(testcase);
+                });
+                sqlSession.flushStatements();
+            }
+        } finally {
             SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
         }
     }
@@ -735,8 +737,6 @@ public class TestCaseService {
      */
     public void updateImportDataCarryId(List<TestCaseWithBLOBs> testCases, String projectId) {
         Map<String, String> nodePathMap = testCaseNodeService.createNodeByTestCases(testCases, projectId);
-        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
-        TestCaseMapper mapper = sqlSession.getMapper(TestCaseMapper.class);
 
         /*
         获取用例的“网页上所显示id”与“数据库ID”映射。
@@ -751,19 +751,21 @@ public class TestCaseService {
         Map<Integer, String> numIdMap = testCasesList.stream()
                 .collect(Collectors.toMap(TestCase::getNum, TestCase::getId));
 
-
-        if (!testCases.isEmpty()) {
-            AtomicInteger sort = new AtomicInteger();
-            testCases.forEach(testcase -> {
-                testcase.setUpdateTime(System.currentTimeMillis());
-                testcase.setNodeId(nodePathMap.get(testcase.getNodePath()));
-                testcase.setSort(sort.getAndIncrement());
-                testcase.setId(numIdMap.get(testcase.getNum()));
-                mapper.updateByPrimaryKeySelective(testcase);
-            });
-        }
-        sqlSession.flushStatements();
-        if (sqlSession != null && sqlSessionFactory != null) {
+        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+        TestCaseMapper mapper = sqlSession.getMapper(TestCaseMapper.class);
+        try {
+            if (!testCases.isEmpty()) {
+                AtomicInteger sort = new AtomicInteger();
+                testCases.forEach(testcase -> {
+                    testcase.setUpdateTime(System.currentTimeMillis());
+                    testcase.setNodeId(nodePathMap.get(testcase.getNodePath()));
+                    testcase.setSort(sort.getAndIncrement());
+                    testcase.setId(numIdMap.get(testcase.getNum()));
+                    mapper.updateByPrimaryKeySelective(testcase);
+                });
+            }
+            sqlSession.flushStatements();
+        } finally {
             SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
         }
     }
@@ -777,8 +779,6 @@ public class TestCaseService {
      */
     public void updateImportDataCustomId(List<TestCaseWithBLOBs> testCases, String projectId) {
         Map<String, String> nodePathMap = testCaseNodeService.createNodeByTestCases(testCases, projectId);
-        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
-        TestCaseMapper mapper = sqlSession.getMapper(TestCaseMapper.class);
 
         /*
         获取用例的“网页上所显示id”与“数据库ID”映射。
@@ -793,19 +793,21 @@ public class TestCaseService {
         Map<String, String> customIdMap = testCasesList.stream()
                 .collect(Collectors.toMap(TestCase::getCustomNum, TestCase::getId, (k1,k2) -> k1));
 
-
-        if (!testCases.isEmpty()) {
-            AtomicInteger sort = new AtomicInteger();
-            testCases.forEach(testcase -> {
-                testcase.setUpdateTime(System.currentTimeMillis());
-                testcase.setNodeId(nodePathMap.get(testcase.getNodePath()));
-                testcase.setSort(sort.getAndIncrement());
-                testcase.setId(customIdMap.get(testcase.getCustomNum()));
-                mapper.updateByPrimaryKeySelective(testcase);
-            });
-        }
-        sqlSession.flushStatements();
-        if (sqlSession != null && sqlSessionFactory != null) {
+        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+        TestCaseMapper mapper = sqlSession.getMapper(TestCaseMapper.class);
+        try {
+            if (!testCases.isEmpty()) {
+                AtomicInteger sort = new AtomicInteger();
+                testCases.forEach(testcase -> {
+                    testcase.setUpdateTime(System.currentTimeMillis());
+                    testcase.setNodeId(nodePathMap.get(testcase.getNodePath()));
+                    testcase.setSort(sort.getAndIncrement());
+                    testcase.setId(customIdMap.get(testcase.getCustomNum()));
+                    mapper.updateByPrimaryKeySelective(testcase);
+                });
+            }
+            sqlSession.flushStatements();
+        } finally {
             SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
         }
     }
@@ -2125,4 +2127,38 @@ public class TestCaseService {
         List<TestCaseFollow> follows = testCaseFollowMapper.selectByExample(example);
         return follows.stream().map(TestCaseFollow::getFollowId).distinct().collect(Collectors.toList());
     }
+
+    public List<TestCaseWithBLOBs> getTestCasesWithBLOBs(List<String> ids) {
+        TestCaseExample example = new TestCaseExample();
+        example.createCriteria().andIdIn(ids);
+        return testCaseMapper.selectByExampleWithBLOBs(example);
+    }
+
+    public void copyTestCaseBath(TestCaseBatchRequest request) {
+        ServiceUtils.getSelectAllIds(request, request.getCondition(),
+                (query) -> extTestCaseMapper.selectIds(query));
+        List<String> ids = request.getIds();
+        if (CollectionUtils.isEmpty(ids)) return;
+        List<TestCaseWithBLOBs> testCases = getTestCasesWithBLOBs(ids);
+        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+        TestCaseMapper mapper = sqlSession.getMapper(TestCaseMapper.class);
+        Long nextOrder = ServiceUtils.getNextOrder(request.getProjectId(), extTestCaseMapper::getLastOrder);
+
+        try {
+            for (int i = 0; i < testCases.size(); i++) {
+                TestCaseWithBLOBs testCase = testCases.get(i);
+                testCase.setId(UUID.randomUUID().toString());
+                testCase.setName(testCase.getName() + "_" + testCase.getId().substring(0, 5));
+                testCase.setNodeId(request.getNodeId());
+                testCase.setNodePath(request.getNodePath());
+                testCase.setOrder(nextOrder += ServiceUtils.ORDER_STEP);
+                mapper.insert(testCase);
+                if (i % 50 == 0)
+                    sqlSession.flushStatements();
+            }
+            sqlSession.flushStatements();
+        } finally {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
index 15e28b101e..66f7f32142 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
@@ -116,7 +116,7 @@ public class TestPlanLoadCaseService {
                 t.setLoadConfiguration(loadTest.getLoadConfiguration());
                 t.setAdvancedConfiguration(loadTest.getAdvancedConfiguration());
             }
-            nextOrder += 5000;
+            nextOrder += ServiceUtils.ORDER_STEP;
             testPlanLoadCaseMapper.insert(t);
         }
 
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 2977e130e9..8a30603d17 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -286,6 +286,7 @@ export default {
       tableLabel: [],
       deletePath: "/test/case/delete",
       enableOrderDrag: true,
+      isMoveBatch: true,
       condition: {
         components: TEST_CASE_CONFIGS,
         filters: {}
@@ -322,11 +323,18 @@ export default {
           name: this.$t('test_track.case.batch_edit_case'),
           handleClick: this.handleBatchEdit,
           permissions: ['PROJECT_TRACK_CASE:READ+EDIT']
-        }, {
+        },
+        {
           name: this.$t('test_track.case.batch_move_case'),
           handleClick: this.handleBatchMove,
           permissions: ['PROJECT_TRACK_CASE:READ+EDIT']
-        }, {
+        },
+        {
+          name: this.$t('api_test.batch_copy'),
+          handleClick: this.handleBatchCopy,
+          permissions: ['PROJECT_TRACK_CASE:READ+EDIT']
+        },
+        {
           name: this.$t('test_track.case.batch_delete_case'),
           handleClick: this.handleDeleteBatchToGc,
           permissions: ['PROJECT_TRACK_CASE:READ+DELETE']
@@ -884,6 +892,11 @@ export default {
       this.$refs.batchEdit.open(this.$refs.table.selectRows.size);
     },
     handleBatchMove() {
+      this.isMoveBatch = true;
+      this.$refs.testBatchMove.open(this.treeNodes, this.$refs.table.selectIds, this.moduleOptions);
+    },
+    handleBatchCopy() {
+      this.isMoveBatch = false;
       this.$refs.testBatchMove.open(this.treeNodes, this.$refs.table.selectIds, this.moduleOptions);
     },
     getMaintainerOptions() {
@@ -893,7 +906,10 @@ export default {
     },
     moveSave(param) {
       param.condition = this.condition;
-      this.page.result = this.$post('/test/case/batch/edit', param, () => {
+      let url = '/test/case/batch/edit';
+      if (!this.isMoveBatch)
+        url = '/test/case/batch/copy';
+      this.page.result = this.$post(url, param, () => {
         this.$success(this.$t('commons.save_success'));
         this.$refs.testBatchMove.close();
         this.refresh();

From 1dd4fa5d4108462b9c511bd8b4f66c92d8b5a34a Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Tue, 14 Dec 2021 17:27:17 +0800
Subject: [PATCH 125/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=80=BB=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008828 --user=王孝刚 接口自动化报告总时间计算错误
https://www.tapd.cn/55049933/s/1080731
---
 .../api/automation/report/ApiReportDetail.vue    | 10 ++++++----
 .../automation/report/SysnApiReportDetail.vue    | 13 +++++++------
 .../automation/report/components/MetricChart.vue | 16 +++++++---------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
index 6eae8054ab..c79a39a221 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
@@ -360,20 +360,22 @@ export default {
     },
     computeTotalTime() {
       if (this.content.scenarios) {
-        let startTime = 99991611737506593;
+        let startTime = 0;
         let endTime = 0;
+        let requestTime = 0;
         this.content.scenarios.forEach((scenario) => {
           scenario.requestResults.forEach((request) => {
-            if (request.startTime && Number(request.startTime) < startTime) {
+            if (request.startTime && Number(request.startTime)) {
               startTime = request.startTime;
             }
-            if (request.endTime && Number(request.endTime) > endTime) {
+            if (request.endTime && Number(request.endTime)) {
               endTime = request.endTime;
             }
+            requestTime = requestTime + (endTime - startTime);
           })
         })
         if (startTime < endTime) {
-          this.totalTime = endTime - startTime + 100;
+          this.totalTime = requestTime
         }
       }
     },
diff --git a/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue b/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
index c2ec7beb30..016affa43f 100644
--- a/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
+++ b/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
@@ -300,8 +300,9 @@ export default {
     },
     formatResult(res) {
       let resMap = new Map;
-      this.startTime = 99991611737506593;
+      this.startTime = 0;
       this.endTime = 0;
+      let requestTime = 0;
       this.clearDebug();
       if (res && res.scenarios) {
         res.scenarios.forEach(item => {
@@ -330,20 +331,20 @@ export default {
                 } else {
                   this.reqError++;
                 }
-                if (req.startTime && Number(req.startTime) < this.startTime) {
+                if (req.startTime && Number(req.startTime)) {
                   this.startTime = req.startTime;
                 }
-                if (req.endTime && Number(req.endTime) > this.endTime) {
+                if (req.endTime && Number(req.endTime)) {
                   this.endTime = req.endTime;
                 }
+                requestTime = requestTime + (this.endTime - this.startTime)
               }
             }
           }
         })
       }
-      if (this.startTime < this.endTime) {
-        this.totalTime = this.endTime - this.startTime + 100;
-      }
+      this.totalTime = requestTime;
+
       this.debugResult = resMap;
       this.setTreeValue(this.fullTreeNodes);
       this.reload();
diff --git a/frontend/src/business/components/api/automation/report/components/MetricChart.vue b/frontend/src/business/components/api/automation/report/components/MetricChart.vue
index bd17bc1e32..e5d83cb300 100644
--- a/frontend/src/business/components/api/automation/report/components/MetricChart.vue
+++ b/frontend/src/business/components/api/automation/report/components/MetricChart.vue
@@ -134,17 +134,16 @@
     },
     methods: {
       initTime() {
-        this.time = this.totalTime
-        this.seconds = Math.floor(this.time / 1000)
+        this.time = this.totalTime;
+        this.seconds = (this.time) / 1000;
         if (this.seconds >= 1) {
-          if (this.seconds > 60) {
-            this.minutes = Math.round(this.time / 60)
-            this.seconds = Math.round(this.time % 60)
-            this.time = this.minutes + "min" + this.seconds + "s"
+          if (this.seconds < 60) {
+            this.seconds = Math.round(this.seconds * 100 / 1) / 100;
+            this.time = this.seconds + "s"
           }
           if (this.seconds > 60) {
-            this.minutes = Math.round(this.time / 60)
-            this.seconds = Math.round(this.time % 60)
+            this.minutes = Math.round(this.seconds / 60)
+            this.seconds = Math.round(this.seconds * 100 % 60) / 100;
             this.time = this.minutes + "min" + this.seconds + "s"
           }
           if (this.minutes > 60) {
@@ -153,7 +152,6 @@
             this.time = this.hour + "hour" + this.minutes + "min" + this.seconds + "s"
           }
 
-          this.time = (this.seconds) + "s"
         } else {
           this.time = this.totalTime + "ms"
         }

From d37f90ba8ae2979b578127671c131bf8452e718c Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 14 Dec 2021 19:45:19 +0800
Subject: [PATCH 126/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E5=B9=B6=E8=A1=8C):=20=E4=BC=98=E5=8C=96=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E5=9C=BA=E6=99=AF=E5=B9=B6=E8=A1=8C=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=81=B6=E5=8F=91=E6=80=A7=E6=89=BE?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=8A=A5=E5=91=8A=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化测试场景并行流程，解决偶发性找不到报告数据的缺陷
---
 .../api/service/ApiAutomationService.java     | 13 +++++++--
 .../ApiDefinitionExecResultService.java       | 16 +++++++----
 .../api/service/ApiScenarioReportService.java | 28 ++++++++++---------
 .../api/service/TestResultService.java        |  1 +
 .../metersphere/service/ScheduleService.java  |  4 +--
 .../track/service/TestPlanReportService.java  | 16 -----------
 6 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 20e74c03e6..2a8cae70cb 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -1575,7 +1575,6 @@ public class ApiAutomationService {
                     //存储报告
                     APIScenarioReportResult report = executeQueue.get(reportId).getReport();
                     batchMapper.insert(report);
-                    MessageCache.scenarioExecResourceLock.put(reportId, report);
                 }
                 sqlSession.flushStatements();
                 if (sqlSession != null && sqlSessionFactory != null) {
@@ -1583,9 +1582,19 @@ public class ApiAutomationService {
                 }
             }
         });
-        thread.start();
+
+        try {
+            thread.start();
+            while (!StringUtils.equals(thread.getState().name(), Thread.State.TERMINATED.name())){
+                Thread.sleep(500);
+            }
+        }catch (Exception e){
+            LogUtil.error("场景报告入库异常 报错：["+e.getMessage()+"]. 场景报告ID list："+JSONArray.toJSONString(executeQueue.keySet()));
+            LogUtil.error(e);
+        }
 
         for (String reportId : executeQueue.keySet()) {
+            MessageCache.scenarioExecResourceLock.put(reportId, executeQueue.get(reportId).getReport());
             // 增加一个本地锁，防止并发找不到资源
             if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) {
                 String testPlanScenarioId = "";
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index eb56654f4f..19c1a5c9d3 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -255,7 +255,6 @@ public class ApiDefinitionExecResultService {
         if (StringUtils.equalsAny(saveResultType, ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name(), ApiRunMode.MANUAL_PLAN.name())) {
             saveResultType = ApiRunMode.API_PLAN.name();
         }
-        String finalSaveResultType = saveResultType;
 
         Map<String, String> apiIdResultMap = new HashMap<>();
         Map<String, String> caseReportMap = new HashMap<>();
@@ -270,7 +269,7 @@ public class ApiDefinitionExecResultService {
             }
             testPlanReportId = testIdArr[1];
         }
-        String creator = TestPlanReportExecuteCatch.getCreator(testPlanReportId);
+        LogUtil.info("收到测试计划案例[" + result.getTestId() + "]的执行信息，开始保存. testID:[" + testId + "] 测试计划ID:[" + testPlanReportId + "]");
         if (CollectionUtils.isNotEmpty(result.getScenarios())) {
             result.getScenarios().forEach(scenarioResult -> {
                 final boolean[] isFirst = {true};
@@ -294,6 +293,7 @@ public class ApiDefinitionExecResultService {
                             item.getResponseResult().setConsole(result.getConsole());
                             boolean saved = true;
                             if (saveResult == null || expectProcessResultCount > 1) {
+                                LogUtil.info("测试计划案例[" + result.getTestId() + "]的执行结果信息未保存，新增。");
                                 saveResult = new ApiDefinitionExecResult();
                                 if (isFirst[0]) {
                                     isFirst[0] = false;
@@ -341,8 +341,10 @@ public class ApiDefinitionExecResultService {
                                 saveResult.setTriggerMode(TriggerMode.MANUAL.name());
                             }
                             if (!saved) {
+                                LogUtil.info("插入案例[" + saveResult.getId() + "]的执行结果。");
                                 apiDefinitionExecResultMapper.insert(saveResult);
                             } else {
+                                LogUtil.info("更新案例[" + saveResult.getId() + "]的执行结果。");
                                 apiDefinitionExecResultMapper.updateByPrimaryKeyWithBLOBs(saveResult);
                             }
                             apiDefinitionService.removeCache(result.getTestId());
@@ -353,9 +355,13 @@ public class ApiDefinitionExecResultService {
                             String caseId = item.getName();
                             if (StringUtils.equalsAny(type, ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name())) {
                                 TestPlanApiCase apiCase = testPlanApiCaseService.getById(caseId);
-                                apiCase.setStatus(status);
-                                apiCase.setUpdateTime(System.currentTimeMillis());
-                                testPlanApiCaseService.updateByPrimaryKeySelective(apiCase);
+                                if(apiCase != null){
+                                    apiCase.setStatus(status);
+                                    apiCase.setUpdateTime(System.currentTimeMillis());
+                                    testPlanApiCaseService.updateByPrimaryKeySelective(apiCase);
+                                }else {
+                                    LogUtil.error("存储测试计划案例[" + result.getTestId() + "]的执行信息出错，TestPlanApiCase id:["+caseId+"] 未找到！ ");
+                                }
                             } else {
                                 testPlanApiCaseService.setExecResult(caseId, status, item.getStartTime());
                                 testCaseReviewApiCaseService.setExecResult(caseId, status, item.getStartTime());
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
index 1240b958ae..8bff619a8d 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
@@ -310,10 +310,9 @@ public class ApiScenarioReportService {
     }
 
     public ApiScenarioReport updateSchedulePlanCase(TestResult result, String runMode) {
-        LogUtil.info("收到测试计划场景[" + result.getTestId() + "]的执行信息，开始保存");
         ApiScenarioReport lastReport = null;
-        List<ScenarioResult> scenarioResultList = result.getScenarios();
-
+        List<ScenarioResult> scenarioResultList = result.getScenarios() == null ? new ArrayList<>(0) : result.getScenarios();
+        LogUtil.info("收到测试计划场景[" + result.getTestId() + "]的执行信息，开始保存.步骤总数：" + scenarioResultList.size());
         List<String> testPlanReportIdList = new ArrayList<>();
         StringBuilder scenarioNames = new StringBuilder();
 
@@ -322,15 +321,14 @@ public class ApiScenarioReportService {
         Map<String, String> scenarioAndErrorMap = new HashMap<>();
         Map<String, String> planScenarioReportMap = new HashMap<>();
         for (ScenarioResult scenarioResult : scenarioResultList) {
-
+            LogUtil.info("收到测试计划场景[" + result.getTestId() + "]的执行信息并存储报告。报告ID:" + scenarioResult.getName());
             // 存储场景报告
             long startTime = System.currentTimeMillis();
             if (CollectionUtils.isNotEmpty(scenarioResult.getRequestResults())) {
                 startTime = scenarioResult.getRequestResults().get(0).getStartTime();
             }
-
             ApiScenarioReport report = editReport(scenarioResult, startTime);
-            if(report != null){
+            if (report != null) {
                 TestResult newResult = createTestResult(result.getTestId(), scenarioResult);
                 newResult.setConsole(result.getConsole());
                 scenarioResult.setName(report.getScenarioName());
@@ -357,7 +355,7 @@ public class ApiScenarioReportService {
                 String passRate = new DecimalFormat("0%").format((float) scenarioResult.getSuccess() / (scenarioResult.getSuccess() + scenarioResult.getError()));
 
                 TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(planScenarioId);
-                if(testPlanApiScenario != null){
+                if (testPlanApiScenario != null) {
                     //更新测试计划场景相关状态
                     report.setScenarioId(testPlanApiScenario.getApiScenarioId());
                     if (scenarioResult.getError() > 0) {
@@ -374,8 +372,8 @@ public class ApiScenarioReportService {
                     scenarioIdList.add(testPlanApiScenario.getApiScenarioId());
 
                     updatePlanTestCaseStates(testPlanApiScenario);
-                }else {
-                    LogUtil.info("TestPlanReport_Id is null. scenario report id : ["+report.getId()+"]; planScenarioIdArr:["+report.getScenarioId()+"] DATA:"+JSON.toJSONString(scenarioResult));
+                } else {
+                    LogUtil.info("TestPlanReport_Id is null. scenario report id : [" + report.getId() + "]; planScenarioIdArr:[" + report.getScenarioId() + "] DATA:" + JSON.toJSONString(scenarioResult));
                 }
 
                 report.setEndTime(System.currentTimeMillis());
@@ -390,11 +388,13 @@ public class ApiScenarioReportService {
                 if (StringUtils.isNotEmpty(report.getTriggerMode()) && report.getTriggerMode().equals("CASE")) {
                     report.setTriggerMode(TriggerMode.MANUAL.name());
                 }
-                apiScenarioReportDetailMapper.insert(detail);
-
-
+                try {
+                    apiScenarioReportDetailMapper.insert(detail);
+                } catch (Exception e) {
+                    LogUtil.error("存储场景报告出错：" + e.getMessage() + "; 步骤信息:" + JSON.toJSONString(scenarioResult));
+                    LogUtil.error(e);
+                }
                 scenarioNames.append(report.getName()).append(",");
-
                 // 更新场景状态
                 ApiScenario scenario = apiScenarioMapper.selectByPrimaryKey(report.getScenarioId());
                 if (scenario != null) {
@@ -416,6 +416,8 @@ public class ApiScenarioReportService {
                 lastReport = report;
                 MessageCache.executionQueue.remove(report.getId());
                 reportIds.add(report.getId());
+            } else {
+                LogUtil.error("测试计划场景[" + result.getTestId() + "]的场景报告未找到。报告ID:" + scenarioResult.getName() + "。 步骤信息:" + JSON.toJSONString(scenarioResult));
             }
         }
         testPlanLog.info("TestPlanReportId" + JSONArray.toJSONString(testPlanReportIdList) + " EXECUTE OVER. SCENARIO STATUS : " + JSONObject.toJSONString(scenarioAndErrorMap));
diff --git a/backend/src/main/java/io/metersphere/api/service/TestResultService.java b/backend/src/main/java/io/metersphere/api/service/TestResultService.java
index 0852dd4ffd..45d2a66848 100644
--- a/backend/src/main/java/io/metersphere/api/service/TestResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/TestResultService.java
@@ -39,6 +39,7 @@ public class TestResultService {
     private ApiAutomationService apiAutomationService;
 
     public void saveResult(TestResult testResult, String runMode, String debugReportId, String testId) {
+        LogUtil.info("Save result:["+testId+"]; RUN MODE:"+runMode);
         try {
             ApiTestReportVariable reportTask = null;
             if (StringUtils.equals(runMode, ApiRunMode.DEFINITION.name())) {
diff --git a/backend/src/main/java/io/metersphere/service/ScheduleService.java b/backend/src/main/java/io/metersphere/service/ScheduleService.java
index ce51671c7b..25166fb13e 100644
--- a/backend/src/main/java/io/metersphere/service/ScheduleService.java
+++ b/backend/src/main/java/io/metersphere/service/ScheduleService.java
@@ -178,14 +178,14 @@ public class ScheduleService {
             scheduleManager.removeJob(jobKey, triggerKey);
         } catch (Exception e) {
             LogUtil.error(e);
-            MSException.throwException("重置定时任务-删除时异常");
+            MSException.throwException("重置定时任务-删除旧定时任务时出现异常");
         }
         try {
             scheduleManager.addCronJob(jobKey, triggerKey, clazz, request.getValue(),
                     scheduleManager.getDefaultJobDataMap(request, request.getValue(), SessionUtils.getUser().getId()));
         } catch (Exception e) {
             LogUtil.error(e);
-            MSException.throwException("重置定时任务-删除时异常");
+            MSException.throwException("重置定时任务-启动新定时任务出现异常");
         }
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
index 7d4d05ab7f..b51a6a743e 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
@@ -130,7 +130,6 @@ public class TestPlanReportService {
             }
         }
         list = extTestPlanReportMapper.list(request);
-        this.checkReportStatus(list);
         return list;
     }
 
@@ -1217,21 +1216,6 @@ public class TestPlanReportService {
         testPlanReportContentMapper.updateByExampleSelective(bloBs,example);
     }
 
-    private void checkReportStatus(List<TestPlanReportDTO> list) {
-        String errorStatus = "FAILED";
-        for (TestPlanReportDTO dto : list) {
-            if (StringUtils.equalsIgnoreCase(dto.getStatus(), "Running")) {
-                if (!TestPlanReportExecuteCatch.containsReport(dto.getId())) {
-                    //测试计划报告处于Running状态，且监听中不存在此ID，更改Running的运行状态。一般在测试计划执行结束之前服务关闭时会出现这种情况
-                    TestPlanReport report = new TestPlanReport();
-                    report.setId(dto.getId());
-                    this.finishReport(report);
-                    dto.setStatus(errorStatus);
-                }
-            }
-        }
-    }
-
     private boolean checkTestPlanReportIsTimeOut(String planReportId) {
         TestPlanExecuteInfo executeInfo = TestPlanReportExecuteCatch.getTestPlanExecuteInfo(planReportId);
         int unFinishNum = executeInfo.countUnFinishedNum();

From 28413355765130d3598ba68fdf99934ec1a12261 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 15 Dec 2021 14:25:47 +0800
Subject: [PATCH 127/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92):=20=E6=89=A7=E8=A1=8C=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=E5=A4=B1=E8=B4=A5=E6=97=B6=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9C=AA=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008758 --user=lyh 【测试跟踪】手动执行测试计划，性能测试没有执行
https://www.tapd.cn/55049933/s/1081054
---
 .../commons/constants/TestPlanLoadCaseStatus.java    |  5 +++++
 .../track/service/LoadReportStatusEvent.java         |  5 +++--
 .../track/service/TestPlanReportService.java         |  6 +++---
 .../metersphere/track/service/TestPlanService.java   | 12 ++++++------
 4 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/commons/constants/TestPlanLoadCaseStatus.java

diff --git a/backend/src/main/java/io/metersphere/commons/constants/TestPlanLoadCaseStatus.java b/backend/src/main/java/io/metersphere/commons/constants/TestPlanLoadCaseStatus.java
new file mode 100644
index 0000000000..f2fd163d46
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/commons/constants/TestPlanLoadCaseStatus.java
@@ -0,0 +1,5 @@
+package io.metersphere.commons.constants;
+
+public enum TestPlanLoadCaseStatus {
+    run, error, success
+}
diff --git a/backend/src/main/java/io/metersphere/track/service/LoadReportStatusEvent.java b/backend/src/main/java/io/metersphere/track/service/LoadReportStatusEvent.java
index b6e2667afa..e2ba414a59 100644
--- a/backend/src/main/java/io/metersphere/track/service/LoadReportStatusEvent.java
+++ b/backend/src/main/java/io/metersphere/track/service/LoadReportStatusEvent.java
@@ -4,6 +4,7 @@ import io.metersphere.base.domain.LoadTestReport;
 import io.metersphere.base.mapper.ext.ExtTestPlanLoadCaseMapper;
 import io.metersphere.commons.constants.PerformanceTestStatus;
 import io.metersphere.commons.constants.ReportTriggerMode;
+import io.metersphere.commons.constants.TestPlanLoadCaseStatus;
 import io.metersphere.commons.consumer.LoadTestFinishEvent;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -24,10 +25,10 @@ public class LoadReportStatusEvent implements LoadTestFinishEvent {
         if (StringUtils.isNotBlank(reportId)) {
             String result = "";
             if (StringUtils.equals(PerformanceTestStatus.Error.name(), status)) {
-                result = "error";
+                result = TestPlanLoadCaseStatus.error.name();
             }
             if (StringUtils.equals(PerformanceTestStatus.Completed.name(), status)) {
-                result = "success";
+                result = TestPlanLoadCaseStatus.success.name();
             }
             extTestPlanLoadCaseMapper.updateCaseStatus(reportId, result);
         }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
index b51a6a743e..ac9e4342eb 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
@@ -898,7 +898,7 @@ public class TestPlanReportService {
                                 if (errorDataCheckMap.get(loadTestReportId) > 10) {
                                     performaneReportIDList.remove(loadTestReportId);
                                     if (performaneReportIDMap.containsKey(loadTestReportId)) {
-                                        finishLoadTestId.put(performaneReportIDMap.get(loadTestReportId), TestPlanApiExecuteStatus.FAILD.name());
+                                        finishLoadTestId.put(performaneReportIDMap.get(loadTestReportId), TestPlanLoadCaseStatus.error.name());
                                         caseReportMap.put(performaneReportIDMap.get(loadTestReportId), loadTestReportId);
                                     }
                                 } else {
@@ -911,14 +911,14 @@ public class TestPlanReportService {
                             testPlanLog.info("TestPlanReportId[" + testPlanReport.getId() + "] SELECT performance ID:" + loadTestReportId + ",RESULT :" + loadTestReportFromDatabase.getStatus());
                             if (StringUtils.equalsAny(loadTestReportFromDatabase.getStatus(),
                                     PerformanceTestStatus.Completed.name(), PerformanceTestStatus.Error.name())) {
-                                finishLoadTestId.put(performaneReportIDMap.get(loadTestReportId), TestPlanApiExecuteStatus.SUCCESS.name());
+                                finishLoadTestId.put(performaneReportIDMap.get(loadTestReportId), TestPlanLoadCaseStatus.success.name());
                                 caseReportMap.put(performaneReportIDMap.get(loadTestReportId), loadTestReportId);
                                 performaneReportIDList.remove(loadTestReportId);
                             }
                         }
                     } catch (Exception e) {
                         performaneReportIDList.remove(loadTestReportId);
-                        finishLoadTestId.put(performaneReportIDMap.get(loadTestReportId), TestPlanApiExecuteStatus.FAILD.name());
+                        finishLoadTestId.put(performaneReportIDMap.get(loadTestReportId), TestPlanLoadCaseStatus.error.name());
                         caseReportMap.put(performaneReportIDMap.get(loadTestReportId), loadTestReportId);
                         testPlanLog.error(e.getMessage());
                     }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 37bd04d9c4..7f19331567 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -1172,19 +1172,19 @@ public class TestPlanService {
                 reportId = performanceTestService.run(performanceRequest);
                 if (reportId != null) {
                     performaneReportIDMap.put(reportId, id);
-                    TestPlanLoadCaseWithBLOBs testPlanLoadCase = new TestPlanLoadCaseWithBLOBs();
-                    testPlanLoadCase.setId(performanceRequest.getTestPlanLoadId());
-                    testPlanLoadCase.setLoadReportId(reportId);
-                    testPlanLoadCaseService.update(testPlanLoadCase);
-
                     //更新关联处的报告
                     TestPlanLoadCaseWithBLOBs loadCase = new TestPlanLoadCaseDTO();
                     loadCase.setId(id);
                     loadCase.setLoadReportId(reportId);
-                    loadCase.setStatus("run");
+                    loadCase.setStatus(TestPlanLoadCaseStatus.run.name());
                     testPlanLoadCaseService.update(loadCase);
                 }
             } catch (Exception e) {
+                TestPlanLoadCaseWithBLOBs testPlanLoadCase = new TestPlanLoadCaseWithBLOBs();
+                testPlanLoadCase.setId(id);
+                testPlanLoadCase.setLoadReportId(reportId);
+                testPlanLoadCase.setStatus(TestPlanLoadCaseStatus.error.name());
+                testPlanLoadCaseService.update(testPlanLoadCase);
                 LogUtil.error(e);
             }
             performaneThreadIDMap.put(performanceRequest.getTestPlanLoadId(), reportId);

From f01549aa92289d549047e98830a4ed18b33f53aa Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 15 Dec 2021 15:03:45 +0800
Subject: [PATCH 128/256] =?UTF-8?q?fix:=20=E7=94=A8=E4=BE=8B=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E9=A1=B5=E9=9D=A2=E8=AF=84=E8=AE=BA=E6=A1=86=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87=E5=8A=A0=E8=BD=BD=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008860 --user=陈建星 [github#8449]测试跟踪，用例执行页面评论框中的图片加载失败 https://www.tapd.cn/55049933/s/1080960
---
 .../track/case/components/MsMarkDownText.vue  | 126 ++++++++++--------
 .../track/case/components/TestCaseComment.vue |  74 ++--------
 .../track/issue/IssueDescriptionTableItem.vue |  18 +--
 .../track/review/commom/ReviewComment.vue     |  65 ++-------
 frontend/src/business/components/xpack        |   2 +-
 frontend/src/network/image.js                 |  25 ++++
 6 files changed, 121 insertions(+), 189 deletions(-)
 create mode 100644 frontend/src/network/image.js

diff --git a/frontend/src/business/components/track/case/components/MsMarkDownText.vue b/frontend/src/business/components/track/case/components/MsMarkDownText.vue
index 913246e17b..30a56ccab3 100644
--- a/frontend/src/business/components/track/case/components/MsMarkDownText.vue
+++ b/frontend/src/business/components/track/case/components/MsMarkDownText.vue
@@ -1,5 +1,5 @@
 <template>
-    <mavon-editor :id="id" v-if="active" :editable="!disabled" @imgAdd="imgAdd" :default-open="defaultOpen" class="mavon-editor"
+      <mavon-editor :id="id" :editable="!disabled" @imgAdd="imgAdd" :default-open="defaultOpen" class="mavon-editor"
                   :xss-options="xssOptions"
                   @change="$emit('change')"
                   :subfield="false" :toolbars="toolbars" :language="language" :toolbarsFlag="disabled ? false : true" @imgDel="imgDel" v-model="data[prop]"  ref="md"/>
@@ -7,10 +7,61 @@
 
 <script>
 import {getCurrentUser, getUUID} from "@/common/js/utils";
+import {deleteMarkDownImg, uploadMarkDownImg} from "@/network/image";
 export default {
   name: "MsMarkDownText",
   components: {},
-  props: ['data', 'prop', 'disabled'],
+  props: {
+    data: Object,
+    prop: String,
+    disabled: Boolean,
+    autoReview: {
+      type: Boolean,
+      default() {
+        return true;
+      }
+    },
+    toolbars: {
+      type: Object,
+      default() {
+        return {
+          bold: true, // 粗体
+          italic: true, // 斜体
+          header: true, // 标题
+          underline: true, // 下划线
+          strikethrough: true, // 中划线
+          mark: true, // 标记
+          superscript: true, // 上角标
+          subscript: true, // 下角标
+          quote: true, // 引用
+          ol: true, // 有序列表
+          ul: true, // 无序列表
+          link: true, // 链接
+          imagelink: true, // 图片链接
+          code: true, // code
+          table: true, // 表格
+          fullscreen: true, // 全屏编辑
+          readmodel: true, // 沉浸式阅读
+          htmlcode: true, // 展示html源码
+          help: true, // 帮助
+          /* 1.3.5 */
+          undo: true, // 上一步
+          redo: true, // 下一步
+          trash: true, // 清空
+          save: false, // 保存（触发events中的save事件）
+          /* 1.4.2 */
+          navigation: true, // 导航目录
+          /* 2.1.8 */
+          alignleft: true, // 左对齐
+          aligncenter: true, // 居中
+          alignright: true, // 右对齐
+          /* 2.2.1 */
+          subfield: true, // 单双栏模式
+          preview: true, // 预览
+        }
+      }
+    }
+  },
   data() {
     return {
       result: {loading: false},
@@ -21,51 +72,11 @@ export default {
         },
         stripIgnoreTagBody: true
       },
-      defaultOpen: 'preview',
-      toolbars: {
-        bold: true, // 粗体
-        italic: true, // 斜体
-        header: true, // 标题
-        underline: true, // 下划线
-        strikethrough: true, // 中划线
-        mark: true, // 标记
-        superscript: true, // 上角标
-        subscript: true, // 下角标
-        quote: true, // 引用
-        ol: true, // 有序列表
-        ul: true, // 无序列表
-        link: true, // 链接
-        imagelink: true, // 图片链接
-        code: true, // code
-        table: true, // 表格
-        fullscreen: true, // 全屏编辑
-        readmodel: true, // 沉浸式阅读
-        htmlcode: true, // 展示html源码
-        help: true, // 帮助
-        /* 1.3.5 */
-        undo: true, // 上一步
-        redo: true, // 下一步
-        trash: true, // 清空
-        save: false, // 保存（触发events中的save事件）
-        /* 1.4.2 */
-        navigation: true, // 导航目录
-        /* 2.1.8 */
-        alignleft: true, // 左对齐
-        aligncenter: true, // 居中
-        alignright: true, // 右对齐
-        /* 2.2.1 */
-        subfield: true, // 单双栏模式
-        preview: true, // 预览
-      }
+      defaultOpen: 'preview'
     }
   },
+
   computed: {
-    active() {
-      if (this.data[this.prop] !== undefined) {
-        return true;
-      }
-      return false;
-    },
     language() {
       const user = getCurrentUser();
       const language = user.language;
@@ -84,31 +95,31 @@ export default {
   mounted() {
     // 点击编辑，失去焦点展示
     let el = document.getElementById(this.id);
+    if (!this.autoReview) {
+      this.defaultOpen = null;
+    }
     if (el) {
       el.addEventListener('click', () => {
         let imagePreview = el.getElementsByClassName('v-note-img-wrapper');
         if (imagePreview.length > 0) { // 图片预览的时候不切换到编辑模式
-          this.defaultOpen = 'preview';
+          if (this.autoReview)
+            this.defaultOpen = 'preview';
         } else {
-          this.defaultOpen = null;
+          if (this.autoReview)
+            this.defaultOpen = null;
         }
       });
       let input = el.getElementsByClassName('auto-textarea-input');
       input[0].addEventListener('blur', () => {
-        this.defaultOpen = 'preview';
+        if (this.autoReview)
+          this.defaultOpen = 'preview';
       });
     }
   },
   methods: {
     imgAdd(pos, file){
-      let param = {
-        id: getUUID().substring(0, 8)
-      };
-      file.prefix = param.id;
       this.result.loading = true;
-      // 带括号和空格，可能无法展示
-      param.fileName = file.name.replace("(", "").replace(")", "").replace(" ", "");
-      this.$fileUpload('/resource/md/upload', file, null, param, () => {
+      uploadMarkDownImg(file, (response, param) => {
         this.$success(this.$t('commons.save_success'));
         this.$refs.md.$img2Url(pos, '/resource/md/get/'  + param.id + '_' + param.fileName);
         this.result.loading = false;
@@ -116,10 +127,11 @@ export default {
       this.$emit('imgAdd', file);
     },
     imgDel(file) {
-      if (file) {
-        this.$get('/resource/md/delete/' + file[1].prefix + "_" + file[1].name);
-      }
+      deleteMarkDownImg(file);
     },
+    getContent() {
+      return this.$refs.md.d_render;
+    }
   }
 }
 </script>
diff --git a/frontend/src/business/components/track/case/components/TestCaseComment.vue b/frontend/src/business/components/track/case/components/TestCaseComment.vue
index 33bc3df788..49db6598e5 100644
--- a/frontend/src/business/components/track/case/components/TestCaseComment.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseComment.vue
@@ -4,10 +4,7 @@
     <div v-loading="result.loading">
       <div class="editors_div_style">
         <div id="editorsDiv">
-          <mavon-editor :disabled="isReadOnly"
-                        :xss-options="xssOptions"
-                        @imgAdd="imgAdd" :default-open="'edit'" class="review-mavon-editor" :imageFilter="imageFilter"
-                        :toolbars="richDataToolbars" @imgDel="imgDel" v-model="textarea" ref="md"/>
+          <ms-mark-down-text prop="description" :data="from" :toolbars="toolbars"/>
         </div>
       </div>
       <div>
@@ -22,11 +19,12 @@
 
 <script>
 import ReviewCommentItem from "@/business/components/track/review/commom/ReviewCommentItem";
-import {getUUID} from "@/common/js/utils";
+import {uploadMarkDownImg} from "@/network/image";
+import MsMarkDownText from "@/business/components/track/case/components/MsMarkDownText";
 
 export default {
   name: "TestCaseComment",
-  components: {ReviewCommentItem},
+  components: {MsMarkDownText, ReviewCommentItem},
   props: {
     caseId: String,
     reviewId: String,
@@ -34,16 +32,12 @@ export default {
   data() {
     return {
       result: {},
-      textarea: '',
+      from: {
+        description: ''
+      },
       isReadOnly: false,
       dialogTableVisible: false,
-      xssOptions: {
-        whiteList: {
-          img: ["src", "alt", "width", "height"],
-        },
-        stripIgnoreTagBody: true
-      },
-      richDataToolbars: {
+      toolbars: {
         bold: false, // 粗体
         italic: false, // 斜体
         header: false, // 标题
@@ -87,59 +81,21 @@ export default {
     sendComment() {
       let comment = {};
       comment.caseId = this.caseId;
-      comment.description = this.textarea;
-      if (!this.textarea) {
+      comment.description = this.from.description;
+      if (!comment.description) {
         this.$warning(this.$t('test_track.comment.description_is_null'));
         return;
       }
       this.result = this.$post('/test/case/comment/save', comment, () => {
         this.$success(this.$t('test_track.comment.send_success'));
         this.refresh(comment.caseId);
-        this.textarea = '';
+        this.from.description = '';
         this.dialogTableVisible = false;
       });
     },
     refresh(id) {
       this.$emit('getComments');
-    },
-    //富文本框
-    imgAdd(pos, file) {
-      let param = {
-        id: getUUID().substring(0, 8)
-      };
-
-      file.prefix = param.id;
-      this.result = this.$fileUpload('/resource/md/upload', file, null, param, () => {
-        this.$success(this.$t('commons.save_success'));
-        this.$refs.md.$img2Url(pos, '/resource/md/get/'  + param.id+"_"+file.name);
-        this.sendComment();
-      });
-      this.$emit('imgAdd', file);
-    },
-    imageFilter(file){
-      let isImg = false;
-      if(file){
-        if(file.name){
-          if (file.name.indexOf("[")> 0 || file.name.indexOf("]") > 0||file.name.indexOf("([)")> 0 || file.name.indexOf(")") > 0){
-            this.$error("图片名称不能含有特殊字符");
-            isImg = false;
-          }else {
-            isImg = true;
-          }
-        }
-      }
-      return isImg;
-    },
-    imgDel(file) {
-      let fileUrl = file[1].prefix + "_" + file[1].name;
-      let comments = this.$refs.reviewComments;
-      comments.forEach(item => {
-        let imgCheckResult = item.checkByUrls(fileUrl);
-        if(imgCheckResult){
-          item.deleteComment();
-        }
-      });
-    },
+    }
   }
 };
 </script>
@@ -159,10 +115,4 @@ export default {
   height: 300px;
   overflow: auto
 }
-
-.review-mavon-editor {
-  min-height: 20px;
-  height: 300px;
-  overflow: auto
-}
 </style>
diff --git a/frontend/src/business/components/track/issue/IssueDescriptionTableItem.vue b/frontend/src/business/components/track/issue/IssueDescriptionTableItem.vue
index 4d350373fd..814856acf3 100644
--- a/frontend/src/business/components/track/issue/IssueDescriptionTableItem.vue
+++ b/frontend/src/business/components/track/issue/IssueDescriptionTableItem.vue
@@ -11,9 +11,7 @@
         trigger="hover"
         popper-class="issues-popover"
       >
-        <mavon-editor :editable="false" default-open="preview" class="mavon-editor"
-                      :xss-options="xssOptions"
-                      :subfield="false" :toolbarsFlag="false" v-model="scope.row.description" ref="md"/>
+        <ms-mark-down-text prop="description" :data="scope.row" :disabled="true"/>
         <el-button slot="reference" type="text">{{ $t('test_track.issue.preview') }}</el-button>
       </el-popover>
     </template>
@@ -22,20 +20,10 @@
 
 <script>
 import MsTableColumn from "@/business/components/common/components/table/MsTableColumn";
+import MsMarkDownText from "@/business/components/track/case/components/MsMarkDownText";
 export default {
   name: "IssueDescriptionTableItem",
-  components: {MsTableColumn},
-  data() {
-    return {
-      readConfig: {toolbar: []},
-      xssOptions: {
-        whiteList: {
-          img: ["src", "alt", "width", "height"],
-        },
-        stripIgnoreTagBody: true
-      },
-    };
-  },
+  components: {MsMarkDownText, MsTableColumn},
   props: {
     field: Object,
     fieldsWidth: Object
diff --git a/frontend/src/business/components/track/review/commom/ReviewComment.vue b/frontend/src/business/components/track/review/commom/ReviewComment.vue
index 10aa1969c1..262faa1146 100644
--- a/frontend/src/business/components/track/review/commom/ReviewComment.vue
+++ b/frontend/src/business/components/track/review/commom/ReviewComment.vue
@@ -17,9 +17,7 @@
     <div>
       <div class="editors_div_style">
         <div id="editorsDiv" >
-          <mavon-editor v-if="showEditor" @imgAdd="imgAdd" :default-open="'edit'" class="review-mavon-editor" :imageFilter="imageFilter"
-                        :xss-options="xssOptions"
-                        :toolbars="richDataToolbars"  @imgDel="imgDel" v-model="textarea"  ref="md"/>
+          <ms-mark-down-text prop="description" :data="from" :toolbars="toolbars"/>
         </div>
       </div>
 
@@ -35,11 +33,12 @@
 <script>
 import ReviewCommentItem from "./ReviewCommentItem";
 import FormRichTextItem from "@/business/components/track/case/components/FormRichTextItem";
-import {getUUID} from "@/common/js/utils";
+import {uploadMarkDownImg} from "@/network/image";
+import MsMarkDownText from "@/business/components/track/case/components/MsMarkDownText";
 
 export default {
   name: "ReviewComment",
-  components: {ReviewCommentItem,FormRichTextItem},
+  components: {MsMarkDownText, ReviewCommentItem,FormRichTextItem},
   props: {
     caseId: String,
     comments: Array,
@@ -49,18 +48,14 @@ export default {
   data() {
     return {
       result: {},
-      textarea: '',
+      from: {
+        description: ''
+      },
       loadCommenItem:true,
       labelWidth: '120px',
       showEditor:true,
       isReadOnly: false,
-      xssOptions: {
-        whiteList: {
-          img: ["src", "alt", "width", "height"],
-        },
-        stripIgnoreTagBody: true
-      },
-      richDataToolbars: {
+      toolbars: {
         bold: false, // 粗体
         italic: false, // 斜体
         header: false, // 标题
@@ -108,10 +103,10 @@ export default {
     sendComment() {
       let comment = {};
       comment.caseId = this.caseId;
-      comment.description = this.textarea;
+      comment.description = this.from.description;
       comment.reviewId = this.reviewId;
       comment.status = this.reviewStatus;
-      if (!this.textarea) {
+      if (!comment.description) {
         this.$warning(this.$t('test_track.comment.description_is_null'));
         return;
       }
@@ -140,45 +135,7 @@ export default {
     refresh() {
       this.resetInputLight();
       this.$emit('getComments');
-    },
-    //富文本框
-    imgAdd(pos, file) {
-      let param = {
-        id: getUUID().substring(0, 8)
-      };
-
-      file.prefix = param.id;
-      this.result = this.$fileUpload('/resource/md/upload', file, null, param, () => {
-        this.$success(this.$t('commons.save_success'));
-        this.$refs.md.$img2Url(pos, '/resource/md/get/'  + param.id+"_"+file.name);
-        this.sendComment();
-      });
-      this.$emit('imgAdd', file);
-    },
-    imageFilter(file){
-      let isImg = false;
-      if(file){
-        if(file.name){
-          if (file.name.indexOf("[")> 0 || file.name.indexOf("]") > 0||file.name.indexOf("([)")> 0 || file.name.indexOf(")") > 0){
-            this.$error("图片名称不能含有特殊字符");
-            isImg = false;
-          }else {
-            isImg = true;
-          }
-        }
-      }
-      return isImg;
-    },
-    imgDel(file) {
-      let fileUrl = file[1].prefix + "_" + file[1].name;
-      let comments = this.$refs.reviewComments;
-      comments.forEach(item => {
-        let imgCheckResult = item.checkByUrls(fileUrl);
-        if(imgCheckResult){
-          item.deleteComment();
-        }
-      });
-    },
+    }
   }
 };
 </script>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index f5b0d929be..992bf5c0bc 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit f5b0d929be13f4a1e4fea6c14d2834fa78703b60
+Subproject commit 992bf5c0bc50e23ced47cdb1aa87e3061c3a6a5d
diff --git a/frontend/src/network/image.js b/frontend/src/network/image.js
new file mode 100644
index 0000000000..2bdfab914e
--- /dev/null
+++ b/frontend/src/network/image.js
@@ -0,0 +1,25 @@
+import {getUUID} from "@/common/js/utils";
+import {fileUpload} from "@/common/js/ajax";
+import {baseGet} from "@/network/base-network";
+
+export function uploadMarkDownImg(file, callback) {
+  let param = {
+    id: getUUID().substring(0, 8)
+  };
+  file.prefix = param.id;
+  // 带括号和空格，可能无法展示
+  param.fileName = file.name.replace("(", "").replace(")", "").replace(" ", "");
+  return fileUpload('/resource/md/upload', file, null, param, (response) => {
+    if (callback) {
+      callback(response, param);
+    }
+  });
+}
+
+export function deleteMarkDownImg(file, callback) {
+  if (file) {
+    let fileName = file.name.replace("(", "").replace(")", "").replace(" ", "");
+    return baseGet('/resource/md/delete/' + file[1].prefix + "_" + fileName, callback);
+  }
+  return {};
+}

From 90bd374998cab54e5e3fd55cbf13fb81e78d37f6 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 15 Dec 2021 15:34:11 +0800
Subject: [PATCH 129/256] =?UTF-8?q?fix:=20jira=E4=BD=BF=E7=94=A8=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=A8=A1=E6=9D=BF=E7=BC=BA=E5=B0=91=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/components/form/CustomFiledFormItem.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue b/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
index e06ba3d51b..41296354f1 100644
--- a/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
+++ b/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
@@ -2,7 +2,7 @@
   <div>
     <el-row v-for="(i) in (customFieldRowNums)" :key="i">
     <span class="custom-item" v-for="(item, j) in issueTemplate.customFields" :key="j">
-      <span v-if="j >= i*3 && j < i*3+3">
+      <span v-if="j >= (i - 1)*3 && j < (i - 1)*3+3">
         <el-col :span="8" v-if="item.type !== 'richText'">
           <el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
                         :label-width="formLabelWidth">

From 0cf3b55d3a8ba3064493c66db573cd7b64ab4775 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 15 Dec 2021 17:08:18 +0800
Subject: [PATCH 130/256] =?UTF-8?q?fix:=20=E6=8F=90=E4=BA=A4=E5=88=B0?=
 =?UTF-8?q?=E7=A6=85=E9=81=93=E7=9A=84=E7=BC=BA=E9=99=B7=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/issue/client/ZentaoClient.java      | 23 +++++++++++++++----
 .../track/issue/client/ZentaoGetClient.java   |  4 ++--
 .../issue/client/ZentaoPathInfoClient.java    |  4 ++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java
index e57ae09d20..b692af0e88 100644
--- a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java
+++ b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java
@@ -16,11 +16,11 @@ import org.springframework.web.client.RestTemplate;
 
 public abstract class ZentaoClient extends BaseClient {
 
-    protected  String ENDPOINT;
+    protected String ENDPOINT;
 
-    protected  String USER_NAME;
+    protected String USER_NAME;
 
-    protected  String PASSWD;
+    protected String PASSWD;
 
     public RequestUrl requestUrl;
     protected String url;
@@ -30,7 +30,7 @@ public abstract class ZentaoClient extends BaseClient {
     }
 
     // 注意 recTotal={1}&recPerPage={2}&pageID={3} 顺序不能调换，实在恶心
-    private static final String BUG_LIST_URL="?m=bug&f=browse&productID={0}&branch=&browseType=&param=0&orderBy=&recTotal={1}&recPerPage={2}&pageID={3}&t=json&zentaosid={4}";
+    private static final String BUG_LIST_URL = "?m=bug&f=browse&productID={0}&branch=&browseType=&param=0&orderBy=&recTotal={1}&recPerPage={2}&pageID={3}&t=json&zentaosid={4}";
 
     public String login() {
         GetUserResponse getUserResponse = new GetUserResponse();
@@ -76,7 +76,7 @@ public abstract class ZentaoClient extends BaseClient {
         ResponseEntity<String> response = null;
         try {
             String bugCreate = requestUrl.getBugCreate();
-           response = restTemplate.exchange(bugCreate + sessionId,
+            response = restTemplate.exchange(bugCreate + sessionId,
                     HttpMethod.POST, requestEntity, String.class);
         } catch (Exception e) {
             LogUtil.error(e.getMessage(), e);
@@ -141,4 +141,17 @@ public abstract class ZentaoClient extends BaseClient {
         PASSWD = config.getPassword();
         ENDPOINT = config.getUrl();
     }
+
+
+    public String getReplaceImgUrl(String replaceImgUrl) {
+        String baseUrl = getBaseUrl();
+        String[] split = baseUrl.split("/");
+        String suffix = split[split.length - 1];
+        if (!StringUtils.equalsAny(suffix, "zentao", "zentaopms", "zentaopro", "zentaobiz")) {
+            suffix = "";
+        } else {
+            suffix = "/" + suffix;
+        }
+        return String.format(replaceImgUrl, suffix);
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoGetClient.java b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoGetClient.java
index 7a64337644..52cd5b27ef 100644
--- a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoGetClient.java
+++ b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoGetClient.java
@@ -16,7 +16,7 @@ public class ZentaoGetClient extends ZentaoClient {
     private static final String USER_GET="&module=user&methodName=getList&t=json&zentaosid=";
     private static final String BUILDS_GET="&module=build&methodName=getProductBuildPairs&productID={0}&zentaosid=";
     private static final String FILE_UPLOAD="&module=file&methodName=saveUpload&t=json&zentaosid=";
-    private static final String REPLACE_IMG_URL="<img src=\"/zentao/index.php?m=file&f=read&fileID=$1\"/>";
+    private static final String REPLACE_IMG_URL="<img src=\"%s/index.php?m=file&f=read&fileID=$1\"/>";
     private static final Pattern IMG_PATTERN = Pattern.compile("m=file&f=read&fileID=(.*?)\"/>");
 
     RequestUrl request = new RequestUrl();
@@ -34,7 +34,7 @@ public class ZentaoGetClient extends ZentaoClient {
         request.setUserGet(getUrl(USER_GET));
         request.setBuildsGet(getUrl(BUILDS_GET));
         request.setFileUpload(getUrl(FILE_UPLOAD));
-        request.setReplaceImgUrl(REPLACE_IMG_URL);
+        request.setReplaceImgUrl(getReplaceImgUrl(REPLACE_IMG_URL));
         request.setImgPattern(IMG_PATTERN);
         request.setBugUpdate(getUrl(BUG_UPDATE));
         request.setBugDelete(getNotSuperModelUrl(BUG_DELETE));
diff --git a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoPathInfoClient.java b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoPathInfoClient.java
index cf7cd1ec85..2df7babf23 100644
--- a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoPathInfoClient.java
+++ b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoPathInfoClient.java
@@ -17,7 +17,7 @@ public class ZentaoPathInfoClient extends ZentaoClient {
     private static final String USER_GET = "/api-getModel-user-getList?zentaosid=";
     private static final String BUILDS_GET = "/api-getModel-build-getProductBuildPairs-productID={projectId}?zentaosid=";
     private static final String FILE_UPLOAD = "/api-getModel-file-saveUpload.json?zentaosid=";
-    private static final String REPLACE_IMG_URL = "<img src=\"/zentao/file-read-$1\"/>";
+    private static final String REPLACE_IMG_URL = "<img src=\"%s/file-read-$1\"/>";
     private static final Pattern IMG_PATTERN = Pattern.compile("file-read-(.*?)\"/>");
 
     public ZentaoPathInfoClient(String url) {
@@ -35,7 +35,7 @@ public class ZentaoPathInfoClient extends ZentaoClient {
         request.setUserGet(getUrl(USER_GET));
         request.setBuildsGet(getUrl(BUILDS_GET));
         request.setFileUpload(getUrl(FILE_UPLOAD));
-        request.setReplaceImgUrl(REPLACE_IMG_URL);
+        request.setReplaceImgUrl(getReplaceImgUrl(REPLACE_IMG_URL));
         request.setImgPattern(IMG_PATTERN);
         request.setBugUpdate(getUrl(BUG_UPDATE));
         request.setBugDelete(getUrl(BUG_DELETE));

From f54e7aaaeb0e53398efb859e1db1b48c0c75f47d Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 3 Dec 2021 17:26:32 +0800
Subject: [PATCH 131/256] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=85=AC=E5=85=B1=E7=94=A8=E4=BE=8B=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1004196 --user=王孝刚 功能用例增加公共用例库（X-Pack）
https://www.tapd.cn/55049933/s/1080558
---
 .../io/metersphere/base/domain/Project.java   |   6 +-
 .../base/domain/ProjectExample.java           | 132 ++++-
 .../io/metersphere/base/domain/TestCase.java  |   2 +
 .../base/domain/TestCaseExample.java          |  60 +++
 .../metersphere/base/mapper/ProjectMapper.xml | 199 ++++---
 .../base/mapper/TestCaseMapper.xml            | 497 +++++++++---------
 .../base/mapper/ext/ExtTestCaseMapper.java    |  13 +-
 .../base/mapper/ext/ExtTestCaseMapper.xml     | 111 +++-
 .../track/controller/TestCaseController.java  |  32 +-
 .../controller/TestCaseNodeController.java    |   5 +
 .../testcase/QueryTestCaseRequest.java        |   1 +
 .../track/service/TestCaseNodeService.java    |   5 +
 .../track/service/TestCaseService.java        |  52 ++
 .../db/migration/V102__v1.16_release.sql      |  29 +-
 .../src/main/resources/generatorConfig.xml    |  35 +-
 .../api/definition/ApiDefinition.vue          |  10 +-
 .../components/module/ModulePublicButton.vue  |  66 +++
 .../project/head/ProjectHeaderMenus.vue       |  20 +-
 .../project/menu/appmanage/AppManage.vue      | 176 +++++++
 .../src/business/components/project/router.js |   8 +-
 .../components/track/case/TestCase.vue        |  57 +-
 .../track/case/components/BatchMove.vue       |  12 +-
 .../track/case/components/ShowMoreBtn.vue     |   8 +
 .../track/case/components/TestCaseEdit.vue    |  27 +-
 .../track/case/components/TestCaseList.vue    | 194 ++++++-
 .../track/common/TestCaseNodeTree.vue         |  20 +-
 .../src/common/js/default-table-header.js     |   1 +
 frontend/src/i18n/en-US.js                    |  30 +-
 frontend/src/i18n/zh-CN.js                    |  28 +-
 frontend/src/i18n/zh-TW.js                    |  28 +-
 30 files changed, 1446 insertions(+), 418 deletions(-)
 create mode 100644 frontend/src/business/components/api/definition/components/module/ModulePublicButton.vue
 create mode 100644 frontend/src/business/components/project/menu/appmanage/AppManage.vue

diff --git a/backend/src/main/java/io/metersphere/base/domain/Project.java b/backend/src/main/java/io/metersphere/base/domain/Project.java
index 57c42ac558..6382be8482 100644
--- a/backend/src/main/java/io/metersphere/base/domain/Project.java
+++ b/backend/src/main/java/io/metersphere/base/domain/Project.java
@@ -45,9 +45,13 @@ public class Project implements Serializable {
 
     private String azureFilterId;
 
+    private String apiQuick;
+
+    private Boolean casePublic;
+
     private String platform;
 
     private Boolean thirdPartTemplate;
 
     private static final long serialVersionUID = 1L;
-}
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java b/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java
index 5530581f3d..6ca9b34dd9 100644
--- a/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java
@@ -1434,6 +1434,136 @@ public class ProjectExample {
             return (Criteria) this;
         }
 
+        public Criteria andApiQuickIsNull() {
+            addCriterion("api_quick is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiQuickIsNotNull() {
+            addCriterion("api_quick is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiQuickEqualTo(String value) {
+            addCriterion("api_quick =", value, "apiQuick");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiQuickNotEqualTo(String value) {
+            addCriterion("api_quick <>", value, "apiQuick");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiQuickGreaterThan(String value) {
+            addCriterion("api_quick >", value, "apiQuick");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiQuickGreaterThanOrEqualTo(String value) {
+            addCriterion("api_quick >=", value, "apiQuick");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiQuickLessThan(String value) {
+            addCriterion("api_quick <", value, "apiQuick");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiQuickLessThanOrEqualTo(String value) {
+            addCriterion("api_quick <=", value, "apiQuick");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiQuickLike(String value) {
+            addCriterion("api_quick like", value, "apiQuick");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiQuickNotLike(String value) {
+            addCriterion("api_quick not like", value, "apiQuick");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiQuickIn(List<String> values) {
+            addCriterion("api_quick in", values, "apiQuick");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiQuickNotIn(List<String> values) {
+            addCriterion("api_quick not in", values, "apiQuick");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiQuickBetween(String value1, String value2) {
+            addCriterion("api_quick between", value1, value2, "apiQuick");
+            return (Criteria) this;
+        }
+
+        public Criteria andApiQuickNotBetween(String value1, String value2) {
+            addCriterion("api_quick not between", value1, value2, "apiQuick");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicIsNull() {
+            addCriterion("case_public is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicIsNotNull() {
+            addCriterion("case_public is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicEqualTo(Boolean value) {
+            addCriterion("case_public =", value, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicNotEqualTo(Boolean value) {
+            addCriterion("case_public <>", value, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicGreaterThan(Boolean value) {
+            addCriterion("case_public >", value, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("case_public >=", value, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicLessThan(Boolean value) {
+            addCriterion("case_public <", value, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicLessThanOrEqualTo(Boolean value) {
+            addCriterion("case_public <=", value, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicIn(List<Boolean> values) {
+            addCriterion("case_public in", values, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicNotIn(List<Boolean> values) {
+            addCriterion("case_public not in", values, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicBetween(Boolean value1, Boolean value2) {
+            addCriterion("case_public between", value1, value2, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("case_public not between", value1, value2, "casePublic");
+            return (Criteria) this;
+        }
+
         public Criteria andPlatformIsNull() {
             addCriterion("platform is null");
             return (Criteria) this;
@@ -1657,4 +1787,4 @@ public class ProjectExample {
             this(condition, value, secondValue, null);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCase.java b/backend/src/main/java/io/metersphere/base/domain/TestCase.java
index d705696118..57d537f5f5 100644
--- a/backend/src/main/java/io/metersphere/base/domain/TestCase.java
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCase.java
@@ -59,5 +59,7 @@ public class TestCase implements Serializable {
 
     private Long order;
 
+    private Boolean casePublic;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java
index 7722990039..04f60db0f3 100644
--- a/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java
@@ -1933,6 +1933,66 @@ public class TestCaseExample {
             addCriterion("`order` not between", value1, value2, "order");
             return (Criteria) this;
         }
+
+        public Criteria andCasePublicIsNull() {
+            addCriterion("case_public is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicIsNotNull() {
+            addCriterion("case_public is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicEqualTo(Boolean value) {
+            addCriterion("case_public =", value, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicNotEqualTo(Boolean value) {
+            addCriterion("case_public <>", value, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicGreaterThan(Boolean value) {
+            addCriterion("case_public >", value, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("case_public >=", value, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicLessThan(Boolean value) {
+            addCriterion("case_public <", value, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicLessThanOrEqualTo(Boolean value) {
+            addCriterion("case_public <=", value, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicIn(List<Boolean> values) {
+            addCriterion("case_public in", values, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicNotIn(List<Boolean> values) {
+            addCriterion("case_public not in", values, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicBetween(Boolean value1, Boolean value2) {
+            addCriterion("case_public between", value1, value2, "casePublic");
+            return (Criteria) this;
+        }
+
+        public Criteria andCasePublicNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("case_public not between", value1, value2, "casePublic");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml
index 82bab88ff3..99e82a80e8 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml
@@ -2,28 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.base.mapper.ProjectMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.base.domain.Project">
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="workspace_id" jdbcType="VARCHAR" property="workspaceId" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="create_time" jdbcType="BIGINT" property="createTime" />
-    <result column="update_time" jdbcType="BIGINT" property="updateTime" />
-    <result column="tapd_id" jdbcType="VARCHAR" property="tapdId" />
-    <result column="jira_key" jdbcType="VARCHAR" property="jiraKey" />
-    <result column="zentao_id" jdbcType="VARCHAR" property="zentaoId" />
-    <result column="azure_devops_id" jdbcType="VARCHAR" property="azureDevopsId" />
-    <result column="repeatable" jdbcType="BIT" property="repeatable" />
-    <result column="case_template_id" jdbcType="VARCHAR" property="caseTemplateId" />
-    <result column="issue_template_id" jdbcType="VARCHAR" property="issueTemplateId" />
-    <result column="custom_num" jdbcType="BIT" property="customNum" />
-    <result column="scenario_custom_num" jdbcType="BIT" property="scenarioCustomNum" />
-    <result column="create_user" jdbcType="VARCHAR" property="createUser" />
-    <result column="system_id" jdbcType="VARCHAR" property="systemId" />
-    <result column="mock_tcp_port" jdbcType="INTEGER" property="mockTcpPort" />
-    <result column="is_mock_tcp_open" jdbcType="BIT" property="isMockTcpOpen" />
-    <result column="azure_filter_id" jdbcType="VARCHAR" property="azureFilterId" />
-    <result column="platform" jdbcType="VARCHAR" property="platform" />
-    <result column="third_part_template" jdbcType="BIT" property="thirdPartTemplate" />
+    <id column="id" jdbcType="VARCHAR" property="id"/>
+    <result column="workspace_id" jdbcType="VARCHAR" property="workspaceId"/>
+    <result column="name" jdbcType="VARCHAR" property="name"/>
+    <result column="description" jdbcType="VARCHAR" property="description"/>
+    <result column="create_time" jdbcType="BIGINT" property="createTime"/>
+    <result column="update_time" jdbcType="BIGINT" property="updateTime"/>
+    <result column="tapd_id" jdbcType="VARCHAR" property="tapdId"/>
+    <result column="jira_key" jdbcType="VARCHAR" property="jiraKey"/>
+    <result column="zentao_id" jdbcType="VARCHAR" property="zentaoId"/>
+    <result column="azure_devops_id" jdbcType="VARCHAR" property="azureDevopsId"/>
+    <result column="repeatable" jdbcType="BIT" property="repeatable"/>
+    <result column="case_template_id" jdbcType="VARCHAR" property="caseTemplateId"/>
+    <result column="issue_template_id" jdbcType="VARCHAR" property="issueTemplateId"/>
+    <result column="custom_num" jdbcType="BIT" property="customNum"/>
+    <result column="scenario_custom_num" jdbcType="BIT" property="scenarioCustomNum"/>
+    <result column="create_user" jdbcType="VARCHAR" property="createUser"/>
+    <result column="system_id" jdbcType="VARCHAR" property="systemId"/>
+    <result column="mock_tcp_port" jdbcType="INTEGER" property="mockTcpPort"/>
+    <result column="is_mock_tcp_open" jdbcType="BIT" property="isMockTcpOpen"/>
+    <result column="azure_filter_id" jdbcType="VARCHAR" property="azureFilterId"/>
+    <result column="api_quick" jdbcType="VARCHAR" property="apiQuick"/>
+    <result column="case_public" jdbcType="BIT" property="casePublic"/>
+    <result column="platform" jdbcType="VARCHAR" property="platform"/>
+    <result column="third_part_template" jdbcType="BIT" property="thirdPartTemplate"/>
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -84,10 +86,11 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, workspace_id, `name`, description, create_time, update_time, tapd_id, jira_key,
-    zentao_id, azure_devops_id, `repeatable`, case_template_id, issue_template_id, custom_num,
-    scenario_custom_num, create_user, system_id, mock_tcp_port, is_mock_tcp_open, azure_filter_id,
-    platform, third_part_template
+    id
+    , workspace_id, `name`, description, create_time, update_time, tapd_id, jira_key,
+    zentao_id, azure_devops_id, `repeatable`, case_template_id, issue_template_id, custom_num, 
+    scenario_custom_num, create_user, system_id, mock_tcp_port, is_mock_tcp_open, azure_filter_id, 
+    api_quick, case_public, platform, third_part_template
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.base.domain.ProjectExample" resultMap="BaseResultMap">
     select
@@ -121,21 +124,21 @@
   </delete>
   <insert id="insert" parameterType="io.metersphere.base.domain.Project">
     insert into project (id, workspace_id, `name`,
-      description, create_time, update_time,
-      tapd_id, jira_key, zentao_id,
-      azure_devops_id, `repeatable`, case_template_id,
-      issue_template_id, custom_num, scenario_custom_num,
-      create_user, system_id, mock_tcp_port,
-      is_mock_tcp_open, azure_filter_id, platform,
-      third_part_template)
+                         description, create_time, update_time,
+                         tapd_id, jira_key, zentao_id,
+                         azure_devops_id, `repeatable`, case_template_id,
+                         issue_template_id, custom_num, scenario_custom_num,
+                         create_user, system_id, mock_tcp_port,
+                         is_mock_tcp_open, azure_filter_id, api_quick,
+                         case_public, platform, third_part_template)
     values (#{id,jdbcType=VARCHAR}, #{workspaceId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
-      #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT},
-      #{tapdId,jdbcType=VARCHAR}, #{jiraKey,jdbcType=VARCHAR}, #{zentaoId,jdbcType=VARCHAR},
-      #{azureDevopsId,jdbcType=VARCHAR}, #{repeatable,jdbcType=BIT}, #{caseTemplateId,jdbcType=VARCHAR},
-      #{issueTemplateId,jdbcType=VARCHAR}, #{customNum,jdbcType=BIT}, #{scenarioCustomNum,jdbcType=BIT},
-      #{createUser,jdbcType=VARCHAR}, #{systemId,jdbcType=VARCHAR}, #{mockTcpPort,jdbcType=INTEGER},
-      #{isMockTcpOpen,jdbcType=BIT}, #{azureFilterId,jdbcType=VARCHAR}, #{platform,jdbcType=VARCHAR},
-      #{thirdPartTemplate,jdbcType=BIT})
+            #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT},
+            #{tapdId,jdbcType=VARCHAR}, #{jiraKey,jdbcType=VARCHAR}, #{zentaoId,jdbcType=VARCHAR},
+            #{azureDevopsId,jdbcType=VARCHAR}, #{repeatable,jdbcType=BIT}, #{caseTemplateId,jdbcType=VARCHAR},
+            #{issueTemplateId,jdbcType=VARCHAR}, #{customNum,jdbcType=BIT}, #{scenarioCustomNum,jdbcType=BIT},
+            #{createUser,jdbcType=VARCHAR}, #{systemId,jdbcType=VARCHAR}, #{mockTcpPort,jdbcType=INTEGER},
+            #{isMockTcpOpen,jdbcType=BIT}, #{azureFilterId,jdbcType=VARCHAR}, #{apiQuick,jdbcType=VARCHAR},
+            #{casePublic,jdbcType=BIT}, #{platform,jdbcType=VARCHAR}, #{thirdPartTemplate,jdbcType=BIT})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.Project">
     insert into project
@@ -200,6 +203,12 @@
       <if test="azureFilterId != null">
         azure_filter_id,
       </if>
+      <if test="apiQuick != null">
+        api_quick,
+      </if>
+      <if test="casePublic != null">
+        case_public,
+      </if>
       <if test="platform != null">
         platform,
       </if>
@@ -268,6 +277,12 @@
       <if test="azureFilterId != null">
         #{azureFilterId,jdbcType=VARCHAR},
       </if>
+      <if test="apiQuick != null">
+        #{apiQuick,jdbcType=VARCHAR},
+      </if>
+      <if test="casePublic != null">
+        #{casePublic,jdbcType=BIT},
+      </if>
       <if test="platform != null">
         #{platform,jdbcType=VARCHAR},
       </if>
@@ -345,6 +360,12 @@
       <if test="record.azureFilterId != null">
         azure_filter_id = #{record.azureFilterId,jdbcType=VARCHAR},
       </if>
+      <if test="record.apiQuick != null">
+        api_quick = #{record.apiQuick,jdbcType=VARCHAR},
+      </if>
+      <if test="record.casePublic != null">
+        case_public = #{record.casePublic,jdbcType=BIT},
+      </if>
       <if test="record.platform != null">
         platform = #{record.platform,jdbcType=VARCHAR},
       </if>
@@ -359,29 +380,31 @@
   <update id="updateByExample" parameterType="map">
     update project
     set id = #{record.id,jdbcType=VARCHAR},
-      workspace_id = #{record.workspaceId,jdbcType=VARCHAR},
-      `name` = #{record.name,jdbcType=VARCHAR},
-      description = #{record.description,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=BIGINT},
-      update_time = #{record.updateTime,jdbcType=BIGINT},
-      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},
-      `repeatable` = #{record.repeatable,jdbcType=BIT},
-      case_template_id = #{record.caseTemplateId,jdbcType=VARCHAR},
-      issue_template_id = #{record.issueTemplateId,jdbcType=VARCHAR},
-      custom_num = #{record.customNum,jdbcType=BIT},
-      scenario_custom_num = #{record.scenarioCustomNum,jdbcType=BIT},
-      create_user = #{record.createUser,jdbcType=VARCHAR},
-      system_id = #{record.systemId,jdbcType=VARCHAR},
-      mock_tcp_port = #{record.mockTcpPort,jdbcType=INTEGER},
-      is_mock_tcp_open = #{record.isMockTcpOpen,jdbcType=BIT},
-      azure_filter_id = #{record.azureFilterId,jdbcType=VARCHAR},
-      platform = #{record.platform,jdbcType=VARCHAR},
-      third_part_template = #{record.thirdPartTemplate,jdbcType=BIT}
+    workspace_id = #{record.workspaceId,jdbcType=VARCHAR},
+    `name` = #{record.name,jdbcType=VARCHAR},
+    description = #{record.description,jdbcType=VARCHAR},
+    create_time = #{record.createTime,jdbcType=BIGINT},
+    update_time = #{record.updateTime,jdbcType=BIGINT},
+    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},
+    `repeatable` = #{record.repeatable,jdbcType=BIT},
+    case_template_id = #{record.caseTemplateId,jdbcType=VARCHAR},
+    issue_template_id = #{record.issueTemplateId,jdbcType=VARCHAR},
+    custom_num = #{record.customNum,jdbcType=BIT},
+    scenario_custom_num = #{record.scenarioCustomNum,jdbcType=BIT},
+    create_user = #{record.createUser,jdbcType=VARCHAR},
+    system_id = #{record.systemId,jdbcType=VARCHAR},
+    mock_tcp_port = #{record.mockTcpPort,jdbcType=INTEGER},
+    is_mock_tcp_open = #{record.isMockTcpOpen,jdbcType=BIT},
+    azure_filter_id = #{record.azureFilterId,jdbcType=VARCHAR},
+    api_quick = #{record.apiQuick,jdbcType=VARCHAR},
+    case_public = #{record.casePublic,jdbcType=BIT},
+    platform = #{record.platform,jdbcType=VARCHAR},
+    third_part_template = #{record.thirdPartTemplate,jdbcType=BIT}
     <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
+      <include refid="Update_By_Example_Where_Clause"/>
     </if>
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.Project">
@@ -444,6 +467,12 @@
       <if test="azureFilterId != null">
         azure_filter_id = #{azureFilterId,jdbcType=VARCHAR},
       </if>
+      <if test="apiQuick != null">
+        api_quick = #{apiQuick,jdbcType=VARCHAR},
+      </if>
+      <if test="casePublic != null">
+        case_public = #{casePublic,jdbcType=BIT},
+      </if>
       <if test="platform != null">
         platform = #{platform,jdbcType=VARCHAR},
       </if>
@@ -455,27 +484,29 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.Project">
     update project
-    set workspace_id = #{workspaceId,jdbcType=VARCHAR},
-      `name` = #{name,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=BIGINT},
-      update_time = #{updateTime,jdbcType=BIGINT},
-      tapd_id = #{tapdId,jdbcType=VARCHAR},
-      jira_key = #{jiraKey,jdbcType=VARCHAR},
-      zentao_id = #{zentaoId,jdbcType=VARCHAR},
-      azure_devops_id = #{azureDevopsId,jdbcType=VARCHAR},
-      `repeatable` = #{repeatable,jdbcType=BIT},
-      case_template_id = #{caseTemplateId,jdbcType=VARCHAR},
-      issue_template_id = #{issueTemplateId,jdbcType=VARCHAR},
-      custom_num = #{customNum,jdbcType=BIT},
-      scenario_custom_num = #{scenarioCustomNum,jdbcType=BIT},
-      create_user = #{createUser,jdbcType=VARCHAR},
-      system_id = #{systemId,jdbcType=VARCHAR},
-      mock_tcp_port = #{mockTcpPort,jdbcType=INTEGER},
-      is_mock_tcp_open = #{isMockTcpOpen,jdbcType=BIT},
-      azure_filter_id = #{azureFilterId,jdbcType=VARCHAR},
-      platform = #{platform,jdbcType=VARCHAR},
-      third_part_template = #{thirdPartTemplate,jdbcType=BIT}
+    set workspace_id        = #{workspaceId,jdbcType=VARCHAR},
+        `name`              = #{name,jdbcType=VARCHAR},
+        description         = #{description,jdbcType=VARCHAR},
+        create_time         = #{createTime,jdbcType=BIGINT},
+        update_time         = #{updateTime,jdbcType=BIGINT},
+        tapd_id             = #{tapdId,jdbcType=VARCHAR},
+        jira_key            = #{jiraKey,jdbcType=VARCHAR},
+        zentao_id           = #{zentaoId,jdbcType=VARCHAR},
+        azure_devops_id     = #{azureDevopsId,jdbcType=VARCHAR},
+        `repeatable`        = #{repeatable,jdbcType=BIT},
+        case_template_id    = #{caseTemplateId,jdbcType=VARCHAR},
+        issue_template_id   = #{issueTemplateId,jdbcType=VARCHAR},
+        custom_num          = #{customNum,jdbcType=BIT},
+        scenario_custom_num = #{scenarioCustomNum,jdbcType=BIT},
+        create_user         = #{createUser,jdbcType=VARCHAR},
+        system_id           = #{systemId,jdbcType=VARCHAR},
+        mock_tcp_port       = #{mockTcpPort,jdbcType=INTEGER},
+        is_mock_tcp_open    = #{isMockTcpOpen,jdbcType=BIT},
+        azure_filter_id     = #{azureFilterId,jdbcType=VARCHAR},
+        api_quick           = #{apiQuick,jdbcType=VARCHAR},
+        case_public         = #{casePublic,jdbcType=BIT},
+        platform            = #{platform,jdbcType=VARCHAR},
+        third_part_template = #{thirdPartTemplate,jdbcType=BIT}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml
index b073ef8e36..f7190373ff 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml
@@ -29,6 +29,7 @@
     <result column="delete_time" jdbcType="BIGINT" property="deleteTime" />
     <result column="delete_user_id" jdbcType="VARCHAR" property="deleteUserId" />
     <result column="order" jdbcType="BIGINT" property="order" />
+    <result column="case_public" jdbcType="BIT" property="casePublic"/>
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.TestCaseWithBLOBs">
     <result column="prerequisite" jdbcType="LONGVARCHAR" property="prerequisite" />
@@ -97,10 +98,11 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, node_id, node_path, project_id, `name`, `type`, maintainer, priority, `method`, 
+      id
+      , node_id, node_path, project_id, `name`, `type`, maintainer, priority, `method`,
     create_time, update_time, test_id, sort, num, other_test_name, review_status, tags, 
     demand_id, demand_name, `status`, custom_num, step_model, create_user, original_status, 
-    delete_time, delete_user_id, `order`
+    delete_time, delete_user_id, `order`, case_public
   </sql>
   <sql id="Blob_Column_List">
     prerequisite, remark, steps, step_description, expected_result, custom_fields
@@ -154,30 +156,31 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.base.domain.TestCaseWithBLOBs">
-    insert into test_case (id, node_id, node_path, 
-      project_id, `name`, `type`, 
-      maintainer, priority, `method`, 
-      create_time, update_time, test_id, 
-      sort, num, other_test_name, 
-      review_status, tags, demand_id, 
-      demand_name, `status`, custom_num, 
-      step_model, create_user, original_status, 
-      delete_time, delete_user_id, `order`, 
-      prerequisite, remark, steps, 
-      step_description, expected_result, 
-      custom_fields)
-    values (#{id,jdbcType=VARCHAR}, #{nodeId,jdbcType=VARCHAR}, #{nodePath,jdbcType=VARCHAR}, 
-      #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
-      #{maintainer,jdbcType=VARCHAR}, #{priority,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{testId,jdbcType=VARCHAR}, 
-      #{sort,jdbcType=INTEGER}, #{num,jdbcType=INTEGER}, #{otherTestName,jdbcType=VARCHAR}, 
-      #{reviewStatus,jdbcType=VARCHAR}, #{tags,jdbcType=VARCHAR}, #{demandId,jdbcType=VARCHAR}, 
-      #{demandName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{customNum,jdbcType=VARCHAR}, 
-      #{stepModel,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{originalStatus,jdbcType=VARCHAR}, 
-      #{deleteTime,jdbcType=BIGINT}, #{deleteUserId,jdbcType=VARCHAR}, #{order,jdbcType=BIGINT}, 
-      #{prerequisite,jdbcType=LONGVARCHAR}, #{remark,jdbcType=LONGVARCHAR}, #{steps,jdbcType=LONGVARCHAR}, 
-      #{stepDescription,jdbcType=LONGVARCHAR}, #{expectedResult,jdbcType=LONGVARCHAR}, 
-      #{customFields,jdbcType=LONGVARCHAR})
+      insert into test_case (id, node_id, node_path,
+                             project_id, `name`, `type`,
+                             maintainer, priority, `method`,
+                             create_time, update_time, test_id,
+                             sort, num, other_test_name,
+                             review_status, tags, demand_id,
+                             demand_name, `status`, custom_num,
+                             step_model, create_user, original_status,
+                             delete_time, delete_user_id, `order`,
+                             case_public, prerequisite, remark,
+                             steps, step_description, expected_result,
+                             custom_fields)
+      values (#{id,jdbcType=VARCHAR}, #{nodeId,jdbcType=VARCHAR}, #{nodePath,jdbcType=VARCHAR},
+              #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
+              #{maintainer,jdbcType=VARCHAR}, #{priority,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR},
+              #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{testId,jdbcType=VARCHAR},
+              #{sort,jdbcType=INTEGER}, #{num,jdbcType=INTEGER}, #{otherTestName,jdbcType=VARCHAR},
+              #{reviewStatus,jdbcType=VARCHAR}, #{tags,jdbcType=VARCHAR}, #{demandId,jdbcType=VARCHAR},
+              #{demandName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{customNum,jdbcType=VARCHAR},
+              #{stepModel,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{originalStatus,jdbcType=VARCHAR},
+              #{deleteTime,jdbcType=BIGINT}, #{deleteUserId,jdbcType=VARCHAR}, #{order,jdbcType=BIGINT},
+              #{casePublic,jdbcType=BIT}, #{prerequisite,jdbcType=LONGVARCHAR}, #{remark,jdbcType=LONGVARCHAR},
+              #{steps,jdbcType=LONGVARCHAR}, #{stepDescription,jdbcType=LONGVARCHAR},
+              #{expectedResult,jdbcType=LONGVARCHAR},
+              #{customFields,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.TestCaseWithBLOBs">
     insert into test_case
@@ -245,42 +248,45 @@
       <if test="customNum != null">
         custom_num,
       </if>
-      <if test="stepModel != null">
-        step_model,
-      </if>
-      <if test="createUser != null">
-        create_user,
-      </if>
-      <if test="originalStatus != null">
-        original_status,
-      </if>
-      <if test="deleteTime != null">
-        delete_time,
-      </if>
-      <if test="deleteUserId != null">
-        delete_user_id,
-      </if>
-      <if test="order != null">
-        `order`,
-      </if>
-      <if test="prerequisite != null">
-        prerequisite,
-      </if>
-      <if test="remark != null">
-        remark,
-      </if>
-      <if test="steps != null">
-        steps,
-      </if>
-      <if test="stepDescription != null">
-        step_description,
-      </if>
-      <if test="expectedResult != null">
-        expected_result,
-      </if>
-      <if test="customFields != null">
-        custom_fields,
-      </if>
+        <if test="stepModel != null">
+            step_model,
+        </if>
+        <if test="createUser != null">
+            create_user,
+        </if>
+        <if test="originalStatus != null">
+            original_status,
+        </if>
+        <if test="deleteTime != null">
+            delete_time,
+        </if>
+        <if test="deleteUserId != null">
+            delete_user_id,
+        </if>
+        <if test="order != null">
+            `order`,
+        </if>
+        <if test="casePublic != null">
+            case_public,
+        </if>
+        <if test="prerequisite != null">
+            prerequisite,
+        </if>
+        <if test="remark != null">
+            remark,
+        </if>
+        <if test="steps != null">
+            steps,
+        </if>
+        <if test="stepDescription != null">
+            step_description,
+        </if>
+        <if test="expectedResult != null">
+            expected_result,
+        </if>
+        <if test="customFields != null">
+            custom_fields,
+        </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -346,42 +352,45 @@
       <if test="customNum != null">
         #{customNum,jdbcType=VARCHAR},
       </if>
-      <if test="stepModel != null">
-        #{stepModel,jdbcType=VARCHAR},
-      </if>
-      <if test="createUser != null">
-        #{createUser,jdbcType=VARCHAR},
-      </if>
-      <if test="originalStatus != null">
-        #{originalStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        #{deleteTime,jdbcType=BIGINT},
-      </if>
-      <if test="deleteUserId != null">
-        #{deleteUserId,jdbcType=VARCHAR},
-      </if>
-      <if test="order != null">
-        #{order,jdbcType=BIGINT},
-      </if>
-      <if test="prerequisite != null">
-        #{prerequisite,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="remark != null">
-        #{remark,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="steps != null">
-        #{steps,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="stepDescription != null">
-        #{stepDescription,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="expectedResult != null">
-        #{expectedResult,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="customFields != null">
-        #{customFields,jdbcType=LONGVARCHAR},
-      </if>
+        <if test="stepModel != null">
+            #{stepModel,jdbcType=VARCHAR},
+        </if>
+        <if test="createUser != null">
+            #{createUser,jdbcType=VARCHAR},
+        </if>
+        <if test="originalStatus != null">
+            #{originalStatus,jdbcType=VARCHAR},
+        </if>
+        <if test="deleteTime != null">
+            #{deleteTime,jdbcType=BIGINT},
+        </if>
+        <if test="deleteUserId != null">
+            #{deleteUserId,jdbcType=VARCHAR},
+        </if>
+        <if test="order != null">
+            #{order,jdbcType=BIGINT},
+        </if>
+        <if test="casePublic != null">
+            #{casePublic,jdbcType=BIT},
+        </if>
+        <if test="prerequisite != null">
+            #{prerequisite,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="remark != null">
+            #{remark,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="steps != null">
+            #{steps,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="stepDescription != null">
+            #{stepDescription,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="expectedResult != null">
+            #{expectedResult,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="customFields != null">
+            #{customFields,jdbcType=LONGVARCHAR},
+        </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.base.domain.TestCaseExample" resultType="java.lang.Long">
@@ -456,42 +465,45 @@
       <if test="record.customNum != null">
         custom_num = #{record.customNum,jdbcType=VARCHAR},
       </if>
-      <if test="record.stepModel != null">
-        step_model = #{record.stepModel,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createUser != null">
-        create_user = #{record.createUser,jdbcType=VARCHAR},
-      </if>
-      <if test="record.originalStatus != null">
-        original_status = #{record.originalStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="record.deleteTime != null">
-        delete_time = #{record.deleteTime,jdbcType=BIGINT},
-      </if>
-      <if test="record.deleteUserId != null">
-        delete_user_id = #{record.deleteUserId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.order != null">
-        `order` = #{record.order,jdbcType=BIGINT},
-      </if>
-      <if test="record.prerequisite != null">
-        prerequisite = #{record.prerequisite,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="record.remark != null">
-        remark = #{record.remark,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="record.steps != null">
-        steps = #{record.steps,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="record.stepDescription != null">
-        step_description = #{record.stepDescription,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="record.expectedResult != null">
-        expected_result = #{record.expectedResult,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="record.customFields != null">
-        custom_fields = #{record.customFields,jdbcType=LONGVARCHAR},
-      </if>
+        <if test="record.stepModel != null">
+            step_model = #{record.stepModel,jdbcType=VARCHAR},
+        </if>
+        <if test="record.createUser != null">
+            create_user = #{record.createUser,jdbcType=VARCHAR},
+        </if>
+        <if test="record.originalStatus != null">
+            original_status = #{record.originalStatus,jdbcType=VARCHAR},
+        </if>
+        <if test="record.deleteTime != null">
+            delete_time = #{record.deleteTime,jdbcType=BIGINT},
+        </if>
+        <if test="record.deleteUserId != null">
+            delete_user_id = #{record.deleteUserId,jdbcType=VARCHAR},
+        </if>
+        <if test="record.order != null">
+            `order` = #{record.order,jdbcType=BIGINT},
+        </if>
+        <if test="record.casePublic != null">
+            case_public = #{record.casePublic,jdbcType=BIT},
+        </if>
+        <if test="record.prerequisite != null">
+            prerequisite = #{record.prerequisite,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="record.remark != null">
+            remark = #{record.remark,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="record.steps != null">
+            steps = #{record.steps,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="record.stepDescription != null">
+            step_description = #{record.stepDescription,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="record.expectedResult != null">
+            expected_result = #{record.expectedResult,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="record.customFields != null">
+            custom_fields = #{record.customFields,jdbcType=LONGVARCHAR},
+        </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -526,15 +538,16 @@
       delete_time = #{record.deleteTime,jdbcType=BIGINT},
       delete_user_id = #{record.deleteUserId,jdbcType=VARCHAR},
       `order` = #{record.order,jdbcType=BIGINT},
+      case_public = #{record.casePublic,jdbcType=BIT},
       prerequisite = #{record.prerequisite,jdbcType=LONGVARCHAR},
       remark = #{record.remark,jdbcType=LONGVARCHAR},
       steps = #{record.steps,jdbcType=LONGVARCHAR},
       step_description = #{record.stepDescription,jdbcType=LONGVARCHAR},
       expected_result = #{record.expectedResult,jdbcType=LONGVARCHAR},
       custom_fields = #{record.customFields,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
+      <if test="_parameter != null">
+          <include refid="Update_By_Example_Where_Clause"/>
+      </if>
   </update>
   <update id="updateByExample" parameterType="map">
     update test_case
@@ -564,10 +577,11 @@
       original_status = #{record.originalStatus,jdbcType=VARCHAR},
       delete_time = #{record.deleteTime,jdbcType=BIGINT},
       delete_user_id = #{record.deleteUserId,jdbcType=VARCHAR},
-      `order` = #{record.order,jdbcType=BIGINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
+      `order` = #{record.order,jdbcType=BIGINT},
+      case_public = #{record.casePublic,jdbcType=BIT}
+      <if test="_parameter != null">
+          <include refid="Update_By_Example_Where_Clause"/>
+      </if>
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.TestCaseWithBLOBs">
     update test_case
@@ -632,109 +646,114 @@
       <if test="customNum != null">
         custom_num = #{customNum,jdbcType=VARCHAR},
       </if>
-      <if test="stepModel != null">
-        step_model = #{stepModel,jdbcType=VARCHAR},
-      </if>
-      <if test="createUser != null">
-        create_user = #{createUser,jdbcType=VARCHAR},
-      </if>
-      <if test="originalStatus != null">
-        original_status = #{originalStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        delete_time = #{deleteTime,jdbcType=BIGINT},
-      </if>
-      <if test="deleteUserId != null">
-        delete_user_id = #{deleteUserId,jdbcType=VARCHAR},
-      </if>
-      <if test="order != null">
-        `order` = #{order,jdbcType=BIGINT},
-      </if>
-      <if test="prerequisite != null">
-        prerequisite = #{prerequisite,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="remark != null">
-        remark = #{remark,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="steps != null">
-        steps = #{steps,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="stepDescription != null">
-        step_description = #{stepDescription,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="expectedResult != null">
-        expected_result = #{expectedResult,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="customFields != null">
-        custom_fields = #{customFields,jdbcType=LONGVARCHAR},
-      </if>
+        <if test="stepModel != null">
+            step_model = #{stepModel,jdbcType=VARCHAR},
+        </if>
+        <if test="createUser != null">
+            create_user = #{createUser,jdbcType=VARCHAR},
+        </if>
+        <if test="originalStatus != null">
+            original_status = #{originalStatus,jdbcType=VARCHAR},
+        </if>
+        <if test="deleteTime != null">
+            delete_time = #{deleteTime,jdbcType=BIGINT},
+        </if>
+        <if test="deleteUserId != null">
+            delete_user_id = #{deleteUserId,jdbcType=VARCHAR},
+        </if>
+        <if test="order != null">
+            `order` = #{order,jdbcType=BIGINT},
+        </if>
+        <if test="casePublic != null">
+            case_public = #{casePublic,jdbcType=BIT},
+        </if>
+        <if test="prerequisite != null">
+            prerequisite = #{prerequisite,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="remark != null">
+            remark = #{remark,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="steps != null">
+            steps = #{steps,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="stepDescription != null">
+            step_description = #{stepDescription,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="expectedResult != null">
+            expected_result = #{expectedResult,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="customFields != null">
+            custom_fields = #{customFields,jdbcType=LONGVARCHAR},
+        </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.TestCaseWithBLOBs">
-    update test_case
-    set node_id = #{nodeId,jdbcType=VARCHAR},
-      node_path = #{nodePath,jdbcType=VARCHAR},
-      project_id = #{projectId,jdbcType=VARCHAR},
-      `name` = #{name,jdbcType=VARCHAR},
-      `type` = #{type,jdbcType=VARCHAR},
-      maintainer = #{maintainer,jdbcType=VARCHAR},
-      priority = #{priority,jdbcType=VARCHAR},
-      `method` = #{method,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=BIGINT},
-      update_time = #{updateTime,jdbcType=BIGINT},
-      test_id = #{testId,jdbcType=VARCHAR},
-      sort = #{sort,jdbcType=INTEGER},
-      num = #{num,jdbcType=INTEGER},
-      other_test_name = #{otherTestName,jdbcType=VARCHAR},
-      review_status = #{reviewStatus,jdbcType=VARCHAR},
-      tags = #{tags,jdbcType=VARCHAR},
-      demand_id = #{demandId,jdbcType=VARCHAR},
-      demand_name = #{demandName,jdbcType=VARCHAR},
-      `status` = #{status,jdbcType=VARCHAR},
-      custom_num = #{customNum,jdbcType=VARCHAR},
-      step_model = #{stepModel,jdbcType=VARCHAR},
-      create_user = #{createUser,jdbcType=VARCHAR},
-      original_status = #{originalStatus,jdbcType=VARCHAR},
-      delete_time = #{deleteTime,jdbcType=BIGINT},
-      delete_user_id = #{deleteUserId,jdbcType=VARCHAR},
-      `order` = #{order,jdbcType=BIGINT},
-      prerequisite = #{prerequisite,jdbcType=LONGVARCHAR},
-      remark = #{remark,jdbcType=LONGVARCHAR},
-      steps = #{steps,jdbcType=LONGVARCHAR},
-      step_description = #{stepDescription,jdbcType=LONGVARCHAR},
-      expected_result = #{expectedResult,jdbcType=LONGVARCHAR},
-      custom_fields = #{customFields,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
+      update test_case
+      set node_id          = #{nodeId,jdbcType=VARCHAR},
+          node_path        = #{nodePath,jdbcType=VARCHAR},
+          project_id       = #{projectId,jdbcType=VARCHAR},
+          `name`           = #{name,jdbcType=VARCHAR},
+          `type`           = #{type,jdbcType=VARCHAR},
+          maintainer       = #{maintainer,jdbcType=VARCHAR},
+          priority         = #{priority,jdbcType=VARCHAR},
+          `method`         = #{method,jdbcType=VARCHAR},
+          create_time      = #{createTime,jdbcType=BIGINT},
+          update_time      = #{updateTime,jdbcType=BIGINT},
+          test_id          = #{testId,jdbcType=VARCHAR},
+          sort             = #{sort,jdbcType=INTEGER},
+          num              = #{num,jdbcType=INTEGER},
+          other_test_name  = #{otherTestName,jdbcType=VARCHAR},
+          review_status    = #{reviewStatus,jdbcType=VARCHAR},
+          tags             = #{tags,jdbcType=VARCHAR},
+          demand_id        = #{demandId,jdbcType=VARCHAR},
+          demand_name      = #{demandName,jdbcType=VARCHAR},
+          `status`         = #{status,jdbcType=VARCHAR},
+          custom_num       = #{customNum,jdbcType=VARCHAR},
+          step_model       = #{stepModel,jdbcType=VARCHAR},
+          create_user      = #{createUser,jdbcType=VARCHAR},
+          original_status  = #{originalStatus,jdbcType=VARCHAR},
+          delete_time      = #{deleteTime,jdbcType=BIGINT},
+          delete_user_id   = #{deleteUserId,jdbcType=VARCHAR},
+          `order`          = #{order,jdbcType=BIGINT},
+          case_public      = #{casePublic,jdbcType=BIT},
+          prerequisite     = #{prerequisite,jdbcType=LONGVARCHAR},
+          remark           = #{remark,jdbcType=LONGVARCHAR},
+          steps            = #{steps,jdbcType=LONGVARCHAR},
+          step_description = #{stepDescription,jdbcType=LONGVARCHAR},
+          expected_result  = #{expectedResult,jdbcType=LONGVARCHAR},
+          custom_fields    = #{customFields,jdbcType=LONGVARCHAR}
+      where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.TestCase">
-    update test_case
-    set node_id = #{nodeId,jdbcType=VARCHAR},
-      node_path = #{nodePath,jdbcType=VARCHAR},
-      project_id = #{projectId,jdbcType=VARCHAR},
-      `name` = #{name,jdbcType=VARCHAR},
-      `type` = #{type,jdbcType=VARCHAR},
-      maintainer = #{maintainer,jdbcType=VARCHAR},
-      priority = #{priority,jdbcType=VARCHAR},
-      `method` = #{method,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=BIGINT},
-      update_time = #{updateTime,jdbcType=BIGINT},
-      test_id = #{testId,jdbcType=VARCHAR},
-      sort = #{sort,jdbcType=INTEGER},
-      num = #{num,jdbcType=INTEGER},
-      other_test_name = #{otherTestName,jdbcType=VARCHAR},
-      review_status = #{reviewStatus,jdbcType=VARCHAR},
-      tags = #{tags,jdbcType=VARCHAR},
-      demand_id = #{demandId,jdbcType=VARCHAR},
-      demand_name = #{demandName,jdbcType=VARCHAR},
-      `status` = #{status,jdbcType=VARCHAR},
-      custom_num = #{customNum,jdbcType=VARCHAR},
-      step_model = #{stepModel,jdbcType=VARCHAR},
-      create_user = #{createUser,jdbcType=VARCHAR},
-      original_status = #{originalStatus,jdbcType=VARCHAR},
-      delete_time = #{deleteTime,jdbcType=BIGINT},
-      delete_user_id = #{deleteUserId,jdbcType=VARCHAR},
-      `order` = #{order,jdbcType=BIGINT}
-    where id = #{id,jdbcType=VARCHAR}
+      update test_case
+      set node_id         = #{nodeId,jdbcType=VARCHAR},
+          node_path       = #{nodePath,jdbcType=VARCHAR},
+          project_id      = #{projectId,jdbcType=VARCHAR},
+          `name`          = #{name,jdbcType=VARCHAR},
+          `type`          = #{type,jdbcType=VARCHAR},
+          maintainer      = #{maintainer,jdbcType=VARCHAR},
+          priority        = #{priority,jdbcType=VARCHAR},
+          `method`        = #{method,jdbcType=VARCHAR},
+          create_time     = #{createTime,jdbcType=BIGINT},
+          update_time     = #{updateTime,jdbcType=BIGINT},
+          test_id         = #{testId,jdbcType=VARCHAR},
+          sort            = #{sort,jdbcType=INTEGER},
+          num             = #{num,jdbcType=INTEGER},
+          other_test_name = #{otherTestName,jdbcType=VARCHAR},
+          review_status   = #{reviewStatus,jdbcType=VARCHAR},
+          tags            = #{tags,jdbcType=VARCHAR},
+          demand_id       = #{demandId,jdbcType=VARCHAR},
+          demand_name     = #{demandName,jdbcType=VARCHAR},
+          `status`        = #{status,jdbcType=VARCHAR},
+          custom_num      = #{customNum,jdbcType=VARCHAR},
+          step_model      = #{stepModel,jdbcType=VARCHAR},
+          create_user     = #{createUser,jdbcType=VARCHAR},
+          original_status = #{originalStatus,jdbcType=VARCHAR},
+          delete_time     = #{deleteTime,jdbcType=BIGINT},
+          delete_user_id  = #{deleteUserId,jdbcType=VARCHAR},
+          `order`         = #{order,jdbcType=BIGINT},
+          case_public     = #{casePublic,jdbcType=BIT}
+      where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
index 749db029bb..d089aafee6 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
@@ -20,6 +20,8 @@ public interface ExtTestCaseMapper {
 
     List<TestCaseDTO> list(@Param("request") QueryTestCaseRequest request);
 
+    List<TestCaseDTO> publicList(@Param("request") QueryTestCaseRequest request);
+
     int moduleCount(@Param("request") QueryTestCaseRequest request);
 
     List<TestCaseDTO> listIds(@Param("request") QueryTestCaseRequest request);
@@ -99,16 +101,19 @@ public interface ExtTestCaseMapper {
 
     List<String> selectRelateIdsByQuery(@Param("request") BaseQueryRequest query);
 
-    List<Map<String, Object>> moduleCountByCollection(@Param("request")QueryTestCaseRequest request);
+    List<Map<String, Object>> moduleCountByCollection(@Param("request") QueryTestCaseRequest request);
 
     List<TestCaseWithBLOBs> getCustomFieldsByIds(@Param("ids") List<String> ids);
 
     int deleteToGc(@Param("request") TestCase testCase);
+
+    int deletePublic(@Param("request") TestCase testCase);
+
     int reduction(@Param("ids") List<String> ids);
 
     void checkOriginalStatusByIds(@Param("ids") List<String> ids);
 
-    List<String> selectIdsByNodeIds(@Param("ids")List<String> nodeIds);
+    List<String> selectIdsByNodeIds(@Param("ids") List<String> nodeIds);
 
     TestCaseWithBLOBs getTestCaseStep(@Param("id") String id);
 
@@ -118,7 +123,7 @@ public interface ExtTestCaseMapper {
 
     Long getLastOrder(@Param("projectId")String projectId, @Param("baseOrder") Long baseOrder);
 
-    Long getPreOrder(@Param("projectId")String projectId, @Param("baseOrder") Long baseOrder);
+    Long getPreOrder(@Param("projectId") String projectId, @Param("baseOrder") Long baseOrder);
 
     List<TestCase> getTestCase(@Param("request") QueryTestCaseRequest request);
 
@@ -127,4 +132,6 @@ public interface ExtTestCaseMapper {
     int countByIds(@Param("ids") List<String> ids);
 
     String getLastExecStatusById(String id);
+
+    int countByWorkSpaceId(String workSpaceId);
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 4fa702d073..87fb1140b5 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -188,6 +188,85 @@
         <include refid="queryWhereCondition"/>
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
+
+    <select id="publicList" resultType="io.metersphere.track.dto.TestCaseDTO">
+        select
+        deleteUser.name AS delete_user_id,test_case.delete_time,
+        <if test="request.selectFields != null and request.selectFields.size() > 0">
+            <foreach collection="request.selectFields" item="field" separator=",">
+                ${field}
+            </foreach>
+        </if>
+        <if test="request.selectFields == null or request.selectFields.size() == 0">
+            test_case.id, test_case.node_id, test_case.node_path, test_case.project_id, test_case.`name`,
+            test_case.`type`, test_case.maintainer, test_case.priority, test_case.`method`,
+            test_case.create_time, test_case.update_time, test_case.test_id, test_case.sort, test_case.num,
+            test_case.other_test_name, test_case.review_status, test_case.tags,
+            test_case.demand_id, test_case.demand_name, test_case.`status`,
+            test_case.custom_num, test_case.step_model, test_case.create_user,u.name as createName,
+            test_case.custom_fields,test_case.case_public , project.name as projectName
+        </if>
+        from test_case left join user u on test_case.create_user=u.id
+        left join user deleteUser on test_case.delete_user_id=deleteUser.id
+        left join project on test_case.project_id = project.id
+        <where>
+            <include refid="filters"/>
+            <if test="request.combine != null">
+                <include refid="combine">
+                    <property name="condition" value="request.combine"/>
+                    <property name="name" value="request.name"/>
+                    <property name="objectKey" value="request.combine.tags"/>
+                </include>
+            </if>
+
+            <if test="request.statusIsNot != null">
+                and (test_case.status is null or test_case.status != #{request.statusIsNot})
+            </if>
+
+            <if test="request.notEqStatus != null">
+                and (test_case.status is null or test_case.status != #{request.notEqStatus})
+            </if>
+            <if test="request.name != null">
+                and (test_case.name like CONCAT('%', #{request.name},'%')
+                or test_case.num like CONCAT('%', #{request.name},'%')
+                or test_case.tags like CONCAT('%', #{request.name},'%')
+                or test_case.custom_num like CONCAT('%', #{request.name},'%'))
+            </if>
+            <if test="request.ids != null">
+                and test_case.id in
+                <foreach collection="request.ids" item="id" separator="," open="(" close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.relevanceCreateTime >0">
+                and test_case.id in (select test_case_id from test_case_test where test_case_test.create_time >=
+                #{request.createTime})
+            </if>
+            <if test="request.createTime >0">
+                and test_case.create_time >= #{request.createTime}
+            </if>
+            <if test="request.nodeIds != null and request.nodeIds.size() > 0">
+                and test_case.node_id in
+                <foreach collection="request.nodeIds" item="nodeId" separator="," open="(" close=")">
+                    #{nodeId}
+                </foreach>
+            </if>
+            <if test="request.workspaceId != null">
+                AND test_case.project_id in (select id from project where workspace_id=#{request.workspaceId})
+            </if>
+            and test_case.case_public = TRUE
+            <include refid="filters"/>
+            <if test="request.caseCoverage == 'uncoverage' ">
+                and test_case.id not in (select distinct test_case_test.test_case_id from test_case_test)
+            </if>
+            <if test="request.caseCoverage == 'coverage' ">
+                and test_case.id in (select distinct test_case_test.test_case_id from test_case_test)
+            </if>
+        </where>
+
+        <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
+    </select>
+
     <select id="moduleCount" resultType="java.lang.Integer">
         select count(test_case.id) from test_case
         left join project on test_case.project_id = project.id
@@ -594,12 +673,20 @@
     </select>
 
     <update id="deleteToGc">
-        update test_case set original_status=status,
-        status = 'Trash',
-        delete_time = #{request.deleteTime},
-        delete_user_id = #{request.deleteUserId}
+        update test_case
+        set original_status=status,
+            status         = 'Trash',
+            delete_time    = #{request.deleteTime},
+            delete_user_id = #{request.deleteUserId}
         where id = #{request.id}
     </update>
+
+    <update id="deletePublic">
+        update test_case
+        set case_public = false
+        where id = #{request.id}
+    </update>
+
     <update id="reduction">
         update test_case
         set
@@ -622,7 +709,21 @@
     </update>
 
     <select id="getLastExecStatusById" resultType="java.lang.String">
-        SELECT `status` FROM test_plan_test_case WHERE case_id = #{0} ORDER BY update_time DESC limit 1 ;
+        SELECT `status`
+        FROM test_plan_test_case
+        WHERE case_id = #{0}
+        ORDER BY update_time DESC limit 1;
+    </select>
+
+    <select id="countByWorkSpaceId" resultType="java.lang.Integer">
+        select count(id)
+        from test_case
+        where project_id in (
+            select id
+            from project
+            where workspace_id = #{workSpaceId})
+          and case_public = true
+          and status != 'Trash'
     </select>
 
 </mapper>
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
index 74f07fa9b9..0390403577 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
@@ -65,6 +65,13 @@ public class TestCaseController {
         return PageUtils.setPageInfo(page, testCaseService.listTestCase(request));
     }
 
+    @PostMapping("/publicList/{goPage}/{pageSize}")
+    @RequiresPermissions(PermissionConstants.PROJECT_TRACK_CASE_READ)
+    public Pager<List<TestCaseDTO>> publicList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryTestCaseRequest request) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        return PageUtils.setPageInfo(page, testCaseService.publicListTestCase(request));
+    }
+
     @GetMapping("/list/{projectId}")
     @RequiresPermissions("PROJECT_TRACK_CASE:READ")
     public List<TestCaseDTO> list(@PathVariable String projectId) {
@@ -238,6 +245,15 @@ public class TestCaseController {
         return testCaseService.deleteTestCaseToGc(testCaseId);
     }
 
+    @PostMapping("/deletePublic/{testCaseId}")
+    @MsAuditLog(module = "track_test_case", type = OperLogConstants.GC, beforeEvent = "#msClass.getLogDetails(#testCaseId)", msClass = TestCaseService.class)
+    @SendNotice(taskType = NoticeConstants.TaskType.TRACK_TEST_CASE_TASK, event = NoticeConstants.Event.DELETE, target = "#targetClass.getTestCase(#testCaseId)", targetClass = TestCaseService.class,
+            mailTemplate = "track/TestCaseDelete", subject = "测试用例通知")
+    public int deletePublic(@PathVariable String testCaseId) {
+        checkPermissionService.checkTestCaseOwner(testCaseId);
+        return testCaseService.deleteTestCasePublic(testCaseId);
+    }
+
 
     @PostMapping("/import/{projectId}/{userId}/{importType}")
     @MsAuditLog(module = "track_test_case", type = OperLogConstants.IMPORT, project = "#projectId")
@@ -285,18 +301,32 @@ public class TestCaseController {
     @SendNotice(taskType = NoticeConstants.TaskType.TRACK_TEST_CASE_TASK, target = "#targetClass.findByBatchRequest(#request)", targetClass = TestCaseService.class,
             event = NoticeConstants.Event.UPDATE, mailTemplate = "track/TestCaseUpdate", subject = "测试用例通知")
     public void editTestCaseBath(@RequestBody TestCaseBatchRequest request) {
+        List<String> ids = request.getIds();
+        for (String id : ids) {
+            checkPermissionService.checkTestCaseOwner(id);
+        }
         testCaseService.editTestCaseBath(request);
     }
 
     @PostMapping("/batch/copy")
     @RequiresPermissions(PermissionConstants.PROJECT_TRACK_CASE_READ_EDIT)
-    @MsAuditLog(module = "track_test_case", type = OperLogConstants.BATCH_ADD, beforeEvent = "#msClass.getLogDetails(#request.ids)", content = "#msClass.getLogDetails(#request.ids)", msClass = TestCaseService.class)
+    @MsAuditLog(module = "track_test_case", type = OperLogConstants.BATCH_UPDATE, beforeEvent = "#msClass.getLogDetails(#request.ids)", content = "#msClass.getLogDetails(#request.ids)", msClass = TestCaseService.class)
     @SendNotice(taskType = NoticeConstants.TaskType.TRACK_TEST_CASE_TASK, target = "#targetClass.findByBatchRequest(#request)", targetClass = TestCaseService.class,
             event = NoticeConstants.Event.CREATE, mailTemplate = "track/TestCaseUpdate", subject = "测试用例通知")
     public void copyTestCaseBath(@RequestBody TestCaseBatchRequest request) {
         testCaseService.copyTestCaseBath(request);
     }
 
+    @PostMapping("/batch/copy/public")
+    @RequiresPermissions(PermissionConstants.PROJECT_TRACK_CASE_READ_EDIT)
+    @MsAuditLog(module = "track_test_case", type = OperLogConstants.BATCH_ADD, beforeEvent = "#msClass.getLogDetails(#request.ids)", content = "#msClass.getLogDetails(#request.ids)", msClass = TestCaseService.class)
+    @SendNotice(taskType = NoticeConstants.TaskType.TRACK_TEST_CASE_TASK, target = "#targetClass.findByBatchRequest(#request)", targetClass = TestCaseService.class,
+            event = NoticeConstants.Event.CREATE, mailTemplate = "track/TestCaseUpdate", subject = "测试用例通知")
+    public void copyTestCaseBathPublic(@RequestBody TestCaseBatchRequest request) {
+        testCaseService.copyTestCaseBathPublic(request);
+    }
+
+
     @PostMapping("/batch/delete")
     @RequiresPermissions(PermissionConstants.PROJECT_TRACK_CASE_READ_DELETE)
     @MsAuditLog(module = "track_test_case", type = OperLogConstants.BATCH_DEL, beforeEvent = "#msClass.getLogDetails(#request.ids)", msClass = TestCaseService.class)
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseNodeController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseNodeController.java
index a9b13e6422..05edaa788e 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseNodeController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseNodeController.java
@@ -35,6 +35,11 @@ public class TestCaseNodeController {
         return testCaseNodeService.trashCount(projectId);
     }
 
+    @GetMapping("/publicCount/{workSpaceId}")
+    public long publicCount(@PathVariable String workSpaceId) {
+        return testCaseNodeService.publicCount(workSpaceId);
+    }
+
     /*模块列表列表*/
     @PostMapping("/list/all/plan")
     public List<TestCaseNodeDTO> getAllNodeByPlanId(@RequestBody QueryNodeRequest request) {
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
index 978e2cc733..197ec8bfce 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
@@ -57,4 +57,5 @@ public class QueryTestCaseRequest extends BaseQueryRequest {
     private String operator;
     //操作时间
     private Long operationTime;
+    private boolean casePublic;
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
index 0267104715..79f47aeda7 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
@@ -803,4 +803,9 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
             }
         }
     }
+
+    public long publicCount(String workSpaceId) {
+
+        return extTestCaseMapper.countByWorkSpaceId(workSpaceId);
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 6eb410e6b0..ce22ab817a 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -375,6 +375,12 @@ public class TestCaseService {
         return extTestCaseMapper.deleteToGc(testCase);
     }
 
+    public int deleteTestCasePublic(String testCaseId) {
+        TestCase testCase = new TestCase();
+        testCase.setId(testCaseId);
+        return extTestCaseMapper.deletePublic(testCase);
+    }
+
     public List<TestCaseDTO> listTestCase(QueryTestCaseRequest request) {
         this.initRequest(request, true);
         setDefaultOrder(request);
@@ -385,6 +391,18 @@ public class TestCaseService {
         returnList = this.parseStatus(returnList);
         return returnList;
     }
+
+    public List<TestCaseDTO> publicListTestCase(QueryTestCaseRequest request) {
+        this.initRequest(request, true);
+        setDefaultOrder(request);
+        if (request.getFilters() != null && !request.getFilters().containsKey("status")) {
+            request.getFilters().put("status", new ArrayList<>(0));
+        }
+        List<TestCaseDTO> returnList = extTestCaseMapper.publicList(request);
+        returnList = this.parseStatus(returnList);
+        return returnList;
+    }
+
     public void setDefaultOrder(QueryTestCaseRequest request) {
         List<OrderRequest> orders = ServiceUtils.getDefaultSortOrder(request.getOrders());
         OrderRequest order = new OrderRequest();
@@ -1304,6 +1322,40 @@ public class TestCaseService {
         }
     }
 
+    public void copyTestCaseBathPublic(TestCaseBatchRequest request) {
+        ServiceUtils.getSelectAllIds(request, request.getCondition(),
+                (query) -> extTestCaseMapper.selectIds(query));
+        List<String> ids = request.getIds();
+        if (CollectionUtils.isEmpty(ids)) {
+            return;
+        }
+        TestCaseExample exampleList = new TestCaseExample();
+        exampleList.createCriteria().andIdIn(request.getIds());
+        List<TestCaseWithBLOBs> list = testCaseMapper.selectByExampleWithBLOBs(exampleList);
+        for (TestCaseWithBLOBs item : list) {
+            TestCaseWithBLOBs batchCopy = new TestCaseWithBLOBs();
+            BeanUtils.copyBean(batchCopy, item);
+            checkTestCaseExist(batchCopy);
+            batchCopy.setId(UUID.randomUUID().toString());
+            batchCopy.setCreateTime(System.currentTimeMillis());
+            batchCopy.setUpdateTime(System.currentTimeMillis());
+            checkTestCustomNum(batchCopy);
+            batchCopy.setNum(getNextNum(SessionUtils.getCurrentProjectId()));
+            if (StringUtils.isBlank(batchCopy.getCustomNum())) {
+                batchCopy.setCustomNum(batchCopy.getNum().toString());
+            }
+            batchCopy.setCreateUser(SessionUtils.getUserId());
+            batchCopy.setMaintainer(SessionUtils.getUserId());
+            batchCopy.setReviewStatus(TestCaseReviewStatus.Prepare.name());
+            batchCopy.setStatus(TestCaseReviewStatus.Prepare.name());
+            batchCopy.setNodePath(request.getNodePath());
+            batchCopy.setNodeId(request.getNodeId());
+            batchCopy.setProjectId(SessionUtils.getCurrentProjectId());
+            batchCopy.setCasePublic(false);
+            testCaseMapper.insert(batchCopy);
+        }
+    }
+
     public void deleteTestCaseBath(TestCaseBatchRequest request) {
         TestCaseExample example = this.getBatchExample(request);
         deleteTestPlanTestCaseBath(request.getIds());
diff --git a/backend/src/main/resources/db/migration/V102__v1.16_release.sql b/backend/src/main/resources/db/migration/V102__v1.16_release.sql
index 04c7b7d9e8..9a49de665d 100644
--- a/backend/src/main/resources/db/migration/V102__v1.16_release.sql
+++ b/backend/src/main/resources/db/migration/V102__v1.16_release.sql
@@ -1,11 +1,28 @@
 -- 新增字段
-ALTER TABLE `swagger_url_project` ADD COLUMN `config` longtext COMMENT '鉴权配置信息' AFTER `mode_id`;
+ALTER TABLE `swagger_url_project`
+    ADD COLUMN `config` longtext COMMENT '鉴权配置信息' AFTER `mode_id`;
 
 -- 第三方平台模板
-ALTER TABLE project ADD platform varchar(20) DEFAULT 'Local' NOT NULL COMMENT '项目使用哪个平台的模板';
-ALTER TABLE project ADD third_part_template tinyint(1) DEFAULT 0 NULL COMMENT '是否使用第三方平台缺陷模板';
+ALTER TABLE project
+    ADD platform varchar(20) DEFAULT 'Local' NOT NULL COMMENT '项目使用哪个平台的模板';
+ALTER TABLE project
+    ADD third_part_template tinyint(1) DEFAULT 0 NULL COMMENT '是否使用第三方平台缺陷模板';
 
 -- 处理历史数据
-UPDATE issue_template SET platform = 'Local' WHERE platform = 'metersphere';
-UPDATE project p JOIN issue_template it on p.issue_template_id = it.id SET p.platform = it.platform;
-UPDATE custom_field SET `type` = 'date' WHERE `type` = 'data';
+UPDATE issue_template
+SET platform = 'Local'
+WHERE platform = 'metersphere';
+UPDATE project p JOIN issue_template it
+on p.issue_template_id = it.id SET p.platform = it.platform;
+UPDATE custom_field
+SET `type` = 'date'
+WHERE `type` = 'data';
+
+-- 公共用例库
+ALTER TABLE project
+    ADD case_public tinyint(1) DEFAULT NULL COMMENT '是否开启用例公共库';
+ALTER TABLE project
+    ADD api_quick varchar(50) DEFAULT NULL COMMENT 'api定义快捷调试按钮',
+
+ALTER TABLE test_case
+    ADD case_public tinyint(1) DEFAULT NULL COMMENT '是否是公共用例';
\ No newline at end of file
diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml
index 1894b97876..7ab1c66b16 100644
--- a/backend/src/main/resources/generatorConfig.xml
+++ b/backend/src/main/resources/generatorConfig.xml
@@ -71,31 +71,30 @@
         <!--<table tableName="test_plan"/>-->
         <!--<table tableName="api_scenario_report"/>-->
         <!--<table tableName="test_case_review"/>-->
-        <table tableName="enterprise_test_report"/>
-        <table tableName="enterprise_test_report_send_record"/>
+        <table tableName="test_case"/>
+        <!--<table tableName="enterprise_test_report_send_record"/>-->
         <!--<table tableName="test_case_review_api_case"/>
         <table tableName="test_case_review_load"/>
         <table tableName="test_case_review_scenario"/>
         <table tableName="test_plan"/>
         <table tableName="test_case_test"/>-->
-<!--        <table tableName="api_test_environment"></table>-->
-       <!-- <table tableName="test_case">
-            <ignoreColumn column="follow_people"/>
-        </table>-->
-<!--        <table tableName="custom_field"></table>-->
-<!--        <table tableName="test_case"></table>-->
-<!--        <table tableName="test_case"></table>-->
-<!--        <table tableName="test_case"></table>-->
-<!--        <table tableName="api_test_case"></table>-->
-<!--        <table tableName="api_definition"></table>-->
-<!--        <table tableName="api_scenario"></table>
-        <table tableName="test_case"></table>
-        <table tableName="api_test_case"></table>
-        <table tableName="api_definition"></table>-->
+        <!--        <table tableName="api_test_environment"></table>-->
+        <!-- <table tableName="test_case">
+             <ignoreColumn column="follow_people"/>
+         </table>-->
+        <!--        <table tableName="custom_field"></table>-->
+        <!--        <table tableName="test_case"></table>-->
+        <!--        <table tableName="test_case"></table>-->
+        <!--        <table tableName="test_case"></table>-->
+        <!--        <table tableName="api_test_case"></table>-->
+        <!--        <table tableName="api_definition"></table>-->
+        <!--        <table tableName="api_scenario"></table>
+                <table tableName="test_case"></table>
+                <table tableName="api_test_case"></table>
+                <table tableName="api_definition"></table>-->
 
 
-
-<!--        表名和关键字冲突-->
+        <!--        表名和关键字冲突-->
 <!--                <table tableName="group" delimitIdentifiers="true"></table>-->
 
     </context>
diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index 0479c23693..d75721e0ad 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -464,7 +464,15 @@ export default {
     },
     addTab(tab) {
       if (tab.name === 'add') {
-        this.handleTabsEdit(this.$t('api_test.definition.request.fast_debug'), "debug");
+        this.result = this.$get('/project/get/' + this.projectId, res => {
+          let projectData = res.data;
+          if (projectData && projectData.apiQuick === 'api') {
+            this.handleTabAdd("ADD");
+          } else {
+            this.handleTabsEdit(this.$t('api_test.definition.request.fast_debug'), "debug");
+          }
+        })
+
       } else if (tab.name === 'trash') {
         if (this.$refs.trashApiList) {
           this.$refs.trashApiList.initTable();
diff --git a/frontend/src/business/components/api/definition/components/module/ModulePublicButton.vue b/frontend/src/business/components/api/definition/components/module/ModulePublicButton.vue
new file mode 100644
index 0000000000..51f47e2b74
--- /dev/null
+++ b/frontend/src/business/components/api/definition/components/module/ModulePublicButton.vue
@@ -0,0 +1,66 @@
+<template>
+  <div @click="exe" class="recycle" :class="{'is-active': condition.publicEnable}" v-if="this.isXpack">
+    <el-row>
+      <el-col :span="21"><i class="el-icon-reading"> {{ $t('project.case_public') }}</i></el-col>
+      <el-col :span="3"><span style="color: #6C317C">{{ publicTotal }}</span></el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import {hasLicense} from "@/common/js/utils";
+
+export default {
+  name: "ModulePublicButton",
+  props: {
+    condition: {
+      type: Object,
+      default() {
+        return {};
+      }
+    },
+    exe: {
+      type: Function
+    },
+    publicTotal: Number,
+  },
+  data() {
+    return {
+      isXPack: false
+    }
+  },
+  created() {
+    if (hasLicense()) {
+      this.isXpack = true;
+    } else {
+      this.isXpack = false;
+    }
+  },
+  methods: {
+    // enableTrash() {
+    //
+    // }
+  }
+}
+</script>
+
+<style scoped>
+
+.recycle {
+  padding-left: 25px;
+  margin-top: 15px;
+  height: 26px;
+  line-height: 26px;
+  margin-bottom: -10px;
+}
+
+.recycle:hover {
+  color: #6d317c;
+  cursor: pointer;
+}
+
+.is-active {
+  background-color: #f3f6f9;
+}
+
+</style>
diff --git a/frontend/src/business/components/project/head/ProjectHeaderMenus.vue b/frontend/src/business/components/project/head/ProjectHeaderMenus.vue
index cb0a598024..b385cf7908 100644
--- a/frontend/src/business/components/project/head/ProjectHeaderMenus.vue
+++ b/frontend/src/business/components/project/head/ProjectHeaderMenus.vue
@@ -33,7 +33,7 @@
           <el-menu-item popper-class="submenu" @click="clickPlanMenu">
             {{ $t('project.version_manage') }}
           </el-menu-item>
-          <el-menu-item popper-class="submenu" @click="clickPlanMenu">
+          <el-menu-item :index="'/project/app'" popper-class="submenu" :disabled="this.isProjectAdmin">
             {{ $t('project.app_manage') }}
           </el-menu-item>
         </el-menu>
@@ -48,6 +48,7 @@ import MsShowAll from "@/business/components/common/head/ShowAll";
 import MsRecentList from "@/business/components/common/head/RecentList";
 import MsCreateButton from "@/business/components/common/head/CreateButton";
 import ProjectChange from "@/business/components/common/head/ProjectSwitch";
+import {getCurrentProjectID, getCurrentUserId, getCurrentWorkspaceId} from "@/common/js/utils";
 
 export default {
   name: "ProjectHeaderMenus",
@@ -56,6 +57,7 @@ export default {
     return {
       currentProject: '',
       pathName: '',
+      isProjectAdmin: true
     };
   },
   watch: {
@@ -66,11 +68,25 @@ export default {
       }
     }
   },
+  created() {
+    this.$get("/user/group/list/project/" + getCurrentProjectID() + "/" + getCurrentUserId(), res => {
+      let data = res.data;
+      if (data) {
+        data.forEach(row => {
+          if (row.id === 'project_admin') {
+            this.isProjectAdmin = false;
+          }
+        })
+      } else {
+        this.isProjectAdmin = true;
+      }
+    })
+  },
   methods: {
     clickPlanMenu() {
       this.$info(this.$t('commons.function_planning'));
       return false;
-    }
+    },
   }
 };
 
diff --git a/frontend/src/business/components/project/menu/appmanage/AppManage.vue b/frontend/src/business/components/project/menu/appmanage/AppManage.vue
new file mode 100644
index 0000000000..a2053d772d
--- /dev/null
+++ b/frontend/src/business/components/project/menu/appmanage/AppManage.vue
@@ -0,0 +1,176 @@
+<template>
+  <ms-container>
+    <ms-main-container>
+      <div v-loading="result.loading">
+        <el-card class="card">
+          <el-col :span="24" justify="space-around">
+            <el-tabs v-model="activeName" @tab-click="handleClick" style="height: 600px">
+              <el-tab-pane :label="$t('commons.my_workstation')" name="my_workstation" :disabled="true">
+                {{ this.$t('commons.my_workstation') }}
+              </el-tab-pane>
+              <el-tab-pane :label="$t('test_track.test_track')" name="test_track">
+                <div>
+                  <el-col :span="8">
+                    <el-row style="margin-top: 10px">
+                      <span>{{ this.$t('commons.enable_settings') }}</span>
+                    </el-row>
+                    <el-row style="margin-top: 10px">
+                      <fieldset>
+                        <el-form :model="form" ref="form" label-position="left" label-width="200px" size="small">
+                          <el-form-item :label-width="labelWidth" :label="$t('project.public_info')" prop="casePublic"
+                                        v-if="this.isXpack">
+                            <el-switch v-model="form.casePublic" style="margin-top:20px"></el-switch>
+                          </el-form-item>
+                          <el-divider v-if="this.isXpack"></el-divider>
+                          <el-form-item :label-width="labelWidth" :label="$t('project.test_case_custom_id_info')"
+                                        prop="repeatable">
+                            <el-switch v-model="form.repeatable" style="margin-top:20px"></el-switch>
+                          </el-form-item>
+                        </el-form>
+                      </fieldset>
+                    </el-row>
+                  </el-col>
+                </div>
+              </el-tab-pane>
+              <el-tab-pane :label="$t('commons.api')" name="api">
+                <el-row :gutter="20">
+                  <el-col :span="8">
+                    <el-row style="margin-top: 10px">
+                      <span>{{ this.$t('commons.enable_settings') }}</span>
+                    </el-row>
+                    <el-row style="margin-top: 10px">
+                      <fieldset>
+                        <el-form :model="form" ref="form" label-position="left" label-width="200px" size="small">
+                          <el-form-item :label-width="labelWidth" :label="$t('project.repeatable_info')"
+                                        prop="customNum">
+                            <el-switch v-model="form.customNum" style="margin-top:20px"></el-switch>
+                          </el-form-item>
+                          <el-divider></el-divider>
+                          <el-form-item :label-width="labelWidth" :label="$t('project.scenario_custom_id_info')"
+                                        prop="scenarioCustomNum">
+                            <el-switch v-model="form.scenarioCustomNum" style="margin-top:20px"></el-switch>
+                          </el-form-item>
+                        </el-form>
+                      </fieldset>
+                    </el-row>
+                  </el-col>
+                  <el-col :span="8" :offset="4">
+                    <el-row style="margin-top: 10px">
+                      <span>{{ this.$t('commons.view_settings') }}</span>
+                    </el-row>
+                    <el-row style="margin-top: 10px">
+                      <fieldset>
+                        <el-form :model="form" ref="form" label-position="left" label-width="200px" size="small">
+                          <el-form-item label-width="200px" :label="$t('api_test.definition.api_quick_button')"
+                                        prop="apiQuick">
+                            <el-radio-group v-model="form.apiQuick">
+                              <el-radio label="debug" value="debug">
+                                {{ this.$t('api_test.definition.request.fast_debug') }}
+                              </el-radio>
+                              <el-radio label="api" value="api">
+                                {{ this.$t('api_test.definition.request.title') }}
+                              </el-radio>
+                            </el-radio-group>
+                          </el-form-item>
+                        </el-form>
+                      </fieldset>
+                    </el-row>
+                  </el-col>
+                </el-row>
+              </el-tab-pane>
+
+              <el-tab-pane :label="$t('commons.performance')" name="performance" :disabled="true">{{
+                  this.$t('commons.performance')
+                }}
+              </el-tab-pane>
+            </el-tabs>
+          </el-col>
+        </el-card>
+      </div>
+    </ms-main-container>
+  </ms-container>
+</template>
+
+
+<script>
+
+import MsContainer from "@/business/components/common/components/MsContainer";
+import MsMainContainer from "@/business/components/common/components/MsMainContainer";
+import {
+  getCurrentProjectID,
+  getCurrentUser,
+  getCurrentUserId,
+  getCurrentWorkspaceId,
+  getUUID, hasLicense,
+  hasPermission
+} from "@/common/js/utils";
+
+export default {
+  name: "appManage",
+  components: {
+    MsMainContainer,
+    MsContainer
+  },
+  data() {
+    return {
+      activeName: 'test_track',
+      form: {},
+      labelWidth: '400px',
+      count: 0,
+      isXpack: false,
+      result: {}
+    };
+  },
+  created() {
+    this.result = this.$get('/project/get/' + this.projectId, res => {
+      this.form = res.data;
+      this.count = 0
+    })
+    if (hasLicense()) {
+      this.isXpack = true;
+    } else {
+      this.isXpack = false;
+    }
+
+  },
+  watch: {
+    form: {
+      handler(val, oldVal) {
+        this.count++;
+        if (this.count > 1) {
+          this.submitForm();
+        }
+      },
+      deep: true
+    }
+  },
+  computed: {
+    projectId() {
+      return getCurrentProjectID();
+    },
+  },
+  methods: {
+    handleClick() {
+
+    },
+    submitForm() {
+      this.form.workspaceId = getCurrentWorkspaceId();
+      this.form.createUser = getCurrentUserId();
+      this.form.id = getCurrentProjectID();
+      this.result = this.$post("/project/update", this.form, () => {
+        this.$success(this.$t('commons.save_success'));
+      });
+    },
+
+  }
+};
+</script>
+
+<style scoped>
+
+/deep/ .el-form-item__label {
+  white-space: pre-line;
+}
+
+
+</style>
diff --git a/frontend/src/business/components/project/router.js b/frontend/src/business/components/project/router.js
index bc215f6b41..3446a7f7ea 100644
--- a/frontend/src/business/components/project/router.js
+++ b/frontend/src/business/components/project/router.js
@@ -6,6 +6,8 @@ const ProjectLog = () => import('@/business/components/project/menu/Log')
 const ProjectCodeSegment = () => import('@/business/components/project/menu/function/CustomFunction')
 const ProjectFileManage = () => import('@/business/components/project/menu/file/FileManage')
 const ProjectUserGroup = () => import('@/business/components/project/menu/UserGroup')
+const ProjectAppManage = () => import('@/business/components/project/menu/appmanage/AppManage')
+
 
 export default {
   path: "/project",
@@ -47,7 +49,11 @@ export default {
     {
       path: 'file/manage',
       component: ProjectFileManage
-    }
+    },
 
+    {
+      path: 'app',
+      component: ProjectAppManage
+    },
   ]
 };
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index 590e3d2512..3516472803 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -12,8 +12,10 @@
         @createCase="handleCaseSimpleCreate($event, 'add')"
         @refreshAll="refreshAll"
         @enableTrash="enableTrash"
+        @enablePublic="enablePublic"
         :type="'edit'"
         :total='total'
+        :public-total="publicTotal"
         ref="nodeTree"
       />
     </ms-aside-container>
@@ -31,12 +33,32 @@
             @testCaseCopy="copyTestCase"
             @testCaseDetail="showTestCaseDetail"
             @getTrashList="getTrashList"
+            @getPublicList="getPublicList"
             @refresh="refresh"
             @refreshAll="refreshAll"
             @setCondition="setCondition"
             ref="testCaseTrashList">
           </test-case-list>
         </el-tab-pane>
+        <el-tab-pane name="public" v-if="publicEnable" :label="$t('project.case_public')">
+          <test-case-list
+            :checkRedirectID="checkRedirectID"
+            :isRedirectEdit="isRedirectEdit"
+            :tree-nodes="treeNodes"
+            :trash-enable="false"
+            :public-enable="true"
+            @refreshTable="refresh"
+            @testCaseEdit="editTestCase"
+            @testCaseCopy="copyTestCase"
+            @testCaseDetail="showTestCaseDetail"
+            @getTrashList="getTrashList"
+            @getPublicList="getPublicList"
+            @refresh="refresh"
+            @refreshAll="refreshAll"
+            @setCondition="setCondition"
+            ref="testCasePublicList">
+          </test-case-list>
+        </el-tab-pane>
         <el-tab-pane name="default" :label="$t('api_test.definition.case_title')">
           <ms-tab-button
             :active-dom="activeDom"
@@ -57,6 +79,7 @@
               @testCaseCopy="copyTestCase"
               @testCaseDetail="showTestCaseDetail"
               @getTrashList="getTrashList"
+              @getPublicList="getPublicList"
               @refresh="refresh"
               @refreshAll="refreshAll"
               @setCondition="setCondition"
@@ -132,7 +155,7 @@ import SelectMenu from "../common/SelectMenu";
 import MsContainer from "../../common/components/MsContainer";
 import MsAsideContainer from "../../common/components/MsAsideContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
-import {getCurrentProjectID, getUUID, hasPermission, setCurTabId} from "@/common/js/utils";
+import {getCurrentProjectID, getCurrentWorkspaceId, getUUID, hasPermission, setCurTabId} from "@/common/js/utils";
 import TestCaseNodeTree from "../common/TestCaseNodeTree";
 
 import MsTabButton from "@/business/components/common/components/MsTabButton";
@@ -158,6 +181,7 @@ export default {
       treeNodes: [],
       testCaseReadOnly: true,
       trashEnable: false,
+      publicEnable: false,
       condition: {},
       activeName: 'default',
       tabs: [],
@@ -167,6 +191,7 @@ export default {
       activeDom: 'left',
       tmpActiveDom: null,
       total: 0,
+      publicTotal: 0,
       tmpPath: null
     };
   },
@@ -210,10 +235,17 @@ export default {
         }
       });
     },
-    trashEnable(){
-      if(this.trashEnable){
+    trashEnable() {
+      if (this.trashEnable) {
         this.activeName = 'trash';
-      }else {
+      } else {
+        this.activeName = 'default';
+      }
+    },
+    publicEnable() {
+      if (this.publicEnable) {
+        this.activeName = 'public';
+      } else {
         this.activeName = 'default';
       }
     }
@@ -257,11 +289,16 @@ export default {
           break;
       }
     },
-    getTrashList(){
-      this.$get("/case/node/trashCount/"+this.projectId , response => {
+    getTrashList() {
+      this.$get("/case/node/trashCount/" + this.projectId, response => {
         this.total = response.data;
       });
     },
+    getPublicList() {
+      this.$get("/case/node/publicCount/" + getCurrentWorkspaceId(), response => {
+        this.publicTotal = response.data;
+      });
+    },
     updateActiveDom(activeDom) {
       openMinderConfirm(this, activeDom);
     },
@@ -386,6 +423,8 @@ export default {
     nodeChange(node) {
       this.condition.trashEnable = false;
       this.trashEnable = false;
+      this.condition.publicEnable = false;
+      this.publicEnable = false;
       this.activeName = "default";
     },
     refreshTable(data) {
@@ -494,7 +533,7 @@ export default {
       this.$get("/project/get/" + this.projectId, result => {
         let data = result.data;
         if (data) {
-          this.$store.commit('setCurrentProjectIsCustomNum',  data.customNum);
+          this.$store.commit('setCurrentProjectIsCustomNum', data.customNum);
         }
       });
     },
@@ -502,6 +541,10 @@ export default {
       this.initApiTableOpretion = "trashEnable";
       this.trashEnable = data;
     },
+    enablePublic(data) {
+      this.initApiTableOpretion = "publicEnable";
+      this.publicEnable = data;
+    },
   }
 };
 </script>
diff --git a/frontend/src/business/components/track/case/components/BatchMove.vue b/frontend/src/business/components/track/case/components/BatchMove.vue
index 327bcd8bec..21c66191a9 100644
--- a/frontend/src/business/components/track/case/components/BatchMove.vue
+++ b/frontend/src/business/components/track/case/components/BatchMove.vue
@@ -58,6 +58,12 @@
         result: {},
       }
     },
+    props: {
+      publicEnable: {
+        type: Boolean,
+        default: false,
+      },
+    },
     watch: {
       filterText(val) {
         this.$refs.tree.filter(val);
@@ -85,7 +91,11 @@
           });
         }
         param.ids = this.selectIds;
-        this.$emit('moveSave', param);
+        if (this.publicEnable) {
+          this.$emit('copyPublic', param);
+        } else {
+          this.$emit('moveSave', param);
+        }
       },
       refresh() {
         this.$emit("refresh");
diff --git a/frontend/src/business/components/track/case/components/ShowMoreBtn.vue b/frontend/src/business/components/track/case/components/ShowMoreBtn.vue
index e700687439..85ff560faf 100644
--- a/frontend/src/business/components/track/case/components/ShowMoreBtn.vue
+++ b/frontend/src/business/components/track/case/components/ShowMoreBtn.vue
@@ -52,6 +52,14 @@ import {hasLicense, hasPermissions} from "@/common/js/utils";
         }
       },
       isDisable(item) {
+        if (item.isDisable) {
+          if (item.isDisable instanceof Function) {
+            console.log(item.isDisable());
+            return item.isDisable();
+          } else {
+            return item.isDisable;
+          }
+        }
         if (item.permissions && item.permissions.length > 0) {
           return !hasPermissions(...item.permissions);
         }
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 322d4e4490..9dc1f7d400 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -34,6 +34,10 @@
                   $t('test_track.case.save_create_continue')
                 }}
               </el-dropdown-item>
+              <el-dropdown-item command="ADD_AND_PUBLIC" v-if="this.publicEnable && this.isXpack">{{
+                  $t('test_track.case.save_add_public')
+                }}
+              </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
@@ -142,7 +146,7 @@ import {
   getCurrentProjectID,
   getCurrentUser,
   getNodePath, getUUID,
-  handleCtrlSEvent, hasPermission,
+  handleCtrlSEvent, hasLicense, hasPermission,
   listenGoBack,
   removeGoBackListener
 } from "@/common/js/utils";
@@ -194,6 +198,8 @@ export default {
     return {
       // sysList: [],//一级选择框的数据
       path: "/test/case/add",
+      publicEnable: false,
+      isXpack: false,
       testCaseTemplate: {},
       options: REVIEW_STATUS,
       statuOptions: API_STATUS,
@@ -391,7 +397,18 @@ export default {
           break;
         }
       }
-    })
+    }),
+      this.result = this.$get('/project/get/' + this.projectId, res => {
+        let data = res.data;
+        if (data.casePublic) {
+          this.publicEnable = true;
+        }
+      })
+    if (hasLicense()) {
+      this.isXpack = true;
+    } else {
+      this.isXpack = false;
+    }
   },
   methods: {
     currentUser: () => {
@@ -462,6 +479,9 @@ export default {
             });
           }
         })
+      } else if (e === 'ADD_AND_PUBLIC') {
+        this.form.casePublic = true;
+        this.saveCase();
       } else {
         this.saveCase();
       }
@@ -562,6 +582,7 @@ export default {
       this.getTestCase(this.index);
     },
     initTestCases(testCase) {
+      this.selectCondition.workspaceId = null;
       this.result = this.$post('/test/case/list/ids', this.selectCondition, response => {
         this.testCases = response.data;
         for (let i = 0; i < this.testCases.length; i++) {
@@ -846,7 +867,7 @@ export default {
 
       } else {
         this.showFollow = true;
-        if(!this.form.follows){
+        if (!this.form.follows) {
           this.form.follows = [];
         }
         this.form.follows.push(this.currentUser().id)
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 8a30603d17..76e8dc8e24 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -129,11 +129,21 @@
           </template>
         </ms-table-column>
 
+        <ms-table-column
+          prop="projectName"
+          :field="item"
+          :fields-width="fieldsWidth"
+          :label="$t('test_track.case.project')"
+          v-if="publicEnable"
+          min-width="150px">
+        </ms-table-column>
+
         <ms-table-column
           prop="nodePath"
           :field="item"
           :fields-width="fieldsWidth"
           :label="$t('test_track.case.module')"
+          v-if="!publicEnable"
           min-width="150px">
         </ms-table-column>
 
@@ -192,7 +202,8 @@
     <batch-edit ref="batchEdit" @batchEdit="batchEdit"
                 :typeArr="typeArr" :value-arr="valueArr" :dialog-title="$t('test_track.case.batch_edit_case')"/>
 
-    <batch-move @refresh="refresh" @moveSave="moveSave" ref="testBatchMove"/>
+    <batch-move @refresh="refresh" @moveSave="moveSave" ref="testBatchMove" :public-enable="publicEnable"
+                @copyPublic="copyPublic"/>
 
     <test-case-preview ref="testCasePreview" :loading="rowCaseResult.loading"/>
 
@@ -235,7 +246,7 @@ import {
 } from "@/common/js/tableUtils";
 import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 import PlanStatusTableItem from "@/business/components/track/common/tableItems/plan/PlanStatusTableItem";
-import {getCurrentProjectID} from "@/common/js/utils";
+import {getCurrentProjectID, getCurrentUserId, getCurrentWorkspaceId} from "@/common/js/utils";
 import {getTestTemplate} from "@/network/custom-field-template";
 import {getProjectMember} from "@/network/user";
 import MsTable from "@/business/components/common/components/table/MsTable";
@@ -279,6 +290,7 @@ export default {
   },
   data() {
     return {
+      addPublic: false,
       projectName: "",
       type: TEST_CASE_LIST,
       tableHeaderKey: "TRACK_TEST_CASE",
@@ -340,12 +352,29 @@ export default {
           permissions: ['PROJECT_TRACK_CASE:READ+DELETE']
         },
         {
-          name: this.$t('生成依赖关系'),
+          name: this.$t('test_track.case.generate_dependencies'),
           isXPack: true,
           handleClick: this.generateGraph,
           permissions: ['PROJECT_API_DEFINITION:READ+EDIT_API']
+        },
+        {
+          name: this.$t('test_track.case.batch_add_public'),
+          isXPack: true,
+          handleClick: this.handleBatchAddPublic,
+          permissions: ['PROJECT_API_DEFINITION:READ+EDIT_API'],
         }
       ],
+      publicButtons: [
+        {
+          name: this.$t('test_track.case.batch_copy'),
+          handleClick: this.handleBatchMove,
+          permissions: ['PROJECT_TRACK_CASE:READ+EDIT']
+        }, {
+          name: this.$t('test_track.case.batch_delete_case'),
+          handleClick: this.handleDeleteBatchToPublic,
+          permissions: ['PROJECT_TRACK_CASE:READ+DELETE'],
+        },
+      ],
       trashButtons: [
         {
           name: this.$t('commons.reduction'),
@@ -375,6 +404,25 @@ export default {
           permissions: ['PROJECT_TRACK_CASE:READ+DELETE']
         }
       ],
+      publicOperators: [
+        {
+          tip: this.$t('commons.edit'), icon: "el-icon-edit",
+          exec: this.handleEdit,
+          permissions: ['PROJECT_TRACK_CASE:READ+EDIT'],
+          isDisable: this.isPublic
+        },
+        {
+          tip: this.$t('commons.copy'), icon: "el-icon-copy-document", type: "success",
+          exec: this.handleCopyPublic,
+          permissions: ['PROJECT_TRACK_CASE:READ+COPY']
+        },
+        {
+          tip: this.$t('commons.delete'), icon: "el-icon-delete", type: "danger",
+          exec: this.handleDeleteToGc,
+          permissions: ['PROJECT_TRACK_CASE:READ+DELETE'],
+          isDisable: this.isPublic
+        }
+      ],
       trashOperators: [
         {
           tip: this.$t('commons.reduction'),
@@ -409,6 +457,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    publicEnable: {
+      type: Boolean,
+      default: false,
+    },
   },
   computed: {
     projectId() {
@@ -439,6 +491,9 @@ export default {
     if (this.trashEnable) {
       this.operators = this.trashOperators;
       this.batchButtons = this.trashButtons;
+    } else if (this.publicEnable) {
+      this.operators = this.publicOperators;
+      this.batchButtons = this.publicButtons;
     } else {
       this.operators = this.simpleOperators;
       this.batchButtons = this.simpleButtons;
@@ -493,6 +548,21 @@ export default {
         this.batchButtons = this.simpleButtons;
         this.condition.filters.status = [];
       }
+    },
+    publicEnable() {
+      if (this.publicEnable) {
+        //更改表格按钮
+        this.operators = this.publicOperators;
+        this.batchButtons = this.publicButtons;
+        this.condition.moduleIds = [];
+        initCondition(this.condition, false);
+        this.initTableData();
+      } else {
+        //更改各种按钮
+        this.operators = this.simpleOperators;
+        this.batchButtons = this.simpleButtons;
+        this.condition.filters.status = [];
+      }
     }
   },
   methods: {
@@ -580,7 +650,7 @@ export default {
         // param.planId = this.planId;
         this.condition.planId = this.planId;
       }
-      if (!this.trashEnable) {
+      if (!this.trashEnable && !this.publicEnable) {
         if (this.selectNodeIds && this.selectNodeIds.length > 0) {
           // param.nodeIds = this.selectNodeIds;
           this.condition.nodeIds = this.selectNodeIds;
@@ -625,25 +695,48 @@ export default {
       if (this.projectId) {
         this.condition.projectId = this.projectId;
         this.$emit('setCondition', this.condition);
-        this.page.result = this.$post(this.buildPagePath('/test/case/list'), this.condition, response => {
-          let data = response.data;
-          this.page.total = data.itemCount;
-          this.page.data = data.listObject;
-          this.page.data.forEach(item => {
-            if (item.customFields) {
-              item.customFields = JSON.parse(item.customFields);
-            }
-          });
-          this.page.data.forEach((item) => {
-            try {
-              item.tags = JSON.parse(item.tags);
-            } catch (e) {
-              item.tags = [];
-            }
+        if (this.publicEnable) {
+          this.condition.casePublic = true;
+          this.condition.workspaceId = getCurrentWorkspaceId();
+          this.page.result = this.$post(this.buildPagePath('/test/case/publicList'), this.condition, response => {
+            let data = response.data;
+            this.page.total = data.itemCount;
+            this.page.data = data.listObject;
+            this.page.data.forEach(item => {
+              if (item.customFields) {
+                item.customFields = JSON.parse(item.customFields);
+              }
+            });
+            this.page.data.forEach((item) => {
+              try {
+                item.tags = JSON.parse(item.tags);
+              } catch (e) {
+                item.tags = [];
+              }
+            });
+          })
+        } else {
+          this.page.result = this.$post(this.buildPagePath('/test/case/list'), this.condition, response => {
+            let data = response.data;
+            this.page.total = data.itemCount;
+            this.page.data = data.listObject;
+            this.page.data.forEach(item => {
+              if (item.customFields) {
+                item.customFields = JSON.parse(item.customFields);
+              }
+            });
+            this.page.data.forEach((item) => {
+              try {
+                item.tags = JSON.parse(item.tags);
+              } catch (e) {
+                item.tags = [];
+              }
 
+            });
           });
-        });
+        }
         this.$emit("getTrashList");
+        this.$emit("getPublicList")
       }
     },
     search() {
@@ -664,6 +757,13 @@ export default {
       }
 
     },
+    isPublic(testCase) {
+      if (testCase.maintainer !== getCurrentUserId() || testCase.createUser !== getCurrentUserId()) {
+        return true;
+      } else {
+        return false;
+      }
+    },
     getCase(id) {
       this.$refs.testCasePreview.open();
       this.rowCaseResult.loading = true;
@@ -692,6 +792,10 @@ export default {
         this.$refs.testCasePreview.setData(this.rowCase);
       });
     },
+    handleCopyPublic(testCase) {
+      this.$refs.table.selectIds.push(testCase.id);
+      this.$refs.testBatchMove.open(this.treeNodes, this.$refs.table.selectIds, this.moduleOptions);
+    },
     handleCopy(testCase) {
       this.$get('test/case/get/' + testCase.id, response => {
         let testCase = response.data;
@@ -724,7 +828,11 @@ export default {
         confirmButtonText: this.$t('commons.confirm'),
         callback: (action) => {
           if (action === 'confirm') {
-            this._handleDeleteToGc(testCase);
+            if (this.publicEnable) {
+              this._handleDeletePublic(testCase);
+            } else {
+              this._handleDeleteToGc(testCase);
+            }
           }
         }
       });
@@ -789,6 +897,14 @@ export default {
         this.$success(this.$t('commons.delete_success'));
       });
     },
+    _handleDeletePublic(testCase) {
+      let testCaseId = testCase.id;
+      this.$post('/test/case/deletePublic/' + testCaseId, {}, () => {
+        this.$emit('refreshTable');
+        this.initTableData();
+        this.$success(this.$t('commons.delete_success'));
+      });
+    },
     refresh() {
       this.$refs.table.clear();
       this.$emit('refresh');
@@ -891,6 +1007,34 @@ export default {
       this.getMaintainerOptions();
       this.$refs.batchEdit.open(this.$refs.table.selectRows.size);
     },
+    handleBatchAddPublic() {
+      this.$get('/project/get/' + getCurrentProjectID(), res => {
+        let data = res.data;
+        if (data.casePublic) {
+          let param = {};
+          param.ids = this.$refs.table.selectIds;
+          param.casePublic = true;
+          param.condition = this.condition;
+          this.page.result = this.$post('/test/case/batch/edit', param, () => {
+            this.$success(this.$t('commons.save_success'));
+            this.refresh();
+          });
+        } else {
+          this.$warning(this.$t('test_track.case.public_warning'))
+        }
+      })
+
+    },
+    handleDeleteBatchToPublic() {
+      let param = {};
+      param.ids = this.$refs.table.selectIds;
+      param.casePublic = false;
+      param.condition = this.condition;
+      this.page.result = this.$post('/test/case/batch/edit', param, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.refresh();
+      });
+    },
     handleBatchMove() {
       this.isMoveBatch = true;
       this.$refs.testBatchMove.open(this.treeNodes, this.$refs.table.selectIds, this.moduleOptions);
@@ -914,6 +1058,14 @@ export default {
         this.$refs.testBatchMove.close();
         this.refresh();
       });
+    },
+    copyPublic(param) {
+      param.condition = this.condition;
+      this.page.result = this.$post('/test/case/batch/copy/public', param, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.$refs.testBatchMove.close();
+        this.refresh();
+      });
     }
   }
 };
diff --git a/frontend/src/business/components/track/common/TestCaseNodeTree.vue b/frontend/src/business/components/track/common/TestCaseNodeTree.vue
index ee6f91ca4b..1234cf9efa 100644
--- a/frontend/src/business/components/track/common/TestCaseNodeTree.vue
+++ b/frontend/src/business/components/track/common/TestCaseNodeTree.vue
@@ -24,6 +24,7 @@
           :condition="condition"
           :commands="operators"/>
           <module-trash-button :condition="condition" :total="total" :exe="enableTrash"/>
+        <module-public-button :condition="condition" :public-total="publicTotal" :exe="enablePublic"/>
       </template>
     </ms-node-tree>
     <test-case-import @refreshAll="refreshAll" ref="testCaseImport"/>
@@ -49,11 +50,21 @@ import {buildTree} from "../../api/definition/model/NodeTree";
 import {buildNodePath} from "@/business/components/api/definition/model/NodeTree";
 import {getCurrentProjectID} from "@/common/js/utils";
 import ModuleTrashButton from "@/business/components/api/definition/components/module/ModuleTrashButton";
+import ModulePublicButton from "@/business/components/api/definition/components/module/ModulePublicButton";
 import {getTestCaseNodes} from "@/network/testCase";
 
 export default {
   name: "TestCaseNodeTree",
-  components: {MsSearchBar, TestCaseImport,TestCaseExport, TestCaseCreate, MsNodeTree, NodeEdit,ModuleTrashButton},
+  components: {
+    MsSearchBar,
+    TestCaseImport,
+    TestCaseExport,
+    TestCaseCreate,
+    MsNodeTree,
+    NodeEdit,
+    ModuleTrashButton,
+    ModulePublicButton
+  },
   data() {
     return {
       defaultProps: {
@@ -92,6 +103,7 @@ export default {
     },
     showOperator: Boolean,
     total: Number,
+    publicTotal: Number,
   },
   watch: {
     treeNodes() {
@@ -132,10 +144,14 @@ export default {
     refreshAll() {
       this.$emit('refreshAll');
     },
-    enableTrash(){
+    enableTrash() {
       this.condition.trashEnable = true;
       this.$emit('enableTrash', this.condition.trashEnable);
     },
+    enablePublic() {
+      this.condition.publicEnable = true;
+      this.$emit('enablePublic', this.condition.publicEnable);
+    },
     list() {
       if (this.projectId) {
         this.result = getTestCaseNodes(this.projectId, data => {
diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js
index dabfc9d66e..4f9a9322d9 100644
--- a/frontend/src/common/js/default-table-header.js
+++ b/frontend/src/common/js/default-table-header.js
@@ -184,6 +184,7 @@ export let CUSTOM_TABLE_HEADER = {
     {id: 'reviewStatus', key: '3', label: 'test_track.case.status'},
     {id: 'tags', key: '4', label: 'commons.tag'},
     {id: 'nodePath', key: '5', label: 'test_track.case.module'},
+    {id: 'projectName', key: 'a', label: 'test_track.review.review_project'},
     {id: 'updateTime', key: '6', label: 'commons.update_time'},
     {id: 'createUser', key: '7', label: 'commons.create_user'},
     {id: 'createTime', key: '8', label: 'commons.create_time'},
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index d64471c3b1..6cbcd95e99 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -87,23 +87,25 @@ export default {
     show: 'Show',
     report: 'Report',
     user: 'User',
-    personal_password_info:'Same old and new password',
+    personal_password_info: 'Same old and new password',
     system: 'System',
     personal_setting: 'Personal Setting',
     api_keys: 'API Keys',
-    third_account:'Third Account',
+    third_account: 'Third Account',
     quota: 'Quota',
     test_resource_pool: 'Resource Pool',
     system_setting: 'Settings',
     api: 'API',
-    my_workstation:'MyWorkstation',
+    my_workstation: 'MyWorkstation',
     performance: 'Performance',
+    enable_settings: 'Enable Settings',
+    view_settings: 'View Settings',
     functional: 'Functional test',
     input_content: 'Please enter content',
     create: 'Create',
     edit: 'Edit',
     copy: 'Copy',
-    follow:'Follow',
+    follow: 'Follow',
     refresh: 'Refresh',
     remark: 'Remark',
     delete: 'Delete',
@@ -641,12 +643,15 @@ export default {
     zentao_id: 'Zentao Project ID',
     azureDevops_id: 'AzureDevops Project ID',
     azureDevops_filter_id: 'AzureDevops Filter ID',
-    azureDevops_info:'AzureDevops Information',
-    azureDevops_tip:'This information is the user token information for submitting defects through Azure Devops. If not filled in, the default information configured in the workspace will be used',
+    azureDevops_info: 'AzureDevops Information',
+    azureDevops_tip: 'This information is the user token information for submitting defects through Azure Devops. If not filled in, the default information configured in the workspace will be used',
     manager: 'Manager',
     no_data: 'No Data',
     select: 'Select',
     repeatable: 'Interface definition URL repeatable',
+    repeatable_info: 'Interface definition URL repeatable \n When enabled, the interface definition repeatability check will not check the URL',
+    case_public: 'Common use case library',
+    public_info: 'Start common use case library \n You can use the public use case library data or add your own use cases to the public use case library',
     upload_file_again: 'Upload again',
     code_segment: {
       code_segment: "Custom Code",
@@ -690,7 +695,9 @@ export default {
     group_desc: 'Add user groups and global configuration',
     code_segment_desc: 'Custom code snippet',
     test_case_custom_id: 'Test Case Custom ID',
+    test_case_custom_id_info: 'Test Case Custom ID \n The Case ID defaults to the system self increment ID',
     scenario_custom_id: 'Scenario Custom ID',
+    scenario_custom_id_info: 'Scenario Custom ID \n The scenario Case ID defaults to the system self increment ID',
   },
   member: {
     create: 'Create',
@@ -1020,7 +1027,8 @@ export default {
       }
     },
     definition: {
-      id:'Api Definition ID',
+      api_quick_button: 'Api definition shortcut add button',
+      id: 'Api Definition ID',
       api_title: "Api test",
       case_title: "Test Case",
       doc_title: "DOC",
@@ -1720,6 +1728,7 @@ export default {
       case_type: "Case Type",
       name: "Test case name",
       module: "Module",
+      project: 'Project',
       maintainer: "Maintainer",
       steps: "Steps",
       number: "Number",
@@ -1737,12 +1746,13 @@ export default {
       delete_confirm: "Confirm delete test case",
       delete: "Delete case",
       save_create_continue: "Save and create continue",
+      save_add_public: "Save and add public",
       please_create_project: "No project available, please create the project first",
       create_module_first: "Please create module first",
       relate_test: "Relate test",
       relate_issue: "Relate Issue",
       demand_name_id: "Demand ID/Name",
-      please_select_relate_test: "请选择要关联的测试",
+      please_select_relate_test: "Please select the test to associate",
       relate_test_not_find: 'The associated test does not exist, please check the test case',
       other_relate_test_not_find: 'Associated test name, please go to the third party platform to execute',
       batch_handle: 'Batch processing (select {0} item)',
@@ -1754,6 +1764,10 @@ export default {
       please_select_attr_value: 'Please select the value corresponding to the attribute',
       batch_edit_case: 'Batch editing',
       batch_move_case: 'Batch move',
+      batch_copy: 'Batch copy',
+      batch_add_public: 'Batch add public',
+      public_warning: 'The public library configuration is not enabled',
+      generate_dependencies: 'Generate dependencies',
       batch_delete_case: 'Batch delete',
       batch_unlink: 'Batch Unlink',
       unlink: 'Unlink',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 5886bd103d..5b52182836 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -84,7 +84,7 @@ export default {
     group: '用户组',
     personal_info: '个人信息',
     api_keys: 'API Keys',
-    third_account:'第三方平台账号',
+    third_account: '第三方平台账号',
     quota: '配额管理',
     status: '状态',
     show_all: '显示全部',
@@ -93,18 +93,20 @@ export default {
     user: '用户',
     system: '系统',
     personal_setting: '个人设置',
-    personal_password_info:'新旧密码相同',
+    personal_password_info: '新旧密码相同',
     test_resource_pool: '测试资源池',
     system_setting: '系统设置',
     api: '接口测试',
     performance: '性能测试',
+    enable_settings: '启用设置',
+    view_settings: '显示设置',
     functional: '功能测试',
-    my_workstation:'我的工作台',
+    my_workstation: '我的工作台',
     input_content: '请输入内容',
     create: '新建',
     edit: '编辑',
     copy: '复制',
-    follow:'关注',
+    follow: '关注',
     refresh: '刷新',
     remark: '备注',
     delete: '删除',
@@ -645,14 +647,17 @@ export default {
     zentao_id: 'Zentao项目ID',
     azureDevops_id: 'AzureDevops项目ID',
     azureDevops_filter_id: 'AzureDevops过滤ID',
-    azureDevops_info:'AzureDevops 信息',
-    azureDevops_tip:'该信息为通过Azure Devops提交缺陷的用户令牌信息，若未填写，则使用工作空间中配置的默认信息',
+    azureDevops_info: 'AzureDevops 信息',
+    azureDevops_tip: '该信息为通过Azure Devops提交缺陷的用户令牌信息，若未填写，则使用工作空间中配置的默认信息',
     manager: '项目管理',
     group_permission: '用户组与权限',
     global: '全局',
     no_data: '无数据',
     select: '选择项目',
     repeatable: '接口定义URL可重复',
+    repeatable_info: '接口定义URL可重复 \n 启用后接口定义重复性校验将不校验URL',
+    case_public: '公共用例库',
+    public_info: '启动公共用例库 \n 可以使用公共用例库数据，也可以自行添加用例至公共用例库',
     upload_file_again: '重新上传',
     code_segment: {
       code_segment: "自定义代码片段",
@@ -696,7 +701,9 @@ export default {
     log_desc: '项目全部操作过程',
     code_segment_desc: '自定义代码片段',
     test_case_custom_id: '测试用例自定义ID',
+    test_case_custom_id_info: '测试用例自定义ID \n 用例ID默认为系统自增ID',
     scenario_custom_id: '场景自定义ID',
+    scenario_custom_id_info: '场景自定义ID \n 场景用例ID默认为系统自增ID',
   },
   member: {
     create: '添加成员',
@@ -1029,7 +1036,8 @@ export default {
       }
     },
     definition: {
-      id:'接口定义ID',
+      api_quick_button: '接口定义快捷添加按钮',
+      id: '接口定义ID',
       api_title: "接口列表",
       case_title: "用例列表",
       doc_title: "文档",
@@ -1726,6 +1734,7 @@ export default {
       case_type: "用例类型",
       name: "用例名称",
       module: "所属模块",
+      project: '所属项目',
       maintainer: "维护人",
       steps: "执行步骤",
       number: "编号",
@@ -1743,6 +1752,7 @@ export default {
       delete_confirm: "确认删除测试用例",
       delete: "删除用例",
       save_create_continue: "保存并继续创建",
+      save_add_public: "保存并添加到公共用例库",
       please_create_project: "暂无项目，请先创建项目",
       create_module_first: "请先新建模块",
       relate_test: "关联测试",
@@ -1761,6 +1771,10 @@ export default {
       batch_edit_case: '批量编辑',
       batch_move_case: '批量移动',
       batch_delete_case: '批量删除',
+      batch_copy: '批量复制',
+      batch_add_public: '批量添加到公共用例库',
+      public_warning: '未开启公共库用例配置',
+      generate_dependencies: '生成依赖关系',
       batch_unlink: '批量取消关联',
       unlink: '取消关联',
       project_name: '所属项目',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index f634c4ed6a..fa74d8fa24 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -84,7 +84,7 @@ export default {
     group: '用戶組',
     personal_info: '個人信息',
     api_keys: 'API Keys',
-    third_account:'第三方平台賬號',
+    third_account: '第三方平台賬號',
     quota: '配額管理',
     status: '狀態',
     show_all: '顯示全部',
@@ -93,18 +93,20 @@ export default {
     user: '用戶',
     system: '系統',
     personal_setting: '個人設置',
-    personal_password_info:'新舊密碼相同',
+    personal_password_info: '新舊密碼相同',
     test_resource_pool: '測試資源池',
     system_setting: '系統設置',
     api: '接口測試',
     performance: '性能測試',
+    enable_settings: '啟用設置',
+    view_settings: '顯示設置',
     functional: '功能測試',
     input_content: '請輸入內容',
-    my_workstation:'我的工作台',
+    my_workstation: '我的工作台',
     create: '新建',
     edit: '編輯',
     copy: '復製',
-    follow:'關注',
+    follow: '關注',
     refresh: '刷新',
     remark: '備註',
     delete: '刪除',
@@ -645,12 +647,15 @@ export default {
     zentao_id: 'Zentao項目ID',
     azureDevops_id: 'AzureDevops項目ID',
     azureDevops_filter_id: 'AzureDevops過濾ID',
-    azureDevops_info:'AzureDevops 信息',
-    azureDevops_tip:'該信息為通過Azure Devops提交缺陷的用戶令牌信息，若未填寫，則使用工作空間中配置的默認信息',
+    azureDevops_info: 'AzureDevops 信息',
+    azureDevops_tip: '該信息為通過Azure Devops提交缺陷的用戶令牌信息，若未填寫，則使用工作空間中配置的默認信息',
     manager: '項目管理',
     no_data: '無數據',
     select: '選擇項目',
     repeatable: '接口定義URL可重復',
+    repeatable_info: '接口定義URL可重復 \n 啟用後介面定義重複性校驗將不校驗URL',
+    case_public: '公共用例庫',
+    public_info: '啟動公共用例庫 \n 可以使用公共用例庫數據，也可以自行添加用例至公共用例庫',
     upload_file_again: '重新上傳',
     code_segment: {
       code_segment: "自定義代碼片段",
@@ -694,7 +699,9 @@ export default {
     group_desc: '添加用戶組與許可權以及全局配置',
     code_segment_desc: '自定義代碼片段',
     test_case_custom_id: '測試用例自定義ID',
+    test_case_custom_id_info: '測試用例自定義ID \n 用例ID默認為系統自增ID',
     scenario_custom_id: '場景自定義ID',
+    scenario_custom_id_info: '場景自定義ID \n 場景用例ID默認為系統自增ID',
   },
   member: {
     create: '添加成員',
@@ -1026,7 +1033,8 @@ export default {
       }
     },
     definition: {
-      id:'接口定義ID',
+      api_quick_button: '接口定義快捷添加按鈕',
+      id: '接口定義ID',
       api_title: "接口列表",
       case_title: "用例列表",
       doc_title: "文檔",
@@ -1729,6 +1737,7 @@ export default {
       case_type: "用例類型",
       name: "用例名稱",
       module: "所屬模塊",
+      project: '所屬項目',
       maintainer: "維護人",
       steps: "執行步驟",
       number: "編號",
@@ -1746,6 +1755,7 @@ export default {
       delete_confirm: "確認刪除測試用例",
       delete: "刪除用例",
       save_create_continue: "保存並繼續創建",
+      save_add_public: "保存並添加到公共用例庫",
       please_create_project: "暫無項目，請先創建項目",
       create_module_first: "請先新建模塊",
       relate_test: "關聯測試",
@@ -1763,6 +1773,10 @@ export default {
       please_select_attr_value: '請選擇屬性對應的值',
       batch_edit_case: '批量編輯',
       batch_move_case: '批量移動',
+      batch_copy: '批量複製',
+      generate_dependencies: '生成依賴關係',
+      batch_add_public: '批量添加到公共用例庫',
+      public_warning: '未開啟公共用例庫配寘',
       batch_delete_case: '批量刪除',
       batch_unlink: '批量取消關聯',
       unlink: '取消關聯',

From 0f8792324adefca024978adc4f9bd2a263a632bb Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 19 Nov 2021 19:41:04 +0800
Subject: [PATCH 132/256] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E9=87=8D=E6=9E=84=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=89=A7=E8=A1=8C=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                               |  196 +-
 .../api/cache/TestPlanExecuteInfo.java        |   28 +-
 .../api/cache/TestPlanReportExecuteCatch.java |   65 +-
 .../APIScenarioReportController.java          |   14 -
 .../api/controller/APITestController.java     |    2 +-
 .../controller/ApiAutomationController.java   |   20 +-
 .../controller/ApiDefinitionController.java   |   29 +-
 .../controller/ApiJmeterFileController.java   |    4 +-
 .../api/controller/ApiTestCaseController.java |   14 +-
 ...chRequest.java => ApiCaseEditRequest.java} |    3 +-
 .../api/dto/ApiCaseRunRequest.java            |   20 +
 .../api/dto/ApiScenarioReportDTO.java         |   28 +
 .../io/metersphere/api/dto/JvmInfoDTO.java    |   38 -
 .../metersphere/api/dto/RunModeDataDTO.java   |   23 +-
 .../io/metersphere/api/dto/RunRequest.java    |    4 +-
 .../io/metersphere/api/dto/StepTreeDTO.java   |   31 +
 .../dto/automation/GenScenarioRequest.java    |   45 +
 .../api/dto/automation/RunModeConfig.java     |   27 -
 .../dto/automation/RunScenarioRequest.java    |   14 +-
 .../RunTestPlanScenarioRequest.java           |    3 +-
 .../SchedulePlanScenarioExecuteRequest.java   |    3 +-
 .../automation/parse/HarScenarioParser.java   |    8 +-
 .../definition/BatchRunDefinitionRequest.java |    4 +-
 .../api/dto/definition/RunCaseRequest.java    |    5 +-
 .../dto/definition/RunDefinitionRequest.java  |   13 +-
 .../dto/definition/request/ElementUtil.java   |   12 +
 .../dto/definition/request/MsScenario.java    |    2 +-
 .../dto/definition/request/MsThreadGroup.java |    6 +-
 .../assertions/document/Condition.java        |   18 -
 .../request/assertions/document/Document.java |    2 +
 .../assertions/document/DocumentUtils.java    |    2 +
 .../assertions/document/ElementCondition.java |   24 -
 .../controller/MsTransactionController.java   |    9 +-
 .../definition/request/extract/MsExtract.java |    2 +-
 .../request/processors/MsJSR223Processor.java |    5 -
 .../processors/post/MsJDBCPostProcessor.java  |    7 +-
 .../processors/pre/MsJDBCPreProcessor.java    |    7 +-
 .../request/sampler/MsDubboSampler.java       |    5 -
 .../request/sampler/MsHTTPSamplerProxy.java   |    7 +-
 .../request/sampler/MsJDBCSampler.java        |    8 +-
 .../request/sampler/MsTCPSampler.java         |    4 -
 .../api/exec/api/ApiExecuteService.java       |  273 +++
 .../exec/api/TestPlanApiExecuteService.java   |  295 +++
 .../metersphere/api/exec/queue/ExecTask.java  |   28 +
 .../exec/queue/ExecThreadPoolExecutor.java    |  165 ++
 .../queue/MsRejectedExecutionHandler.java     |   28 +
 .../exec/queue/PoolExecBlockingQueueUtil.java |   58 +
 .../exec/queue/SerialBlockingQueueUtil.java   |   60 +
 .../exec/scenario/ApiScenarioEnvService.java  |  431 +++++
 .../scenario/ApiScenarioExecuteService.java   |  378 ++++
 .../scenario/ApiScenarioParallelService.java  |   63 +
 .../scenario/ApiScenarioSerialService.java    |  137 ++
 .../utils/ApiDefinitionExecResultUtil.java    |   97 +
 .../api/exec/utils/GenerateHashTreeUtil.java  |  134 ++
 .../utils}/NamedThreadFactory.java            |    2 +-
 .../api/jmeter/APIBackendListenerClient.java  |   60 -
 .../api/jmeter/APIBackendListenerHandler.java |   75 +-
 .../api/jmeter/APISingleResultListener.java   |   40 +
 .../api/jmeter/ExecutedHandleSingleton.java   |    2 +-
 .../io/metersphere/api/jmeter/FixedTask.java  |   24 +-
 .../api/jmeter/GroovyLoadJarService.java      |   36 +
 .../metersphere/api/jmeter/JMeterService.java |  210 +--
 .../io/metersphere/api/jmeter/JMeterVars.java |  120 --
 .../api/jmeter/JmeterThreadUtils.java         |    3 +-
 .../metersphere/api/jmeter/LocalRunner.java   |   43 -
 .../metersphere/api/jmeter/MessageCache.java  |   15 +-
 ...ultCollector.java => MsDebugListener.java} |   42 +-
 .../api/jmeter/MsKafkaListener.java           |   39 +-
 .../metersphere/api/jmeter/ReportCounter.java |    4 +-
 .../metersphere/api/jmeter/RequestResult.java |   52 -
 .../api/jmeter/ResourcePoolCalculation.java   |   43 +-
 .../api/jmeter/ResponseAssertionResult.java   |   17 -
 .../api/jmeter/ResponseResult.java            |   32 -
 .../api/jmeter/ScenarioResult.java            |    1 +
 .../io/metersphere/api/jmeter/TestResult.java |    1 +
 .../api/service/APITestService.java           |   66 +-
 .../api/service/ApiAutomationService.java     | 1226 +-----------
 .../ApiDefinitionExecResultService.java       |  382 ++--
 .../api/service/ApiDefinitionService.java     |  134 +-
 .../api/service/ApiJmeterFileService.java     |   75 +-
 .../ApiScenarioReportResultService.java       |   66 +
 .../api/service/ApiScenarioReportService.java |  683 +++----
 .../ApiScenarioReportStructureService.java    |  227 +++
 .../api/service/ApiTestCaseService.java       |  188 +-
 .../api/service/MsResultService.java          |  266 +--
 .../api/service/NodeKafkaService.java         |   26 -
 .../api/service/RemakeReportService.java      |   78 +-
 .../api/service/TcpApiParamService.java       |   34 +-
 .../api/service/TestResultService.java        |  191 +-
 .../service/task/SerialScenarioExecTask.java  |   85 -
 .../base/domain/ApiScenarioReport.java        |    2 +
 .../base/domain/ApiScenarioReportExample.java |   60 +
 .../base/domain/ApiScenarioReportResult.java  |   28 +
 .../ApiScenarioReportResultExample.java       |  720 +++++++
 .../domain/ApiScenarioReportStructure.java    |   15 +
 .../ApiScenarioReportStructureExample.java    |  400 ++++
 .../ApiScenarioReportStructureWithBLOBs.java  |   18 +
 .../base/mapper/ApiScenarioReportMapper.xml   |   31 +-
 .../mapper/ApiScenarioReportResultMapper.java |   36 +
 .../mapper/ApiScenarioReportResultMapper.xml  |  324 ++++
 .../ApiScenarioReportStructureMapper.java     |   38 +
 .../ApiScenarioReportStructureMapper.xml      |  249 +++
 .../commons/constants/ApiRunMode.java         |    2 +-
 .../commons/constants/RunModeConstants.java   |   17 -
 .../metersphere/commons/utils/DateUtils.java  |   20 +-
 .../io/metersphere/config/KafkaConfig.java    |   18 +-
 .../metersphere/config/KafkaProperties.java   |    3 +
 .../controller/CustomFunctionController.java  |    3 +-
 .../java/io/metersphere/dto/RunResultDTO.java |   10 +
 .../job/sechedule/ApiScenarioTestJob.java     |    4 +-
 .../listener/AppStartListener.java            |   20 +-
 .../performance/engine/EngineFactory.java     |    4 +-
 .../service/CustomFunctionService.java        |   18 +-
 .../service/SystemParameterService.java       |    8 +
 .../service/utils/MsClassLoader.java          |   12 +-
 .../metersphere/task/service/TaskService.java |   11 +-
 .../TestCaseReviewScenarioCaseController.java |    3 +-
 .../controller/TestPlanApiCaseController.java |    3 +-
 .../TestPlanScenarioCaseController.java       |   10 +-
 .../testplan/RunBatchTestPlanRequest.java     |    4 +-
 .../TestCaseReviewScenarioCaseService.java    |    5 +-
 .../track/service/TestPlanApiCaseService.java |  380 +---
 .../service/TestPlanLoadCaseService.java      |    6 +-
 .../track/service/TestPlanReportService.java  |    2 +-
 .../service/TestPlanScenarioCaseService.java  |   10 +-
 .../track/service/TestPlanService.java        |  207 +--
 .../track/service/task/SerialApiExecTask.java |   77 -
 .../track/service/utils/SerialExecTask.java   |    6 +-
 .../websocket/ApiReportWebSocket.java         |    8 +-
 .../websocket/ScenarioReportWebSocket.java    |  118 --
 .../websocket/c/to/c/util/MsgDto.java         |    2 +
 backend/src/main/java/io/metersphere/xpack    |    2 +-
 .../java/org/apache/jmeter/NewDriver.java     |  378 ----
 .../jmeter/assertions/JSONPathAssertion.java  |  267 ---
 .../jmeter/assertions/XMLAssertion.java       |  175 --
 .../org/apache/jmeter/config/CSVDataSet.java  |  346 ----
 .../apache/jmeter/config/KeystoreConfig.java  |  174 --
 .../http/sampler/HTTPSamplerProxy.java        |  152 --
 .../apache/jmeter/reporters/ResultAction.java |   98 -
 .../apache/jmeter/samplers/SampleResult.java  | 1654 -----------------
 .../apache/jmeter/threads/JMeterThread.java   | 1181 ------------
 .../jmeter/util/JSR223BeanInfoSupport.java    |   93 -
 .../apache/jmeter/util/JSR223TestElement.java |  399 ----
 .../org/apache/jmeter/util/SSLManager.java    |  378 ----
 .../apache/jorphan/collections/HashTree.java  | 1095 -----------
 .../db/migration/V102__v1.16_release.sql      |   31 +-
 backend/src/main/resources/logback.xml        |  402 ++--
 .../api/automation/report/ApiReportDetail.vue |   72 +-
 .../automation/report/ApiReportViewHeader.vue |    2 +-
 .../automation/report/SysnApiReportDetail.vue |  352 +---
 .../report/components/RequestResult.vue       |    4 +-
 .../report/components/ResponseText.vue        |    4 -
 .../report/components/ScenarioResult.vue      |    4 +-
 .../report/components/ScenarioResults.vue     |   19 +
 .../automation/scenario/EditApiScenario.vue   |  185 +-
 .../api/definition/components/Run.vue         |   37 +-
 .../definition/components/body/ApiBody.vue    |   10 +-
 .../components/debug/DebugJdbcPage.vue        |    4 +-
 .../components/list/ApiCaseSimpleList.vue     |    6 +-
 .../project/menu/function/FunctionRun.vue     |    6 +-
 .../business/components/task/TaskCenter.vue   |    2 +-
 161 files changed, 6288 insertions(+), 11652 deletions(-)
 rename backend/src/main/java/io/metersphere/api/dto/{ApiCaseBatchRequest.java => ApiCaseEditRequest.java} (79%)
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/ApiCaseRunRequest.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/ApiScenarioReportDTO.java
 delete mode 100644 backend/src/main/java/io/metersphere/api/dto/JvmInfoDTO.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/StepTreeDTO.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/automation/GenScenarioRequest.java
 delete mode 100644 backend/src/main/java/io/metersphere/api/dto/automation/RunModeConfig.java
 delete mode 100644 backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/Condition.java
 delete mode 100644 backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/ElementCondition.java
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/queue/ExecTask.java
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/queue/ExecThreadPoolExecutor.java
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/queue/MsRejectedExecutionHandler.java
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/queue/PoolExecBlockingQueueUtil.java
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/queue/SerialBlockingQueueUtil.java
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioExecuteService.java
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioParallelService.java
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/utils/ApiDefinitionExecResultUtil.java
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java
 rename backend/src/main/java/io/metersphere/api/{service/task => exec/utils}/NamedThreadFactory.java (92%)
 delete mode 100644 backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
 create mode 100644 backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java
 create mode 100644 backend/src/main/java/io/metersphere/api/jmeter/GroovyLoadJarService.java
 delete mode 100644 backend/src/main/java/io/metersphere/api/jmeter/JMeterVars.java
 delete mode 100644 backend/src/main/java/io/metersphere/api/jmeter/LocalRunner.java
 rename backend/src/main/java/io/metersphere/api/jmeter/{MsResultCollector.java => MsDebugListener.java} (75%)
 delete mode 100644 backend/src/main/java/io/metersphere/api/jmeter/RequestResult.java
 delete mode 100644 backend/src/main/java/io/metersphere/api/jmeter/ResponseAssertionResult.java
 delete mode 100644 backend/src/main/java/io/metersphere/api/jmeter/ResponseResult.java
 create mode 100644 backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
 create mode 100644 backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java
 delete mode 100644 backend/src/main/java/io/metersphere/api/service/NodeKafkaService.java
 delete mode 100644 backend/src/main/java/io/metersphere/api/service/task/SerialScenarioExecTask.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportResult.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportResultExample.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportStructure.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportStructureExample.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportStructureWithBLOBs.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportResultMapper.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportResultMapper.xml
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportStructureMapper.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportStructureMapper.xml
 delete mode 100644 backend/src/main/java/io/metersphere/commons/constants/RunModeConstants.java
 create mode 100644 backend/src/main/java/io/metersphere/dto/RunResultDTO.java
 delete mode 100644 backend/src/main/java/io/metersphere/track/service/task/SerialApiExecTask.java
 delete mode 100644 backend/src/main/java/io/metersphere/websocket/ScenarioReportWebSocket.java
 delete mode 100644 backend/src/main/java/org/apache/jmeter/NewDriver.java
 delete mode 100644 backend/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
 delete mode 100644 backend/src/main/java/org/apache/jmeter/assertions/XMLAssertion.java
 delete mode 100644 backend/src/main/java/org/apache/jmeter/config/CSVDataSet.java
 delete mode 100644 backend/src/main/java/org/apache/jmeter/config/KeystoreConfig.java
 delete mode 100644 backend/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java
 delete mode 100644 backend/src/main/java/org/apache/jmeter/reporters/ResultAction.java
 delete mode 100644 backend/src/main/java/org/apache/jmeter/samplers/SampleResult.java
 delete mode 100644 backend/src/main/java/org/apache/jmeter/threads/JMeterThread.java
 delete mode 100644 backend/src/main/java/org/apache/jmeter/util/JSR223BeanInfoSupport.java
 delete mode 100644 backend/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
 delete mode 100644 backend/src/main/java/org/apache/jmeter/util/SSLManager.java
 delete mode 100644 backend/src/main/java/org/apache/jorphan/collections/HashTree.java

diff --git a/backend/pom.xml b/backend/pom.xml
index 64044a1cf0..bdb14b6932 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -17,11 +17,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <shiro.version>1.6.0</shiro.version>
         <java.version>1.8</java.version>
-        <jmeter.version>5.4.1</jmeter.version>
-        <nacos.version>1.1.3</nacos.version>
-        <dubbo.version>2.7.8</dubbo.version>
-        <groovy.version>3.0.8</groovy.version>
-        <metersphere-jmeter-functions.version>1.4</metersphere-jmeter-functions.version>
     </properties>
 
     <dependencies>
@@ -120,11 +115,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>4.1</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
@@ -154,23 +144,12 @@
             <artifactId>spring-boot-starter-rsocket</artifactId>
         </dependency>
 
-        <!-- jmeter -->
-
         <dependency>
-            <groupId>org.apache.jmeter</groupId>
-            <artifactId>ApacheJMeter_http</artifactId>
-            <version>${jmeter.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-slf4j-impl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>xstream</artifactId>
-                    <groupId>com.thoughtworks.xstream</groupId>
-                </exclusion>
-            </exclusions>
+            <groupId>io.metersphere</groupId>
+            <artifactId>ms-jmeter-core</artifactId>
+            <version>1.0.0</version>
         </dependency>
+
         <!--   排除jmeter中的 xstream 解决bug     -->
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
@@ -178,103 +157,6 @@
             <version>1.4.18</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.python</groupId>
-            <artifactId>jython-standalone</artifactId>
-            <version>2.7.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.jmeter</groupId>
-            <artifactId>ApacheJMeter_functions</artifactId>
-            <version>${jmeter.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.jmeter</groupId>
-            <artifactId>ApacheJMeter_jdbc</artifactId>
-            <version>${jmeter.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.jmeter</groupId>
-            <artifactId>ApacheJMeter_tcp</artifactId>
-            <version>${jmeter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jmeter</groupId>
-            <artifactId>ApacheJMeter_java</artifactId>
-            <version>${jmeter.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.metersphere</groupId>
-            <artifactId>metersphere-jmeter-functions</artifactId>
-            <version>${metersphere-jmeter-functions.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <version>7.4.1.jre8</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>42.2.14</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <version>19.7.0.0</version>
-        </dependency>
-
-        <!-- Zookeeper -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo</artifactId>
-            <version>${dubbo.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-            <version>3.4.14</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-log4j12</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-framework</artifactId>
-            <version>4.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-recipes</artifactId>
-            <version>4.0.1</version>
-        </dependency>
-
-        <!-- nacos -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-registry-nacos</artifactId>
-            <version>${dubbo.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-api</artifactId>
-            <version>${nacos.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-            <version>${nacos.version}</version>
-        </dependency>
         <!-- easyexcel -->
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -288,11 +170,6 @@
             <version>0.0.7</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.metersphere</groupId>
-            <artifactId>jmeter-plugins-dubbo</artifactId>
-            <version>2.7.13</version>
-        </dependency>
 
         <!-- LDAP Module -->
         <dependency>
@@ -307,11 +184,6 @@
             <version>2.0.24</version>
         </dependency>
 
-        <!-- ApacheJMeter_core scope 是 runtime，这里去掉scope -->
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-jsr223</artifactId>
-        </dependency>
 
         <!-- 执行 js 代码依赖 -->
         <dependency>
@@ -355,17 +227,6 @@
             <version>2.24</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20171018</version>
-        </dependency>
-        <!--钉钉sdk-->
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>alibaba-dingtalk-service-sdk</artifactId>
-            <version>1.0.1</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -382,53 +243,7 @@
             <artifactId>kubernetes-client</artifactId>
             <version>4.13.0</version>
         </dependency>
-        <!-- 添加jmeter包支持导入的jmx能正常执行 -->
-        <dependency>
-            <groupId>org.apache.jmeter</groupId>
-            <artifactId>ApacheJMeter_bolt</artifactId>
-            <version>${jmeter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jmeter</groupId>
-            <artifactId>ApacheJMeter_jms</artifactId>
-            <version>${jmeter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jmeter</groupId>
-            <artifactId>ApacheJMeter_ftp</artifactId>
-            <version>${jmeter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jmeter</groupId>
-            <artifactId>ApacheJMeter_junit</artifactId>
-            <version>${jmeter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jmeter</groupId>
-            <artifactId>ApacheJMeter_ldap</artifactId>
-            <version>${jmeter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jmeter</groupId>
-            <artifactId>ApacheJMeter_mail</artifactId>
-            <version>${jmeter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jmeter</groupId>
-            <artifactId>ApacheJMeter_components</artifactId>
-            <version>${jmeter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jmeter</groupId>
-            <artifactId>ApacheJMeter_native</artifactId>
-            <version>${jmeter.version}</version>
-        </dependency>
-        <!-- 添加jmeter包支持导入的jmx能正常执行 -->
-        <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
-            <version>2.4.0</version>
-        </dependency>
+
         <dependency>
             <groupId>org.java-websocket</groupId>
             <artifactId>Java-WebSocket</artifactId>
@@ -475,7 +290,6 @@
             <groupId>com.google.guava</groupId>
             <version>31.0.1-jre</version>
         </dependency>
-
     </dependencies>
 
     <build>
diff --git a/backend/src/main/java/io/metersphere/api/cache/TestPlanExecuteInfo.java b/backend/src/main/java/io/metersphere/api/cache/TestPlanExecuteInfo.java
index d6c3cf79dc..e6dce87fb5 100644
--- a/backend/src/main/java/io/metersphere/api/cache/TestPlanExecuteInfo.java
+++ b/backend/src/main/java/io/metersphere/api/cache/TestPlanExecuteInfo.java
@@ -1,14 +1,16 @@
 package io.metersphere.api.cache;
 
 
+import io.metersphere.api.exec.queue.ExecThreadPoolExecutor;
+import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.jmeter.JmeterThreadUtils;
-import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.base.domain.ApiScenarioReport;
 import io.metersphere.base.domain.ApiScenarioReportExample;
 import io.metersphere.base.mapper.ApiScenarioReportMapper;
 import io.metersphere.commons.constants.TestPlanApiExecuteStatus;
 import io.metersphere.commons.constants.TestPlanResourceType;
 import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.utils.LoggerUtil;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.collections.CollectionUtils;
@@ -88,13 +90,16 @@ public class TestPlanExecuteInfo {
         this.isApiCaseAllExecuted = true;
         this.isScenarioAllExecuted = true;
         this.isLoadCaseAllExecuted = true;
-
+        boolean isQueue = false;
         for (String result : apiCaseExecInfo.values()) {
             if (StringUtils.equalsIgnoreCase(result, TestPlanApiExecuteStatus.RUNNING.name())) {
                 unFinishedCount++;
                 if (this.isApiCaseAllExecuted) {
                     this.isApiCaseAllExecuted = false;
                 }
+                if (!isQueue) {
+                    isQueue = CommonBeanFactory.getBean(ExecThreadPoolExecutor.class).check(apiCaseExecuteThreadMap.get(result));
+                }
             }
         }
         for (String result : apiScenarioCaseExecInfo.values()) {
@@ -103,6 +108,9 @@ public class TestPlanExecuteInfo {
                 if (this.isScenarioAllExecuted) {
                     isScenarioAllExecuted = false;
                 }
+                if (!isQueue) {
+                    isQueue = CommonBeanFactory.getBean(ExecThreadPoolExecutor.class).check(apiScenarioThreadMap.get(result));
+                }
             }
         }
         for (String result : loadCaseExecInfo.values()) {
@@ -117,6 +125,12 @@ public class TestPlanExecuteInfo {
             lastUnFinishedNumCount = unFinishedCount;
             lastFinishedNumCountTime = System.currentTimeMillis();
         }
+
+        if (lastUnFinishedNumCount == unFinishedCount && isQueue) {
+            LoggerUtil.info("执行的报告还在队列中，重置超时时间");
+            lastUnFinishedNumCount = unFinishedCount;
+            lastFinishedNumCountTime = System.currentTimeMillis();
+        }
         return unFinishedCount;
     }
 
@@ -180,7 +194,7 @@ public class TestPlanExecuteInfo {
             }
 
             if (apiCaseExecuteThreadMap.containsKey(resourceId)) {
-                MessageCache.executionQueue.remove(apiCaseExecuteThreadMap.get(resourceId));
+                SerialBlockingQueueUtil.remove(apiCaseExecuteThreadMap.get(resourceId));
             }
         }
 
@@ -197,16 +211,16 @@ public class TestPlanExecuteInfo {
             }
 
             if (apiScenarioThreadMap.containsKey(resourceId)) {
-                MessageCache.executionQueue.remove(apiScenarioThreadMap.get(resourceId));
+                SerialBlockingQueueUtil.remove(apiScenarioThreadMap.get(resourceId));
             }
         }
-        if(CollectionUtils.isNotEmpty(updateScenarioReportList)){
+        if (CollectionUtils.isNotEmpty(updateScenarioReportList)) {
             ApiScenarioReportMapper apiScenarioReportMapper = CommonBeanFactory.getBean(ApiScenarioReportMapper.class);
             ApiScenarioReportExample example = new ApiScenarioReportExample();
             example.createCriteria().andIdIn(updateScenarioReportList).andStatusEqualTo("Running");
             ApiScenarioReport report = new ApiScenarioReport();
             report.setStatus("Error");
-            apiScenarioReportMapper.updateByExampleSelective(report,example);
+            apiScenarioReportMapper.updateByExampleSelective(report, example);
         }
 
         for (Map.Entry<String, String> entry : loadCaseExecInfo.entrySet()) {
@@ -220,7 +234,7 @@ public class TestPlanExecuteInfo {
             }
 
             if (loadCaseReportIdMap.containsKey(resourceId)) {
-                MessageCache.executionQueue.remove(loadCaseReportIdMap.get(resourceId));
+                SerialBlockingQueueUtil.remove(loadCaseReportIdMap.get(resourceId));
             }
         }
 
diff --git a/backend/src/main/java/io/metersphere/api/cache/TestPlanReportExecuteCatch.java b/backend/src/main/java/io/metersphere/api/cache/TestPlanReportExecuteCatch.java
index d1161c02fb..7971a362de 100644
--- a/backend/src/main/java/io/metersphere/api/cache/TestPlanReportExecuteCatch.java
+++ b/backend/src/main/java/io/metersphere/api/cache/TestPlanReportExecuteCatch.java
@@ -1,9 +1,11 @@
 package io.metersphere.api.cache;
 
+import io.metersphere.commons.constants.TestPlanApiExecuteStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,84 +19,95 @@ public class TestPlanReportExecuteCatch {
     private TestPlanReportExecuteCatch() {
     }
 
-    public synchronized static void addApiTestPlanExecuteInfo(String reportId,String creator,
-              Map<String, String> apiCaseExecInfo, Map<String, String> apiScenarioCaseExecInfo, Map<String, String> loadCaseExecInfo) {
-        if(testPlanReportMap == null){
+    public synchronized static void addApiTestPlanExecuteInfo(String reportId, String creator,
+                                                              Map<String, String> apiCaseExecInfo, Map<String, String> apiScenarioCaseExecInfo, Map<String, String> loadCaseExecInfo) {
+        if (testPlanReportMap == null) {
             testPlanReportMap = new HashMap<>();
         }
-        if(apiCaseExecInfo == null){
+        if (apiCaseExecInfo == null) {
             apiCaseExecInfo = new HashMap<>();
         }
-        if(apiScenarioCaseExecInfo == null){
+        if (apiScenarioCaseExecInfo == null) {
             apiScenarioCaseExecInfo = new HashMap<>();
         }
-        if(loadCaseExecInfo == null){
+        if (loadCaseExecInfo == null) {
             loadCaseExecInfo = new HashMap<>();
         }
 
-        TestPlanExecuteInfo executeInfo = new TestPlanExecuteInfo(reportId,creator);
+        TestPlanExecuteInfo executeInfo = new TestPlanExecuteInfo(reportId, creator);
         executeInfo.setApiCaseExecInfo(apiCaseExecInfo);
         executeInfo.setApiScenarioCaseExecInfo(apiScenarioCaseExecInfo);
         executeInfo.setLoadCaseExecInfo(loadCaseExecInfo);
-        testPlanReportMap.put(reportId,executeInfo);
+        testPlanReportMap.put(reportId, executeInfo);
     }
 
-    public synchronized static String getCreator(String reportId){
-        if(testPlanReportMap != null && testPlanReportMap.containsKey(reportId)){
+    public synchronized static String getCreator(String reportId) {
+        if (testPlanReportMap != null && testPlanReportMap.containsKey(reportId)) {
             return testPlanReportMap.get(reportId).getCreator();
-        }else {
+        } else {
             return null;
         }
     }
 
-    public synchronized static boolean containsReport(String reportId){
+    public synchronized static boolean containsReport(String reportId) {
         return testPlanReportMap != null && testPlanReportMap.containsKey(reportId);
     }
 
     public synchronized static void updateApiTestPlanExecuteInfo(String reportId,
                                                                  Map<String, String> apiCaseExecInfo, Map<String, String> apiScenarioCaseExecInfo, Map<String, String> loadCaseExecInfo) {
-        if(testPlanReportMap != null && testPlanReportMap.containsKey(reportId)){
-            testPlanReportMap.get(reportId).updateExecuteInfo(apiCaseExecInfo,apiScenarioCaseExecInfo,loadCaseExecInfo);
+        if (testPlanReportMap != null && testPlanReportMap.containsKey(reportId)) {
+            testPlanReportMap.get(reportId).updateExecuteInfo(apiCaseExecInfo, apiScenarioCaseExecInfo, loadCaseExecInfo);
         }
     }
 
     public synchronized static void updateTestPlanThreadInfo(String reportId,
                                                              Map<String, String> apiCaseExecResultInfo, Map<String, String> apiScenarioCaseExecResultInfo, Map<String, String> loadCaseExecResultInfo) {
-        if(testPlanReportMap != null && testPlanReportMap.containsKey(reportId)){
-            testPlanReportMap.get(reportId).updateThreadResult(apiCaseExecResultInfo,apiScenarioCaseExecResultInfo,loadCaseExecResultInfo);
+        if (testPlanReportMap != null && testPlanReportMap.containsKey(reportId)) {
+            testPlanReportMap.get(reportId).updateThreadResult(apiCaseExecResultInfo, apiScenarioCaseExecResultInfo, loadCaseExecResultInfo);
         }
     }
 
     public synchronized static void updateTestPlanReport(String reportId,
-                                                             Map<String, String> apiCaseExecResultInfo, Map<String, String> apiScenarioCaseExecResultInfo) {
-        if(testPlanReportMap != null && testPlanReportMap.containsKey(reportId)){
-            testPlanReportMap.get(reportId).updateReport(apiCaseExecResultInfo,apiScenarioCaseExecResultInfo);
+                                                         Map<String, String> apiCaseExecResultInfo, Map<String, String> apiScenarioCaseExecResultInfo) {
+        if (testPlanReportMap != null && testPlanReportMap.containsKey(reportId)) {
+            testPlanReportMap.get(reportId).updateReport(apiCaseExecResultInfo, apiScenarioCaseExecResultInfo);
         }
     }
 
 
-
-    public static TestPlanExecuteInfo getTestPlanExecuteInfo(String reportId){
+    public static TestPlanExecuteInfo getTestPlanExecuteInfo(String reportId) {
         return testPlanReportMap.get(reportId);
     }
 
     public static synchronized void setReportDataCheckResult(String reportId, boolean result) {
-        if(testPlanReportMap.containsKey(reportId)){
+        if (testPlanReportMap.containsKey(reportId)) {
             testPlanReportMap.get(reportId).setReportDataInDataBase(result);
         }
     }
 
-    public static synchronized void remove(String reportId){
-        if(testPlanReportMap.containsKey(reportId)){
+    public static synchronized void remove(String reportId) {
+        if (testPlanReportMap.containsKey(reportId)) {
             testPlanReportMap.get(reportId).finishAllTask();
             testPlanReportMap.remove(reportId);
         }
     }
 
     public static void finishAllTask(String planReportId) {
-        testPlanLog.info("ReportId["+planReportId+"] finish task!");
-        if(testPlanReportMap.containsKey(planReportId)){
+        testPlanLog.info("ReportId[" + planReportId + "] finish task!");
+        if (testPlanReportMap.containsKey(planReportId)) {
             testPlanReportMap.get(planReportId).finishAllTask();
         }
     }
+
+    public static void set(String planReportId, List<String> executeErrorList) {
+        if (TestPlanReportExecuteCatch.containsReport(planReportId)) {
+            if (!executeErrorList.isEmpty()) {
+                Map<String, String> executeErrorMap = new HashMap<>();
+                for (String id : executeErrorList) {
+                    executeErrorMap.put(id, TestPlanApiExecuteStatus.FAILD.name());
+                }
+                TestPlanReportExecuteCatch.updateApiTestPlanExecuteInfo(planReportId, executeErrorMap, null, null);
+            }
+        }
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/controller/APIScenarioReportController.java b/backend/src/main/java/io/metersphere/api/controller/APIScenarioReportController.java
index 39f1794a9b..5466365ef6 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APIScenarioReportController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APIScenarioReportController.java
@@ -7,9 +7,7 @@ import io.metersphere.api.dto.DeleteAPIReportRequest;
 import io.metersphere.api.dto.QueryAPIReportRequest;
 import io.metersphere.api.dto.automation.APIScenarioReportResult;
 import io.metersphere.api.dto.automation.ExecuteType;
-import io.metersphere.api.jmeter.TestResult;
 import io.metersphere.api.service.ApiScenarioReportService;
-import io.metersphere.api.service.MsResultService;
 import io.metersphere.commons.constants.NoticeConstants;
 import io.metersphere.commons.constants.OperLogConstants;
 import io.metersphere.commons.utils.PageUtils;
@@ -27,8 +25,6 @@ public class APIScenarioReportController {
 
     @Resource
     private ApiScenarioReportService apiReportService;
-    @Resource
-    private MsResultService resultService;
 
     @GetMapping("/get/{reportId}")
     public APIScenarioReportResult get(@PathVariable String reportId) {
@@ -63,14 +59,4 @@ public class APIScenarioReportController {
         apiReportService.deleteAPIReportBatch(request);
     }
 
-    @GetMapping("/get/real/{reportId}")
-    public TestResult getRealReport(@PathVariable String reportId) {
-        return resultService.getResult(reportId);
-    }
-
-    @GetMapping("/remove/real/{reportId}")
-    public void removeRealReport(@PathVariable String reportId) {
-        resultService.delete(reportId);
-    }
-
 }
diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
index 2138b532c3..08c9759c77 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -340,7 +340,7 @@ public class APITestController {
     @GetMapping("/faliureCaseAboutTestPlan/{projectId}/{limitNumber}")
     public List<ExecutedCaseInfoDTO> faliureCaseAboutTestPlan(@PathVariable String projectId, @PathVariable int limitNumber) {
 
-        List<ExecutedCaseInfoResult> selectDataList = apiDefinitionExecResultService.findFaliureCaseInfoByProjectIDAndLimitNumberInSevenDays(projectId, limitNumber);
+        List<ExecutedCaseInfoResult> selectDataList = apiDefinitionExecResultService.findFailureCaseInfoByProjectIDAndLimitNumberInSevenDays(projectId, limitNumber);
 
         List<ExecutedCaseInfoDTO> returnList = new ArrayList<>(limitNumber);
 
diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
index 85837936f6..ac60bcbc9f 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
@@ -6,7 +6,7 @@ import io.metersphere.api.dto.*;
 import io.metersphere.api.dto.automation.*;
 import io.metersphere.api.dto.automation.parse.ScenarioImport;
 import io.metersphere.api.dto.definition.RunDefinitionRequest;
-import io.metersphere.api.jmeter.LocalRunner;
+import io.metersphere.api.exec.queue.ExecThreadPoolExecutor;
 import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.api.service.ApiAutomationService;
 import io.metersphere.base.domain.ApiScenario;
@@ -17,6 +17,8 @@ import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.controller.request.ResetOrderRequest;
 import io.metersphere.controller.request.ScheduleRequest;
+import io.metersphere.dto.MsExecResponseDTO;
+import io.metersphere.jmeter.LocalRunner;
 import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.notice.annotation.SendNotice;
 import io.metersphere.task.service.TaskService;
@@ -42,6 +44,8 @@ public class ApiAutomationController {
     private ApiAutomationService apiAutomationService;
     @Resource
     private TaskService taskService;
+    @Resource
+    private ExecThreadPoolExecutor execThreadPoolExecutor;
 
     @PostMapping("/list/{goPage}/{pageSize}")
     @RequiresPermissions("PROJECT_API_SCENARIO:READ")
@@ -208,7 +212,7 @@ public class ApiAutomationController {
 
     @PostMapping(value = "/run")
     @MsAuditLog(module = "api_automation", type = OperLogConstants.EXECUTE, content = "#msClass.getLogDetails(#request.ids)", msClass = ApiAutomationService.class)
-    public String run(@RequestBody RunScenarioRequest request) {
+    public List<MsExecResponseDTO> run(@RequestBody RunScenarioRequest request) {
         if (!StringUtils.equals(request.getExecuteType(), ExecuteType.Saved.name())) {
             request.setExecuteType(ExecuteType.Completed.name());
         }
@@ -219,7 +223,7 @@ public class ApiAutomationController {
 
     @PostMapping(value = "/run/jenkins")
     @MsAuditLog(module = "api_automation", type = OperLogConstants.EXECUTE, content = "#msClass.getLogDetails(#request.id)", msClass = ApiAutomationService.class)
-    public String runByJenkins(@RequestBody RunScenarioRequest request) {
+    public List<MsExecResponseDTO> runByJenkins(@RequestBody RunScenarioRequest request) {
         request.setExecuteType(ExecuteType.Saved.name());
         request.setTriggerMode(TriggerMode.API.name());
         request.setRunMode(ApiRunMode.SCENARIO.name()); // 回退
@@ -228,7 +232,7 @@ public class ApiAutomationController {
 
     @PostMapping(value = "/run/batch")
     @MsAuditLog(module = "api_automation", type = OperLogConstants.EXECUTE, content = "#msClass.getLogDetails(#request.ids)", msClass = ApiAutomationService.class)
-    public String runBatch(@RequestBody RunScenarioRequest request) {
+    public List<MsExecResponseDTO> runBatch(@RequestBody RunScenarioRequest request) {
         request.setExecuteType(ExecuteType.Saved.name());
         request.setTriggerMode(TriggerMode.BATCH.name());
         request.setRunMode(ApiRunMode.SCENARIO.name());
@@ -283,7 +287,7 @@ public class ApiAutomationController {
     }
 
     @PostMapping(value = "/genPerformanceTestJmx")
-    public JmxInfoDTO genPerformanceTestJmx(@RequestBody RunScenarioRequest runRequest) throws Exception {
+    public JmxInfoDTO genPerformanceTestJmx(@RequestBody GenScenarioRequest runRequest) throws Exception {
         runRequest.setExecuteType(ExecuteType.Completed.name());
         return apiAutomationService.genPerformanceTestJmx(runRequest);
     }
@@ -327,6 +331,7 @@ public class ApiAutomationController {
     public void stop(@PathVariable String reportId) {
         if (StringUtils.isNotEmpty(reportId)) {
             MessageCache.caseExecResourceLock.remove(reportId);
+            execThreadPoolExecutor.removeQueue(reportId);
             new LocalRunner().stop(reportId);
         }
     }
@@ -373,9 +378,10 @@ public class ApiAutomationController {
     public List<String> getFollows(@PathVariable String scenarioId) {
         return apiAutomationService.getFollows(scenarioId);
     }
+
     @PostMapping("/update/follows/{scenarioId}")
-    public void saveFollows(@PathVariable String scenarioId,@RequestBody List<String> follows) {
-        apiAutomationService.saveFollows(scenarioId,follows);
+    public void saveFollows(@PathVariable String scenarioId, @RequestBody List<String> follows) {
+        apiAutomationService.saveFollows(scenarioId, follows);
     }
 }
 
diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
index 8088c0ea2d..a5d5104840 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
@@ -12,6 +12,7 @@ import io.metersphere.api.dto.definition.request.assertions.document.DocumentEle
 import io.metersphere.api.dto.scenario.Body;
 import io.metersphere.api.dto.swaggerurl.SwaggerTaskResult;
 import io.metersphere.api.dto.swaggerurl.SwaggerUrlRequest;
+import io.metersphere.api.exec.queue.ExecThreadPoolExecutor;
 import io.metersphere.api.service.ApiDefinitionService;
 import io.metersphere.api.service.ApiTestEnvironmentService;
 import io.metersphere.api.service.EsbApiParamService;
@@ -28,6 +29,7 @@ import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.controller.request.ResetOrderRequest;
 import io.metersphere.controller.request.ScheduleRequest;
+import io.metersphere.dto.MsExecResponseDTO;
 import io.metersphere.dto.RelationshipEdgeDTO;
 import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.notice.annotation.SendNotice;
@@ -57,6 +59,8 @@ public class ApiDefinitionController {
     private EsbImportService esbImportService;
     @Resource
     private ApiTestEnvironmentService apiTestEnvironmentService;
+    @Resource
+    private ExecThreadPoolExecutor execThreadPoolExecutor;
 
     @PostMapping("/list/{goPage}/{pageSize}")
     @RequiresPermissions("PROJECT_API_DEFINITION:READ")
@@ -174,22 +178,18 @@ public class ApiDefinitionController {
 
     @PostMapping(value = "/run/debug", consumes = {"multipart/form-data"})
     @MsAuditLog(module = "api_definition", type = OperLogConstants.DEBUG, title = "#request.name", project = "#request.projectId")
-    public String runDebug(@RequestPart("request") RunDefinitionRequest request, @RequestPart(value = "files", required = false) List<MultipartFile> bodyFiles) {
+    public MsExecResponseDTO runDebug(@RequestPart("request") RunDefinitionRequest request, @RequestPart(value = "files", required = false) List<MultipartFile> bodyFiles) {
+        request.setDebug(true);
         return apiDefinitionService.run(request, bodyFiles);
     }
 
     @PostMapping(value = "/run", consumes = {"multipart/form-data"})
     @MsAuditLog(module = "api_definition", type = OperLogConstants.EXECUTE, sourceId = "#request.id", title = "#request.name", project = "#request.projectId")
-    public String run(@RequestPart("request") RunDefinitionRequest request, @RequestPart(value = "files", required = false) List<MultipartFile> bodyFiles) {
+    public MsExecResponseDTO run(@RequestPart("request") RunDefinitionRequest request, @RequestPart(value = "files", required = false) List<MultipartFile> bodyFiles) {
         request.setReportId(null);
         return apiDefinitionService.run(request, bodyFiles);
     }
 
-    @GetMapping("/report/get/{testId}/{test}")
-    public APIReportResult getResult(@PathVariable String testId, @PathVariable String test) {
-        return apiDefinitionService.getResult(testId, test);
-    }
-
     @GetMapping("/report/getReport/{testId}")
     public APIReportResult getReport(@PathVariable String testId) {
         return apiDefinitionService.getDbResult(testId);
@@ -333,18 +333,23 @@ public class ApiDefinitionController {
     }
 
     @GetMapping("/getDocument/{id}/{type}")
-    public List<DocumentElement> getDocument(@PathVariable String id,@PathVariable String type) {
-        return apiDefinitionService.getDocument(id,type);
+    public List<DocumentElement> getDocument(@PathVariable String id, @PathVariable String type) {
+        return apiDefinitionService.getDocument(id, type);
     }
 
     @PostMapping("/jsonGenerator")
     public List<DocumentElement> jsonGenerator(@RequestBody Body body) {
-        return JSONToDocumentUtils.getDocument(body.getRaw(),body.getType());
+        return JSONToDocumentUtils.getDocument(body.getRaw(), body.getType());
     }
 
     @PostMapping("/update/follows/{definitionId}")
-    public void saveFollows(@PathVariable String definitionId,@RequestBody List<String> follows) {
-        apiDefinitionService.saveFollows(definitionId,follows);
+    public void saveFollows(@PathVariable String definitionId, @RequestBody List<String> follows) {
+        apiDefinitionService.saveFollows(definitionId, follows);
     }
 
+
+    @GetMapping("/getWorkerQueue")
+    public String getWorkerQueue() {
+        return execThreadPoolExecutor.getWorkerQueue();
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiJmeterFileController.java b/backend/src/main/java/io/metersphere/api/controller/ApiJmeterFileController.java
index 9fd3402508..3ac47493ef 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiJmeterFileController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiJmeterFileController.java
@@ -47,8 +47,8 @@ public class ApiJmeterFileController {
     }
 
     @GetMapping("download")
-    public ResponseEntity<byte[]> downloadJmeterFiles(@RequestParam("testId") String testId, @RequestParam("reportId") String reportId, @RequestParam("runMode") String runMode, @RequestParam("testPlanScenarioId") String testPlanScenarioId) {
-        byte[] bytes = apiJmeterFileService.downloadJmeterFiles(runMode, testId, reportId, testPlanScenarioId);
+    public ResponseEntity<byte[]> downloadJmeterFiles(@RequestParam("testId") String testId, @RequestParam("reportId") String reportId, @RequestParam("runMode") String runMode) {
+        byte[] bytes = apiJmeterFileService.downloadJmeterFiles(runMode, testId, reportId);
         return ResponseEntity.ok()
                 .contentType(MediaType.parseMediaType("application/octet-stream"))
                 .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + testId + ".zip\"")
diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java b/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java
index 689588aa63..da79ff5da1 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java
@@ -2,7 +2,8 @@ package io.metersphere.api.controller;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import io.metersphere.api.dto.ApiCaseBatchRequest;
+import io.metersphere.api.dto.ApiCaseEditRequest;
+import io.metersphere.api.dto.ApiCaseRunRequest;
 import io.metersphere.api.dto.DeleteCheckResult;
 import io.metersphere.api.dto.definition.*;
 import io.metersphere.api.service.ApiTestCaseService;
@@ -14,6 +15,7 @@ import io.metersphere.commons.constants.OperLogConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.controller.request.ResetOrderRequest;
+import io.metersphere.dto.MsExecResponseDTO;
 import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.notice.annotation.SendNotice;
 import io.metersphere.track.request.testcase.ApiCaseRelevanceRequest;
@@ -128,7 +130,7 @@ public class ApiTestCaseController {
     }
 
     @PostMapping("/batch/edit")
-    public void editApiBath(@RequestBody ApiCaseBatchRequest request) {
+    public void editApiBath(@RequestBody ApiCaseEditRequest request) {
         apiTestCaseService.editApiBath(request);
     }
 
@@ -189,13 +191,13 @@ public class ApiTestCaseController {
 
     @PostMapping(value = "/batch/run")
     @MsAuditLog(module = "api_definition_case", type = OperLogConstants.EXECUTE, content = "#msClass.getLogDetails(#request.caseId)", msClass = ApiTestCaseService.class)
-    public void batchRun(@RequestBody ApiCaseBatchRequest request) {
+    public void batchRun(@RequestBody ApiCaseRunRequest request) {
         apiTestCaseService.batchRun(request);
     }
 
     @PostMapping(value = "/jenkins/run")
     @MsAuditLog(module = "api_definition_case", type = OperLogConstants.EXECUTE, content = "#msClass.getLogDetails(#request.caseId)", msClass = ApiTestCaseService.class)
-    public String jenkinsRun(@RequestBody RunCaseRequest request) {
+    public MsExecResponseDTO jenkinsRun(@RequestBody RunCaseRequest request) {
         return apiTestCaseService.jenkinsRun(request);
     }
 
@@ -211,7 +213,7 @@ public class ApiTestCaseController {
     }
 
     @PostMapping("/update/follows/{testId}")
-    public void saveFollows(@PathVariable String testId,@RequestBody List<String> follows) {
-        apiTestCaseService.saveFollows(testId,follows);
+    public void saveFollows(@PathVariable String testId, @RequestBody List<String> follows) {
+        apiTestCaseService.saveFollows(testId, follows);
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/ApiCaseBatchRequest.java b/backend/src/main/java/io/metersphere/api/dto/ApiCaseEditRequest.java
similarity index 79%
rename from backend/src/main/java/io/metersphere/api/dto/ApiCaseBatchRequest.java
rename to backend/src/main/java/io/metersphere/api/dto/ApiCaseEditRequest.java
index 45004d0ab0..a51412d129 100644
--- a/backend/src/main/java/io/metersphere/api/dto/ApiCaseBatchRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/ApiCaseEditRequest.java
@@ -2,7 +2,6 @@ package io.metersphere.api.dto;
 
 import io.metersphere.api.dto.definition.ApiTestCaseRequest;
 import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
-import io.metersphere.controller.request.BaseQueryRequest;
 import io.metersphere.controller.request.OrderRequest;
 import lombok.Getter;
 import lombok.Setter;
@@ -11,7 +10,7 @@ import java.util.List;
 
 @Getter
 @Setter
-public class ApiCaseBatchRequest extends ApiTestCaseWithBLOBs {
+public class ApiCaseEditRequest extends ApiTestCaseWithBLOBs {
     private List<String> ids;
     private List<OrderRequest> orders;
     private String projectId;
diff --git a/backend/src/main/java/io/metersphere/api/dto/ApiCaseRunRequest.java b/backend/src/main/java/io/metersphere/api/dto/ApiCaseRunRequest.java
new file mode 100644
index 0000000000..81323d7bf5
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/ApiCaseRunRequest.java
@@ -0,0 +1,20 @@
+package io.metersphere.api.dto;
+
+import io.metersphere.api.dto.definition.ApiTestCaseRequest;
+import io.metersphere.controller.request.OrderRequest;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class ApiCaseRunRequest {
+    private String reportId;
+    private String id;
+    private List<String> ids;
+    private List<OrderRequest> orders;
+    private String projectId;
+    private String environmentId;
+    private ApiTestCaseRequest condition;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/ApiScenarioReportDTO.java b/backend/src/main/java/io/metersphere/api/dto/ApiScenarioReportDTO.java
new file mode 100644
index 0000000000..db69e10074
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/ApiScenarioReportDTO.java
@@ -0,0 +1,28 @@
+package io.metersphere.api.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ApiScenarioReportDTO {
+
+    private List<StepTreeDTO> steps;
+
+    private String console;
+    private long totalTime;
+    private long total;
+    private long error;
+
+    private long scenarioTotal;
+    private long scenarioError;
+    private long scenarioSuccess;
+
+    private long scenarioStepTotal;
+    private long scenarioStepError;
+    private long scenarioStepSuccess;
+
+    private long totalAssertions = 0;
+    private long passAssertions = 0;
+
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/JvmInfoDTO.java b/backend/src/main/java/io/metersphere/api/dto/JvmInfoDTO.java
deleted file mode 100644
index e87aa935e3..0000000000
--- a/backend/src/main/java/io/metersphere/api/dto/JvmInfoDTO.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.metersphere.api.dto;
-
-import io.metersphere.base.domain.TestResource;
-import lombok.Data;
-
-@Data
-public class JvmInfoDTO {
-    /**
-     * JVM内存的空闲空间为
-     */
-    private long vmFree;
-    /**
-     * JVM内存已用的空间为
-     */
-    private long vmUse;
-
-    private long vmTotal;
-    /**
-     * JVM总内存空间为
-     */
-    private long vmMax;
-
-    private int totalThread;
-
-    private TestResource testResource;
-
-    public JvmInfoDTO() {
-
-    }
-
-    public JvmInfoDTO(long vmTotal, long vmFree, long vmMax, long vmUse, int totalThread) {
-        this.vmFree = vmFree;
-        this.vmTotal = vmTotal;
-        this.vmMax = vmMax;
-        this.vmUse = vmUse;
-        this.totalThread = totalThread;
-    }
-}
diff --git a/backend/src/main/java/io/metersphere/api/dto/RunModeDataDTO.java b/backend/src/main/java/io/metersphere/api/dto/RunModeDataDTO.java
index 3f4c9d557f..8122fc93c2 100644
--- a/backend/src/main/java/io/metersphere/api/dto/RunModeDataDTO.java
+++ b/backend/src/main/java/io/metersphere/api/dto/RunModeDataDTO.java
@@ -14,6 +14,8 @@ public class RunModeDataDTO {
     private HashTree hashTree;
     // 测试场景/测试用例
     private String testId;
+
+    private String reportId;
     // 初始化报告
     private APIScenarioReportResult report;
     //
@@ -21,28 +23,13 @@ public class RunModeDataDTO {
 
     private Map<String, String> planEnvMap;
 
-    private String debugReportId;
-
-    public RunModeDataDTO(){
+    public RunModeDataDTO() {
 
     }
-    public RunModeDataDTO(String testId, String apiCaseId) {
-        this.testId = testId;
-        this.apiCaseId = apiCaseId;
-    }
 
-    public RunModeDataDTO(HashTree hashTree, String apiCaseId) {
-        this.hashTree = hashTree;
-        this.apiCaseId = apiCaseId;
-    }
-
-    public RunModeDataDTO(String testId, APIScenarioReportResult report) {
-        this.testId = testId;
-        this.report = report;
-    }
-
-    public RunModeDataDTO(HashTree hashTree, APIScenarioReportResult report) {
+    public RunModeDataDTO(HashTree hashTree, APIScenarioReportResult report, String testId) {
         this.hashTree = hashTree;
         this.report = report;
+        this.testId = testId;
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/RunRequest.java b/backend/src/main/java/io/metersphere/api/dto/RunRequest.java
index dd379f77c2..9b572d02cf 100644
--- a/backend/src/main/java/io/metersphere/api/dto/RunRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/RunRequest.java
@@ -1,6 +1,6 @@
 package io.metersphere.api.dto;
 
-import io.metersphere.api.dto.automation.RunModeConfig;
+import io.metersphere.dto.RunModeConfigDTO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -20,7 +20,7 @@ public class RunRequest {
     private String jmx;
     // 集成报告ID
     private String amassReport;
-    private RunModeConfig config;
+    private RunModeConfigDTO config;
 
     private Map<String, Object> kafka;
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/StepTreeDTO.java b/backend/src/main/java/io/metersphere/api/dto/StepTreeDTO.java
new file mode 100644
index 0000000000..8d8b6aba1c
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/StepTreeDTO.java
@@ -0,0 +1,31 @@
+package io.metersphere.api.dto;
+
+import io.metersphere.dto.RequestResult;
+import lombok.Data;
+import org.apache.commons.lang.StringUtils;
+
+import java.util.LinkedList;
+import java.util.List;
+
+@Data
+public class StepTreeDTO {
+    private String type;
+    private int index;
+    private String resourceId;
+    private String label;
+    private RequestResult value;
+
+    private List<StepTreeDTO> children;
+
+    public StepTreeDTO() {
+
+    }
+
+    public StepTreeDTO(String name, String resourceId, String type, int index) {
+        this.label = StringUtils.isNotEmpty(name) ? name : type;
+        this.resourceId = resourceId;
+        this.type = type;
+        this.index = index;
+        this.children = new LinkedList<>();
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/GenScenarioRequest.java b/backend/src/main/java/io/metersphere/api/dto/automation/GenScenarioRequest.java
new file mode 100644
index 0000000000..8d36b3dc13
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/GenScenarioRequest.java
@@ -0,0 +1,45 @@
+package io.metersphere.api.dto.automation;
+
+import io.metersphere.base.domain.ApiScenarioWithBLOBs;
+import io.metersphere.dto.RunModeConfigDTO;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+public class GenScenarioRequest extends ApiScenarioWithBLOBs {
+
+    private String reportId;
+
+    private String environmentId;
+
+    private String triggerMode;
+
+    private String executeType;
+
+    private String runMode;
+
+    /**测试情景和测试计划的关联ID*/
+    private String planScenarioId;
+
+    private List<String> planCaseIds;
+
+    private List<String> ids;
+
+    private String reportUserID;
+
+    private Map<String, String> scenarioTestPlanIdMap;
+
+    private ApiScenarioRequest condition;
+
+    private RunModeConfigDTO config;
+
+    private boolean isTestPlanScheduleJob = false;
+    //生成测试报告：当isTestPlanScheduleJob为ture时使用
+    private String testPlanReportId;
+
+    private String requestOriginator;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/RunModeConfig.java b/backend/src/main/java/io/metersphere/api/dto/automation/RunModeConfig.java
deleted file mode 100644
index 63c311c11c..0000000000
--- a/backend/src/main/java/io/metersphere/api/dto/automation/RunModeConfig.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.metersphere.api.dto.automation;
-
-import io.metersphere.api.dto.JvmInfoDTO;
-import io.metersphere.dto.BaseSystemConfigDTO;
-import lombok.Data;
-
-import java.util.Map;
-import java.util.List;
-
-@Data
-public class RunModeConfig {
-    private String mode;
-    private String reportType;
-    private String reportName;
-    private String reportId;
-    private String amassReport;
-    private boolean onSampleError;
-    private String resourcePoolId;
-    private BaseSystemConfigDTO baseInfo;
-    private List<JvmInfoDTO> testResources;
-    /**
-     * 运行环境
-     */
-    private Map<String, String> envMap;
-    private String environmentType;
-    private String environmentGroupId;
-}
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/RunScenarioRequest.java b/backend/src/main/java/io/metersphere/api/dto/automation/RunScenarioRequest.java
index 03b42b9ab7..62f555d156 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/RunScenarioRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/RunScenarioRequest.java
@@ -1,6 +1,6 @@
 package io.metersphere.api.dto.automation;
 
-import io.metersphere.base.domain.ApiScenarioWithBLOBs;
+import io.metersphere.dto.RunModeConfigDTO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,19 +9,24 @@ import java.util.Map;
 
 @Setter
 @Getter
-public class RunScenarioRequest extends ApiScenarioWithBLOBs {
+public class RunScenarioRequest {
+    private String id;
 
     private String reportId;
 
     private String environmentId;
 
+    private String projectId;
+
     private String triggerMode;
 
     private String executeType;
 
     private String runMode;
 
-    /**测试情景和测试计划的关联ID*/
+    /**
+     * 测试情景和测试计划的关联ID
+     */
     private String planScenarioId;
 
     private List<String> planCaseIds;
@@ -34,9 +39,10 @@ public class RunScenarioRequest extends ApiScenarioWithBLOBs {
 
     private ApiScenarioRequest condition;
 
-    private RunModeConfig config;
+    private RunModeConfigDTO config;
 
     private boolean isTestPlanScheduleJob = false;
+
     //生成测试报告：当isTestPlanScheduleJob为ture时使用
     private String testPlanReportId;
 
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/RunTestPlanScenarioRequest.java b/backend/src/main/java/io/metersphere/api/dto/automation/RunTestPlanScenarioRequest.java
index 5c323bb28f..f92a7fe4df 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/RunTestPlanScenarioRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/RunTestPlanScenarioRequest.java
@@ -1,6 +1,7 @@
 package io.metersphere.api.dto.automation;
 
 import io.metersphere.base.domain.ApiScenarioWithBLOBs;
+import io.metersphere.dto.RunModeConfigDTO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -36,5 +37,5 @@ public class RunTestPlanScenarioRequest extends ApiScenarioWithBLOBs {
 
     private TestPlanScenarioRequest condition;
 
-    private RunModeConfig config;
+    private RunModeConfigDTO config;
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/SchedulePlanScenarioExecuteRequest.java b/backend/src/main/java/io/metersphere/api/dto/automation/SchedulePlanScenarioExecuteRequest.java
index 7a6df6dce4..09cbddedbd 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/SchedulePlanScenarioExecuteRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/SchedulePlanScenarioExecuteRequest.java
@@ -1,5 +1,6 @@
 package io.metersphere.api.dto.automation;
 
+import io.metersphere.dto.RunModeConfigDTO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -36,5 +37,5 @@ public class SchedulePlanScenarioExecuteRequest {
 
     private String testPlanReportId;
 
-    private RunModeConfig config;
+    private RunModeConfigDTO config;
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/HarScenarioParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/HarScenarioParser.java
index f9b5173e5e..da2543a827 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/HarScenarioParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/HarScenarioParser.java
@@ -5,16 +5,16 @@ import io.metersphere.api.dto.ApiTestImportRequest;
 import io.metersphere.api.dto.definition.parse.har.HarUtils;
 import io.metersphere.api.dto.definition.parse.har.model.*;
 import io.metersphere.api.dto.definition.request.MsScenario;
-import io.metersphere.plugin.core.MsTestElement;
 import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
 import io.metersphere.api.dto.scenario.KeyValue;
-import io.metersphere.api.jmeter.RequestResult;
-import io.metersphere.api.jmeter.ResponseResult;
 import io.metersphere.api.parse.HarScenarioAbstractParser;
 import io.metersphere.base.domain.ApiScenarioModule;
 import io.metersphere.base.domain.ApiScenarioWithBLOBs;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.dto.RequestResult;
+import io.metersphere.dto.ResponseResult;
+import io.metersphere.plugin.core.MsTestElement;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -89,7 +89,7 @@ public class HarScenarioParser extends HarScenarioAbstractParser<ScenarioImport>
         scenario.setHashTree(results);
     }
 
-private RequestResult getRequestResult(MsHTTPSamplerProxy samplerProxy,HarEntry harEntry) {
+private RequestResult getRequestResult(MsHTTPSamplerProxy samplerProxy, HarEntry harEntry) {
     HarRequest request = harEntry.request;
     HarResponse response = harEntry.response;
 
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/BatchRunDefinitionRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/BatchRunDefinitionRequest.java
index 396b922bf8..bdeb5ca2b2 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/BatchRunDefinitionRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/BatchRunDefinitionRequest.java
@@ -1,6 +1,6 @@
 package io.metersphere.api.dto.definition;
 
-import io.metersphere.api.dto.automation.RunModeConfig;
+import io.metersphere.dto.RunModeConfigDTO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -15,7 +15,7 @@ public class BatchRunDefinitionRequest {
 
     private String triggerMode;
 
-    private RunModeConfig config;
+    private RunModeConfigDTO config;
 
     //测试计划报告ID。 测试计划执行时使用
     private String planReportId;
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/RunCaseRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/RunCaseRequest.java
index 01d5383c61..cf0050f0dc 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/RunCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/RunCaseRequest.java
@@ -8,11 +8,12 @@ import lombok.Setter;
 @Setter
 @Getter
 public class RunCaseRequest {
+    private String reportId;
+
+    private String id;
 
     private String caseId;
 
-    private String reportId;
-
     private String runMode;
 
     private String environmentId;
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/RunDefinitionRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/RunDefinitionRequest.java
index b519be9d91..8ca56e0aaa 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/RunDefinitionRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/RunDefinitionRequest.java
@@ -1,22 +1,21 @@
 package io.metersphere.api.dto.definition;
 
-import io.metersphere.api.dto.automation.RunModeConfig;
 import io.metersphere.api.dto.definition.response.Response;
+import io.metersphere.dto.RunModeConfigDTO;
 import io.metersphere.plugin.core.MsTestElement;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 
 import java.util.List;
 import java.util.Map;
 
-@Setter
-@Getter
+@Data
 public class RunDefinitionRequest {
-
     private String id;
 
     private String reportId;
 
+    private boolean isDebug;
+
     private boolean saved;
 
     private String requestId;
@@ -43,7 +42,7 @@ public class RunDefinitionRequest {
 
     List<String> scenarioFileIds;
 
-    private RunModeConfig config;
+    private RunModeConfigDTO config;
 
     private Map<String, String> environmentMap;
 
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
index c5f0ad1cb0..ef8259ad12 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
@@ -38,6 +38,7 @@ import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jorphan.collections.HashTree;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.net.URL;
 import java.util.*;
@@ -474,4 +475,15 @@ public class ElementUtil {
             element.setHashTree(targetHashTree);
         }
     }
+
+    public static String hashTreeToString(HashTree hashTree) {
+        try (ByteArrayOutputStream bas = new ByteArrayOutputStream()) {
+            SaveService.saveTree(hashTree, bas);
+            return bas.toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+            io.metersphere.plugin.core.utils.LogUtil.warn("HashTree error, can't log jmx scenarioDefinition");
+        }
+        return null;
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
index 40e34da394..e92aa95b13 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
@@ -17,9 +17,9 @@ import io.metersphere.api.service.ApiTestEnvironmentService;
 import io.metersphere.base.domain.ApiScenarioWithBLOBs;
 import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
 import io.metersphere.commons.constants.MsTestElementConstants;
-import io.metersphere.commons.constants.RunModeConstants;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.FileUtils;
+import io.metersphere.constants.RunModeConstants;
 import io.metersphere.plugin.core.MsParameter;
 import io.metersphere.plugin.core.MsTestElement;
 import io.metersphere.service.EnvironmentGroupProjectService;
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsThreadGroup.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsThreadGroup.java
index 19c7562f0d..5ff7baec02 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsThreadGroup.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsThreadGroup.java
@@ -12,8 +12,8 @@ import io.metersphere.api.dto.mockconfig.MockConfigStaticData;
 import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
 import io.metersphere.api.service.ApiTestEnvironmentService;
 import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
-import io.metersphere.commons.constants.RunModeConstants;
 import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.constants.RunModeConstants;
 import io.metersphere.plugin.core.MsParameter;
 import io.metersphere.plugin.core.MsTestElement;
 import lombok.Data;
@@ -63,7 +63,7 @@ public class MsThreadGroup extends MsTestElement {
             boolean isConnScenarioPost = false;
             //获取projectConfig
             String projectId = this.checkProjectId(hashTree);
-            this.checkEnviromentConfig(projectId,config,hashTree);
+            this.checkEnvironmentConfig(projectId,config,hashTree);
             if (config.getConfig() != null) {
                 if (config.isEffective(projectId)) {
                     EnvironmentConfig environmentConfig = config.getConfig().get(projectId);
@@ -154,7 +154,7 @@ public class MsThreadGroup extends MsTestElement {
         return projectId;
     }
 
-    private void checkEnviromentConfig(String projectId, ParameterConfig config, List<MsTestElement> hashTree) {
+    private void checkEnvironmentConfig(String projectId, ParameterConfig config, List<MsTestElement> hashTree) {
         //检查全局前后置脚本
         if (config.getConfig() == null) {
             // 单独接口执行
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/Condition.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/Condition.java
deleted file mode 100644
index 8a4743cc24..0000000000
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/Condition.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.metersphere.api.dto.definition.request.assertions.document;
-
-import lombok.Data;
-
-@Data
-public class Condition {
-    private String key;
-    private Object value;
-
-    public Condition() {
-
-    }
-
-    public Condition(String key, Object value) {
-        this.key = key;
-        this.value = value;
-    }
-}
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/Document.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/Document.java
index c8b02b3e69..ff5241f6b5 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/Document.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/Document.java
@@ -1,6 +1,8 @@
 package io.metersphere.api.dto.definition.request.assertions.document;
 
 import com.alibaba.fastjson.JSON;
+import io.metersphere.vo.Condition;
+import io.metersphere.vo.ElementCondition;
 import lombok.Data;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/DocumentUtils.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/DocumentUtils.java
index 71ad3bda99..73c792063c 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/DocumentUtils.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/DocumentUtils.java
@@ -2,6 +2,8 @@ package io.metersphere.api.dto.definition.request.assertions.document;
 
 import com.alibaba.fastjson.JSON;
 import com.google.gson.Gson;
+import io.metersphere.vo.Condition;
+import io.metersphere.vo.ElementCondition;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.util.JMeterUtils;
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/ElementCondition.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/ElementCondition.java
deleted file mode 100644
index 389d1e2f78..0000000000
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/ElementCondition.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.metersphere.api.dto.definition.request.assertions.document;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class ElementCondition {
-    private boolean include;
-    private boolean typeVerification;
-    private boolean arrayVerification;
-    List<Condition> conditions;
-
-    public ElementCondition() {
-
-    }
-
-    public ElementCondition(boolean include, boolean typeVerification, boolean arrayVerification, List<Condition> conditions) {
-        this.include = include;
-        this.typeVerification = typeVerification;
-        this.arrayVerification = arrayVerification;
-        this.conditions = conditions;
-    }
-}
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsTransactionController.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsTransactionController.java
index 4237766d02..ca3a74f610 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsTransactionController.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsTransactionController.java
@@ -1,9 +1,7 @@
 package io.metersphere.api.dto.definition.request.controller;
 
 import com.alibaba.fastjson.annotation.JSONType;
-import io.metersphere.api.dto.definition.request.ElementUtil;
 import io.metersphere.api.dto.definition.request.ParameterConfig;
-import io.metersphere.commons.constants.DelimiterConstants;
 import io.metersphere.plugin.core.MsParameter;
 import io.metersphere.plugin.core.MsTestElement;
 import lombok.Data;
@@ -37,11 +35,6 @@ public class MsTransactionController extends MsTestElement {
         }
 
         TransactionController transactionController = transactionController();
-        String name = ElementUtil.getParentName(this.getParent());
-        if (StringUtils.isNotEmpty(name) && !config.isOperating()) {
-            transactionController.setName(this.getName() + DelimiterConstants.SEPARATOR.toString() + name);
-        }
-
         final HashTree groupTree = tree.add(transactionController);
         if (CollectionUtils.isNotEmpty(hashTree)) {
             hashTree.forEach(el -> {
@@ -58,7 +51,7 @@ public class MsTransactionController extends MsTestElement {
         if (StringUtils.isEmpty(this.getName())) {
             this.setName(getLabelName());
         }
-        transactionController.setName(this.getName());
+        transactionController.setName("Transaction=" + this.getName());
         transactionController.setProperty(TestElement.TEST_CLASS, TransactionController.class.getName());
         transactionController.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TransactionControllerGui"));
         transactionController.setGenerateParentSample(generateParentSample);
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/extract/MsExtract.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/extract/MsExtract.java
index 3eca2e7a45..0929a35507 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/extract/MsExtract.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/extract/MsExtract.java
@@ -66,7 +66,7 @@ public class MsExtract extends MsTestElement {
             shell.setProperty(TestElement.TEST_CLASS, JSR223PostProcessor.class.getName());
             shell.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
             shell.setProperty("cacheKey", false);
-            shell.setProperty("script", "io.metersphere.api.jmeter.JMeterVars.addVars(prev.hashCode(),vars," + "\"" + extract.toString() + "\"" + ");");
+            shell.setProperty("script", "io.metersphere.utils.JMeterVars.addVars(prev.hashCode(),vars," + "\"" + extract.toString() + "\"" + ");");
             samplerHashTree.add(shell);
         }
     }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java
index e57162f749..dc93cc95e7 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java
@@ -7,7 +7,6 @@ import io.metersphere.api.dto.RunningParamKeys;
 import io.metersphere.api.dto.definition.request.ElementUtil;
 import io.metersphere.api.dto.definition.request.ParameterConfig;
 import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
-import io.metersphere.commons.constants.DelimiterConstants;
 import io.metersphere.plugin.core.MsParameter;
 import io.metersphere.plugin.core.MsTestElement;
 import lombok.Data;
@@ -71,10 +70,6 @@ public class MsJSR223Processor extends MsTestElement {
         } else {
             processor.setName("JSR223Processor");
         }
-        String name = ElementUtil.getParentName(this.getParent());
-        if (StringUtils.isNotEmpty(name) && !config.isOperating()) {
-            processor.setName(this.getName() + DelimiterConstants.SEPARATOR.toString() + name);
-        }
         processor.setProperty("MS-ID", this.getId());
         processor.setProperty("MS-RESOURCE-ID", this.getResourceId()+ "_" + this.getIndex());
         List<String> id_names = new LinkedList<>();
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJDBCPostProcessor.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJDBCPostProcessor.java
index 597a01dc30..87d6c02787 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJDBCPostProcessor.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJDBCPostProcessor.java
@@ -18,12 +18,11 @@ import io.metersphere.api.service.ApiTestEnvironmentService;
 import io.metersphere.base.domain.ApiDefinitionWithBLOBs;
 import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
 import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
-import io.metersphere.commons.constants.DelimiterConstants;
 import io.metersphere.commons.constants.MsTestElementConstants;
-import io.metersphere.commons.constants.RunModeConstants;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.constants.RunModeConstants;
 import io.metersphere.plugin.core.MsParameter;
 import io.metersphere.plugin.core.MsTestElement;
 import lombok.Data;
@@ -244,10 +243,6 @@ public class MsJDBCPostProcessor extends MsTestElement {
         JDBCPostProcessor jdbcPostProcessor = new JDBCPostProcessor();
         jdbcPostProcessor.setEnabled(this.isEnable());
         jdbcPostProcessor.setName(this.getName() == null? "JDBCPostProcessor" : this.getName());
-        String name = ElementUtil.getParentName(this.getParent());
-        if (StringUtils.isNotEmpty(name) && !config.isOperating()) {
-            jdbcPostProcessor.setName(this.getName() + DelimiterConstants.SEPARATOR.toString() + name);
-        }
         jdbcPostProcessor.setProperty(TestElement.TEST_CLASS, JDBCPostProcessor.class.getName());
         jdbcPostProcessor.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
         jdbcPostProcessor.setProperty("MS-ID", this.getId());
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJDBCPreProcessor.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJDBCPreProcessor.java
index b15026579e..655440b6a3 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJDBCPreProcessor.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJDBCPreProcessor.java
@@ -18,12 +18,11 @@ import io.metersphere.api.service.ApiTestEnvironmentService;
 import io.metersphere.base.domain.ApiDefinitionWithBLOBs;
 import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
 import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
-import io.metersphere.commons.constants.DelimiterConstants;
 import io.metersphere.commons.constants.MsTestElementConstants;
-import io.metersphere.commons.constants.RunModeConstants;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.constants.RunModeConstants;
 import io.metersphere.plugin.core.MsParameter;
 import io.metersphere.plugin.core.MsTestElement;
 import lombok.Data;
@@ -244,10 +243,6 @@ public class MsJDBCPreProcessor extends MsTestElement {
         JDBCPreProcessor jdbcPreProcessor = new JDBCPreProcessor();
         jdbcPreProcessor.setEnabled(this.isEnable());
         jdbcPreProcessor.setName(this.getName() == null? "JDBCPreProcessor" : this.getName());
-        String name = ElementUtil.getParentName(this.getParent());
-        if (StringUtils.isNotEmpty(name) && !config.isOperating()) {
-            jdbcPreProcessor.setName(this.getName() + DelimiterConstants.SEPARATOR.toString() + name);
-        }
         jdbcPreProcessor.setProperty(TestElement.TEST_CLASS, JDBCPreProcessor.class.getName());
         jdbcPreProcessor.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
         jdbcPreProcessor.setProperty("MS-ID", this.getId());
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsDubboSampler.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsDubboSampler.java
index 9eb6d9ecaf..94ad610b83 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsDubboSampler.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsDubboSampler.java
@@ -21,7 +21,6 @@ import io.metersphere.api.service.ApiDefinitionService;
 import io.metersphere.api.service.ApiTestCaseService;
 import io.metersphere.base.domain.ApiDefinitionWithBLOBs;
 import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
-import io.metersphere.commons.constants.DelimiterConstants;
 import io.metersphere.commons.constants.MsTestElementConstants;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.LogUtil;
@@ -151,10 +150,6 @@ public class MsDubboSampler extends MsTestElement {
         DubboSample sampler = new DubboSample();
         sampler.setEnabled(this.isEnable());
         sampler.setName(this.getName());
-        String name = ElementUtil.getParentName(this.getParent());
-        if (StringUtils.isNotEmpty(name) && !config.isOperating()) {
-            sampler.setName(this.getName() + DelimiterConstants.SEPARATOR.toString() + name);
-        }
         sampler.setProperty(TestElement.TEST_CLASS, DubboSample.class.getName());
         sampler.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("DubboSampleGui"));
         sampler.setProperty("MS-ID", this.getId());
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
index 3c957206e5..9b4ee6c025 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
@@ -33,13 +33,12 @@ import io.metersphere.base.domain.ApiDefinitionWithBLOBs;
 import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
 import io.metersphere.base.domain.TestPlanApiCase;
 import io.metersphere.commons.constants.ConditionType;
-import io.metersphere.commons.constants.DelimiterConstants;
 import io.metersphere.commons.constants.MsTestElementConstants;
-import io.metersphere.commons.constants.RunModeConstants;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.FileUtils;
 import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.constants.RunModeConstants;
 import io.metersphere.jmeter.utils.ScriptEngineUtils;
 import io.metersphere.plugin.core.MsParameter;
 import io.metersphere.plugin.core.MsTestElement;
@@ -196,10 +195,6 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         if (StringUtils.isEmpty(this.getName())) {
             sampler.setName("HTTPSamplerProxy");
         }
-        String name = ElementUtil.getParentName(this.getParent());
-        if (StringUtils.isNotEmpty(name) && !config.isOperating()) {
-            sampler.setName(this.getName() + DelimiterConstants.SEPARATOR.toString() + name);
-        }
         sampler.setProperty(TestElement.TEST_CLASS, HTTPSamplerProxy.class.getName());
         sampler.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("HttpTestSampleGui"));
         sampler.setProperty("MS-ID", this.getId());
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
index fcaf9f56cc..b89cc64f27 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
@@ -20,12 +20,11 @@ import io.metersphere.api.service.ApiTestEnvironmentService;
 import io.metersphere.base.domain.ApiDefinitionWithBLOBs;
 import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
 import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
-import io.metersphere.commons.constants.DelimiterConstants;
 import io.metersphere.commons.constants.MsTestElementConstants;
-import io.metersphere.commons.constants.RunModeConstants;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.constants.RunModeConstants;
 import io.metersphere.plugin.core.MsParameter;
 import io.metersphere.plugin.core.MsTestElement;
 import lombok.Data;
@@ -39,7 +38,6 @@ import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jorphan.collections.HashTree;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -300,10 +298,6 @@ public class MsJDBCSampler extends MsTestElement {
         JDBCSampler sampler = new JDBCSampler();
         sampler.setEnabled(this.isEnable());
         sampler.setName(this.getName());
-        String name = ElementUtil.getParentName(this.getParent());
-        if (StringUtils.isNotEmpty(name) && !config.isOperating()) {
-            sampler.setName(this.getName() + DelimiterConstants.SEPARATOR.toString() + name);
-        }
         sampler.setProperty(TestElement.TEST_CLASS, JDBCSampler.class.getName());
         sampler.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
         sampler.setProperty("MS-ID", this.getId());
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
index c2a7ad5cab..82b6c52f23 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
@@ -243,10 +243,6 @@ public class MsTCPSampler extends MsTestElement {
         TCPSampler tcpSampler = new TCPSampler();
         tcpSampler.setEnabled(this.isEnable());
         tcpSampler.setName(this.getName());
-        String name = ElementUtil.getParentName(this.getParent());
-        if (StringUtils.isNotEmpty(name) && !config.isOperating()) {
-            tcpSampler.setName(this.getName() + DelimiterConstants.SEPARATOR.toString() + name);
-        }
         tcpSampler.setProperty("MS-ID", this.getId());
         String indexPath = this.getIndex();
         tcpSampler.setProperty("MS-RESOURCE-ID", this.getResourceId() + "_" + ElementUtil.getFullIndexPath(this.getParent(), indexPath));
diff --git a/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java b/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java
new file mode 100644
index 0000000000..687fa06dad
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java
@@ -0,0 +1,273 @@
+package io.metersphere.api.exec.api;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.metersphere.api.dto.ApiCaseRunRequest;
+import io.metersphere.api.dto.definition.ApiTestCaseRequest;
+import io.metersphere.api.dto.definition.RunCaseRequest;
+import io.metersphere.api.dto.definition.RunDefinitionRequest;
+import io.metersphere.api.dto.definition.request.ElementUtil;
+import io.metersphere.api.dto.definition.request.MsTestPlan;
+import io.metersphere.api.dto.definition.request.MsThreadGroup;
+import io.metersphere.api.dto.definition.request.ParameterConfig;
+import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
+import io.metersphere.api.dto.scenario.Body;
+import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
+import io.metersphere.api.exec.utils.ApiDefinitionExecResultUtil;
+import io.metersphere.api.jmeter.JMeterService;
+import io.metersphere.api.jmeter.MessageCache;
+import io.metersphere.api.service.ApiTestEnvironmentService;
+import io.metersphere.api.service.TcpApiParamService;
+import io.metersphere.base.domain.*;
+import io.metersphere.base.mapper.ApiDefinitionExecResultMapper;
+import io.metersphere.base.mapper.ApiTestCaseMapper;
+import io.metersphere.base.mapper.TestPlanApiCaseMapper;
+import io.metersphere.base.mapper.ext.ExtApiTestCaseMapper;
+import io.metersphere.commons.constants.APITestStatus;
+import io.metersphere.commons.constants.ApiRunMode;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.commons.utils.FileUtils;
+import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.commons.utils.ServiceUtils;
+import io.metersphere.dto.JmeterRunRequestDTO;
+import io.metersphere.dto.MsExecResponseDTO;
+import io.metersphere.plugin.core.MsTestElement;
+import io.metersphere.utils.LoggerUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.jorphan.collections.HashTree;
+import org.apache.jorphan.collections.ListedHashTree;
+import org.mybatis.spring.SqlSessionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ApiExecuteService {
+    @Resource
+    private ApiTestCaseMapper apiTestCaseMapper;
+    @Resource
+    private SqlSessionFactory sqlSessionFactory;
+    @Resource
+    private ExtApiTestCaseMapper extApiTestCaseMapper;
+    @Resource
+    private JMeterService jMeterService;
+    @Resource
+    private ApiDefinitionExecResultMapper apiDefinitionExecResultMapper;
+    @Resource
+    private TestPlanApiCaseMapper testPlanApiCaseMapper;
+    @Resource
+    private ApiTestEnvironmentService environmentService;
+    @Resource
+    private TcpApiParamService tcpApiParamService;
+
+    public List<MsExecResponseDTO> run(ApiCaseRunRequest request) {
+        if (LoggerUtil.getLogger().isDebugEnabled()) {
+            LoggerUtil.debug("进入执行方法，接收到参数：" + JSON.toJSONString(request));
+        }
+
+        ServiceUtils.getSelectAllIds(request, request.getCondition(),
+                (query) -> extApiTestCaseMapper.selectIdsByQuery((ApiTestCaseRequest) query));
+        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+
+        ApiTestCaseExample example = new ApiTestCaseExample();
+        example.createCriteria().andIdIn(request.getIds());
+        List<ApiTestCaseWithBLOBs> list = apiTestCaseMapper.selectByExampleWithBLOBs(example);
+
+        LoggerUtil.debug("查询到执行数据：" + list.size());
+
+        ApiTestCaseMapper sqlSessionMapper = sqlSession.getMapper(ApiTestCaseMapper.class);
+        ApiDefinitionExecResultMapper batchMapper = sqlSession.getMapper(ApiDefinitionExecResultMapper.class);
+        List<RunCaseRequest> executeQueue = new LinkedList<>();
+        for (ApiTestCaseWithBLOBs caseWithBLOBs : list) {
+            ApiDefinitionExecResult report = ApiDefinitionExecResultUtil.initBase(caseWithBLOBs.getId(), APITestStatus.Running.name(), null);
+            report.setName(caseWithBLOBs.getName());
+            caseWithBLOBs.setLastResultId(report.getId());
+            caseWithBLOBs.setUpdateTime(System.currentTimeMillis());
+            caseWithBLOBs.setStatus(APITestStatus.Running.name());
+            sqlSessionMapper.updateByPrimaryKey(caseWithBLOBs);
+
+            // 执行对象
+            RunCaseRequest runCaseRequest = new RunCaseRequest();
+            runCaseRequest.setRunMode(ApiRunMode.DEFINITION.name());
+            runCaseRequest.setCaseId(caseWithBLOBs.getId());
+            runCaseRequest.setReportId(report.getId());
+            runCaseRequest.setEnvironmentId(request.getEnvironmentId());
+            runCaseRequest.setBloBs(caseWithBLOBs);
+            runCaseRequest.setReport(report);
+
+            batchMapper.insert(report);
+            executeQueue.add(runCaseRequest);
+        }
+        sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
+
+        LoggerUtil.info("生成执行队列：" + executeQueue.size());
+        if (LoggerUtil.getLogger().isDebugEnabled()) {
+            LoggerUtil.debug("生成执行队列：" + JSON.toJSONString(executeQueue));
+        }
+        List<MsExecResponseDTO> responseDTOS = new LinkedList<>();
+        for (RunCaseRequest runCaseRequest : executeQueue) {
+            MessageCache.caseExecResourceLock.put(runCaseRequest.getReportId(), runCaseRequest.getReport());
+            responseDTOS.add(exec(runCaseRequest));
+        }
+        return responseDTOS;
+    }
+
+    /**
+     * 单条执行
+     *
+     * @param request
+     * @return
+     */
+    public MsExecResponseDTO exec(RunCaseRequest request) {
+        ApiTestCaseWithBLOBs testCaseWithBLOBs = request.getBloBs();
+        if (StringUtils.equals(request.getRunMode(), ApiRunMode.JENKINS_API_PLAN.name())) {
+            testCaseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(request.getReportId());
+            request.setCaseId(request.getReportId());
+            //通过测试计划id查询环境
+            request.setReportId(request.getTestPlanId());
+        }
+        LoggerUtil.info("开始执行单条用例【 " + testCaseWithBLOBs.getId() + " 】");
+
+        // 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取
+        if (testCaseWithBLOBs != null && StringUtils.isNotEmpty(testCaseWithBLOBs.getRequest())) {
+            try {
+                HashTree jmeterHashTree = this.generateHashTree(request, testCaseWithBLOBs);
+                if (LoggerUtil.getLogger().isDebugEnabled()) {
+                    LoggerUtil.debug("生成jmx文件：" + ElementUtil.hashTreeToString(jmeterHashTree));
+                }
+                // 调用执行方法
+                JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(testCaseWithBLOBs.getId(), StringUtils.isEmpty(request.getReportId()) ? request.getId() : request.getReportId(), request.getRunMode(), jmeterHashTree);
+                jMeterService.run(runRequest);
+            } catch (Exception ex) {
+                ApiDefinitionExecResult result = MessageCache.caseExecResourceLock.get(request.getReportId());
+                result.setStatus("error");
+                apiDefinitionExecResultMapper.updateByPrimaryKey(result);
+                ApiTestCaseWithBLOBs caseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(request.getCaseId());
+                caseWithBLOBs.setStatus("error");
+                apiTestCaseMapper.updateByPrimaryKey(caseWithBLOBs);
+                MessageCache.caseExecResourceLock.remove(request.getReportId());
+                LogUtil.error(ex.getMessage(), ex);
+            }
+        }
+        return new MsExecResponseDTO(request.getCaseId(), request.getReport().getId(), request.getRunMode());
+    }
+
+    public MsExecResponseDTO debug(RunDefinitionRequest request, List<MultipartFile> bodyFiles) {
+        ParameterConfig config = new ParameterConfig();
+        config.setProjectId(request.getProjectId());
+
+        Map<String, EnvironmentConfig> envConfig = new HashMap<>();
+        Map<String, String> map = request.getEnvironmentMap();
+        if (map != null && map.size() > 0) {
+            for (String key : map.keySet()) {
+                ApiTestEnvironmentWithBLOBs environment = environmentService.get(map.get(key));
+                if (environment != null) {
+                    EnvironmentConfig env = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
+                    env.setApiEnvironmentid(environment.getId());
+                    envConfig.put(key, env);
+                }
+            }
+            config.setConfig(envConfig);
+        }
+
+        if (CollectionUtils.isNotEmpty(bodyFiles)) {
+            List<MsHTTPSamplerProxy> requests = MsHTTPSamplerProxy.findHttpSampleFromHashTree(request.getTestElement());
+            // 单接口调试生成tmp临时目录
+            requests.forEach(item -> {
+                Body body = item.getBody();
+                String tmpFilePath = "tmp/" + UUID.randomUUID().toString();
+                body.setTmpFilePath(tmpFilePath);
+                FileUtils.copyBdyFile(item.getId(), tmpFilePath);
+                FileUtils.createBodyFiles(tmpFilePath, bodyFiles);
+            });
+        }
+        //检查TCP数据结构，等其他进行处理
+        tcpApiParamService.checkTestElement(request.getTestElement());
+
+        HashTree hashTree = request.getTestElement().generateHashTree(config);
+        if (LoggerUtil.getLogger().isDebugEnabled()) {
+            LoggerUtil.debug("生成执行JMX内容【 " + request.getTestElement().getJmx(hashTree) + " 】");
+        }
+
+        String runMode = ApiRunMode.DEFINITION.name();
+        if (StringUtils.isNotBlank(request.getType()) && StringUtils.equals(request.getType(), ApiRunMode.API_PLAN.name())) {
+            runMode = ApiRunMode.API_PLAN.name();
+        }
+
+        String testId = request.getTestElement() != null &&
+                CollectionUtils.isNotEmpty(request.getTestElement().getHashTree()) &&
+                CollectionUtils.isNotEmpty(request.getTestElement().getHashTree().get(0).getHashTree()) ?
+                request.getTestElement().getHashTree().get(0).getHashTree().get(0).getName() : request.getId();
+        JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(testId, request.getId(), runMode, hashTree);
+        runRequest.setConfig(request.getConfig());
+        runRequest.setDebug(request.isDebug());
+        // 开始执行
+        jMeterService.run(runRequest);
+        return new MsExecResponseDTO(runRequest.getTestId(), runRequest.getReportId(), runMode);
+    }
+
+    public HashTree generateHashTree(RunCaseRequest request, ApiTestCaseWithBLOBs testCaseWithBLOBs) throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        JSONObject elementObj = JSON.parseObject(testCaseWithBLOBs.getRequest());
+        ElementUtil.dataFormatting(elementObj);
+
+        MsTestElement element = mapper.readValue(elementObj.toJSONString(), new TypeReference<MsTestElement>() {
+        });
+        element.setProjectId(testCaseWithBLOBs.getProjectId());
+        if (StringUtils.isBlank(request.getEnvironmentId())) {
+            TestPlanApiCaseExample example = new TestPlanApiCaseExample();
+            example.createCriteria().andTestPlanIdEqualTo(request.getTestPlanId()).andApiCaseIdEqualTo(request.getCaseId());
+            List<TestPlanApiCase> list = testPlanApiCaseMapper.selectByExample(example);
+            request.setEnvironmentId(list.get(0).getEnvironmentId());
+            element.setName(list.get(0).getId());
+        } else {
+            element.setName(request.getCaseId());
+        }
+
+        // 测试计划
+        MsTestPlan testPlan = new MsTestPlan();
+        testPlan.setHashTree(new LinkedList<>());
+        HashTree jmeterHashTree = new ListedHashTree();
+
+        // 线程组
+        MsThreadGroup group = new MsThreadGroup();
+        group.setLabel(testCaseWithBLOBs.getName());
+        group.setName(testCaseWithBLOBs.getId());
+        group.setOnSampleError(true);
+        LinkedList<MsTestElement> hashTrees = new LinkedList<>();
+        hashTrees.add(element);
+        group.setHashTree(hashTrees);
+        testPlan.getHashTree().add(group);
+
+        ApiTestEnvironmentService environmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
+        ApiTestEnvironmentWithBLOBs environment = environmentService.get(request.getEnvironmentId());
+        ParameterConfig parameterConfig = new ParameterConfig();
+
+        Map<String, EnvironmentConfig> envConfig = new HashMap<>(16);
+        if (environment != null && environment.getConfig() != null) {
+            EnvironmentConfig environmentConfig = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
+            environmentConfig.setApiEnvironmentid(environment.getId());
+            envConfig.put(testCaseWithBLOBs.getProjectId(), environmentConfig);
+            parameterConfig.setConfig(envConfig);
+        }
+
+        testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), parameterConfig);
+        return jmeterHashTree;
+    }
+
+}
diff --git a/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java b/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java
new file mode 100644
index 0000000000..11b42099f8
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java
@@ -0,0 +1,295 @@
+package io.metersphere.api.exec.api;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.metersphere.api.cache.TestPlanReportExecuteCatch;
+import io.metersphere.api.dto.definition.BatchRunDefinitionRequest;
+import io.metersphere.api.dto.definition.request.ElementUtil;
+import io.metersphere.api.dto.definition.request.MsTestPlan;
+import io.metersphere.api.dto.definition.request.MsThreadGroup;
+import io.metersphere.api.dto.definition.request.ParameterConfig;
+import io.metersphere.api.dto.definition.request.sampler.MsDubboSampler;
+import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
+import io.metersphere.api.dto.definition.request.sampler.MsJDBCSampler;
+import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
+import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
+import io.metersphere.api.exec.utils.ApiDefinitionExecResultUtil;
+import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
+import io.metersphere.api.jmeter.JMeterService;
+import io.metersphere.api.jmeter.MessageCache;
+import io.metersphere.api.service.RemakeReportService;
+import io.metersphere.base.domain.ApiDefinitionExecResult;
+import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
+import io.metersphere.base.domain.TestPlanApiCase;
+import io.metersphere.base.domain.TestPlanApiCaseExample;
+import io.metersphere.base.mapper.ApiDefinitionExecResultMapper;
+import io.metersphere.base.mapper.ApiTestCaseMapper;
+import io.metersphere.base.mapper.TestPlanApiCaseMapper;
+import io.metersphere.commons.constants.APITestStatus;
+import io.metersphere.commons.constants.ApiRunMode;
+import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.constants.RunModeConstants;
+import io.metersphere.dto.JmeterRunRequestDTO;
+import io.metersphere.dto.MsExecResponseDTO;
+import io.metersphere.plugin.core.MsTestElement;
+import io.metersphere.utils.LoggerUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.jorphan.collections.HashTree;
+import org.mybatis.spring.SqlSessionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class TestPlanApiExecuteService {
+    @Resource
+    private TestPlanApiCaseMapper testPlanApiCaseMapper;
+    @Resource
+    private ApiTestCaseMapper apiTestCaseMapper;
+    @Resource
+    private JMeterService jMeterService;
+    @Resource
+    private ApiDefinitionExecResultMapper apiDefinitionExecResultMapper;
+    @Resource
+    private SqlSessionFactory sqlSessionFactory;
+    @Resource
+    private RemakeReportService remakeReportService;
+
+    public List<MsExecResponseDTO> run(BatchRunDefinitionRequest request) {
+        List<String> ids = request.getPlanIds();
+        TestPlanApiCaseExample example = new TestPlanApiCaseExample();
+        example.createCriteria().andIdIn(ids);
+        example.setOrderByClause("`order` DESC");
+        List<TestPlanApiCase> planApiCases = testPlanApiCaseMapper.selectByExample(example);
+        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+        ApiDefinitionExecResultMapper batchMapper = sqlSession.getMapper(ApiDefinitionExecResultMapper.class);
+        if (StringUtils.isEmpty(request.getTriggerMode())) {
+            request.setTriggerMode(ApiRunMode.API_PLAN.name());
+        }
+
+        List<MsExecResponseDTO> responseDTOS = new LinkedList<>();
+        // 资源池
+        GenerateHashTreeUtil.setPoolResource(request.getConfig());
+        // 开始选择执行模式
+        if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
+            Map<TestPlanApiCase, ApiDefinitionExecResult> executeQueue = new LinkedHashMap<>();
+            //记录案例线程结果以及执行失败的案例ID
+            Map<String, String> executeThreadIdMap = new HashMap<>();
+
+            planApiCases.forEach(testPlanApiCase -> {
+                ApiDefinitionExecResult report = ApiDefinitionExecResultUtil.addResult(request, testPlanApiCase, APITestStatus.Waiting.name(), batchMapper);
+                executeQueue.put(testPlanApiCase, report);
+                executeThreadIdMap.put(testPlanApiCase.getId(), report.getId());
+                responseDTOS.add(new MsExecResponseDTO(testPlanApiCase.getId(), report.getId(), request.getTriggerMode()));
+            });
+
+            //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
+            if (TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())) {
+                if (!executeThreadIdMap.isEmpty()) {
+                    TestPlanReportExecuteCatch.updateTestPlanThreadInfo(request.getPlanReportId(), executeThreadIdMap, null, null);
+                }
+            }
+            sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
+            // 开始串行执行
+            serial(executeQueue, request);
+        } else {
+            Map<String, TestPlanApiCase> executeQueue = new HashMap<>();
+            //记录案例线程结果以及执行失败的案例ID
+            Map<String, String> executeThreadIdMap = new HashMap<>();
+            planApiCases.forEach(testPlanApiCase -> {
+                ApiDefinitionExecResult report = ApiDefinitionExecResultUtil.addResult(request, testPlanApiCase, APITestStatus.Running.name(), batchMapper);
+                executeQueue.put(report.getId(), testPlanApiCase);
+                executeThreadIdMap.put(testPlanApiCase.getId(), report.getId());
+                MessageCache.caseExecResourceLock.put(report.getId(), report);
+                responseDTOS.add(new MsExecResponseDTO(testPlanApiCase.getId(), report.getId(), request.getTriggerMode()));
+            });
+            sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
+            //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
+            if (TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())) {
+                if (!executeThreadIdMap.isEmpty()) {
+                    TestPlanReportExecuteCatch.updateTestPlanThreadInfo(request.getPlanReportId(), executeThreadIdMap, null, null);
+                }
+            }
+            // 开始并发执行
+            this.parallel(executeQueue, request);
+        }
+
+        return responseDTOS;
+    }
+
+    private void serial(Map<TestPlanApiCase, ApiDefinitionExecResult> executeQueue, BatchRunDefinitionRequest request) {
+        // 开始串行执行
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Thread.currentThread().setName("TestPlanCase串行执行线程");
+                    List<String> executeErrorList = new ArrayList<>();
+                    for (TestPlanApiCase testPlanApiCase : executeQueue.keySet()) {
+                        try {
+                            ApiDefinitionExecResult execResult = executeQueue.get(testPlanApiCase);
+                            execResult.setStatus(APITestStatus.Running.name());
+                            apiDefinitionExecResultMapper.updateByPrimaryKey(execResult);
+
+                            JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(testPlanApiCase.getId(), execResult.getId(), request.getTriggerMode(), null);
+                            runRequest.setConfig(request.getConfig());
+                            runRequest.setPool(GenerateHashTreeUtil.isResourcePool(request.getConfig()));
+                            runRequest.setTestPlanReportId(request.getPlanReportId());
+                            try {
+                                if (!GenerateHashTreeUtil.isResourcePool(request.getConfig()).isPool()) {
+                                    runRequest.setHashTree(generateHashTree(testPlanApiCase.getId()));
+                                }
+                            } catch (Exception e) {
+                                remakeReportService.remake(runRequest);
+                                continue;
+                            }
+                            // 初始化等待队列
+                            SerialBlockingQueueUtil.init(runRequest.getReportId(), 1);
+                            LoggerUtil.info("TestPlan Serial run 【 " + runRequest.getReportId() + "】start");
+                            // 开始执行
+                            jMeterService.run(runRequest);
+
+                            Object reportObj = SerialBlockingQueueUtil.take(runRequest.getReportId());
+                            LoggerUtil.info("TestPlan Serial run 【 " + runRequest.getReportId() + "】end");
+                            // 如果开启失败结束执行，则判断返回结果状态
+                            if (request.getConfig().isOnSampleError()) {
+                                if (reportObj != null) {
+                                    ApiDefinitionExecResult result = (ApiDefinitionExecResult) reportObj;
+                                    if (result == null || !result.getStatus().equals("Success")) {
+                                        break;
+                                    }
+                                }
+                            }
+
+                        } catch (Exception e) {
+                            executeErrorList.add(testPlanApiCase.getId());
+                            LogUtil.error("执行终止：" + e.getMessage());
+                            break;
+                        }
+                    }
+                    //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
+                    TestPlanReportExecuteCatch.set(request.getPlanReportId(), executeErrorList);
+
+                } catch (Exception e) {
+                    LogUtil.error(e);
+                }
+            }
+        });
+        thread.start();
+    }
+
+    private void parallel(Map<String, TestPlanApiCase> executeQueue, BatchRunDefinitionRequest request) {
+        List<String> executeErrorList = new ArrayList<>();
+        for (String reportId : executeQueue.keySet()) {
+            TestPlanApiCase testPlanApiCase = executeQueue.get(reportId);
+            try {
+                HashTree hashTree = null;
+                if (!GenerateHashTreeUtil.isResourcePool(request.getConfig()).isPool()) {
+                    hashTree = generateHashTree(testPlanApiCase.getId());
+                }
+                JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(testPlanApiCase.getId(), reportId, request.getTriggerMode(), hashTree);
+                runRequest.setConfig(request.getConfig());
+                runRequest.setPool(GenerateHashTreeUtil.isResourcePool(request.getConfig()));
+                runRequest.setTestPlanReportId(request.getPlanReportId());
+                jMeterService.run(runRequest);
+            } catch (Exception e) {
+                executeErrorList.add(testPlanApiCase.getId());
+            }
+        }
+
+        //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
+        TestPlanReportExecuteCatch.set(request.getPlanReportId(), executeErrorList);
+    }
+
+    public HashTree generateHashTree(String testId) {
+        TestPlanApiCase apiCase = testPlanApiCaseMapper.selectByPrimaryKey(testId);
+        if (apiCase != null) {
+            ApiTestCaseWithBLOBs caseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(apiCase.getApiCaseId());
+            HashTree jmeterHashTree = new HashTree();
+            MsTestPlan testPlan = new MsTestPlan();
+            testPlan.setHashTree(new LinkedList<>());
+            if (caseWithBLOBs != null) {
+                try {
+                    MsThreadGroup group = new MsThreadGroup();
+                    group.setLabel(caseWithBLOBs.getName());
+                    group.setName(caseWithBLOBs.getName());
+                    MsTestElement testElement = parse(caseWithBLOBs, testId);
+                    group.setHashTree(new LinkedList<>());
+                    group.getHashTree().add(testElement);
+                    testPlan.getHashTree().add(group);
+                } catch (Exception ex) {
+                    MSException.throwException(ex.getMessage());
+                }
+            }
+            testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), new ParameterConfig());
+            return jmeterHashTree;
+        }
+        return null;
+    }
+
+    private MsTestElement parse(ApiTestCaseWithBLOBs caseWithBLOBs, String planId) {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        try {
+            String api = caseWithBLOBs.getRequest();
+            JSONObject element = JSON.parseObject(api);
+            ElementUtil.dataFormatting(element);
+
+            LinkedList<MsTestElement> list = new LinkedList<>();
+            if (element != null && StringUtils.isNotEmpty(element.getString("hashTree"))) {
+                LinkedList<MsTestElement> elements = mapper.readValue(element.getString("hashTree"),
+                        new TypeReference<LinkedList<MsTestElement>>() {
+                        });
+                list.addAll(elements);
+            }
+            TestPlanApiCase apiCase = testPlanApiCaseMapper.selectByPrimaryKey(planId);
+            if (element.getString("type").equals("HTTPSamplerProxy")) {
+                MsHTTPSamplerProxy httpSamplerProxy = JSON.parseObject(api, MsHTTPSamplerProxy.class);
+                httpSamplerProxy.setHashTree(list);
+                httpSamplerProxy.setName(planId);
+                httpSamplerProxy.setUseEnvironment(apiCase.getEnvironmentId());
+                return httpSamplerProxy;
+            }
+            if (element.getString("type").equals("TCPSampler")) {
+                MsTCPSampler msTCPSampler = JSON.parseObject(api, MsTCPSampler.class);
+                msTCPSampler.setUseEnvironment(apiCase.getEnvironmentId());
+                msTCPSampler.setHashTree(list);
+                msTCPSampler.setName(planId);
+                return msTCPSampler;
+            }
+            if (element.getString("type").equals("DubboSampler")) {
+                MsDubboSampler dubboSampler = JSON.parseObject(api, MsDubboSampler.class);
+                dubboSampler.setUseEnvironment(apiCase.getEnvironmentId());
+                dubboSampler.setHashTree(list);
+                dubboSampler.setName(planId);
+                return dubboSampler;
+            }
+            if (element.getString("type").equals("JDBCSampler")) {
+                MsJDBCSampler jDBCSampler = JSON.parseObject(api, MsJDBCSampler.class);
+                jDBCSampler.setUseEnvironment(apiCase.getEnvironmentId());
+                jDBCSampler.setHashTree(list);
+                jDBCSampler.setName(planId);
+                return jDBCSampler;
+            }
+        } catch (Exception e) {
+            LogUtil.error(e);
+        }
+        return null;
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/exec/queue/ExecTask.java b/backend/src/main/java/io/metersphere/api/exec/queue/ExecTask.java
new file mode 100644
index 0000000000..1d8ede4912
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/queue/ExecTask.java
@@ -0,0 +1,28 @@
+package io.metersphere.api.exec.queue;
+
+import io.metersphere.api.jmeter.JMeterService;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.dto.JmeterRunRequestDTO;
+import io.metersphere.utils.LoggerUtil;
+
+public class ExecTask implements Runnable {
+    private JmeterRunRequestDTO request;
+
+    public ExecTask(JmeterRunRequestDTO request) {
+        this.request = request;
+    }
+
+    public JmeterRunRequestDTO getRequest() {
+        return this.request;
+    }
+
+    @Override
+    public void run() {
+        PoolExecBlockingQueueUtil.init(request.getReportId(), 1);
+        LoggerUtil.info("开始执行报告ID：【 " + request.getReportId() + " 】,资源ID【 " + request.getTestId() + " 】");
+        JMeterService jMeterService = CommonBeanFactory.getBean(JMeterService.class);
+        jMeterService.addQueue(request);
+        PoolExecBlockingQueueUtil.take(request.getReportId());
+        LoggerUtil.info("任务：【 " + request.getReportId() + " 】执行完成");
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/exec/queue/ExecThreadPoolExecutor.java b/backend/src/main/java/io/metersphere/api/exec/queue/ExecThreadPoolExecutor.java
new file mode 100644
index 0000000000..3451d2aa0b
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/queue/ExecThreadPoolExecutor.java
@@ -0,0 +1,165 @@
+package io.metersphere.api.exec.queue;
+
+import io.metersphere.api.exec.utils.NamedThreadFactory;
+import io.metersphere.dto.JmeterRunRequestDTO;
+import io.metersphere.utils.LoggerUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Queue;
+import java.util.concurrent.*;
+
+@Service
+public class ExecThreadPoolExecutor {
+    // 线程池维护线程的最少数量
+    private final static int CORE_POOL_SIZE = 10;
+    // 线程池维护线程的最大数量
+    private final static int MAX_POOL_SIZE = 10;
+    // 线程池维护线程所允许的空闲时间
+    private final static int KEEP_ALIVE_TIME = 1;
+    // 线程池所使用的缓冲队列大小
+    private final static int WORK_QUEUE_SIZE = 10000;
+
+    private MsRejectedExecutionHandler msRejectedExecutionHandler = new MsRejectedExecutionHandler();
+    /**
+     * 创建线程池
+     */
+    private final ThreadPoolExecutor threadPool = new ThreadPoolExecutor(
+            CORE_POOL_SIZE,
+            MAX_POOL_SIZE,
+            KEEP_ALIVE_TIME,
+            TimeUnit.SECONDS,
+            new ArrayBlockingQueue(WORK_QUEUE_SIZE),
+            new NamedThreadFactory("MS-JMETER-RUN-TASK"),
+            msRejectedExecutionHandler);
+    /**
+     * 缓冲区调度线程池
+     */
+    private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1, new NamedThreadFactory("MS-BUFFER-SCHEDULED"));
+
+    public void addTask(JmeterRunRequestDTO requestDTO) {
+        outApiThreadPoolExecutorLogger();
+        ExecTask task = new ExecTask(requestDTO);
+        threadPool.execute(task);
+    }
+
+    /**
+     * 调度线程池，检查缓冲区
+     */
+    final ScheduledFuture scheduledFuture = scheduler.scheduleAtFixedRate(new Runnable() {
+        @Override
+        public void run() {
+            //判断缓冲队列是否存在记录
+            if (CollectionUtils.isNotEmpty(msRejectedExecutionHandler.getBufferQueue())) {
+                //当线程池的队列容量少于WORK_QUEUE_SIZE，则开始把缓冲队列的任务 加入到 线程池
+                if (threadPool.getQueue().size() < WORK_QUEUE_SIZE) {
+                    JmeterRunRequestDTO requestDTO = msRejectedExecutionHandler.getBufferQueue().poll();
+                    ExecTask task = new ExecTask(requestDTO);
+                    threadPool.submit(task);
+                    LoggerUtil.info("把缓冲区任务重新添加到线程池，报告ID：" + requestDTO.getReportId());
+                }
+            }
+        }
+    }, 0, 2, TimeUnit.SECONDS);
+
+
+    /**
+     * 终止线程池和调度线程池
+     */
+    public void shutdown() {
+        //true表示如果定时任务在执行，立即中止，false则等待任务结束后再停止
+        LoggerUtil.info("终止执行线程池和调度线程池：" + scheduledFuture.cancel(true));
+        scheduler.shutdown();
+        threadPool.shutdown();
+    }
+
+    /**
+     * 保留两位小数
+     */
+    private String divide(int num1, int num2) {
+        return String.format("%1.2f%%", Double.parseDouble(num1 + "") / Double.parseDouble(num2 + "") * 100);
+    }
+
+    public void outApiThreadPoolExecutorLogger() {
+        ArrayBlockingQueue queue = (ArrayBlockingQueue) threadPool.getQueue();
+        StringBuffer buffer = new StringBuffer("API 并发队列详情：\n");
+        buffer.append(" 核心线程数：" + threadPool.getCorePoolSize()).append("\n");
+        buffer.append(" 活动线程数：" + threadPool.getActiveCount()).append("\n");
+        buffer.append(" 最大线程数：" + threadPool.getMaximumPoolSize()).append("\n");
+        buffer.append(" 线程池活跃度：" + divide(threadPool.getActiveCount(), threadPool.getMaximumPoolSize())).append("\n");
+        buffer.append(" 任务完成数：" + threadPool.getCompletedTaskCount()).append("\n");
+        buffer.append(" 队列大小：" + (queue.size() + queue.remainingCapacity())).append("\n");
+        buffer.append(" 当前排队线程数：" + (msRejectedExecutionHandler.getBufferQueue().size() + queue.size())).append("\n");
+        buffer.append(" 队列剩余大小：" + queue.remainingCapacity()).append("\n");
+        buffer.append(" 队列使用度：" + divide(queue.size(), queue.size() + queue.remainingCapacity()));
+
+        LoggerUtil.info(buffer.toString());
+
+        if (queue.size() > 0 && LoggerUtil.getLogger().isDebugEnabled()) {
+            LoggerUtil.debug(this.getWorkerQueue());
+        }
+    }
+
+    public void setCorePoolSize(int corePoolSize) {
+        try {
+            threadPool.setCorePoolSize(corePoolSize);
+            threadPool.setMaximumPoolSize(corePoolSize);
+            threadPool.allowCoreThreadTimeOut(true);
+            LoggerUtil.info("AllCoreThreads: " + threadPool.prestartAllCoreThreads());
+        } catch (Exception e) {
+            LoggerUtil.error("设置线程参数异常：" + e);
+        }
+    }
+
+    public void removeQueue(String reportId) {
+        // 检查缓冲区
+        Queue<JmeterRunRequestDTO> bufferQueue = msRejectedExecutionHandler.getBufferQueue();
+        if (CollectionUtils.isNotEmpty(bufferQueue)) {
+            bufferQueue.forEach(item -> {
+                if (item != null && StringUtils.equals(item.getReportId(), reportId)) {
+                    bufferQueue.remove(item);
+                }
+            });
+        }
+        // 检查等待队列
+        BlockingQueue workerQueue = threadPool.getQueue();
+        workerQueue.forEach(item -> {
+            ExecTask task = (ExecTask) item;
+            if (task.getRequest() != null && StringUtils.equals(task.getRequest().getReportId(), reportId)) {
+                workerQueue.remove(item);
+            }
+        });
+    }
+
+    public void removeAllQueue() {
+        // 检查缓冲区
+        msRejectedExecutionHandler.getBufferQueue().clear();
+        // 检查等待队列
+        threadPool.getQueue().clear();
+    }
+
+    public boolean check(String reportId) {
+        // 检查缓冲区
+        Queue<JmeterRunRequestDTO> bufferQueue = msRejectedExecutionHandler.getBufferQueue();
+        if (CollectionUtils.isNotEmpty(bufferQueue)) {
+            return bufferQueue.stream().filter(task -> StringUtils.equals(task.getReportId(), reportId)).count() > 0;
+        }
+        // 检查等待队列
+        BlockingQueue workerQueue = threadPool.getQueue();
+        return workerQueue.stream().filter(task -> StringUtils.equals(((ExecTask) task).getRequest().getReportId(), reportId)).count() > 0;
+    }
+
+    public String getWorkerQueue() {
+        StringBuffer buffer = new StringBuffer();
+        BlockingQueue workerQueue = threadPool.getQueue();
+        workerQueue.forEach(item -> {
+            ExecTask task = (ExecTask) item;
+            if (task.getRequest() != null) {
+                buffer.append("等待队列报告：【 " + task.getRequest().getReportId() + "】资源：【 " + task.getRequest().getTestId() + "】").append("\n");
+            }
+        });
+
+        return buffer.toString();
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/exec/queue/MsRejectedExecutionHandler.java b/backend/src/main/java/io/metersphere/api/exec/queue/MsRejectedExecutionHandler.java
new file mode 100644
index 0000000000..7859fbc47c
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/queue/MsRejectedExecutionHandler.java
@@ -0,0 +1,28 @@
+package io.metersphere.api.exec.queue;
+
+import io.metersphere.dto.JmeterRunRequestDTO;
+import io.metersphere.utils.LoggerUtil;
+
+import java.util.Queue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadPoolExecutor;
+
+public class MsRejectedExecutionHandler implements RejectedExecutionHandler {
+    /**
+     * 执行任务缓冲队列,当线程池满了，则将任务存入到此缓冲队列
+     * 这里是否搞个redis/写到磁盘？
+     */
+    private Queue<JmeterRunRequestDTO> bufferQueue = new LinkedBlockingQueue<>();
+
+    public Queue<JmeterRunRequestDTO> getBufferQueue() {
+        return bufferQueue;
+    }
+
+    @Override
+    public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {
+        //任务加入到缓冲队列
+        bufferQueue.offer(((ExecTask) r).getRequest());
+        LoggerUtil.info("执行任务过多，任务加入缓冲区：" + ((ExecTask) r).getRequest().getReportId());
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/exec/queue/PoolExecBlockingQueueUtil.java b/backend/src/main/java/io/metersphere/api/exec/queue/PoolExecBlockingQueueUtil.java
new file mode 100644
index 0000000000..6e6bd4042b
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/queue/PoolExecBlockingQueueUtil.java
@@ -0,0 +1,58 @@
+package io.metersphere.api.exec.queue;
+
+import io.metersphere.commons.utils.LogUtil;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Map;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+public class PoolExecBlockingQueueUtil {
+    // 系统级队列控制整体并发数量
+    public static Map<String, BlockingQueue<Object>> queue = new ConcurrentHashMap<>();
+
+    public static void init(String key, int queueSize) {
+        BlockingQueue<Object> blockingQueue = new ArrayBlockingQueue<>(queueSize);
+        queue.put(key, blockingQueue);
+    }
+
+    public static void offer(String key) {
+        if (StringUtils.isNotEmpty(key) && queue.containsKey(key)) {
+            try {
+                if (!queue.get(key).offer("end")) {
+                    queue.get(key).add("end");
+                }
+            } catch (Exception e) {
+                LogUtil.error(e);
+            } finally {
+                queue.get(key).offer("end");
+                queue.remove(key);
+            }
+        }
+    }
+
+    public static Object take(String key) {
+        try {
+            if (StringUtils.isNotEmpty(key) && queue.containsKey(key)) {
+                return queue.get(key).poll(5, TimeUnit.MINUTES);
+            }
+        } catch (Exception e) {
+            LogUtil.error("获取队列失败：" + e.getMessage());
+            return null;
+        } finally {
+            if (StringUtils.isNotEmpty(key)) {
+                queue.remove(key);
+            }
+        }
+        return null;
+    }
+
+    public static void remove(String key) {
+        if (StringUtils.isNotEmpty(key) && queue.containsKey(key)) {
+            queue.get(key).add("end");
+            queue.remove(key);
+        }
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/exec/queue/SerialBlockingQueueUtil.java b/backend/src/main/java/io/metersphere/api/exec/queue/SerialBlockingQueueUtil.java
new file mode 100644
index 0000000000..fb4ee17532
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/queue/SerialBlockingQueueUtil.java
@@ -0,0 +1,60 @@
+package io.metersphere.api.exec.queue;
+
+import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.constants.RunModeConstants;
+import io.metersphere.dto.ResultDTO;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Map;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+public class SerialBlockingQueueUtil {
+    // 只作用与串行任务
+    public static Map<String, BlockingQueue<Object>> queue = new ConcurrentHashMap<>();
+
+    public static void init(String key, int queueSize) {
+        BlockingQueue<Object> blockingQueue = new ArrayBlockingQueue<>(queueSize);
+        queue.put(key, blockingQueue);
+    }
+
+    public static void offer(ResultDTO dto, Object report) {
+        String key = dto != null && StringUtils.equals(dto.getReportType(), RunModeConstants.SET_REPORT.toString()) ? dto.getReportId() + "_" + dto.getTestId() : dto.getReportId();
+        if (StringUtils.isNotEmpty(key) && queue.containsKey(key)) {
+            try {
+                if (!queue.get(key).offer(report)) {
+                    queue.get(key).add(report);
+                }
+            } catch (Exception e) {
+                LogUtil.error(e);
+            } finally {
+                queue.get(key).offer(report);
+            }
+        }
+    }
+
+    public static Object take(String key) {
+        try {
+            if (StringUtils.isNotEmpty(key) && queue.containsKey(key)) {
+                return queue.get(key).poll(3, TimeUnit.MINUTES);
+            }
+        } catch (Exception e) {
+            LogUtil.error("获取队列失败：" + e.getMessage());
+            return null;
+        } finally {
+            if (StringUtils.isNotEmpty(key)) {
+                queue.remove(key);
+            }
+        }
+        return null;
+    }
+
+    public static void remove(String key) {
+        if (StringUtils.isNotEmpty(key) && queue.containsKey(key)) {
+            queue.get(key).add(null);
+            queue.remove(key);
+        }
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java
new file mode 100644
index 0000000000..3cc2cdd296
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java
@@ -0,0 +1,431 @@
+package io.metersphere.api.exec.scenario;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.metersphere.api.dto.EnvironmentType;
+import io.metersphere.api.dto.ScenarioEnv;
+import io.metersphere.api.dto.automation.ApiScenarioDTO;
+import io.metersphere.api.dto.automation.RunScenarioRequest;
+import io.metersphere.api.dto.definition.request.ElementUtil;
+import io.metersphere.api.dto.definition.request.MsScenario;
+import io.metersphere.api.dto.definition.request.ParameterConfig;
+import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
+import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
+import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
+import io.metersphere.api.service.ApiDefinitionService;
+import io.metersphere.api.service.ApiTestCaseService;
+import io.metersphere.api.service.ApiTestEnvironmentService;
+import io.metersphere.base.domain.*;
+import io.metersphere.base.mapper.ApiScenarioMapper;
+import io.metersphere.base.mapper.ApiTestEnvironmentMapper;
+import io.metersphere.base.mapper.ProjectMapper;
+import io.metersphere.base.mapper.TestPlanApiScenarioMapper;
+import io.metersphere.commons.constants.ApiRunMode;
+import io.metersphere.commons.constants.MsTestElementConstants;
+import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.plugin.core.MsTestElement;
+import io.metersphere.service.EnvironmentGroupProjectService;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class ApiScenarioEnvService {
+    @Resource
+    private ApiDefinitionService apiDefinitionService;
+    @Resource
+    private ApiTestCaseService apiTestCaseService;
+    @Resource
+    private ApiScenarioMapper apiScenarioMapper;
+    @Resource
+    private EnvironmentGroupProjectService environmentGroupProjectService;
+    @Resource
+    private ProjectMapper projectMapper;
+    @Resource
+    private ApiTestEnvironmentMapper apiTestEnvironmentMapper;
+    @Resource
+    private TestPlanApiScenarioMapper testPlanApiScenarioMapper;
+
+    public ScenarioEnv getApiScenarioEnv(String definition) {
+        ScenarioEnv env = new ScenarioEnv();
+        List<MsTestElement> hashTree = GenerateHashTreeUtil.getScenarioHashTree(definition);
+        for (int i = 0; i < hashTree.size(); i++) {
+            MsTestElement tr = hashTree.get(i);
+            if (!tr.isEnable()) {
+                continue;
+            }
+            String referenced = tr.getReferenced();
+            if (StringUtils.equals(MsTestElementConstants.REF.name(), referenced)) {
+                if (StringUtils.equals(tr.getType(), "HTTPSamplerProxy")) {
+                    MsHTTPSamplerProxy http = (MsHTTPSamplerProxy) tr;
+                    String refType = tr.getRefType();
+                    if (StringUtils.equals(refType, "CASE")) {
+                        http.setUrl(null);
+                    } else {
+                        ApiDefinition apiDefinition = apiDefinitionService.get(tr.getId());
+                        if (apiDefinition != null) {
+                            http.setUrl(apiDefinition.getPath());
+                        }
+                    }
+                    if (http.isEnable()) {
+                        if (StringUtils.isBlank(http.getUrl()) || (http.getIsRefEnvironment() != null && http.getIsRefEnvironment())) {
+                            env.getProjectIds().add(http.getProjectId());
+                            env.setFullUrl(false);
+                        }
+                    }
+                } else if (StringUtils.equals(tr.getType(), "JDBCSampler") || StringUtils.equals(tr.getType(), "TCPSampler")) {
+                    if (StringUtils.equals(tr.getRefType(), "CASE")) {
+                        ApiTestCaseWithBLOBs apiTestCaseWithBLOBs = apiTestCaseService.get(tr.getId());
+                        if (apiTestCaseWithBLOBs != null) {
+                            env.getProjectIds().add(apiTestCaseWithBLOBs.getProjectId());
+                        }
+                    } else {
+                        ApiDefinition apiDefinition = apiDefinitionService.get(tr.getId());
+                        if (apiDefinition != null) {
+                            env.getProjectIds().add(apiDefinition.getProjectId());
+                        }
+                    }
+                } else if (StringUtils.equals(tr.getType(), "scenario")) {
+                    if (tr.isEnable()) {
+                        ApiScenarioWithBLOBs apiScenario = apiScenarioMapper.selectByPrimaryKey(tr.getId());
+                        if (apiScenario != null) {
+                            env.getProjectIds().add(apiScenario.getProjectId());
+                            String scenarioDefinition = apiScenario.getScenarioDefinition();
+                            tr.setHashTree(GenerateHashTreeUtil.getScenarioHashTree(scenarioDefinition));
+                        }
+                    }
+                }
+            } else {
+                if (StringUtils.equals(tr.getType(), "HTTPSamplerProxy")) {
+                    // 校验是否是全路径
+                    MsHTTPSamplerProxy httpSamplerProxy = (MsHTTPSamplerProxy) tr;
+                    if (httpSamplerProxy.isEnable()) {
+                        if (StringUtils.isBlank(httpSamplerProxy.getUrl()) || (httpSamplerProxy.getIsRefEnvironment() != null && httpSamplerProxy.getIsRefEnvironment())) {
+                            env.getProjectIds().add(httpSamplerProxy.getProjectId());
+                            env.setFullUrl(false);
+                        }
+                    }
+                } else if (StringUtils.equals(tr.getType(), "JDBCSampler") || StringUtils.equals(tr.getType(), "TCPSampler")) {
+                    env.getProjectIds().add(tr.getProjectId());
+                }
+            }
+            if (StringUtils.equals(tr.getType(), "scenario")) {
+                MsScenario scenario = (MsScenario) tr;
+                if (scenario.isEnvironmentEnable()) {
+                    continue;
+                }
+                env.getProjectIds().add(tr.getProjectId());
+            }
+            if (CollectionUtils.isNotEmpty(tr.getHashTree())) {
+                getHashTree(tr.getHashTree(), env);
+            }
+        }
+        return env;
+    }
+
+    private void getHashTree(List<MsTestElement> tree, ScenarioEnv env) {
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            for (int i = 0; i < tree.size(); i++) {
+                MsTestElement tr = tree.get(i);
+                if (!tr.isEnable()) {
+                    continue;
+                }
+                String referenced = tr.getReferenced();
+                if (StringUtils.equals(MsTestElementConstants.REF.name(), referenced)) {
+                    if (StringUtils.equals(tr.getType(), "HTTPSamplerProxy")) {
+                        MsHTTPSamplerProxy http = (MsHTTPSamplerProxy) tr;
+                        String refType = tr.getRefType();
+                        if (StringUtils.equals(refType, "CASE")) {
+                            http.setUrl(null);
+                        } else {
+                            ApiDefinition apiDefinition = apiDefinitionService.get(tr.getId());
+                            http.setUrl(apiDefinition.getPath());
+                        }
+                        if (http.isEnable()) {
+                            if (StringUtils.isBlank(http.getUrl()) || (http.getIsRefEnvironment() != null && http.getIsRefEnvironment())) {
+                                env.setFullUrl(false);
+                                env.getProjectIds().add(http.getProjectId());
+                            }
+                        }
+                    } else if (StringUtils.equals(tr.getType(), "JDBCSampler") || StringUtils.equals(tr.getType(), "TCPSampler")) {
+                        if (StringUtils.equals(tr.getRefType(), "CASE")) {
+                            ApiTestCaseWithBLOBs apiTestCaseWithBLOBs = apiTestCaseService.get(tr.getId());
+                            env.getProjectIds().add(apiTestCaseWithBLOBs.getProjectId());
+                        } else {
+                            ApiDefinition apiDefinition = apiDefinitionService.get(tr.getId());
+                            env.getProjectIds().add(apiDefinition.getProjectId());
+                        }
+                    } else if (StringUtils.equals(tr.getType(), "scenario")) {
+                        if (tr.isEnable()) {
+                            ApiScenarioWithBLOBs apiScenario = apiScenarioMapper.selectByPrimaryKey(tr.getId());
+                            if (apiScenario != null) {
+                                env.getProjectIds().add(apiScenario.getProjectId());
+                                String scenarioDefinition = apiScenario.getScenarioDefinition();
+                                JSONObject element1 = JSON.parseObject(scenarioDefinition);
+                                ElementUtil.dataFormatting(element1);
+                                LinkedList<MsTestElement> hashTree1 = mapper.readValue(element1.getString("hashTree"), new TypeReference<LinkedList<MsTestElement>>() {
+                                });
+                                tr.setHashTree(hashTree1);
+                            }
+                        }
+                    }
+                } else {
+                    if (StringUtils.equals(tr.getType(), "HTTPSamplerProxy")) {
+                        // 校验是否是全路径
+                        MsHTTPSamplerProxy httpSamplerProxy = (MsHTTPSamplerProxy) tr;
+                        if (httpSamplerProxy.isEnable()) {
+                            if (StringUtils.isBlank(httpSamplerProxy.getUrl()) || !ElementUtil.isURL(httpSamplerProxy.getUrl())) {
+                                env.setFullUrl(false);
+                                env.getProjectIds().add(httpSamplerProxy.getProjectId());
+                            }
+                        }
+                    } else if (StringUtils.equals(tr.getType(), "JDBCSampler") || StringUtils.equals(tr.getType(), "TCPSampler")) {
+                        env.getProjectIds().add(tr.getProjectId());
+                    }
+                }
+                if (StringUtils.equals(tr.getType(), "scenario")) {
+                    MsScenario scenario = (MsScenario) tr;
+                    if (scenario.isEnvironmentEnable()) {
+                        continue;
+                    }
+                    env.getProjectIds().add(tr.getProjectId());
+                }
+                if (CollectionUtils.isNotEmpty(tr.getHashTree())) {
+                    getHashTree(tr.getHashTree(), env);
+                }
+            }
+        } catch (JsonProcessingException e) {
+            LogUtil.error(e);
+        }
+    }
+
+    /**
+     * 设置场景的运行环境 环境组/环境JSON
+     *
+     * @param apiScenarioWithBLOBs
+     */
+    public void setScenarioEnv(ApiScenarioWithBLOBs apiScenarioWithBLOBs) {
+        String environmentType = apiScenarioWithBLOBs.getEnvironmentType();
+        String environmentJson = apiScenarioWithBLOBs.getEnvironmentJson();
+        String environmentGroupId = apiScenarioWithBLOBs.getEnvironmentGroupId();
+        if (StringUtils.isBlank(environmentType)) {
+            environmentType = EnvironmentType.JSON.toString();
+        }
+        String definition = apiScenarioWithBLOBs.getScenarioDefinition();
+        MsScenario scenario = JSONObject.parseObject(definition, MsScenario.class);
+        GenerateHashTreeUtil.parse(definition, scenario);
+        if (StringUtils.equals(environmentType, EnvironmentType.JSON.toString())) {
+            scenario.setEnvironmentMap(JSON.parseObject(environmentJson, Map.class));
+        } else if (StringUtils.equals(environmentType, EnvironmentType.GROUP.toString())) {
+            Map<String, String> map = environmentGroupProjectService.getEnvMap(environmentGroupId);
+            scenario.setEnvironmentMap(map);
+        }
+        apiScenarioWithBLOBs.setScenarioDefinition(JSON.toJSONString(scenario));
+    }
+
+    public boolean checkScenarioEnv(ApiScenarioWithBLOBs apiScenarioWithBLOBs, TestPlanApiScenario testPlanApiScenarios) {
+        String definition = apiScenarioWithBLOBs.getScenarioDefinition();
+        MsScenario scenario = JSONObject.parseObject(definition, MsScenario.class);
+        boolean isEnv = true;
+        Map<String, String> envMap = scenario.getEnvironmentMap();
+        if (testPlanApiScenarios != null) {
+            String envType = testPlanApiScenarios.getEnvironmentType();
+            String envJson = testPlanApiScenarios.getEnvironment();
+            String envGroupId = testPlanApiScenarios.getEnvironmentGroupId();
+            if (StringUtils.equals(envType, EnvironmentType.JSON.toString())
+                    && StringUtils.isNotBlank(envJson)) {
+                envMap = JSON.parseObject(testPlanApiScenarios.getEnvironment(), Map.class);
+            } else if (StringUtils.equals(envType, EnvironmentType.GROUP.name())
+                    && StringUtils.isNotBlank(envGroupId)) {
+                envMap = environmentGroupProjectService.getEnvMap(envGroupId);
+            } else {
+                envMap = new HashMap<>();
+            }
+        }
+        ScenarioEnv apiScenarioEnv = getApiScenarioEnv(definition);
+        // 所有请求非全路径检查环境
+        if (!apiScenarioEnv.getFullUrl()) {
+            try {
+                if (envMap == null || envMap.isEmpty()) {
+                    isEnv = false;
+                } else {
+                    Set<String> projectIds = apiScenarioEnv.getProjectIds();
+                    projectIds.remove(null);
+                    if (CollectionUtils.isNotEmpty(envMap.keySet())) {
+                        for (String id : projectIds) {
+                            Project project = projectMapper.selectByPrimaryKey(id);
+                            if (project == null) {
+                                id = apiScenarioWithBLOBs.getProjectId();
+                            }
+                            String s = envMap.get(id);
+                            if (StringUtils.isBlank(s)) {
+                                isEnv = false;
+                                break;
+                            } else {
+                                ApiTestEnvironmentWithBLOBs env = apiTestEnvironmentMapper.selectByPrimaryKey(s);
+                                if (env == null) {
+                                    isEnv = false;
+                                    break;
+                                }
+                            }
+                        }
+                    } else {
+                        isEnv = false;
+                    }
+                }
+            } catch (Exception e) {
+                isEnv = false;
+                LogUtil.error(e.getMessage(), e);
+            }
+        }
+
+        // 1.8 之前环境是 environmentId
+        if (!isEnv) {
+            String envId = scenario.getEnvironmentId();
+            if (StringUtils.isNotBlank(envId)) {
+                ApiTestEnvironmentWithBLOBs env = apiTestEnvironmentMapper.selectByPrimaryKey(envId);
+                if (env != null) {
+                    isEnv = true;
+                }
+            }
+        }
+        return isEnv;
+    }
+
+    public void checkPlanScenarioEnv(RunScenarioRequest request) {
+        StringBuilder builder = new StringBuilder();
+        List<String> planCaseIds = request.getPlanCaseIds();
+        if (CollectionUtils.isNotEmpty(planCaseIds)) {
+            TestPlanApiScenarioExample example = new TestPlanApiScenarioExample();
+            example.createCriteria().andIdIn(planCaseIds);
+            List<TestPlanApiScenario> testPlanApiScenarios = testPlanApiScenarioMapper.selectByExampleWithBLOBs(example);
+            for (TestPlanApiScenario testPlanApiScenario : testPlanApiScenarios) {
+                try {
+                    ApiScenarioWithBLOBs apiScenarioWithBLOBs = apiScenarioMapper.selectByPrimaryKey(testPlanApiScenario.getApiScenarioId());
+                    boolean haveEnv = this.checkScenarioEnv(apiScenarioWithBLOBs, testPlanApiScenario);
+                    if (!haveEnv) {
+                        builder.append(apiScenarioWithBLOBs.getName()).append("; ");
+                    }
+                } catch (Exception e) {
+                    MSException.throwException("场景：" + builder.toString() + "运行环境未配置，请检查!");
+                }
+            }
+            if (builder.length() > 0) {
+                MSException.throwException("场景：" + builder.toString() + "运行环境未配置，请检查!");
+            }
+        }
+    }
+
+    public void checkEnv(RunScenarioRequest request, List<ApiScenarioWithBLOBs> apiScenarios) {
+        if (StringUtils.equals(request.getRequestOriginator(), "TEST_PLAN")) {
+            this.checkPlanScenarioEnv(request);
+        } else if (StringUtils.isNotBlank(request.getRunMode()) &&
+                StringUtils.equalsAny(request.getRunMode(), ApiRunMode.SCENARIO.name(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
+            StringBuilder builder = new StringBuilder();
+            for (ApiScenarioWithBLOBs apiScenarioWithBLOBs : apiScenarios) {
+                try {
+                    this.setScenarioEnv(apiScenarioWithBLOBs);
+                    boolean haveEnv = this.checkScenarioEnv(apiScenarioWithBLOBs, null);
+                    if (!haveEnv) {
+                        builder.append(apiScenarioWithBLOBs.getName()).append("; ");
+                    }
+                } catch (Exception e) {
+                    MSException.throwException("场景：" + builder.toString() + "运行环境未配置，请检查!");
+                }
+            }
+            if (builder.length() > 0) {
+                MSException.throwException("场景：" + builder.toString() + "运行环境未配置，请检查!");
+            }
+        } else if (StringUtils.equals(request.getRunMode(), ApiRunMode.SCHEDULE_SCENARIO.name())) {
+            for (ApiScenarioWithBLOBs apiScenarioWithBLOBs : apiScenarios) {
+                try {
+                    this.setScenarioEnv(apiScenarioWithBLOBs);
+                } catch (Exception e) {
+                    MSException.throwException("定时任务设置场景环境失败，场景ID： " + apiScenarioWithBLOBs.getId());
+                }
+            }
+        }
+    }
+
+    public void setApiScenarioEnv(List<ApiScenarioDTO> list) {
+        List<Project> projectList = projectMapper.selectByExample(new ProjectExample());
+        List<ApiTestEnvironmentWithBLOBs> apiTestEnvironments = apiTestEnvironmentMapper.selectByExampleWithBLOBs(new ApiTestEnvironmentExample());
+        for (int i = 0; i < list.size(); i++) {
+            try {
+                Map<String, String> map = new HashMap<>();
+                String environmentType = list.get(i).getEnvironmentType();
+                String environmentGroupId = list.get(i).getEnvironmentGroupId();
+                String env = list.get(i).getEnv();
+                if (StringUtils.equals(environmentType, EnvironmentType.JSON.name())) {
+                    // 环境属性为空 跳过
+                    if (StringUtils.isBlank(env)) {
+                        continue;
+                    }
+                    map = JSON.parseObject(env, Map.class);
+                } else if (StringUtils.equals(environmentType, EnvironmentType.GROUP.name())) {
+                    map = environmentGroupProjectService.getEnvMap(environmentGroupId);
+                }
+
+                Set<String> set = map.keySet();
+                HashMap<String, String> envMap = new HashMap<>(16);
+                // 项目为空 跳过
+                if (set.isEmpty()) {
+                    continue;
+                }
+                for (String projectId : set) {
+                    String envId = map.get(projectId);
+                    if (StringUtils.isBlank(envId)) {
+                        continue;
+                    }
+                    List<Project> projects = projectList.stream().filter(p -> StringUtils.equals(p.getId(), projectId)).collect(Collectors.toList());
+                    if (CollectionUtils.isEmpty(projects)) {
+                        continue;
+                    }
+                    Project project = projects.get(0);
+                    List<ApiTestEnvironmentWithBLOBs> envs = apiTestEnvironments.stream().filter(e -> StringUtils.equals(e.getId(), envId)).collect(Collectors.toList());
+                    if (CollectionUtils.isEmpty(envs)) {
+                        continue;
+                    }
+                    ApiTestEnvironmentWithBLOBs environment = envs.get(0);
+                    String projectName = project.getName();
+                    String envName = environment.getName();
+                    if (StringUtils.isBlank(projectName) || StringUtils.isBlank(envName)) {
+                        continue;
+                    }
+                    envMap.put(projectName, envName);
+                }
+                list.get(i).setEnvironmentMap(envMap);
+            } catch (Exception e) {
+                LogUtil.error("api scenario environment map incorrect parsing. api scenario id:" + list.get(i).getId());
+            }
+        }
+    }
+
+    public void setEnvConfig(Map<String, String> environmentMap, ParameterConfig config) {
+        final Map<String, EnvironmentConfig> envConfig = new HashMap<>(16);
+        if (environmentMap != null) {
+            environmentMap.keySet().forEach(projectId -> {
+                ApiTestEnvironmentService environmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
+                ApiTestEnvironmentWithBLOBs environment = environmentService.get(environmentMap.get(projectId));
+                if (environment != null && environment.getConfig() != null) {
+                    EnvironmentConfig env = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
+                    env.setApiEnvironmentid(environment.getId());
+                    envConfig.put(projectId, env);
+                }
+            });
+            config.setConfig(envConfig);
+        }
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioExecuteService.java b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioExecuteService.java
new file mode 100644
index 0000000000..9d28d86887
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioExecuteService.java
@@ -0,0 +1,378 @@
+package io.metersphere.api.exec.scenario;
+
+import com.alibaba.fastjson.JSON;
+import io.metersphere.api.cache.TestPlanReportExecuteCatch;
+import io.metersphere.api.dto.EnvironmentType;
+import io.metersphere.api.dto.RunModeDataDTO;
+import io.metersphere.api.dto.automation.APIScenarioReportResult;
+import io.metersphere.api.dto.automation.ExecuteType;
+import io.metersphere.api.dto.automation.RunScenarioRequest;
+import io.metersphere.api.dto.definition.RunDefinitionRequest;
+import io.metersphere.api.dto.definition.request.ParameterConfig;
+import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
+import io.metersphere.api.jmeter.JMeterService;
+import io.metersphere.api.jmeter.MessageCache;
+import io.metersphere.api.jmeter.ReportCounter;
+import io.metersphere.api.service.ApiScenarioReportService;
+import io.metersphere.api.service.ApiScenarioReportStructureService;
+import io.metersphere.api.service.RemakeReportService;
+import io.metersphere.api.service.TcpApiParamService;
+import io.metersphere.base.domain.ApiScenarioExample;
+import io.metersphere.base.domain.ApiScenarioWithBLOBs;
+import io.metersphere.base.domain.TestPlanApiScenario;
+import io.metersphere.base.mapper.ApiScenarioMapper;
+import io.metersphere.base.mapper.ApiScenarioReportMapper;
+import io.metersphere.base.mapper.TestPlanApiScenarioMapper;
+import io.metersphere.base.mapper.ext.ExtApiScenarioMapper;
+import io.metersphere.commons.constants.ApiRunMode;
+import io.metersphere.commons.constants.ReportTriggerMode;
+import io.metersphere.commons.constants.TriggerMode;
+import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.FileUtils;
+import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.commons.utils.ServiceUtils;
+import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.constants.RunModeConstants;
+import io.metersphere.dto.JmeterRunRequestDTO;
+import io.metersphere.dto.MsExecResponseDTO;
+import io.metersphere.i18n.Translator;
+import io.metersphere.service.EnvironmentGroupProjectService;
+import io.metersphere.track.service.TestPlanScenarioCaseService;
+import io.metersphere.utils.LoggerUtil;
+import org.apache.commons.beanutils.BeanComparator;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.comparators.FixedOrderComparator;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.jorphan.collections.HashTree;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Service
+public class ApiScenarioExecuteService {
+    @Resource
+    private ApiScenarioEnvService apiScenarioEnvService;
+    @Resource
+    private ApiScenarioMapper apiScenarioMapper;
+    @Resource
+    private ExtApiScenarioMapper extApiScenarioMapper;
+    @Resource
+    private TestPlanApiScenarioMapper testPlanApiScenarioMapper;
+    @Resource
+    private ApiScenarioReportMapper apiScenarioReportMapper;
+    @Resource
+    @Lazy
+    private TestPlanScenarioCaseService testPlanScenarioCaseService;
+    @Resource
+    private ApiScenarioReportService apiScenarioReportService;
+    @Resource
+    private RemakeReportService remakeReportService;
+    @Resource
+    private EnvironmentGroupProjectService environmentGroupProjectService;
+    @Resource
+    private ApiScenarioReportStructureService apiScenarioReportStructureService;
+    @Resource
+    private ApiScenarioSerialService apiScenarioSerialService;
+    @Resource
+    private ApiScenarioParallelService apiScenarioParallelService;
+    @Resource
+    private TcpApiParamService tcpApiParamService;
+    @Resource
+    private JMeterService jMeterService;
+
+    public List<MsExecResponseDTO> run(RunScenarioRequest request) {
+        if (LoggerUtil.getLogger().isDebugEnabled()) {
+            LoggerUtil.debug("Scenario run-执行脚本装载-接收到场景执行参数：【 " + JSON.toJSONString(request) + " 】");
+        }
+        if (StringUtils.isEmpty(request.getTriggerMode())) {
+            request.setTriggerMode(ReportTriggerMode.MANUAL.name());
+        }
+        // 生成集成报告
+        String serialReportId = null;
+        LoggerUtil.info("Scenario run-执行脚本装载-根据条件查询所有场景 ");
+        List<ApiScenarioWithBLOBs> apiScenarios = this.get(request);
+        // 只有一个场景且没有测试步骤，则提示
+        if (apiScenarios != null && apiScenarios.size() == 1 && (apiScenarios.get(0).getStepTotal() == null || apiScenarios.get(0).getStepTotal() == 0)) {
+            MSException.throwException((apiScenarios.get(0).getName() + "，" + Translator.get("automation_exec_info")));
+        }
+        // 资源池
+        LoggerUtil.info("Scenario run-执行脚本装载-开始检查是否需要加载资源池");
+        GenerateHashTreeUtil.setPoolResource(request.getConfig());
+        // 环境检查
+        LoggerUtil.info("Scenario run-执行脚本装载-开始针对所有执行场景进行环境检查");
+        apiScenarioEnvService.checkEnv(request, apiScenarios);
+        // 集合报告设置
+        if (request.getConfig() != null && StringUtils.equals(request.getConfig().getReportType(), RunModeConstants.SET_REPORT.toString()) && StringUtils.isNotEmpty(request.getConfig().getReportName())) {
+            if (request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
+                request.setExecuteType(ExecuteType.Completed.name());
+            } else {
+                request.setExecuteType(ExecuteType.Marge.name());
+            }
+            serialReportId = UUID.randomUUID().toString();
+        }
+        List<MsExecResponseDTO> responseDTOS = new LinkedList<>();
+
+        Map<String, RunModeDataDTO> executeQueue = new LinkedHashMap<>();
+        List<String> scenarioIds = new ArrayList<>();
+        StringBuilder scenarioNames = new StringBuilder();
+
+        LoggerUtil.info("Scenario run-执行脚本装载-初始化执行队列");
+        if (StringUtils.equalsAny(request.getRunMode(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
+            //测试计划执行
+            assemblyPlanScenario(apiScenarios, request, executeQueue, scenarioIds, scenarioNames);
+        } else {
+            // 按照场景执行
+            assemblyScenario(apiScenarios, request, executeQueue, scenarioIds, scenarioNames, serialReportId);
+        }
+        LoggerUtil.info("Scenario run-执行脚本装载-初始化执行队列完成：" + executeQueue.size());
+
+        if (GenerateHashTreeUtil.isSetReport(request.getConfig())) {
+            LoggerUtil.info("Scenario run-执行脚本装载-初始化集成报告：" + serialReportId);
+            request.getConfig().setReportId(UUID.randomUUID().toString());
+
+            APIScenarioReportResult report = apiScenarioReportService.init(request.getConfig().getReportId(),
+                    JSON.toJSONString(CollectionUtils.isNotEmpty(scenarioIds) && scenarioIds.size() > 50 ? scenarioIds.subList(0, 50) : scenarioIds),
+                    scenarioNames.length() >= 3000 ? scenarioNames.substring(0, 2000) : scenarioNames.deleteCharAt(scenarioNames.length() - 1).toString(),
+                    ReportTriggerMode.MANUAL.name(), ExecuteType.Saved.name(), request.getProjectId(), request.getReportUserID(), request.getConfig(), JSON.toJSONString(scenarioIds));
+
+            report.setName(request.getConfig().getReportName());
+            report.setId(serialReportId);
+            request.getConfig().setAmassReport(serialReportId);
+            apiScenarioReportMapper.insert(report);
+
+            responseDTOS.add(new MsExecResponseDTO(JSON.toJSONString(scenarioIds), serialReportId, request.getRunMode()));
+
+            // 增加并行集合报告
+            if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.PARALLEL.toString())) {
+                List<String> testIds = executeQueue.entrySet().stream().map(reports -> reports.getValue().getTestId()).collect(Collectors.toList());
+                ReportCounter counter = new ReportCounter();
+                counter.setCompletedIds(new LinkedList<>());
+                if (CollectionUtils.isNotEmpty(request.getConfig().getTestResources())) {
+                    counter.setPoolUrls(request.getConfig().getTestResources());
+                }
+                counter.setTestIds(testIds);
+                MessageCache.concurrencyCounter.put(serialReportId, counter);
+
+                LoggerUtil.debug("Scenario run-执行脚本装载-初始化并行集成报告队列：" + JSON.toJSONString(counter));
+                apiScenarioReportStructureService.save(apiScenarios, serialReportId);
+            }
+        }
+        // 开始执行
+        if (executeQueue != null && executeQueue.size() > 0) {
+            if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
+                if (StringUtils.isNotEmpty(serialReportId)) {
+                    apiScenarioReportStructureService.save(apiScenarios, serialReportId);
+                }
+                apiScenarioSerialService.serial(executeQueue, request, serialReportId, responseDTOS);
+            } else {
+                apiScenarioParallelService.parallel(executeQueue, request, serialReportId, responseDTOS);
+            }
+        }
+        return responseDTOS;
+    }
+
+    private List<ApiScenarioWithBLOBs> get(RunScenarioRequest request) {
+        ServiceUtils.getSelectAllIds(request, request.getCondition(),
+                (query) -> extApiScenarioMapper.selectIdsByQuery(query));
+        List<String> ids = request.getIds();
+        ApiScenarioExample example = new ApiScenarioExample();
+        example.createCriteria().andIdIn(ids);
+        List<ApiScenarioWithBLOBs> apiScenarios = apiScenarioMapper.selectByExampleWithBLOBs(example);
+        if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
+            if (request.getCondition() == null || !request.getCondition().isSelectAll()) {
+                // 按照id指定顺序排序
+                FixedOrderComparator<String> fixedOrderComparator = new FixedOrderComparator<String>(ids);
+                fixedOrderComparator.setUnknownObjectBehavior(FixedOrderComparator.UnknownObjectBehavior.BEFORE);
+                BeanComparator beanComparator = new BeanComparator("id", fixedOrderComparator);
+                Collections.sort(apiScenarios, beanComparator);
+            }
+        }
+        return apiScenarios;
+    }
+
+
+    /**
+     * 测试计划接口场景的预执行（生成场景报告）
+     */
+    private void assemblyPlanScenario(List<ApiScenarioWithBLOBs> apiScenarios, RunScenarioRequest request, Map<String, RunModeDataDTO> executeQueue, List<String> scenarioIds, StringBuilder scenarioNames) {
+        String reportId = request.getId();
+        Map<String, String> planScenarioIdMap = request.getScenarioTestPlanIdMap();
+        if (MapUtils.isEmpty(planScenarioIdMap)) {
+            return;
+        }
+        String projectId = request.getProjectId();
+        Map<String, ApiScenarioWithBLOBs> scenarioMap = apiScenarios.stream().collect(Collectors.toMap(ApiScenarioWithBLOBs::getId, Function.identity(), (t1, t2) -> t1));
+        for (Map.Entry<String, String> entry : planScenarioIdMap.entrySet()) {
+            String testPlanScenarioId = entry.getKey();
+            String scenarioId = entry.getValue();
+            ApiScenarioWithBLOBs scenario = scenarioMap.get(scenarioId);
+
+            if (scenario.getStepTotal() == null || scenario.getStepTotal() == 0) {
+                continue;
+            }
+            APIScenarioReportResult report;
+            Map<String, String> planEnvMap = new HashMap<>();
+
+            //测试计划页面触发的执行方式，生成报告时createScenarioReport第二个参数需要特殊处理
+            // 获取场景用例单独的执行环境
+            TestPlanApiScenario planApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(testPlanScenarioId);
+            String envJson = planApiScenario.getEnvironment();
+            String envType = planApiScenario.getEnvironmentType();
+            String envGroupId = planApiScenario.getEnvironmentGroupId();
+            if (StringUtils.equals(envType, EnvironmentType.JSON.toString()) && StringUtils.isNotBlank(envJson)) {
+                planEnvMap = JSON.parseObject(envJson, Map.class);
+            } else if (StringUtils.equals(envType, EnvironmentType.GROUP.toString()) && StringUtils.isNotBlank(envGroupId)) {
+                planEnvMap = environmentGroupProjectService.getEnvMap(envGroupId);
+            }
+            if (StringUtils.isEmpty(projectId)) {
+                projectId = testPlanScenarioCaseService.getProjectIdById(testPlanScenarioId);
+            }
+            if (StringUtils.isEmpty(projectId)) {
+                projectId = scenario.getProjectId();
+            }
+            report = apiScenarioReportService.init(reportId, testPlanScenarioId, scenario.getName(), request.getTriggerMode(),
+                    request.getExecuteType(), projectId, request.getReportUserID(), request.getConfig(), scenario.getId());
+
+            if (report != null && StringUtils.isNotEmpty(request.getTestPlanReportId())) {
+                Map<String, String> scenarioReportIdMap = new HashMap<>();
+                scenarioReportIdMap.put(testPlanScenarioId, report.getId());
+                TestPlanReportExecuteCatch.updateTestPlanThreadInfo(request.getTestPlanReportId(), null, scenarioReportIdMap, null);
+            }
+            scenarioIds.add(scenario.getId());
+            if (request.getConfig() != null && StringUtils.isNotBlank(request.getConfig().getResourcePoolId())) {
+                RunModeDataDTO runModeDataDTO = new RunModeDataDTO();
+                runModeDataDTO.setTestId(testPlanScenarioId);
+                runModeDataDTO.setPlanEnvMap(planEnvMap);
+                runModeDataDTO.setReport(report);
+                runModeDataDTO.setReportId(report.getId());
+                executeQueue.put(report.getId(), runModeDataDTO);
+            } else {
+                try {
+                    // 生成报告和HashTree
+                    HashTree hashTree = GenerateHashTreeUtil.generateHashTree(scenario, reportId, planEnvMap);
+                    executeQueue.put(report.getId(), new RunModeDataDTO(hashTree, report, testPlanScenarioId));
+                } catch (Exception ex) {
+                    scenarioIds.remove(scenario.getId());
+                    if (StringUtils.equalsAny(request.getTriggerMode(), TriggerMode.BATCH.name(), TriggerMode.SCHEDULE.name())) {
+                        remakeReportService.remakeScenario(request.getRunMode(), testPlanScenarioId, scenario, report);
+                    } else {
+                        MSException.throwException(ex);
+                    }
+                }
+            }
+
+            scenarioNames.append(scenario.getName()).append(",");
+
+            // 生成文档结构
+            if (request.getConfig() == null || !StringUtils.equals(request.getConfig().getReportType(), RunModeConstants.SET_REPORT.toString())) {
+                apiScenarioReportStructureService.save(scenario, report.getId());
+            }
+            // 重置报告ID
+            reportId = UUID.randomUUID().toString();
+        }
+    }
+
+    /**
+     * 接口场景的预执行（生成场景报告）
+     */
+    private void assemblyScenario(List<ApiScenarioWithBLOBs> apiScenarios, RunScenarioRequest request, Map<String, RunModeDataDTO> executeQueue, List<String> scenarioIds, StringBuilder scenarioNames, String serialReportId) {
+        String reportId = request.getId();
+        for (int i = 0; i < apiScenarios.size(); i++) {
+            ApiScenarioWithBLOBs item = apiScenarios.get(i);
+            if (item.getStepTotal() == null || item.getStepTotal() == 0) {
+                continue;
+            }
+            APIScenarioReportResult report = apiScenarioReportService.init(reportId, item.getId(), item.getName(), request.getTriggerMode(),
+                    request.getExecuteType(), item.getProjectId(), request.getReportUserID(), request.getConfig(), item.getId());
+            scenarioIds.add(item.getId());
+            scenarioNames.append(item.getName()).append(",");
+            if (request.getConfig() != null && StringUtils.isNotBlank(request.getConfig().getResourcePoolId())) {
+                RunModeDataDTO runModeDataDTO = new RunModeDataDTO();
+                runModeDataDTO.setTestId(item.getId());
+                runModeDataDTO.setPlanEnvMap(new HashMap<>());
+                runModeDataDTO.setReport(report);
+                runModeDataDTO.setReportId(report.getId());
+                executeQueue.put(report.getId(), runModeDataDTO);
+            } else {
+                // 生成报告和HashTree
+                try {
+                    HashTree hashTree = GenerateHashTreeUtil.generateHashTree(item, StringUtils.isNotEmpty(serialReportId) ? serialReportId + "-" + i : reportId, new HashMap<>());
+                    executeQueue.put(report.getId(), new RunModeDataDTO(hashTree, report, item.getId()));
+                } catch (Exception ex) {
+                    scenarioIds.remove(item.getId());
+                    if (StringUtils.equalsAny(request.getTriggerMode(), TriggerMode.BATCH.name(), TriggerMode.SCHEDULE.name())) {
+                        remakeReportService.remakeScenario(request.getRunMode(), null, item, report);
+                    } else {
+                        MSException.throwException(ex);
+                    }
+                }
+            }
+            // 生成报告结构
+            if (request.getConfig() == null || !StringUtils.equals(request.getConfig().getReportType(), RunModeConstants.SET_REPORT.toString())) {
+                apiScenarioReportStructureService.save(item, report.getId());
+            }
+            // 重置报告ID
+            reportId = UUID.randomUUID().toString();
+        }
+    }
+
+    public void testElement(RunDefinitionRequest request) {
+        if (request.getTestElement() != null) {
+            tcpApiParamService.checkTestElement(request.getTestElement());
+        }
+    }
+
+    public String debug(RunDefinitionRequest request, List<MultipartFile> bodyFiles, List<MultipartFile> scenarioFiles) {
+        Map<String, String> map = request.getEnvironmentMap();
+        String envType = request.getEnvironmentType();
+        if (StringUtils.equals(envType, EnvironmentType.GROUP.toString())) {
+            String environmentGroupId = request.getEnvironmentGroupId();
+            map = environmentGroupProjectService.getEnvMap(environmentGroupId);
+        }
+        ParameterConfig config = new ParameterConfig();
+        if (map != null) {
+            apiScenarioEnvService.setEnvConfig(map, config);
+        }
+        HashTree hashTree = null;
+        try {
+            this.testElement(request);
+            hashTree = request.getTestElement().generateHashTree(config);
+            LogUtil.info(request.getTestElement().getJmx(hashTree));
+        } catch (Exception e) {
+            MSException.throwException(e.getMessage());
+        }
+
+        APIScenarioReportResult report = apiScenarioReportService.init(request.getId(), request.getScenarioId(), request.getScenarioName(), ReportTriggerMode.MANUAL.name(), request.getExecuteType(), request.getProjectId(),
+                SessionUtils.getUserId(), request.getConfig(), request.getId());
+        apiScenarioReportMapper.insert(report);
+        if (request.isSaved()) {
+            ApiScenarioWithBLOBs scenario = apiScenarioMapper.selectByPrimaryKey(request.getScenarioId());
+            apiScenarioReportStructureService.save(scenario, report.getId());
+        }
+        uploadBodyFiles(request.getBodyFileRequestIds(), bodyFiles);
+        FileUtils.createBodyFiles(request.getScenarioFileIds(), scenarioFiles);
+
+        // 调用执行方法
+        JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(request.getId(), request.getId(), ApiRunMode.SCENARIO.name(), hashTree);
+        runRequest.setConfig(request.getConfig());
+        runRequest.setDebug(true);
+
+        jMeterService.run(runRequest);
+        return request.getId();
+    }
+
+    private void uploadBodyFiles(List<String> bodyFileRequestIds, List<MultipartFile> bodyFiles) {
+        if (CollectionUtils.isNotEmpty(bodyFileRequestIds)) {
+            bodyFileRequestIds.forEach(requestId -> {
+                FileUtils.createBodyFiles(requestId, bodyFiles);
+            });
+        }
+    }
+}
+
diff --git a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioParallelService.java b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioParallelService.java
new file mode 100644
index 0000000000..709a7df5f8
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioParallelService.java
@@ -0,0 +1,63 @@
+package io.metersphere.api.exec.scenario;
+
+import com.alibaba.fastjson.JSON;
+import io.metersphere.api.dto.RunModeDataDTO;
+import io.metersphere.api.dto.automation.APIScenarioReportResult;
+import io.metersphere.api.dto.automation.RunScenarioRequest;
+import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
+import io.metersphere.api.jmeter.JMeterService;
+import io.metersphere.base.mapper.ApiScenarioReportMapper;
+import io.metersphere.constants.RunModeConstants;
+import io.metersphere.dto.JmeterRunRequestDTO;
+import io.metersphere.dto.MsExecResponseDTO;
+import io.metersphere.utils.LoggerUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class ApiScenarioParallelService {
+
+    @Resource
+    private SqlSessionFactory sqlSessionFactory;
+    @Resource
+    private JMeterService jMeterService;
+
+    public void parallel(Map<String, RunModeDataDTO> executeQueue, RunScenarioRequest request, String serialReportId, List<MsExecResponseDTO> responseDTOS) {
+        if (StringUtils.isEmpty(serialReportId)) {
+            SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+            ApiScenarioReportMapper batchMapper = sqlSession.getMapper(ApiScenarioReportMapper.class);
+            // 开始并发执行
+            for (String reportId : executeQueue.keySet()) {
+                //存储报告
+                APIScenarioReportResult report = executeQueue.get(reportId).getReport();
+                batchMapper.insert(report);
+                responseDTOS.add(new MsExecResponseDTO(executeQueue.get(reportId).getTestId(), reportId, request.getRunMode()));
+            }
+            sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
+        }
+
+        for (String reportId : executeQueue.keySet()) {
+            JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(executeQueue.get(reportId).getTestId(), StringUtils.isNotEmpty(serialReportId) ? serialReportId : reportId, request.getRunMode(), executeQueue.get(reportId).getHashTree());
+            runRequest.setConfig(request.getConfig());
+            runRequest.setReportType(StringUtils.isNotEmpty(serialReportId) ? RunModeConstants.SET_REPORT.toString() : RunModeConstants.INDEPENDENCE.toString());
+            runRequest.setPool(GenerateHashTreeUtil.isResourcePool(request.getConfig()));
+            runRequest.setTestPlanReportId(request.getTestPlanReportId());
+
+            if (LoggerUtil.getLogger().isDebugEnabled()) {
+                LoggerUtil.debug("Scenario run-开始并发执行：" + JSON.toJSONString(request));
+            }
+            jMeterService.run(runRequest);
+        }
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java
new file mode 100644
index 0000000000..2b3995a7e3
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java
@@ -0,0 +1,137 @@
+package io.metersphere.api.exec.scenario;
+
+import io.metersphere.api.dto.RunModeDataDTO;
+import io.metersphere.api.dto.automation.APIScenarioReportResult;
+import io.metersphere.api.dto.automation.RunScenarioRequest;
+import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
+import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
+import io.metersphere.api.jmeter.JMeterService;
+import io.metersphere.api.service.ApiScenarioReportService;
+import io.metersphere.api.service.ApiTestEnvironmentService;
+import io.metersphere.base.domain.ApiScenarioReport;
+import io.metersphere.base.mapper.ApiScenarioReportMapper;
+import io.metersphere.commons.constants.APITestStatus;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.commons.utils.HashTreeUtil;
+import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.constants.RunModeConstants;
+import io.metersphere.dto.JmeterRunRequestDTO;
+import io.metersphere.dto.MsExecResponseDTO;
+import io.metersphere.utils.LoggerUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.jorphan.collections.HashTree;
+import org.mybatis.spring.SqlSessionUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class ApiScenarioSerialService {
+
+    @Resource
+    private SqlSessionFactory sqlSessionFactory;
+    @Resource
+    private ApiScenarioReportMapper apiScenarioReportMapper;
+    @Resource
+    private JMeterService jMeterService;
+    @Resource
+    private ApiScenarioReportService apiScenarioReportService;
+
+    public void serial(Map<String, RunModeDataDTO> executeQueue, RunScenarioRequest request, String serialReportId, List<MsExecResponseDTO> responseDTOS) {
+        LoggerUtil.debug("Scenario run-执行脚本装载-进入串行准备");
+
+        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+        ApiScenarioReportMapper batchMapper = sqlSession.getMapper(ApiScenarioReportMapper.class);
+        // 非集合报告，先生成执行队列
+        if (StringUtils.isEmpty(serialReportId)) {
+            for (String reportId : executeQueue.keySet()) {
+                APIScenarioReportResult report = executeQueue.get(reportId).getReport();
+                report.setStatus(APITestStatus.Waiting.name());
+                batchMapper.insert(report);
+                responseDTOS.add(new MsExecResponseDTO(executeQueue.get(reportId).getTestId(), reportId, request.getRunMode()));
+            }
+            sqlSession.flushStatements();
+            if (sqlSession != null && sqlSessionFactory != null) {
+                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+            }
+        }
+        // 开始串行执行
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                Thread.currentThread().setName("Scenario串行执行线程");
+                try {
+                    //记录串行执行中的环境参数，供下一个场景执行时使用。 <envId,<key,data>>
+                    Map<String, Map<String, String>> executeEnvParams = new LinkedHashMap<>();
+                    ApiTestEnvironmentService apiTestEnvironmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
+                    HashTreeUtil hashTreeUtil = new HashTreeUtil();
+                    for (String key : executeQueue.keySet()) {
+                        APIScenarioReportResult report = executeQueue.get(key).getReport();
+                        if (StringUtils.isEmpty(serialReportId)) {
+                            report.setStatus(APITestStatus.Running.name());
+                            report.setCreateTime(System.currentTimeMillis());
+                            report.setUpdateTime(System.currentTimeMillis());
+                            apiScenarioReportMapper.updateByPrimaryKey(report);
+                        }
+
+                        String queueReportId = StringUtils.isNotEmpty(serialReportId) ? serialReportId + "_" + executeQueue.get(key).getTestId() : key;
+                        LoggerUtil.info("Scenario run-开始执行，队列ID：【 " + queueReportId + " 】");
+                        try {
+                            if (!executeEnvParams.isEmpty()) {
+                                HashTree hashTree = executeQueue.get(key).getHashTree();
+                                hashTreeUtil.setEnvParamsMapToHashTree(hashTree, executeEnvParams);
+                                executeQueue.get(key).setHashTree(hashTree);
+                            }
+
+                            SerialBlockingQueueUtil.init(queueReportId, 1);
+
+                            String reportId = StringUtils.isNotEmpty(serialReportId) ? serialReportId : key;
+                            JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(executeQueue.get(key).getTestId(), reportId, request.getRunMode(), executeQueue.get(key).getHashTree());
+                            if (request.getConfig() != null) {
+                                runRequest.setConfig(request.getConfig());
+                            }
+                            runRequest.setReportType(StringUtils.isNotEmpty(serialReportId) ? RunModeConstants.SET_REPORT.toString() : RunModeConstants.INDEPENDENCE.toString());
+                            runRequest.setPool(GenerateHashTreeUtil.isResourcePool(request.getConfig()));
+                            runRequest.setTestPlanReportId(request.getTestPlanReportId());
+
+                            // 开始执行
+                            jMeterService.run(runRequest);
+
+                            Object reportObj = SerialBlockingQueueUtil.take(queueReportId);
+                            LoggerUtil.info("Scenario run-执行完成：【 " + queueReportId + " 】");
+                            // 如果开启失败结束执行，则判断返回结果状态
+                            if (request.getConfig().isOnSampleError()) {
+                                if (reportObj != null) {
+                                    ApiScenarioReport scenarioReport = (ApiScenarioReport) reportObj;
+                                    if (!scenarioReport.getStatus().equals("Success")) {
+                                        break;
+                                    }
+                                }
+                            }
+
+                            Map<String, Map<String, String>> envParamsMap = hashTreeUtil.getEnvParamsDataByHashTree(executeQueue.get(key).getHashTree(), apiTestEnvironmentService);
+                            executeEnvParams = hashTreeUtil.mergeParamDataMap(executeEnvParams, envParamsMap);
+                        } catch (Exception e) {
+                            SerialBlockingQueueUtil.remove(queueReportId);
+                            LogUtil.error("执行终止：" + e.getMessage());
+                            break;
+                        }
+                    }
+                    // 更新集成报告
+                    if (StringUtils.isNotEmpty(serialReportId)) {
+                        apiScenarioReportService.margeReport(serialReportId);
+                    }
+                } catch (Exception e) {
+                    LogUtil.error(e);
+                }
+            }
+        });
+        thread.start();
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/exec/utils/ApiDefinitionExecResultUtil.java b/backend/src/main/java/io/metersphere/api/exec/utils/ApiDefinitionExecResultUtil.java
new file mode 100644
index 0000000000..356df02577
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/utils/ApiDefinitionExecResultUtil.java
@@ -0,0 +1,97 @@
+package io.metersphere.api.exec.utils;
+
+import io.metersphere.api.dto.definition.BatchRunDefinitionRequest;
+import io.metersphere.base.domain.ApiDefinitionExecResult;
+import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
+import io.metersphere.base.domain.TestPlanApiCase;
+import io.metersphere.base.mapper.ApiDefinitionExecResultMapper;
+import io.metersphere.base.mapper.ApiTestCaseMapper;
+import io.metersphere.commons.constants.ApiRunMode;
+import io.metersphere.commons.constants.TriggerMode;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.commons.utils.SessionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Objects;
+import java.util.UUID;
+
+public class ApiDefinitionExecResultUtil {
+    public static ApiDefinitionExecResult initBase(String resourceId, String status, String reportId) {
+        ApiDefinitionExecResult apiResult = new ApiDefinitionExecResult();
+        if (StringUtils.isEmpty(reportId)) {
+            apiResult.setId(UUID.randomUUID().toString());
+        } else {
+            apiResult.setId(reportId);
+        }
+        apiResult.setCreateTime(System.currentTimeMillis());
+        apiResult.setStartTime(System.currentTimeMillis());
+        apiResult.setEndTime(System.currentTimeMillis());
+        apiResult.setTriggerMode(TriggerMode.BATCH.name());
+        apiResult.setActuator("LOCAL");
+        apiResult.setUserId(Objects.requireNonNull(SessionUtils.getUser()).getId());
+        apiResult.setResourceId(resourceId);
+        apiResult.setStartTime(System.currentTimeMillis());
+        apiResult.setType(ApiRunMode.DEFINITION.name());
+        apiResult.setStatus(status);
+        return apiResult;
+    }
+
+    public static ApiDefinitionExecResult addResult(BatchRunDefinitionRequest request, TestPlanApiCase key, String status, ApiDefinitionExecResultMapper batchMapper) {
+        ApiDefinitionExecResult apiResult = new ApiDefinitionExecResult();
+        apiResult.setId(UUID.randomUUID().toString());
+        apiResult.setCreateTime(System.currentTimeMillis());
+        apiResult.setStartTime(System.currentTimeMillis());
+        apiResult.setEndTime(System.currentTimeMillis());
+        ApiTestCaseWithBLOBs caseWithBLOBs = CommonBeanFactory.getBean(ApiTestCaseMapper.class).selectByPrimaryKey(key.getApiCaseId());
+        if (caseWithBLOBs != null) {
+            apiResult.setName(caseWithBLOBs.getName());
+        }
+        if (StringUtils.equalsIgnoreCase(request.getTriggerMode(), ApiRunMode.SCHEDULE_API_PLAN.name())) {
+            apiResult.setTriggerMode(TriggerMode.SCHEDULE.name());
+        } else if (StringUtils.equalsIgnoreCase(request.getTriggerMode(), ApiRunMode.JENKINS_API_PLAN.name())) {
+            apiResult.setTriggerMode(TriggerMode.MANUAL.name());
+        } else {
+            apiResult.setTriggerMode(TriggerMode.BATCH.name());
+        }
+        apiResult.setActuator("LOCAL");
+        if (GenerateHashTreeUtil.isResourcePool(request.getConfig()).isPool()) {
+            apiResult.setActuator(request.getConfig().getResourcePoolId());
+        }
+        if (StringUtils.isEmpty(request.getUserId())) {
+            if (SessionUtils.getUser() != null) {
+                apiResult.setUserId(SessionUtils.getUser().getId());
+            }
+        } else {
+            apiResult.setUserId(request.getUserId());
+        }
+
+        apiResult.setResourceId(key.getApiCaseId());
+        apiResult.setStartTime(System.currentTimeMillis());
+        apiResult.setType(ApiRunMode.API_PLAN.name());
+        apiResult.setStatus(status);
+        apiResult.setContent(request.getPlanReportId());
+        batchMapper.insert(apiResult);
+        return apiResult;
+    }
+
+    public static ApiDefinitionExecResult add(String resourceId, String status, String reportId) {
+        ApiDefinitionExecResult apiResult = new ApiDefinitionExecResult();
+        if (StringUtils.isEmpty(reportId)) {
+            apiResult.setId(UUID.randomUUID().toString());
+        } else {
+            apiResult.setId(reportId);
+        }
+        apiResult.setCreateTime(System.currentTimeMillis());
+        apiResult.setStartTime(System.currentTimeMillis());
+        apiResult.setEndTime(System.currentTimeMillis());
+        apiResult.setTriggerMode(TriggerMode.BATCH.name());
+        apiResult.setActuator("LOCAL");
+        apiResult.setUserId(Objects.requireNonNull(SessionUtils.getUser()).getId());
+        apiResult.setResourceId(resourceId);
+        apiResult.setStartTime(System.currentTimeMillis());
+        apiResult.setType(ApiRunMode.DEFINITION.name());
+        apiResult.setStatus(status);
+
+        return apiResult;
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java b/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java
new file mode 100644
index 0000000000..7871fc8c74
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java
@@ -0,0 +1,134 @@
+package io.metersphere.api.exec.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.metersphere.api.dto.definition.request.*;
+import io.metersphere.api.dto.definition.request.variable.ScenarioVariable;
+import io.metersphere.api.jmeter.ResourcePoolCalculation;
+import io.metersphere.base.domain.ApiScenarioWithBLOBs;
+import io.metersphere.base.domain.TestResourcePool;
+import io.metersphere.base.mapper.TestResourcePoolMapper;
+import io.metersphere.commons.constants.ResourcePoolTypeEnum;
+import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.constants.RunModeConstants;
+import io.metersphere.dto.JvmInfoDTO;
+import io.metersphere.dto.RunModeConfigDTO;
+import io.metersphere.plugin.core.MsTestElement;
+import io.metersphere.vo.BooleanPool;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.jorphan.collections.HashTree;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+public class GenerateHashTreeUtil {
+
+    public static MsScenario parseScenarioDefinition(String scenarioDefinition) {
+        MsScenario scenario = JSONObject.parseObject(scenarioDefinition, MsScenario.class);
+        parse(scenarioDefinition, scenario);
+        return scenario;
+    }
+
+    public static void parse(String scenarioDefinition, MsScenario scenario) {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        try {
+            JSONObject element = JSON.parseObject(scenarioDefinition);
+            ElementUtil.dataFormatting(element);
+            // 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取
+            if (element != null && StringUtils.isNotEmpty(element.getString("hashTree"))) {
+                LinkedList<MsTestElement> elements = mapper.readValue(element.getString("hashTree"),
+                        new TypeReference<LinkedList<MsTestElement>>() {
+                        });
+                scenario.setHashTree(elements);
+            }
+            if (element != null && StringUtils.isNotEmpty(element.getString("variables"))) {
+                LinkedList<ScenarioVariable> variables = mapper.readValue(element.getString("variables"),
+                        new TypeReference<LinkedList<ScenarioVariable>>() {
+                        });
+                scenario.setVariables(variables);
+            }
+        } catch (Exception e) {
+            LogUtil.error(e);
+            LogUtil.error(e);
+        }
+    }
+
+    public static LinkedList<MsTestElement> getScenarioHashTree(String definition) {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        JSONObject element = JSON.parseObject(definition);
+        try {
+            if (element != null) {
+                ElementUtil.dataFormatting(element);
+                return objectMapper.readValue(element.getString("hashTree"), new TypeReference<LinkedList<MsTestElement>>() {
+                });
+            }
+        } catch (JsonProcessingException e) {
+            LogUtil.error(e.getMessage(), e);
+        }
+        return new LinkedList<>();
+    }
+
+    public static BooleanPool isResourcePool(RunModeConfigDTO config) {
+        BooleanPool pool = new BooleanPool();
+        pool.setPool(config != null && StringUtils.isNotEmpty(config.getResourcePoolId()));
+        if (pool.isPool()) {
+            TestResourcePool resourcePool = CommonBeanFactory.getBean(TestResourcePoolMapper.class).selectByPrimaryKey(config.getResourcePoolId());
+            pool.setK8s(resourcePool != null && resourcePool.getApi() && resourcePool.getType().equals(ResourcePoolTypeEnum.K8S.name()));
+        }
+        return pool;
+    }
+
+    public static void setPoolResource(RunModeConfigDTO config) {
+        if (GenerateHashTreeUtil.isResourcePool(config).isPool()) {
+            if (GenerateHashTreeUtil.isResourcePool(config).isK8s()) {
+                LogUtil.info("K8S 暂时不做校验 ");
+            } else {
+                ResourcePoolCalculation resourcePoolCalculation = CommonBeanFactory.getBean(ResourcePoolCalculation.class);
+                List<JvmInfoDTO> testResources = resourcePoolCalculation.getPools(config.getResourcePoolId());
+                config.setTestResources(testResources);
+            }
+        }
+    }
+
+    public static HashTree generateHashTree(ApiScenarioWithBLOBs item, String reportId, Map<String, String> planEnvMap) {
+        HashTree jmeterHashTree = new HashTree();
+        MsTestPlan testPlan = new MsTestPlan();
+        testPlan.setHashTree(new LinkedList<>());
+        try {
+            MsThreadGroup group = new MsThreadGroup();
+            group.setLabel(item.getName());
+            group.setName(reportId);
+            MsScenario scenario = JSONObject.parseObject(item.getScenarioDefinition(), MsScenario.class);
+            group.setOnSampleError(scenario.getOnSampleError());
+            if (planEnvMap.size() > 0) {
+                scenario.setEnvironmentMap(planEnvMap);
+            }
+            GenerateHashTreeUtil.parse(item.getScenarioDefinition(), scenario);
+
+            group.setEnableCookieShare(scenario.isEnableCookieShare());
+            LinkedList<MsTestElement> scenarios = new LinkedList<>();
+            scenarios.add(scenario);
+
+            group.setHashTree(scenarios);
+            testPlan.getHashTree().add(group);
+        } catch (Exception ex) {
+            MSException.throwException(ex.getMessage());
+        }
+
+        testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), new ParameterConfig());
+        return jmeterHashTree;
+    }
+
+    public static boolean isSetReport(RunModeConfigDTO config) {
+        return config != null && StringUtils.equals(config.getReportType(), RunModeConstants.SET_REPORT.toString()) && StringUtils.isNotEmpty(config.getReportName());
+    }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/api/service/task/NamedThreadFactory.java b/backend/src/main/java/io/metersphere/api/exec/utils/NamedThreadFactory.java
similarity index 92%
rename from backend/src/main/java/io/metersphere/api/service/task/NamedThreadFactory.java
rename to backend/src/main/java/io/metersphere/api/exec/utils/NamedThreadFactory.java
index a474673285..bb2fe259f1 100644
--- a/backend/src/main/java/io/metersphere/api/service/task/NamedThreadFactory.java
+++ b/backend/src/main/java/io/metersphere/api/exec/utils/NamedThreadFactory.java
@@ -1,4 +1,4 @@
-package io.metersphere.api.service.task;
+package io.metersphere.api.exec.utils;
 
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
deleted file mode 100644
index 614e94478d..0000000000
--- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.metersphere.api.jmeter;
-
-import io.metersphere.commons.constants.ApiRunMode;
-import io.metersphere.commons.utils.CommonBeanFactory;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.visualizers.backend.AbstractBackendListenerClient;
-import org.apache.jmeter.visualizers.backend.BackendListenerContext;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * JMeter BackendListener扩展, jmx脚本中使用
- */
-public class APIBackendListenerClient extends AbstractBackendListenerClient implements Serializable {
-
-    public final static String TEST_ID = "ms.test.id";
-    public final static String AMASS_REPORT = "ms.test.amass.report.id";
-
-    public String runMode = ApiRunMode.RUN.name();
-    private String amassReport;
-    private final List<SampleResult> queue = new ArrayList<>();
-
-    // 测试ID
-    private String testId;
-
-    private String debugReportId;
-
-    @Override
-    public void setupTest(BackendListenerContext context) throws Exception {
-        setParam(context);
-        super.setupTest(context);
-    }
-
-    @Override
-    public void handleSampleResults(List<SampleResult> sampleResults, BackendListenerContext context) {
-        queue.addAll(sampleResults);
-    }
-
-    @Override
-    public void teardownTest(BackendListenerContext context) throws Exception {
-        APIBackendListenerHandler apiBackendListenerHandler =
-                CommonBeanFactory.getBean(APIBackendListenerHandler.class);
-        apiBackendListenerHandler.handleTeardownTest(queue, this.runMode, this.testId, this.debugReportId, this.amassReport);
-        super.teardownTest(context);
-    }
-
-    private void setParam(BackendListenerContext context) {
-        this.testId = context.getParameter(APIBackendListenerClient.TEST_ID);
-        this.runMode = context.getParameter("runMode");
-        this.debugReportId = context.getParameter("debugReportId");
-        this.amassReport = context.getParameter(AMASS_REPORT);
-        if (StringUtils.isBlank(this.runMode)) {
-            this.runMode = ApiRunMode.RUN.name();
-        }
-    }
-
-}
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerHandler.java b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerHandler.java
index 70eb1ee21d..40e04d596d 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerHandler.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerHandler.java
@@ -1,70 +1,33 @@
 package io.metersphere.api.jmeter;
 
 
-import io.metersphere.api.dto.RunningParamKeys;
+import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.service.MsResultService;
 import io.metersphere.api.service.TestResultService;
-import org.apache.commons.collections.CollectionUtils;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.dto.ResultDTO;
+import io.metersphere.utils.LoggerUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.jmeter.samplers.SampleResult;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
-import java.util.*;
+import java.util.Map;
 
-/**
- * 获取结果和数据库操作分离
- * 减少占用的数据库连接
- */
-@Service
-@Transactional(rollbackFor = Exception.class)
 public class APIBackendListenerHandler {
+    public void handleTeardownTest(ResultDTO dto, Map<String, Object> kafkaConfig) {
+        LoggerUtil.info("开始处理执行结果报告【" + dto.getReportId() + " 】,资源【 " + dto.getTestId() + " 】");
+        TestResultService testResultService = CommonBeanFactory.getBean(TestResultService.class);
+        MsResultService resultService = CommonBeanFactory.getBean(MsResultService.class);
 
-    @Resource
-    private TestResultService testResultService;
-    @Resource
-    private MsResultService resultService;
+        // 无结果返回直接结束队列
+        if (dto == null || CollectionUtils.isEmpty(dto.getRequestResults())) {
+            SerialBlockingQueueUtil.offer(dto, "testEnd");
+        }
+        dto.setConsole(resultService.getJmeterLogger(dto.getReportId()));
+        // 存储结果
+        testResultService.saveResults(dto);
 
-    public void handleTeardownTest(List<SampleResult> queue, String runMode, String testId, String debugReportId, String amassReport) throws Exception {
-        try {
-            TestResult testResult = new TestResult();
-            testResult.setTestId(testId);
-            testResult.setSetReportId(amassReport);
-            MessageCache.runningEngine.remove(testId);
-            testResult.setTotal(0);
-            List<String> environmentList = new ArrayList<>();
-            // 一个脚本里可能包含多个场景(ThreadGroup)，所以要区分开，key: 场景Id
-            final Map<String, ScenarioResult> scenarios = new LinkedHashMap<>();
-            queue.forEach(result -> {
-                // 线程名称: <场景名> <场景Index>-<请求Index>, 例如：Scenario 2-1
-                if (StringUtils.equals(result.getSampleLabel(), RunningParamKeys.RUNNING_DEBUG_SAMPLER_NAME)) {
-                    String evnStr = result.getResponseDataAsString();
-                    environmentList.add(evnStr);
-                } else {
-                    resultService.formatTestResult(testResult, scenarios, result);
-                }
-            });
-            queue.clear();
-            testResult.getScenarios().addAll(scenarios.values());
-            testResult.getScenarios().sort(Comparator.comparing(ScenarioResult::getId));
-            testResult.setConsole(resultService.getJmeterLogger(testId, true));
-            //处理环境参数
-            ExecutedHandleSingleton.parseEnvironment(environmentList);
-            testResultService.saveResult(testResult, runMode, debugReportId, testId);
-            // 清除已经中断的过程数据
-            if (!MessageCache.reportCache.containsKey(testId) && resultService.getProcessCache().containsKey(testId)) {
-                resultService.getProcessCache().remove(testId);
-            }
-            if (StringUtils.isNotEmpty(testId)) {
-                MessageCache.executionQueue.remove(testId);
-            }
-        } catch (Exception e) {
-            if (StringUtils.isNotEmpty(amassReport) && MessageCache.cache.get(amassReport) != null
-                    && StringUtils.isNotEmpty(testId)
-                    && CollectionUtils.isNotEmpty(MessageCache.cache.get(amassReport).getReportIds())) {
-                MessageCache.cache.get(amassReport).getReportIds().remove(testId);
-            }
+        if (StringUtils.isNotEmpty(dto.getReportId())) {
+            SerialBlockingQueueUtil.remove(dto.getReportId());
         }
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java b/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java
new file mode 100644
index 0000000000..cfcd08e22f
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java
@@ -0,0 +1,40 @@
+package io.metersphere.api.jmeter;
+
+
+import io.metersphere.api.exec.queue.PoolExecBlockingQueueUtil;
+import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
+import io.metersphere.api.service.MsResultService;
+import io.metersphere.api.service.TestResultService;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.dto.ResultDTO;
+import io.metersphere.jmeter.MsExecListener;
+import io.metersphere.utils.LoggerUtil;
+
+import java.util.Map;
+
+public class APISingleResultListener extends MsExecListener {
+    @Override
+    public void handleTeardownTest(ResultDTO dto, Map<String, Object> kafkaConfig) {
+        LoggerUtil.info("开始处理单条执行结果报告【" + dto.getReportId() + " 】,资源【 " + dto.getTestId() + " 】");
+
+        dto.setConsole(CommonBeanFactory.getBean(MsResultService.class).getJmeterLogger(dto.getReportId()));
+        // 存储结果
+        CommonBeanFactory.getBean(TestResultService.class).saveResults(dto);
+    }
+
+    @Override
+    public void testEnded(ResultDTO dto, Map<String, Object> kafkaConfig) {
+        try {
+            LoggerUtil.info("进入TEST-END处理报告【" + dto.getReportId() + " 】整体执行完成；" + dto.getRunMode());
+            // 串行队列
+            SerialBlockingQueueUtil.offer(dto, "testEnd");
+            // 全局并发队列
+            PoolExecBlockingQueueUtil.offer(dto.getReportId());
+            dto.setConsole(CommonBeanFactory.getBean(MsResultService.class).getJmeterLogger(dto.getReportId()));
+        } catch (Exception e) {
+            LoggerUtil.error(e);
+        }
+        // 存储结果
+        CommonBeanFactory.getBean(TestResultService.class).testEnded(dto);
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/ExecutedHandleSingleton.java b/backend/src/main/java/io/metersphere/api/jmeter/ExecutedHandleSingleton.java
index 8bf44a6b92..e797f8a2c8 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/ExecutedHandleSingleton.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/ExecutedHandleSingleton.java
@@ -19,7 +19,7 @@ public class ExecutedHandleSingleton {
     private ExecutedHandleSingleton() {
     }
 
-    public synchronized static void parseEnvironment(List<String> evnStrList) {
+    public  static void parseEnvironment(List<String> evnStrList) {
         for (String evnStr: evnStrList) {
             try {
                 Thread.sleep(1000);
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java b/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java
index d11cb35764..e5b2a1f0a7 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java
@@ -15,7 +15,6 @@ import java.util.stream.Collectors;
 
 @Component
 public class FixedTask {
-    public static Map<String, Long> tasks = new HashMap<>();
     public static Map<String, Integer> guardTask = new HashMap<>();
     private ApiScenarioReportService scenarioReportService;
 
@@ -24,24 +23,21 @@ public class FixedTask {
         if (MessageCache.caseExecResourceLock.size() > 10000) {
             MessageCache.caseExecResourceLock.clear();
         }
-        if (MessageCache.scenarioExecResourceLock.size() > 5000) {
-            MessageCache.scenarioExecResourceLock.clear();
-        }
         if (scenarioReportService == null) {
             scenarioReportService = CommonBeanFactory.getBean(ApiScenarioReportService.class);
         }
-        if (MessageCache.cache != null && MessageCache.cache.size() > 0) {
-            for (String key : MessageCache.cache.keySet()) {
-                ReportCounter counter = MessageCache.cache.get(key);
-                LogUtil.info("集成报告：【" + key + "】总执行场景：【" + counter.getReportIds().size() + "】已经执行完成场景：【" + counter.getCompletedIds().size() + "】");
-                List<String> filterList = counter.getReportIds().stream().filter(t -> !counter.getCompletedIds().contains(t)).collect(Collectors.toList());
+        if (MessageCache.concurrencyCounter != null && MessageCache.concurrencyCounter.size() > 0) {
+            for (String key : MessageCache.concurrencyCounter.keySet()) {
+                ReportCounter counter = MessageCache.concurrencyCounter.get(key);
+                LogUtil.info("集成报告：【" + key + "】总执行场景：【" + counter.getTestIds().size() + "】已经执行完成场景：【" + counter.getCompletedIds().size() + "】");
+                List<String> filterList = counter.getTestIds().stream().filter(t -> !counter.getCompletedIds().contains(t)).collect(Collectors.toList());
 
                 LogUtil.debug("剩余要执行的报告" + JSON.toJSONString(filterList));
                 // 合并
-                if (counter.getCompletedIds().size() >= counter.getReportIds().size()) {
-                    scenarioReportService.margeReport(key, counter.getReportIds());
+                if (counter.getCompletedIds().size() >= counter.getTestIds().size()) {
+                    scenarioReportService.margeReport(key);
                     guardTask.remove(key);
-                    MessageCache.cache.remove(key);
+                    MessageCache.concurrencyCounter.remove(key);
                 } else {
                     try {
                         if (guardTask.containsKey(key)) {
@@ -56,9 +52,9 @@ public class FixedTask {
                             int runningCount = scenarioReportService.get(key, counter);
                             if (runningCount == 0) {
                                 LogUtil.error("发生未知异常，进行资源合并，请检查资源池是否正常运行");
-                                scenarioReportService.margeReport(key, counter.getReportIds());
+                                scenarioReportService.margeReport(key);
                                 guardTask.remove(key);
-                                MessageCache.cache.remove(key);
+                                MessageCache.concurrencyCounter.remove(key);
                             }
                         }
                     } catch (Exception ex) {
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/GroovyLoadJarService.java b/backend/src/main/java/io/metersphere/api/jmeter/GroovyLoadJarService.java
new file mode 100644
index 0000000000..2d06f35d1b
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/jmeter/GroovyLoadJarService.java
@@ -0,0 +1,36 @@
+package io.metersphere.api.jmeter;
+
+import groovy.lang.GroovyClassLoader;
+import io.metersphere.base.domain.JarConfig;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.service.JarConfigService;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.List;
+
+@Service
+public class GroovyLoadJarService {
+    /**
+     * groovy 使用的是自己的类加载器，
+     * 这里再执行脚本前，使用 groovy的加载器加载jar包，
+     * 解决groovy脚本无法使用jar包的问题
+     */
+    public void loadGroovyJar(GroovyClassLoader classLoader) {
+        JarConfigService jarConfigService = CommonBeanFactory.getBean(JarConfigService.class);
+        List<JarConfig> jars = jarConfigService.list();
+        jars.forEach(jarConfig -> {
+            try {
+                String path = jarConfig.getPath();
+                File file = new File(path);
+                if (file.isDirectory() && !path.endsWith("/")) {
+                    file = new File(path + "/");
+                }
+                classLoader.addURL(file.toURI().toURL());
+            } catch (Exception e) {
+                LogUtil.error(e);
+            }
+        });
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
index b37469156f..fdf3f3565e 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
@@ -1,35 +1,26 @@
 package io.metersphere.api.jmeter;
 
 import com.alibaba.fastjson.JSON;
-import io.metersphere.api.dto.JvmInfoDTO;
 import io.metersphere.api.dto.RunRequest;
-import io.metersphere.api.dto.automation.ExecuteType;
-import io.metersphere.api.dto.automation.RunModeConfig;
+import io.metersphere.api.exec.queue.ExecThreadPoolExecutor;
 import io.metersphere.api.service.ApiScenarioReportService;
-import io.metersphere.api.service.NodeKafkaService;
 import io.metersphere.api.service.RemakeReportService;
-import io.metersphere.base.domain.TestResource;
-import io.metersphere.base.domain.TestResourcePool;
-import io.metersphere.base.mapper.*;
 import io.metersphere.commons.constants.ApiRunMode;
-import io.metersphere.commons.constants.ResourcePoolTypeEnum;
-import io.metersphere.commons.constants.TriggerMode;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.CommonBeanFactory;
-import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.config.JmeterProperties;
-import io.metersphere.dto.BaseSystemConfigDTO;
-import io.metersphere.dto.NodeDTO;
-import io.metersphere.i18n.Translator;
+import io.metersphere.config.KafkaConfig;
+import io.metersphere.dto.*;
+import io.metersphere.jmeter.JMeterBase;
+import io.metersphere.jmeter.LocalRunner;
 import io.metersphere.performance.engine.Engine;
 import io.metersphere.performance.engine.EngineFactory;
 import io.metersphere.service.SystemParameterService;
+import io.metersphere.utils.LoggerUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jmeter.visualizers.backend.BackendListener;
 import org.apache.jorphan.collections.HashTree;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.http.ResponseEntity;
@@ -40,8 +31,6 @@ import org.springframework.web.client.RestTemplate;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.io.File;
-import java.io.InputStream;
-import java.lang.reflect.Field;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -50,14 +39,10 @@ public class JMeterService {
     @Resource
     private JmeterProperties jmeterProperties;
     @Resource
-    private TestResourcePoolMapper testResourcePoolMapper;
-    @Resource
     private RestTemplate restTemplate;
-    @Resource
-    private NodeKafkaService nodeKafkaService;
 
     @PostConstruct
-    public void init() {
+    private void init() {
         String JMETER_HOME = getJmeterHome();
 
         String JMETER_PROPERTIES = JMETER_HOME + "/bin/jmeter.properties";
@@ -66,22 +51,6 @@ public class JMeterService {
         JMeterUtils.setLocale(LocaleContextHolder.getLocale());
     }
 
-    public void runOld(String testId, String debugReportId, InputStream is) {
-        init();
-        try {
-            Object scriptWrapper = SaveService.loadElement(is);
-            HashTree testPlan = getHashTree(scriptWrapper);
-            JMeterVars.addJSR223PostProcessor(testPlan);
-            String runMode = StringUtils.isBlank(debugReportId) ? ApiRunMode.RUN.name() : ApiRunMode.DEBUG.name();
-            addBackendListener(testId, null, debugReportId, runMode, testPlan);
-            LocalRunner runner = new LocalRunner(testPlan);
-            runner.run(testId);
-        } catch (Exception e) {
-            LogUtil.error(e.getMessage(), e);
-            MSException.throwException(Translator.get("api_load_script_error"));
-        }
-    }
-
     public String getJmeterHome() {
         String home = getClass().getResource("/").getPath() + "jmeter";
         try {
@@ -96,111 +65,116 @@ public class JMeterService {
         }
     }
 
-    public static HashTree getHashTree(Object scriptWrapper) throws Exception {
-        Field field = scriptWrapper.getClass().getDeclaredField("testPlan");
-        field.setAccessible(true);
-        return (HashTree) field.get(scriptWrapper);
-    }
-
-    private void addBackendListener(String testId, String amassReport, String debugReportId, String runMode, HashTree testPlan) {
-        BackendListener backendListener = new BackendListener();
-        backendListener.setName(testId);
-        Arguments arguments = new Arguments();
-        arguments.addArgument(APIBackendListenerClient.TEST_ID, testId);
-        if (StringUtils.isNotEmpty(amassReport)) {
-            arguments.addArgument(APIBackendListenerClient.AMASS_REPORT, amassReport);
-        }
-        if (StringUtils.isNotBlank(runMode)) {
-            arguments.addArgument("runMode", runMode);
-        }
-        if (StringUtils.isNotBlank(debugReportId)) {
-            arguments.addArgument("debugReportId", debugReportId);
-        }
-        backendListener.setArguments(arguments);
-        backendListener.setClassname(APIBackendListenerClient.class.getCanonicalName());
-        testPlan.add(testPlan.getArray()[0], backendListener);
-    }
-
-    private void addResultCollector(String testId, HashTree testPlan) {
-        MsResultCollector resultCollector = new MsResultCollector();
+    private void addDebugListener(String testId, HashTree testPlan) {
+        MsDebugListener resultCollector = new MsDebugListener();
         resultCollector.setName(testId);
-        resultCollector.setProperty(TestElement.TEST_CLASS, MsResultCollector.class.getName());
+        resultCollector.setProperty(TestElement.TEST_CLASS, MsDebugListener.class.getName());
         resultCollector.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("ViewResultsFullVisualizer"));
         resultCollector.setEnabled(true);
         testPlan.add(testPlan.getArray()[0], resultCollector);
     }
 
-
-    public void runLocal(String testId, RunModeConfig config, HashTree testPlan, String debugReportId, String runMode) {
+    private void runLocal(JmeterRunRequestDTO request) {
         init();
-        FixedTask.tasks.put(testId, System.currentTimeMillis());
-        addBackendListener(testId, config != null ? config.getAmassReport() : "", debugReportId, runMode, testPlan);
-        if (ExecuteType.Debug.name().equals(debugReportId) || (ApiRunMode.SCENARIO.name().equals(runMode) && !TriggerMode.BATCH.name().equals(debugReportId))) {
-            addResultCollector(testId, testPlan);
+        if (!MessageCache.jmeterLogTask.containsKey(request.getReportId())) {
+            MessageCache.jmeterLogTask.put(request.getReportId(), System.currentTimeMillis());
         }
-        LocalRunner runner = new LocalRunner(testPlan);
-        runner.run(testId);
-    }
 
-    public void runTest(String testId, String reportId, String runMode, String testPlanScenarioId, RunModeConfig config) {
-        // 获取可以执行的资源池
-        String resourcePoolId = config.getResourcePoolId();
-        BaseSystemConfigDTO baseInfo = config.getBaseInfo();
-        if (baseInfo == null) {
-            baseInfo = CommonBeanFactory.getBean(SystemParameterService.class).getBaseInfo();
+        LoggerUtil.debug("监听MessageCache.tasks当前容量：" + MessageCache.jmeterLogTask.size());
+        if (request.isDebug() && !StringUtils.equalsAny(request.getRunMode(), ApiRunMode.DEFINITION.name())) {
+            LoggerUtil.debug("为请求 [ " + request.getReportId() + " ] 添加同步接收结果 Listener");
+            JMeterBase.addSyncListener(request, APISingleResultListener.class.getCanonicalName());
         }
-        RunRequest runRequest = new RunRequest();
-        runRequest.setTestId(testId);
-        runRequest.setReportId(reportId);
-        runRequest.setPoolId(resourcePoolId);
-        runRequest.setAmassReport(config.getAmassReport());
-        // 占位符
-        String platformUrl = "http://localhost:8081";
-        if (baseInfo != null) {
-            platformUrl = baseInfo.getUrl();
-        }
-        platformUrl += "/api/jmeter/download?testId=" + testId + "&reportId=" + reportId + "&runMode=" + runMode + "&testPlanScenarioId";
-        if (StringUtils.isNotEmpty(testPlanScenarioId)) {
-            platformUrl += "=" + testPlanScenarioId;
-        }
-        runRequest.setUrl(platformUrl);
-        runRequest.setRunMode(runMode);
-        runRequest.setKafka(nodeKafkaService.getKafka());
-
-        // 如果是K8S调用
-        TestResourcePool pool = testResourcePoolMapper.selectByPrimaryKey(resourcePoolId);
-        if (pool != null && pool.getApi() && pool.getType().equals(ResourcePoolTypeEnum.K8S.name())) {
-            try {
-                final Engine engine = EngineFactory.createApiEngine(runRequest);
-                engine.start();
-            } catch (Exception e) {
-                ApiScenarioReportService apiScenarioReportService = CommonBeanFactory.getBean(ApiScenarioReportService.class);
-                apiScenarioReportService.delete(reportId);
-                MSException.throwException(e.getMessage());
-            }
+        if (request.isDebug()) {
+            LoggerUtil.debug("为请求 [ " + request.getReportId() + " ] 添加Debug Listener");
+            addDebugListener(request.getReportId(), request.getHashTree());
         } else {
-            this.send(runRequest, config, reportId);
+            LoggerUtil.debug("为请求 [ " + request.getReportId() + " ] 添加同步接收结果 Listener");
+            JMeterBase.addSyncListener(request, APISingleResultListener.class.getCanonicalName());
+        }
+
+        LocalRunner runner = new LocalRunner(request.getHashTree());
+        runner.run(request.getReportId());
+    }
+
+    private void runNode(JmeterRunRequestDTO request) {
+        // 获取可以执行的资源池
+        if (request.getConfig() != null) {
+            BaseSystemConfigDTO baseInfo = request.getConfig().getBaseInfo();
+            if (baseInfo == null) {
+                baseInfo = CommonBeanFactory.getBean(SystemParameterService.class).getBaseInfo();
+            }
+            // 占位符
+            String platformUrl = "http://localhost:8081";
+            if (baseInfo != null) {
+                platformUrl = baseInfo.getUrl();
+            }
+            platformUrl += "/api/jmeter/download?testId=" + request.getTestId() + "&reportId=" + request.getReportId() + "&runMode=" + request.getRunMode();
+
+            request.setPlatformUrl(platformUrl);
+            request.setKafkaConfig(KafkaConfig.getKafka());
+            // 如果是K8S调用
+            if (request.getPool().isK8s()) {
+                try {
+                    LoggerUtil.error("开始发送请求[ " + request.getTestId() + " ] 到K8S节点执行");
+                    final Engine engine = EngineFactory.createApiEngine(request);
+                    engine.start();
+                } catch (Exception e) {
+                    LoggerUtil.error("调用K8S执行请求[ " + request.getTestId() + " ] 失败：" + e.getMessage());
+                    ApiScenarioReportService apiScenarioReportService = CommonBeanFactory.getBean(ApiScenarioReportService.class);
+                    apiScenarioReportService.delete(request.getReportId());
+                    MSException.throwException(e.getMessage());
+                }
+            } else {
+                this.send(request);
+            }
         }
     }
 
-    public synchronized void send(RunRequest runRequest, RunModeConfig config, String reportId) {
+    private synchronized void send(JmeterRunRequestDTO request) {
         try {
-            int index = (int) (Math.random() * config.getTestResources().size());
-            JvmInfoDTO jvmInfoDTO = config.getTestResources().get(index);
-            TestResource testResource = jvmInfoDTO.getTestResource();
+            int index = (int) (Math.random() * request.getConfig().getTestResources().size());
+            JvmInfoDTO jvmInfoDTO = request.getConfig().getTestResources().get(index);
+            TestResourceDTO testResource = jvmInfoDTO.getTestResource();
             String configuration = testResource.getConfiguration();
+
             NodeDTO node = JSON.parseObject(configuration, NodeDTO.class);
             String nodeIp = node.getIp();
             Integer port = node.getPort();
             String uri = String.format(BASE_URL + "/jmeter/api/start", nodeIp, port);
-            ResponseEntity<String> result = restTemplate.postForEntity(uri, runRequest, String.class);
+
+            LoggerUtil.info("开始发送请求【 " + request.getReportId() + " 】,资源【 " + request.getTestId() + " 】" + uri + " 节点执行");
+
+            ResponseEntity<String> result = restTemplate.postForEntity(uri, request, String.class);
             if (result == null || !StringUtils.equals("SUCCESS", result.getBody())) {
                 RemakeReportService remakeReportService = CommonBeanFactory.getBean(RemakeReportService.class);
-                remakeReportService.remake(runRequest, config, reportId);
+                RunRequest runRequest = new RunRequest();
+                runRequest.setTestId(request.getTestId());
+                runRequest.setRunMode(request.getRunMode());
+                remakeReportService.remake(request);
+
+                LoggerUtil.error("发送请求[ " + request.getTestId() + " ] 到" + uri + " 节点执行失败");
             }
         } catch (Exception e) {
             RemakeReportService remakeReportService = CommonBeanFactory.getBean(RemakeReportService.class);
-            remakeReportService.remake(runRequest, config, reportId);
+            RunRequest runRequest = new RunRequest();
+            runRequest.setTestId(request.getTestId());
+            runRequest.setRunMode(request.getRunMode());
+            remakeReportService.remake(request);
+            LoggerUtil.error("发送请求[ " + request.getTestId() + " ] 执行失败：" + e.getMessage());
+        }
+    }
+
+
+    public void run(JmeterRunRequestDTO request) {
+        CommonBeanFactory.getBean(ExecThreadPoolExecutor.class).addTask(request);
+    }
+
+    public void addQueue(JmeterRunRequestDTO request) {
+        if (request.getPool().isPool()) {
+            this.runNode(request);
+        } else {
+            this.runLocal(request);
         }
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/JMeterVars.java b/backend/src/main/java/io/metersphere/api/jmeter/JMeterVars.java
deleted file mode 100644
index a2900fb1d5..0000000000
--- a/backend/src/main/java/io/metersphere/api/jmeter/JMeterVars.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package io.metersphere.api.jmeter;
-
-import com.alibaba.fastjson.JSON;
-import io.github.ningyu.jmeter.plugin.dubbo.sample.DubboSample;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.jmeter.extractor.JSR223PostProcessor;
-import org.apache.jmeter.extractor.RegexExtractor;
-import org.apache.jmeter.extractor.XPath2Extractor;
-import org.apache.jmeter.extractor.json.jsonpath.JSONPostProcessor;
-import org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy;
-import org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler;
-import org.apache.jmeter.threads.JMeterVariables;
-import org.apache.jorphan.collections.HashTree;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.*;
-
-public class JMeterVars {
-
-    private JMeterVars() {
-    }
-
-    /**
-     * 数据和线程变量保持一致
-     */
-    private static Map<Integer, JMeterVariables> variables = new HashMap<>();
-
-    /**
-     * 线程执行过程调用提取变量值
-     *
-     * @param testId
-     * @param vars
-     * @param extract
-     */
-    public static void addVars(Integer testId, JMeterVariables vars, String extract) {
-        JMeterVariables vs = variables.get(testId);
-        if (vs == null) {
-            vs = new JMeterVariables();
-        }
-        if (!StringUtils.isEmpty(extract) && vars != null) {
-            List<String> extracts = Arrays.asList(extract.split(";"));
-            if (CollectionUtils.isNotEmpty(extracts)) {
-                for (String item : extracts) {
-                    String nrKey = item + "_matchNr";
-                    Object nr = vars.get(nrKey);
-                    JMeterVariables jMeterVariables = new JMeterVariables();
-                    if (nr != null) {
-                        int nrv = 0;
-                        try {
-                            nrv = Integer.valueOf(String.valueOf(nr));
-                        } catch (Exception e) {
-                        }
-                        if (nrv > 0) {
-                            List<Object> data = new ArrayList<>();
-                            for (int i = 1; i < nrv + 1; i++) {
-                                data.add(vars.get(item + "_" + i));
-                            }
-                            String array = JSON.toJSONString(data);
-                            jMeterVariables.put(item, array);
-                        }
-                    }
-                    if (jMeterVariables.get(item) != null) {
-                        vs.put(item, jMeterVariables.get(item));
-                    } else {
-                        vs.put(item, vars.get(item) == null ? "" : vars.get(item));
-                    }
-                }
-                vs.remove("TESTSTART.MS"); // 标示变量移除
-            }
-        }
-
-        variables.put(testId, vs);
-    }
-
-    /**
-     * 处理所有请求，有提取变量的请求增加后置脚本提取变量值
-     *
-     * @param tree
-     */
-    public static void addJSR223PostProcessor(HashTree tree) {
-        for (Object key : tree.keySet()) {
-            HashTree node = tree.get(key);
-            if (key instanceof HTTPSamplerProxy || key instanceof DubboSample || key instanceof JDBCSampler) {
-                StringJoiner extract = new StringJoiner(";");
-                for (Object child : node.keySet()) {
-                    if (child instanceof RegexExtractor) {
-                        RegexExtractor regexExtractor = (RegexExtractor) child;
-                        extract.add(regexExtractor.getRefName());
-                    } else if (child instanceof XPath2Extractor) {
-                        XPath2Extractor regexExtractor = (XPath2Extractor) child;
-                        extract.add(regexExtractor.getRefName());
-                    } else if (child instanceof JSONPostProcessor) {
-                        JSONPostProcessor regexExtractor = (JSONPostProcessor) child;
-                        extract.add(regexExtractor.getRefNames());
-                    }
-                }
-
-                if (Optional.ofNullable(extract).orElse(extract).length() > 0) {
-                    JSR223PostProcessor shell = new JSR223PostProcessor();
-                    shell.setEnabled(true);
-                    shell.setProperty("script", "io.metersphere.api.jmeter.JMeterVars.addVars(prev.hashCode(),vars," + "\"" + extract.toString() + "\"" + ");");
-                    node.add(shell);
-                }
-            }
-
-            if (node != null) {
-                addJSR223PostProcessor(node);
-            }
-        }
-    }
-
-    public static JMeterVariables get(Integer key) {
-        return variables.get(key);
-    }
-
-    public static void remove(Integer key) {
-        variables.remove(key);
-    }
-
-}
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/JmeterThreadUtils.java b/backend/src/main/java/io/metersphere/api/jmeter/JmeterThreadUtils.java
index f4a33e6e67..8830be02da 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/JmeterThreadUtils.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/JmeterThreadUtils.java
@@ -1,5 +1,6 @@
 package io.metersphere.api.jmeter;
 
+import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.commons.utils.LogUtil;
 import org.apache.commons.lang3.StringUtils;
 
@@ -18,7 +19,7 @@ public class JmeterThreadUtils {
             if (StringUtils.isNotEmpty(lstThreads[i].getName()) && lstThreads[i].getName().startsWith(name)) {
                 String threadName = StringUtils.substringBeforeLast(lstThreads[i].getName(), THREAD_SPLIT);
                 if (StringUtils.isNotEmpty(threadName)) {
-                    MessageCache.executionQueue.remove(threadName);
+                    SerialBlockingQueueUtil.remove(threadName);
                 }
                 System.out.println("异常强制处理线程编号：" + i + " = " + lstThreads[i].getName());
                 LogUtil.error("异常强制处理线程编号：" + i + " = " + lstThreads[i].getName());
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/LocalRunner.java b/backend/src/main/java/io/metersphere/api/jmeter/LocalRunner.java
deleted file mode 100644
index b00915af00..0000000000
--- a/backend/src/main/java/io/metersphere/api/jmeter/LocalRunner.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.metersphere.api.jmeter;
-
-import io.metersphere.commons.utils.LogUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.jmeter.engine.JMeterEngineException;
-import org.apache.jmeter.engine.StandardJMeterEngine;
-import org.apache.jorphan.collections.HashTree;
-
-public class LocalRunner {
-    private HashTree jmxTree;
-
-    public LocalRunner(HashTree jmxTree) {
-        this.jmxTree = jmxTree;
-    }
-
-    public LocalRunner() {
-    }
-
-    public void run(String report) {
-        StandardJMeterEngine engine = new StandardJMeterEngine();
-        engine.configure(jmxTree);
-        try {
-            engine.runTest();
-            if (StringUtils.isNotEmpty(report)) {
-                MessageCache.runningEngine.put(report, engine);
-            }
-        } catch (JMeterEngineException e) {
-            engine.stopTest(true);
-        }
-    }
-
-    public void stop(String report) {
-        try {
-            StandardJMeterEngine engine = MessageCache.runningEngine.get(report);
-            if (engine != null && StringUtils.isNotEmpty(report)) {
-                engine.stopTest();
-                MessageCache.runningEngine.remove(report);
-            }
-        } catch (Exception e) {
-            LogUtil.error(e);
-        }
-    }
-}
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java b/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java
index ccaa206a6b..41dd0fb2db 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java
@@ -1,30 +1,19 @@
 package io.metersphere.api.jmeter;
 
-import io.metersphere.api.dto.automation.APIScenarioReportResult;
 import io.metersphere.base.domain.ApiDefinitionExecResult;
-import org.apache.jmeter.engine.StandardJMeterEngine;
 
 import javax.websocket.Session;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedDeque;
 
 public class MessageCache {
-    public static Map<String, ReportCounter> cache = new HashMap<>();
+    public static Map<String, ReportCounter> concurrencyCounter = new HashMap<>();
 
     public static ConcurrentHashMap<String, Session> reportCache = new ConcurrentHashMap<>();
 
-    public static ConcurrentHashMap<String, StandardJMeterEngine> runningEngine = new ConcurrentHashMap<>();
-
-    public static ConcurrentLinkedDeque<String> terminationOrderDeque = new ConcurrentLinkedDeque<>();
     // 用例并发锁
     public static ConcurrentHashMap<String, ApiDefinitionExecResult> caseExecResourceLock = new ConcurrentHashMap<>();
-    // 场景并发锁
-    public static ConcurrentHashMap<String, APIScenarioReportResult> scenarioExecResourceLock = new ConcurrentHashMap<>();
-
-    // 串行执行队列 KEY=报告ID VALUE=开始时间
-    public static Map<String, Long> executionQueue = new HashMap<>();
-
 
+    public static Map<String, Long> jmeterLogTask = new HashMap<>();
 }
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/MsResultCollector.java b/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java
similarity index 75%
rename from backend/src/main/java/io/metersphere/api/jmeter/MsResultCollector.java
rename to backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java
index 1f01ca474b..f0cc1ba69e 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/MsResultCollector.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java
@@ -19,9 +19,15 @@ package io.metersphere.api.jmeter;
 
 import com.alibaba.fastjson.JSON;
 import io.metersphere.api.dto.RunningParamKeys;
+import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.service.MsResultService;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.dto.RequestResult;
+import io.metersphere.dto.ResultDTO;
+import io.metersphere.jmeter.JMeterBase;
+import io.metersphere.utils.JMeterVars;
+import io.metersphere.utils.LoggerUtil;
 import io.metersphere.websocket.c.to.c.MsWebSocketClient;
 import io.metersphere.websocket.c.to.c.util.MsgDto;
 import org.apache.commons.collections4.CollectionUtils;
@@ -39,7 +45,7 @@ import java.util.Map;
 /**
  * 实时结果监听
  */
-public class MsResultCollector extends AbstractListenerElement implements SampleListener, Clearable, Serializable,
+public class MsDebugListener extends AbstractListenerElement implements SampleListener, Clearable, Serializable,
         TestStateListener, Remoteable, NoThreadClone {
 
     private static final String ERROR_LOGGING = "MsResultCollector.error_logging"; // $NON-NLS-1$
@@ -50,13 +56,11 @@ public class MsResultCollector extends AbstractListenerElement implements Sample
 
     public static final String TEST_END = "MS_TEST_END";
 
-    private MsResultService msResultService;
-
     private MsWebSocketClient client;
 
     @Override
     public Object clone() {
-        MsResultCollector clone = (MsResultCollector) super.clone();
+        MsDebugListener clone = (MsDebugListener) super.clone();
         return clone;
     }
 
@@ -96,10 +100,12 @@ public class MsResultCollector extends AbstractListenerElement implements Sample
 
     @Override
     public void testEnded(String host) {
-        LogUtil.debug("TestEnded " + this.getName());
+        LoggerUtil.debug("TestEnded " + this.getName());
         SampleResult result = new SampleResult();
         result.setResponseCode(TEST_END);
-        msResultService.setCache(this.getName(), result);
+        ResultDTO dto = new ResultDTO();
+        dto.setReportId(this.getName());
+        SerialBlockingQueueUtil.offer(dto, "testEnd");
         try {
             if (client != null) {
                 client.close();
@@ -112,10 +118,6 @@ public class MsResultCollector extends AbstractListenerElement implements Sample
     @Override
     public void testStarted(String host) {
         LogUtil.debug("TestStarted " + this.getName());
-        msResultService = CommonBeanFactory.getBean(MsResultService.class);
-        if (msResultService == null) {
-            LogUtil.error("testResultService is required");
-        }
         try {
             client = new MsWebSocketClient("ws://127.0.0.1:8081/ws/" + "send." + this.getName());
             client.connect();
@@ -141,7 +143,7 @@ public class MsResultCollector extends AbstractListenerElement implements Sample
             dto.setContent(e.getThreadGroup());
             dto.setReportId("send." + this.getName());
             dto.setToReport(this.getName());
-            LogUtil.debug("send. " + this.getName());
+            LoggerUtil.debug("send. " + this.getName());
             if (client != null) {
                 client.send(JSON.toJSONString(dto));
             }
@@ -167,7 +169,23 @@ public class MsResultCollector extends AbstractListenerElement implements Sample
             }
         }
         if (isSampleWanted(result.isSuccessful()) && !StringUtils.equals(result.getSampleLabel(), RunningParamKeys.RUNNING_DEBUG_SAMPLER_NAME)) {
-            msResultService.setCache(this.getName(), result);
+            RequestResult requestResult = JMeterBase.getRequestResult(result);
+            if (requestResult != null) {
+                if (StringUtils.isNotEmpty(requestResult.getName()) && requestResult.getName().startsWith("Transaction=") && CollectionUtils.isEmpty(requestResult.getSubRequestResults())) {
+                    LoggerUtil.debug("进入合并事物，暂不处理");
+                } else {
+                    requestResult.getResponseResult().setConsole(CommonBeanFactory.getBean(MsResultService.class).getJmeterLogger(this.getName()));
+                    MsgDto dto = new MsgDto();
+                    dto.setExecEnd(false);
+                    dto.setContent("result_" + JSON.toJSONString(requestResult));
+                    dto.setReportId("send." + this.getName());
+                    dto.setToReport(this.getName());
+                    LoggerUtil.debug("send. " + this.getName());
+                    if (client != null) {
+                        client.send(JSON.toJSONString(dto));
+                    }
+                }
+            }
         }
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java b/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java
index 9454fbfb4a..5e4ec20d6f 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java
@@ -3,10 +3,13 @@ package io.metersphere.api.jmeter;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.metersphere.api.exec.queue.PoolExecBlockingQueueUtil;
+import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.service.ApiEnvironmentRunningParamService;
 import io.metersphere.api.service.TestResultService;
-import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.config.KafkaConfig;
+import io.metersphere.dto.ResultDTO;
+import io.metersphere.utils.LoggerUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.kafka.annotation.KafkaListener;
@@ -20,13 +23,19 @@ public class MsKafkaListener {
 
     @KafkaListener(id = CONSUME_ID, topics = KafkaConfig.TOPICS, groupId = "${spring.kafka.consumer.group-id}")
     public void consume(ConsumerRecord<?, String> record) {
-        LogUtil.info("接收到执行结果开始存储");
-        try {
-            this.save(record.value());
-        } catch (Exception e) {
-            LogUtil.error(e.getMessage());
+        LoggerUtil.info("接收到执行结果开始存储");
+        ResultDTO testResult = this.formatResult(record.value());
+        if (testResult != null && testResult.getArbitraryData() != null && testResult.getArbitraryData().containsKey("TEST_END") && (Boolean) testResult.getArbitraryData().get("TEST_END")) {
+            LoggerUtil.info("报告 【 " + testResult.getReportId() + " 】资源 " + testResult.getTestId() + " 整体执行完成");
+            testResultService.testEnded(testResult);
+            // 串行队列
+            SerialBlockingQueueUtil.offer(testResult, "testEnd");
+            // 全局并发队列
+            PoolExecBlockingQueueUtil.offer(testResult.getReportId());
+        } else {
+            testResultService.saveResults(testResult);
         }
-        LogUtil.info("执行内容存储结束");
+        LoggerUtil.info("执行内容存储结束");
     }
 
     @Resource
@@ -35,32 +44,24 @@ public class MsKafkaListener {
     @Resource
     private ApiEnvironmentRunningParamService apiEnvironmentRunningParamService;
 
-    private TestResult formatResult(String result) {
+    private ResultDTO formatResult(String result) {
         ObjectMapper mapper = new ObjectMapper();
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         try {
             // 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取
             if (StringUtils.isNotEmpty(result)) {
-                TestResult element = mapper.readValue(result, new TypeReference<TestResult>() {
+                ResultDTO element = mapper.readValue(result, new TypeReference<ResultDTO>() {
                 });
                 if (StringUtils.isNotEmpty(element.getRunningDebugSampler())) {
                     String evnStr = element.getRunningDebugSampler();
                     apiEnvironmentRunningParamService.parseEvn(evnStr);
                 }
+                LoggerUtil.info("formatResult 完成：" + element.getReportId());
                 return element;
             }
         } catch (Exception e) {
-            LogUtil.error(e);
+            LoggerUtil.error("formatResult 格式化数据失败：" + e.getMessage());
         }
         return null;
     }
-
-    private void save(String execResult) {
-        TestResult testResult = this.formatResult(execResult);
-        String testId = testResult.getTestId();
-        testResultService.saveResult(testResult, testResult.getRunMode(), null, testResult.getTestId());
-        if (StringUtils.isNotEmpty(testId)) {
-            MessageCache.executionQueue.remove(testId);
-        }
-    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/ReportCounter.java b/backend/src/main/java/io/metersphere/api/jmeter/ReportCounter.java
index ca4f14d724..1005a92835 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/ReportCounter.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/ReportCounter.java
@@ -1,6 +1,6 @@
 package io.metersphere.api.jmeter;
 
-import io.metersphere.api.dto.JvmInfoDTO;
+import io.metersphere.dto.JvmInfoDTO;
 import lombok.Data;
 
 import java.util.List;
@@ -9,5 +9,5 @@ import java.util.List;
 public class ReportCounter {
     private List<String> completedIds;
     private List<JvmInfoDTO> poolUrls;
-    private List<String> reportIds;
+    private List<String> testIds;
 }
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/RequestResult.java b/backend/src/main/java/io/metersphere/api/jmeter/RequestResult.java
deleted file mode 100644
index 797ce38c58..0000000000
--- a/backend/src/main/java/io/metersphere/api/jmeter/RequestResult.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.metersphere.api.jmeter;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-public class RequestResult {
-    // 请求ID
-    private String id;
-
-    // 步骤请求唯一ID
-    private String resourceId;
-
-    private String name;
-
-    private String url;
-
-    private String method;
-
-    private String scenario;
-
-    private long requestSize;
-
-    private long startTime;
-
-    private long endTime;
-
-    private int error;
-
-    private boolean success;
-
-    private String headers;
-
-    private String cookies;
-
-    private String body;
-
-    private int totalAssertions = 0;
-
-    private int passAssertions = 0;
-
-    private final List<RequestResult> subRequestResults = new ArrayList<>();
-
-    private final ResponseResult responseResult = new ResponseResult();
-
-    public void addPassAssertions() {
-        this.passAssertions++;
-    }
-
-}
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/ResourcePoolCalculation.java b/backend/src/main/java/io/metersphere/api/jmeter/ResourcePoolCalculation.java
index c1e8ff7eff..b577a4c820 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/ResourcePoolCalculation.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/ResourcePoolCalculation.java
@@ -1,7 +1,6 @@
 package io.metersphere.api.jmeter;
 
 import com.alibaba.fastjson.JSON;
-import io.metersphere.api.dto.JvmInfoDTO;
 import io.metersphere.base.domain.TestResource;
 import io.metersphere.base.domain.TestResourceExample;
 import io.metersphere.base.domain.TestResourcePool;
@@ -9,7 +8,10 @@ import io.metersphere.base.domain.TestResourcePoolExample;
 import io.metersphere.base.mapper.TestResourceMapper;
 import io.metersphere.base.mapper.TestResourcePoolMapper;
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.BeanUtils;
+import io.metersphere.dto.JvmInfoDTO;
 import io.metersphere.dto.NodeDTO;
+import io.metersphere.dto.TestResourceDTO;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,41 +42,6 @@ public class ResourcePoolCalculation {
         }
     }
 
-    public TestResource getPool(String resourcePoolId) {
-        // 获取可以执行的资源池
-        TestResourcePoolExample example = new TestResourcePoolExample();
-        example.createCriteria().andStatusEqualTo("VALID").andIdEqualTo(resourcePoolId);
-        List<TestResourcePool> pools = testResourcePoolMapper.selectByExample(example);
-        // 按照NODE节点的可用内存空间大小排序
-        List<JvmInfoDTO> availableNodes = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(pools)) {
-            List<String> poolIds = pools.stream().map(pool -> pool.getId()).collect(Collectors.toList());
-            TestResourceExample resourceExample = new TestResourceExample();
-            resourceExample.createCriteria().andTestResourcePoolIdIn(poolIds);
-            List<TestResource> testResources = testResourceMapper.selectByExampleWithBLOBs(resourceExample);
-            for (TestResource testResource : testResources) {
-                String configuration = testResource.getConfiguration();
-                NodeDTO node = JSON.parseObject(configuration, NodeDTO.class);
-                String nodeIp = node.getIp();
-                Integer port = node.getPort();
-                String uri = String.format(BASE_URL + "/jmeter/getJvmInfo", nodeIp, port);
-                JvmInfoDTO nodeJvm = this.getNodeJvmInfo(uri);
-                if (nodeJvm == null) {
-                    continue;
-                }
-                nodeJvm.setTestResource(testResource);
-                availableNodes.add(nodeJvm);
-            }
-        }
-        if (CollectionUtils.isEmpty(availableNodes)) {
-            MSException.throwException("未获取到资源池，请检查配置【系统设置-系统-测试资源池】");
-        }
-        int index = (int) (Math.random() * availableNodes.size());
-        JvmInfoDTO jvmInfoDTO = availableNodes.get(index);
-        return jvmInfoDTO.getTestResource();
-    }
-
-
     public List<JvmInfoDTO> getPools(String resourcePoolId) {
         // 获取可以执行的资源池
         TestResourcePoolExample example = new TestResourcePoolExample();
@@ -98,7 +65,9 @@ public class ResourcePoolCalculation {
                 if (nodeJvm == null) {
                     continue;
                 }
-                nodeJvm.setTestResource(testResource);
+                TestResourceDTO dto = new TestResourceDTO();
+                BeanUtils.copyBean(dto,testResource);
+                nodeJvm.setTestResource(dto);
                 availableNodes.add(nodeJvm);
             }
         }
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/ResponseAssertionResult.java b/backend/src/main/java/io/metersphere/api/jmeter/ResponseAssertionResult.java
deleted file mode 100644
index 357f5be7ef..0000000000
--- a/backend/src/main/java/io/metersphere/api/jmeter/ResponseAssertionResult.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.metersphere.api.jmeter;
-
-import lombok.Data;
-
-@Data
-public class ResponseAssertionResult {
-
-    private String name;
-
-    private String content;
-
-    private String script;
-
-    private String message;
-
-    private boolean pass;
-}
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/ResponseResult.java b/backend/src/main/java/io/metersphere/api/jmeter/ResponseResult.java
deleted file mode 100644
index 96ff6991c1..0000000000
--- a/backend/src/main/java/io/metersphere/api/jmeter/ResponseResult.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.metersphere.api.jmeter;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@Data
-public class ResponseResult {
-
-    private String responseCode;
-
-    private String responseMessage;
-
-    private long responseTime;
-
-    private long latency;
-
-    private long responseSize;
-
-    private String headers;
-
-    private String body;
-
-    private String vars;
-
-    private String console;
-
-    private final List<ResponseAssertionResult> assertions = new ArrayList<>();
-
-}
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/ScenarioResult.java b/backend/src/main/java/io/metersphere/api/jmeter/ScenarioResult.java
index e9ec0a7599..f0277e8765 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/ScenarioResult.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/ScenarioResult.java
@@ -1,5 +1,6 @@
 package io.metersphere.api.jmeter;
 
+import io.metersphere.dto.RequestResult;
 import lombok.Data;
 
 import java.util.ArrayList;
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/TestResult.java b/backend/src/main/java/io/metersphere/api/jmeter/TestResult.java
index 6b5a75fd95..db0a5cda64 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/TestResult.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/TestResult.java
@@ -3,6 +3,7 @@ package io.metersphere.api.jmeter;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import io.metersphere.commons.constants.DelimiterConstants;
+import io.metersphere.dto.RequestResult;
 import lombok.Data;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java
index bbabd7b933..934826919a 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -22,14 +22,16 @@ import io.metersphere.commons.constants.FileType;
 import io.metersphere.commons.constants.ScheduleGroup;
 import io.metersphere.commons.constants.ScheduleType;
 import io.metersphere.commons.exception.MSException;
-import io.metersphere.commons.utils.*;
+import io.metersphere.commons.utils.BeanUtils;
+import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.commons.utils.ServiceUtils;
+import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.QueryScheduleRequest;
 import io.metersphere.controller.request.ScheduleRequest;
 import io.metersphere.dto.ScheduleDao;
 import io.metersphere.i18n.Translator;
 import io.metersphere.job.sechedule.ApiTestJob;
 import io.metersphere.service.FileService;
-import io.metersphere.service.QuotaService;
 import io.metersphere.service.ScheduleService;
 import io.metersphere.track.service.TestCaseService;
 import org.apache.dubbo.common.URL;
@@ -232,12 +234,6 @@ public class APITestService {
             apiTest.setUserId(request.getUserId());
         }
         String reportId = apiReportService.create(apiTest, request.getTriggerMode());
-        /*if (request.getTriggerMode().equals("SCHEDULE")) {
-            List<Notice> notice = noticeService.queryNotice(request.getId());
-            mailService.sendHtml(reportId,notice,"api");
-        }*/
-        changeStatus(request.getId(), APITestStatus.Running);
-        jMeterService.runOld(request.getId(), null, is);
         return reportId;
     }
 
@@ -445,8 +441,6 @@ public class APITestService {
         } catch (IOException e) {
             LogUtil.error(e.getMessage(), e);
         }
-
-        jMeterService.runOld(request.getId(), reportId, is);
         return reportId;
     }
 
@@ -526,32 +520,32 @@ public class APITestService {
         //处理附件
         Map<String, String> attachmentFiles = new HashMap<>();
         //去重处理
-        if(!CollectionUtils.isEmpty(attachmentFilePathList)){
+        if (!CollectionUtils.isEmpty(attachmentFilePathList)) {
             attachmentFilePathList = attachmentFilePathList.stream().distinct().collect(Collectors.toList());
         }
         List<FileMetadata> fileMetadataList = new ArrayList<>();
-        for (String filePath: attachmentFilePathList) {
-            File file  = new File(filePath);
-            if(file.exists() && file.isFile()){
-                try{
-                    FileMetadata fileMetadata = fileService.saveFile(file,FileUtil.readAsByteArray(file));
+        for (String filePath : attachmentFilePathList) {
+            File file = new File(filePath);
+            if (file.exists() && file.isFile()) {
+                try {
+                    FileMetadata fileMetadata = fileService.saveFile(file, FileUtil.readAsByteArray(file));
                     fileMetadataList.add(fileMetadata);
-                    attachmentFiles.put(fileMetadata.getId(),fileMetadata.getName());
-                }catch (Exception e){
+                    attachmentFiles.put(fileMetadata.getId(), fileMetadata.getName());
+                } catch (Exception e) {
                     LogUtil.error(e);
                 }
             }
         }
 
-        JmxInfoDTO returnDTO = new JmxInfoDTO("Demo.jmx",jmxString,attachmentFiles);
+        JmxInfoDTO returnDTO = new JmxInfoDTO("Demo.jmx", jmxString, attachmentFiles);
         returnDTO.setFileMetadataList(fileMetadataList);
         return returnDTO;
     }
 
-private List<String> parseAttachmentFileInfo(Element parentHashTreeElement) {
-         List<String> attachmentFilePathList = new ArrayList<>();
+    private List<String> parseAttachmentFileInfo(Element parentHashTreeElement) {
+        List<String> attachmentFilePathList = new ArrayList<>();
         List<Element> parentElementList = parentHashTreeElement.elements();
-        for (Element parentElement: parentElementList) {
+        for (Element parentElement : parentElementList) {
             String qname = parentElement.getQName().getName();
             if (StringUtils.equals(qname, "CSVDataSet")) {
                 try {
@@ -593,23 +587,23 @@ private List<String> parseAttachmentFileInfo(Element parentHashTreeElement) {
                         }
                     }
                 }
-            }else if (StringUtils.equals(qname, "KeystoreConfig")) {
-                    List<Element> stringPropList = parentElement.elements("stringProp");
-                    for (Element element : stringPropList) {
-                        if (StringUtils.equals(element.attributeValue("name"), "MS-KEYSTORE-FILE-PATH")) {
+            } else if (StringUtils.equals(qname, "KeystoreConfig")) {
+                List<Element> stringPropList = parentElement.elements("stringProp");
+                for (Element element : stringPropList) {
+                    if (StringUtils.equals(element.attributeValue("name"), "MS-KEYSTORE-FILE-PATH")) {
 
-                            try {
-                                String filePath = element.getStringValue();
-                                File file = new File(filePath);
-                                if(file.exists() && file.isFile()){
-                                    attachmentFilePathList.add(filePath);
-                                    String fileName = file.getName();
-                                    element.setText(fileName);
-                                }
-                            }catch (Exception e){
+                        try {
+                            String filePath = element.getStringValue();
+                            File file = new File(filePath);
+                            if (file.exists() && file.isFile()) {
+                                attachmentFilePathList.add(filePath);
+                                String fileName = file.getName();
+                                element.setText(fileName);
                             }
+                        } catch (Exception e) {
                         }
                     }
+                }
             } else if (StringUtils.equals(qname, "hashTree")) {
                 attachmentFilePathList.addAll(this.parseAttachmentFileInfo(parentElement));
             }
@@ -652,7 +646,7 @@ private List<String> parseAttachmentFileInfo(Element parentHashTreeElement) {
                         String scriptName = scriptElement.attributeValue("name");
                         String contentValue = scriptElement.getStringValue();
 
-                        if ("script".equals(scriptName) && contentValue.startsWith("io.metersphere.api.jmeter.JMeterVars.addVars")) {
+                        if ("script".equals(scriptName) && contentValue.startsWith("io.metersphere.utils.JMeterVars.addVars")) {
                             isRemove = true;
                             removeElement.add(hashTreeItemElement);
                         }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 2a8cae70cb..34e067dda5 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -3,11 +3,6 @@ package io.metersphere.api.service;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.metersphere.api.cache.TestPlanReportExecuteCatch;
 import io.metersphere.api.dto.*;
 import io.metersphere.api.dto.automation.*;
 import io.metersphere.api.dto.automation.parse.ScenarioImport;
@@ -18,25 +13,23 @@ import io.metersphere.api.dto.definition.RunDefinitionRequest;
 import io.metersphere.api.dto.definition.request.*;
 import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
 import io.metersphere.api.dto.definition.request.unknown.MsJmeterElement;
-import io.metersphere.api.dto.definition.request.variable.ScenarioVariable;
-import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
-import io.metersphere.api.jmeter.JMeterService;
-import io.metersphere.api.jmeter.MessageCache;
-import io.metersphere.api.jmeter.ReportCounter;
-import io.metersphere.api.jmeter.ResourcePoolCalculation;
+import io.metersphere.api.exec.scenario.ApiScenarioEnvService;
+import io.metersphere.api.exec.scenario.ApiScenarioExecuteService;
+import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
 import io.metersphere.api.parse.ApiImportParser;
-import io.metersphere.api.service.task.NamedThreadFactory;
-import io.metersphere.api.service.task.SerialScenarioExecTask;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
 import io.metersphere.base.mapper.ext.*;
-import io.metersphere.commons.constants.*;
+import io.metersphere.commons.constants.APITestStatus;
+import io.metersphere.commons.constants.MsTestElementConstants;
+import io.metersphere.commons.constants.ScheduleGroup;
+import io.metersphere.commons.constants.ScheduleType;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
 import io.metersphere.controller.request.ResetOrderRequest;
 import io.metersphere.controller.request.ScheduleRequest;
 import io.metersphere.dto.ApiReportCountDTO;
-import io.metersphere.dto.BaseSystemConfigDTO;
+import io.metersphere.dto.MsExecResponseDTO;
 import io.metersphere.i18n.Translator;
 import io.metersphere.job.sechedule.ApiScenarioTestJob;
 import io.metersphere.job.sechedule.SwaggerUrlImportJob;
@@ -50,16 +43,12 @@ import io.metersphere.service.EnvironmentGroupProjectService;
 import io.metersphere.service.QuotaService;
 import io.metersphere.service.RelationshipEdgeService;
 import io.metersphere.service.ScheduleService;
-import io.metersphere.service.SystemParameterService;
 import io.metersphere.track.dto.TestPlanDTO;
 import io.metersphere.track.request.testcase.ApiCaseRelevanceRequest;
 import io.metersphere.track.request.testcase.QueryTestPlanRequest;
 import io.metersphere.track.request.testplan.FileOperationRequest;
 import io.metersphere.track.service.TestPlanScenarioCaseService;
-import org.apache.commons.beanutils.BeanComparator;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.collections4.comparators.FixedOrderComparator;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.EnumUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -80,10 +69,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
@@ -104,17 +89,13 @@ public class ApiAutomationService {
     @Resource
     private TestCaseReviewScenarioMapper testCaseReviewScenarioMapper;
     @Resource
-    private JMeterService jMeterService;
-    @Resource
-    private ApiTestEnvironmentService environmentService;
-    @Resource
     private ScheduleService scheduleService;
     @Resource
     private ApiScenarioReportService apiReportService;
     @Resource
     private ExtTestPlanMapper extTestPlanMapper;
     @Resource
-    SqlSessionFactory sqlSessionFactory;
+    private SqlSessionFactory sqlSessionFactory;
     @Resource
     private ApiScenarioReportMapper apiScenarioReportMapper;
     @Resource
@@ -131,7 +112,7 @@ public class ApiAutomationService {
     @Resource
     private UserMapper userMapper;
     @Resource
-    private SystemParameterService systemParameterService;
+    private ApiScenarioEnvService apiScenarioEnvService;
     @Resource
     private ApiScenarioReportService apiScenarioReportService;
     @Resource
@@ -143,19 +124,15 @@ public class ApiAutomationService {
     @Resource
     private ApiScenarioReferenceIdService apiScenarioReferenceIdService;
     @Resource
-    private ResourcePoolCalculation resourcePoolCalculation;
-    @Resource
-    private RemakeReportService remakeReportService;
-    @Resource
     private ExtTestPlanScenarioCaseMapper extTestPlanScenarioCaseMapper;
     @Resource
     private RelationshipEdgeService relationshipEdgeService;
     @Resource
     private ApiScenarioFollowMapper apiScenarioFollowMapper;
     @Resource
-    private TestResourcePoolMapper testResourcePoolMapper;
-    @Resource
     private EnvironmentGroupProjectService environmentGroupProjectService;
+    @Resource
+    private ApiScenarioExecuteService apiScenarioExecuteService;
 
     private ThreadLocal<Long> currentScenarioOrder = new ThreadLocal<>();
 
@@ -185,65 +162,11 @@ public class ApiAutomationService {
         request = this.initRequest(request, true, true);
         List<ApiScenarioDTO> list = extApiScenarioMapper.list(request);
         if (BooleanUtils.isTrue(request.isSelectEnvironment())) {
-            this.setApiScenarioEnv(list);
+            apiScenarioEnvService.setApiScenarioEnv(list);
         }
         return list;
     }
 
-    private void setApiScenarioEnv(List<ApiScenarioDTO> list) {
-        List<Project> projectList = projectMapper.selectByExample(new ProjectExample());
-        List<ApiTestEnvironmentWithBLOBs> apiTestEnvironments = apiTestEnvironmentMapper.selectByExampleWithBLOBs(new ApiTestEnvironmentExample());
-        for (int i = 0; i < list.size(); i++) {
-            try {
-                Map<String, String> map = new HashMap<>();
-                String environmentType = list.get(i).getEnvironmentType();
-                String environmentGroupId = list.get(i).getEnvironmentGroupId();
-                String env = list.get(i).getEnv();
-                if (StringUtils.equals(environmentType, EnvironmentType.JSON.name())) {
-                    // 环境属性为空 跳过
-                    if (StringUtils.isBlank(env)) {
-                        continue;
-                    }
-                    map = JSON.parseObject(env, Map.class);
-                } else if (StringUtils.equals(environmentType, EnvironmentType.GROUP.name())) {
-                    map = environmentGroupProjectService.getEnvMap(environmentGroupId);
-                }
-
-                Set<String> set = map.keySet();
-                HashMap<String, String> envMap = new HashMap<>(16);
-                // 项目为空 跳过
-                if (set.isEmpty()) {
-                    continue;
-                }
-                for (String projectId : set) {
-                    String envId = map.get(projectId);
-                    if (StringUtils.isBlank(envId)) {
-                        continue;
-                    }
-                    List<Project> projects = projectList.stream().filter(p -> StringUtils.equals(p.getId(), projectId)).collect(Collectors.toList());
-                    if (CollectionUtils.isEmpty(projects)) {
-                        continue;
-                    }
-                    Project project = projects.get(0);
-                    List<ApiTestEnvironmentWithBLOBs> envs = apiTestEnvironments.stream().filter(e -> StringUtils.equals(e.getId(), envId)).collect(Collectors.toList());
-                    if (CollectionUtils.isEmpty(envs)) {
-                        continue;
-                    }
-                    ApiTestEnvironmentWithBLOBs environment = envs.get(0);
-                    String projectName = project.getName();
-                    String envName = environment.getName();
-                    if (StringUtils.isBlank(projectName) || StringUtils.isBlank(envName)) {
-                        continue;
-                    }
-                    envMap.put(projectName, envName);
-                }
-                list.get(i).setEnvironmentMap(envMap);
-            } catch (Exception e) {
-                LogUtil.error("api scenario environment map incorrect parsing. api scenario id:" + list.get(i).getId());
-            }
-        }
-    }
-
     public List<ApiScenarioWithBLOBs> listAll(ApiScenarioBatchRequest request) {
         ServiceUtils.getSelectAllIds(request, request.getCondition(),
                 (query) -> extApiScenarioMapper.selectIdsByQuery(query));
@@ -358,14 +281,6 @@ public class ApiAutomationService {
         }
     }
 
-    private void uploadBodyFiles(List<String> bodyFileRequestIds, List<MultipartFile> bodyFiles) {
-        if (CollectionUtils.isNotEmpty(bodyFileRequestIds)) {
-            bodyFileRequestIds.forEach(requestId -> {
-                FileUtils.createBodyFiles(requestId, bodyFiles);
-            });
-        }
-    }
-
     private void checkScenarioNum(SaveApiScenarioRequest request) {
         String projectId = request.getProjectId();
         Project project = projectMapper.selectByPrimaryKey(projectId);
@@ -458,7 +373,7 @@ public class ApiAutomationService {
      */
     public void deleteUpdateBodyFile(ApiScenarioWithBLOBs scenario, ApiScenarioWithBLOBs oldScenario) {
         Set<String> newRequestIds = getRequestIds(scenario.getScenarioDefinition());
-        MsTestElement msTestElement = parseScenarioDefinition(oldScenario.getScenarioDefinition());
+        MsTestElement msTestElement = GenerateHashTreeUtil.parseScenarioDefinition(oldScenario.getScenarioDefinition());
         List<MsHTTPSamplerProxy> oldRequests = MsHTTPSamplerProxy.findHttpSampleFromHashTree(msTestElement);
         oldRequests.forEach(item -> {
             if (item.isCustomizeReq() && !newRequestIds.contains(item.getId())) {
@@ -467,14 +382,8 @@ public class ApiAutomationService {
         });
     }
 
-    public MsScenario parseScenarioDefinition(String scenarioDefinition) {
-        MsScenario scenario = JSONObject.parseObject(scenarioDefinition, MsScenario.class);
-        parse(scenarioDefinition, scenario);
-        return scenario;
-    }
-
     public Set<String> getRequestIds(String scenarioDefinition) {
-        MsScenario msScenario = parseScenarioDefinition(scenarioDefinition);
+        MsScenario msScenario = GenerateHashTreeUtil.parseScenarioDefinition(scenarioDefinition);
         List<MsHTTPSamplerProxy> httpSampleFromHashTree = MsHTTPSamplerProxy.findHttpSampleFromHashTree(msScenario);
         return httpSampleFromHashTree.stream()
                 .map(MsHTTPSamplerProxy::getId).collect(Collectors.toSet());
@@ -606,7 +515,7 @@ public class ApiAutomationService {
     }
 
     public void deleteBodyFile(String scenarioDefinition) {
-        MsTestElement msTestElement = parseScenarioDefinition(scenarioDefinition);
+        MsTestElement msTestElement = GenerateHashTreeUtil.parseScenarioDefinition(scenarioDefinition);
         List<MsHTTPSamplerProxy> httpSampleFromHashTree = MsHTTPSamplerProxy.findHttpSampleFromHashTree(msTestElement);
         httpSampleFromHashTree.forEach((httpSamplerProxy) -> {
             if (httpSamplerProxy.isCustomizeReq()) {
@@ -765,20 +674,7 @@ public class ApiAutomationService {
 
 
         ParameterConfig config = new ParameterConfig();
-        Map<String, EnvironmentConfig> envConfig = new HashMap<>(16);
-        if (environmentMap != null && !environmentMap.isEmpty()) {
-            Map<String, String> finalEnvironmentMap = environmentMap;
-            environmentMap.keySet().forEach(projectId -> {
-                ApiTestEnvironmentService environmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
-                ApiTestEnvironmentWithBLOBs environment = environmentService.get(finalEnvironmentMap.get(projectId));
-                if (environment != null && environment.getConfig() != null) {
-                    EnvironmentConfig env = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
-                    env.setApiEnvironmentid(environment.getId());
-                    envConfig.put(projectId, env);
-                }
-            });
-            config.setConfig(envConfig);
-        }
+        apiScenarioEnvService.setEnvConfig(environmentMap, config);
         if (config.getConfig() != null && !config.getConfig().isEmpty()) {
             ElementUtil.dataSetDomain(element.getJSONArray("hashTree"), config);
         }
@@ -786,179 +682,6 @@ public class ApiAutomationService {
     }
 
 
-    public LinkedList<MsTestElement> getScenarioHashTree(String definition) {
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        JSONObject element = JSON.parseObject(definition);
-        try {
-            if (element != null) {
-                ElementUtil.dataFormatting(element);
-                return objectMapper.readValue(element.getString("hashTree"), new TypeReference<LinkedList<MsTestElement>>() {
-                });
-            }
-        } catch (JsonProcessingException e) {
-            LogUtil.error(e.getMessage(), e);
-        }
-        return new LinkedList<>();
-    }
-
-    public ScenarioEnv getApiScenarioEnv(String definition) {
-        ScenarioEnv env = new ScenarioEnv();
-        List<MsTestElement> hashTree = getScenarioHashTree(definition);
-        for (int i = 0; i < hashTree.size(); i++) {
-            MsTestElement tr = hashTree.get(i);
-            if (!tr.isEnable()) {
-                continue;
-            }
-            String referenced = tr.getReferenced();
-            if (StringUtils.equals(MsTestElementConstants.REF.name(), referenced)) {
-                if (StringUtils.equals(tr.getType(), "HTTPSamplerProxy")) {
-                    MsHTTPSamplerProxy http = (MsHTTPSamplerProxy) tr;
-                    String refType = tr.getRefType();
-                    if (StringUtils.equals(refType, "CASE")) {
-                        http.setUrl(null);
-                    } else {
-                        ApiDefinition apiDefinition = apiDefinitionService.get(tr.getId());
-                        if (apiDefinition != null) {
-                            http.setUrl(apiDefinition.getPath());
-                        }
-                    }
-                    if (http.isEnable()) {
-                        if (StringUtils.isBlank(http.getUrl()) || (http.getIsRefEnvironment() != null && http.getIsRefEnvironment())) {
-                            env.getProjectIds().add(http.getProjectId());
-                            env.setFullUrl(false);
-                        }
-                    }
-                } else if (StringUtils.equals(tr.getType(), "JDBCSampler") || StringUtils.equals(tr.getType(), "TCPSampler")) {
-                    if (StringUtils.equals(tr.getRefType(), "CASE")) {
-                        ApiTestCaseWithBLOBs apiTestCaseWithBLOBs = apiTestCaseService.get(tr.getId());
-                        if (apiTestCaseWithBLOBs != null) {
-                            env.getProjectIds().add(apiTestCaseWithBLOBs.getProjectId());
-                        }
-                    } else {
-                        ApiDefinition apiDefinition = apiDefinitionService.get(tr.getId());
-                        if (apiDefinition != null) {
-                            env.getProjectIds().add(apiDefinition.getProjectId());
-                        }
-                    }
-                } else if (StringUtils.equals(tr.getType(), "scenario")) {
-                    if (tr.isEnable()) {
-                        ApiScenarioWithBLOBs apiScenario = getApiScenario(tr.getId());
-                        if (apiScenario != null) {
-                            env.getProjectIds().add(apiScenario.getProjectId());
-                            String scenarioDefinition = apiScenario.getScenarioDefinition();
-                            tr.setHashTree(getScenarioHashTree(scenarioDefinition));
-                        }
-                    }
-                }
-            } else {
-                if (StringUtils.equals(tr.getType(), "HTTPSamplerProxy")) {
-                    // 校验是否是全路径
-                    MsHTTPSamplerProxy httpSamplerProxy = (MsHTTPSamplerProxy) tr;
-                    if (httpSamplerProxy.isEnable()) {
-                        if (StringUtils.isBlank(httpSamplerProxy.getUrl()) || (httpSamplerProxy.getIsRefEnvironment() != null && httpSamplerProxy.getIsRefEnvironment())) {
-                            env.getProjectIds().add(httpSamplerProxy.getProjectId());
-                            env.setFullUrl(false);
-                        }
-                    }
-                } else if (StringUtils.equals(tr.getType(), "JDBCSampler") || StringUtils.equals(tr.getType(), "TCPSampler")) {
-                    env.getProjectIds().add(tr.getProjectId());
-                }
-            }
-
-            if (StringUtils.equals(tr.getType(), "scenario")) {
-                MsScenario scenario = (MsScenario) tr;
-                if (scenario.isEnvironmentEnable()) {
-                    continue;
-                }
-                env.getProjectIds().add(tr.getProjectId());
-            }
-            if (CollectionUtils.isNotEmpty(tr.getHashTree())) {
-                getHashTree(tr.getHashTree(), env);
-            }
-        }
-        return env;
-    }
-
-    private void getHashTree(List<MsTestElement> tree, ScenarioEnv env) {
-        try {
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-            for (int i = 0; i < tree.size(); i++) {
-                MsTestElement tr = tree.get(i);
-                if (!tr.isEnable()) {
-                    continue;
-                }
-                String referenced = tr.getReferenced();
-                if (StringUtils.equals(MsTestElementConstants.REF.name(), referenced)) {
-                    if (StringUtils.equals(tr.getType(), "HTTPSamplerProxy")) {
-                        MsHTTPSamplerProxy http = (MsHTTPSamplerProxy) tr;
-                        String refType = tr.getRefType();
-                        if (StringUtils.equals(refType, "CASE")) {
-                            http.setUrl(null);
-                        } else {
-                            ApiDefinition apiDefinition = apiDefinitionService.get(tr.getId());
-                            http.setUrl(apiDefinition.getPath());
-                        }
-                        if (http.isEnable()) {
-                            if (StringUtils.isBlank(http.getUrl()) || (http.getIsRefEnvironment() != null && http.getIsRefEnvironment())) {
-                                env.setFullUrl(false);
-                                env.getProjectIds().add(http.getProjectId());
-                            }
-                        }
-                    } else if (StringUtils.equals(tr.getType(), "JDBCSampler") || StringUtils.equals(tr.getType(), "TCPSampler")) {
-                        if (StringUtils.equals(tr.getRefType(), "CASE")) {
-                            ApiTestCaseWithBLOBs apiTestCaseWithBLOBs = apiTestCaseService.get(tr.getId());
-                            env.getProjectIds().add(apiTestCaseWithBLOBs.getProjectId());
-                        } else {
-                            ApiDefinition apiDefinition = apiDefinitionService.get(tr.getId());
-                            env.getProjectIds().add(apiDefinition.getProjectId());
-                        }
-                    } else if (StringUtils.equals(tr.getType(), "scenario")) {
-                        if (tr.isEnable()) {
-                            ApiScenarioWithBLOBs apiScenario = getApiScenario(tr.getId());
-                            if (apiScenario != null) {
-                                env.getProjectIds().add(apiScenario.getProjectId());
-                                String scenarioDefinition = apiScenario.getScenarioDefinition();
-                                JSONObject element1 = JSON.parseObject(scenarioDefinition);
-                                ElementUtil.dataFormatting(element1);
-                                LinkedList<MsTestElement> hashTree1 = mapper.readValue(element1.getString("hashTree"), new TypeReference<LinkedList<MsTestElement>>() {
-                                });
-                                tr.setHashTree(hashTree1);
-                            }
-                        }
-                    }
-                } else {
-                    if (StringUtils.equals(tr.getType(), "HTTPSamplerProxy")) {
-                        // 校验是否是全路径
-                        MsHTTPSamplerProxy httpSamplerProxy = (MsHTTPSamplerProxy) tr;
-                        if (httpSamplerProxy.isEnable()) {
-                            if (StringUtils.isBlank(httpSamplerProxy.getUrl()) || (httpSamplerProxy.getIsRefEnvironment() != null && httpSamplerProxy.getIsRefEnvironment())) {
-                                env.setFullUrl(false);
-                                env.getProjectIds().add(httpSamplerProxy.getProjectId());
-                            }
-                        }
-                    } else if (StringUtils.equals(tr.getType(), "JDBCSampler") || StringUtils.equals(tr.getType(), "TCPSampler")) {
-                        env.getProjectIds().add(tr.getProjectId());
-                    }
-                }
-                if (StringUtils.equals(tr.getType(), "scenario")) {
-                    MsScenario scenario = (MsScenario) tr;
-                    if (scenario.isEnvironmentEnable()) {
-                        continue;
-                    }
-                    env.getProjectIds().add(tr.getProjectId());
-                }
-                if (CollectionUtils.isNotEmpty(tr.getHashTree())) {
-                    getHashTree(tr.getHashTree(), env);
-                }
-            }
-        } catch (JsonProcessingException e) {
-            LogUtil.error(e);
-        }
-    }
-
-
     public List<ApiScenarioWithBLOBs> getApiScenarios(List<String> ids) {
         if (CollectionUtils.isNotEmpty(ids)) {
             return extApiScenarioMapper.selectIds(ids);
@@ -982,98 +705,6 @@ public class ApiAutomationService {
         return null;
     }
 
-    public APIScenarioReportResult createScenarioReport(String id, String scenarioId, String scenarioName, String triggerMode, String execType, String projectId, String userID, RunModeConfig config, String desc) {
-        APIScenarioReportResult report = new APIScenarioReportResult();
-        if (triggerMode.equals(ApiRunMode.SCENARIO.name()) || triggerMode.equals(ApiRunMode.DEFINITION.name())) {
-            triggerMode = ReportTriggerMode.MANUAL.name();
-        }
-        report.setId(id);
-        report.setTestId(id);
-        if (StringUtils.isNotEmpty(scenarioName)) {
-            report.setName(scenarioName);
-        } else {
-            report.setName("场景调试");
-        }
-        report.setUpdateTime(System.currentTimeMillis());
-        report.setCreateTime(System.currentTimeMillis());
-
-        report.setStatus(APITestStatus.Running.name());
-        if (StringUtils.isNotEmpty(userID)) {
-            report.setUserId(userID);
-            report.setCreateUser(userID);
-        } else {
-            report.setUserId(SessionUtils.getUserId());
-            report.setCreateUser(SessionUtils.getUserId());
-        }
-        if (config != null && StringUtils.isNotBlank(config.getResourcePoolId())) {
-            report.setActuator(config.getResourcePoolId());
-        } else {
-            report.setActuator("LOCAL");
-        }
-        report.setTriggerMode(triggerMode);
-        report.setExecuteType(execType);
-        report.setProjectId(projectId);
-        report.setScenarioName(scenarioName);
-        report.setScenarioId(scenarioId);
-        report.setDescription(desc);
-        return report;
-    }
-
-
-    private void parse(String scenarioDefinition, MsScenario scenario) {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        try {
-            JSONObject element = JSON.parseObject(scenarioDefinition);
-            ElementUtil.dataFormatting(element);
-
-            // 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取
-            if (element != null && StringUtils.isNotEmpty(element.getString("hashTree"))) {
-                LinkedList<MsTestElement> elements = mapper.readValue(element.getString("hashTree"),
-                        new TypeReference<LinkedList<MsTestElement>>() {
-                        });
-                scenario.setHashTree(elements);
-            }
-            if (element != null && StringUtils.isNotEmpty(element.getString("variables"))) {
-                LinkedList<ScenarioVariable> variables = mapper.readValue(element.getString("variables"),
-                        new TypeReference<LinkedList<ScenarioVariable>>() {
-                        });
-                scenario.setVariables(variables);
-            }
-        } catch (Exception e) {
-            LogUtil.error(e);
-            LogUtil.error(e);
-        }
-    }
-
-    public HashTree generateHashTree(ApiScenarioWithBLOBs item, String reportId, Map<String, String> planEnvMap) {
-        HashTree jmeterHashTree = new HashTree();
-        MsTestPlan testPlan = new MsTestPlan();
-        testPlan.setHashTree(new LinkedList<>());
-        try {
-            MsThreadGroup group = new MsThreadGroup();
-            group.setLabel(item.getName());
-            group.setName(reportId);
-            MsScenario scenario = JSONObject.parseObject(item.getScenarioDefinition(), MsScenario.class);
-            group.setOnSampleError(scenario.getOnSampleError());
-            if (planEnvMap.size() > 0) {
-                scenario.setEnvironmentMap(planEnvMap);
-            }
-            parse(item.getScenarioDefinition(), scenario);
-
-            group.setEnableCookieShare(scenario.isEnableCookieShare());
-            LinkedList<MsTestElement> scenarios = new LinkedList<>();
-            scenarios.add(scenario);
-
-            group.setHashTree(scenarios);
-            testPlan.getHashTree().add(group);
-        } catch (Exception ex) {
-            MSException.throwException(ex.getMessage());
-        }
-
-        testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), new ParameterConfig());
-        return jmeterHashTree;
-    }
 
     private String generateJmx(ApiScenarioWithBLOBs apiScenario) {
         HashTree jmeterHashTree = new ListedHashTree();
@@ -1088,7 +719,7 @@ public class ApiAutomationService {
             if (scenario == null) {
                 return null;
             }
-            parse(apiScenario.getScenarioDefinition(), scenario);
+            GenerateHashTreeUtil.parse(apiScenario.getScenarioDefinition(), scenario);
             String environmentType = apiScenario.getEnvironmentType();
             String environmentJson = apiScenario.getEnvironmentJson();
             String environmentGroupId = apiScenario.getEnvironmentGroupId();
@@ -1122,752 +753,6 @@ public class ApiAutomationService {
         return testPlan.getJmx(jmeterHashTree);
     }
 
-    private void checkPlanScenarioEnv(RunScenarioRequest request) {
-        StringBuilder builder = new StringBuilder();
-        List<String> planCaseIds = request.getPlanCaseIds();
-        if (CollectionUtils.isNotEmpty(planCaseIds)) {
-            TestPlanApiScenarioExample example = new TestPlanApiScenarioExample();
-            example.createCriteria().andIdIn(planCaseIds);
-            List<TestPlanApiScenario> testPlanApiScenarios = testPlanApiScenarioMapper.selectByExampleWithBLOBs(example);
-            for (TestPlanApiScenario testPlanApiScenario : testPlanApiScenarios) {
-                try {
-                    ApiScenarioWithBLOBs apiScenarioWithBLOBs = apiScenarioMapper.selectByPrimaryKey(testPlanApiScenario.getApiScenarioId());
-                    boolean haveEnv = checkScenarioEnv(apiScenarioWithBLOBs, testPlanApiScenario);
-                    if (!haveEnv) {
-                        builder.append(apiScenarioWithBLOBs.getName()).append("; ");
-                    }
-                } catch (Exception e) {
-                    MSException.throwException("场景：" + builder.toString() + "运行环境未配置，请检查!");
-                }
-            }
-            if (builder.length() > 0) {
-                MSException.throwException("场景：" + builder.toString() + "运行环境未配置，请检查!");
-            }
-        }
-    }
-
-    private void checkEnv(RunScenarioRequest request, List<ApiScenarioWithBLOBs> apiScenarios) {
-        if (StringUtils.equals(request.getRequestOriginator(), "TEST_PLAN")) {
-            this.checkPlanScenarioEnv(request);
-        } else if (StringUtils.isNotBlank(request.getRunMode()) &&
-                StringUtils.equalsAny(request.getRunMode(), ApiRunMode.SCENARIO.name(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
-            StringBuilder builder = new StringBuilder();
-            for (ApiScenarioWithBLOBs apiScenarioWithBLOBs : apiScenarios) {
-                try {
-                    this.setScenarioEnv(apiScenarioWithBLOBs);
-                    boolean haveEnv = checkScenarioEnv(apiScenarioWithBLOBs, null);
-                    if (!haveEnv) {
-                        builder.append(apiScenarioWithBLOBs.getName()).append("; ");
-                    }
-                } catch (Exception e) {
-                    MSException.throwException("场景：" + builder.toString() + "运行环境未配置，请检查!");
-                }
-            }
-            if (builder.length() > 0) {
-                MSException.throwException("场景：" + builder.toString() + "运行环境未配置，请检查!");
-            }
-        } else if (StringUtils.equals(request.getRunMode(), ApiRunMode.SCHEDULE_SCENARIO.name())) {
-            for (ApiScenarioWithBLOBs apiScenarioWithBLOBs : apiScenarios) {
-                try {
-                    this.setScenarioEnv(apiScenarioWithBLOBs);
-                } catch (Exception e) {
-                    MSException.throwException("定时任务设置场景环境失败，场景ID： " + apiScenarioWithBLOBs.getId());
-                }
-            }
-        }
-    }
-
-    /**
-     * 设置场景的运行环境 环境组/环境JSON
-     *
-     * @param apiScenarioWithBLOBs
-     */
-    private void setScenarioEnv(ApiScenarioWithBLOBs apiScenarioWithBLOBs) {
-        String environmentType = apiScenarioWithBLOBs.getEnvironmentType();
-        String environmentJson = apiScenarioWithBLOBs.getEnvironmentJson();
-        String environmentGroupId = apiScenarioWithBLOBs.getEnvironmentGroupId();
-        if (StringUtils.isBlank(environmentType)) {
-            environmentType = EnvironmentType.JSON.toString();
-        }
-        String definition = apiScenarioWithBLOBs.getScenarioDefinition();
-        MsScenario scenario = JSONObject.parseObject(definition, MsScenario.class);
-        this.parse(definition, scenario);
-        if (StringUtils.equals(environmentType, EnvironmentType.JSON.toString())) {
-            scenario.setEnvironmentMap(JSON.parseObject(environmentJson, Map.class));
-        } else if (StringUtils.equals(environmentType, EnvironmentType.GROUP.toString())) {
-            Map<String, String> map = environmentGroupProjectService.getEnvMap(environmentGroupId);
-            scenario.setEnvironmentMap(map);
-        }
-        apiScenarioWithBLOBs.setScenarioDefinition(JSON.toJSONString(scenario));
-    }
-
-    /**
-     * 场景测试执行
-     *
-     * @param request
-     * @return
-     */
-    public String modeRun(RunScenarioRequest request) {
-        ServiceUtils.getSelectAllIds(request, request.getCondition(),
-                (query) -> extApiScenarioMapper.selectIdsByQuery(query));
-
-        List<String> ids = request.getIds();
-        // 生成集成报告
-        String serialReportId = null;
-
-        ApiScenarioExample example = new ApiScenarioExample();
-        example.createCriteria().andIdIn(ids);
-        List<ApiScenarioWithBLOBs> apiScenarios = apiScenarioMapper.selectByExampleWithBLOBs(example);
-        if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
-            if (request.getCondition() == null || !request.getCondition().isSelectAll()) {
-                // 按照id指定顺序排序
-                FixedOrderComparator<String> fixedOrderComparator = new FixedOrderComparator<String>(ids);
-                fixedOrderComparator.setUnknownObjectBehavior(FixedOrderComparator.UnknownObjectBehavior.BEFORE);
-                BeanComparator beanComparator = new BeanComparator("id", fixedOrderComparator);
-                Collections.sort(apiScenarios, beanComparator);
-            }
-        }
-
-        // 只有一个场景且没有测试步骤，则提示
-        if (apiScenarios != null && apiScenarios.size() == 1 && (apiScenarios.get(0).getStepTotal() == null || apiScenarios.get(0).getStepTotal() == 0)) {
-            MSException.throwException((apiScenarios.get(0).getName() + "，" + Translator.get("automation_exec_info")));
-        }
-        // 资源池
-        if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) {
-            TestResourcePool pool = testResourcePoolMapper.selectByPrimaryKey(request.getConfig().getResourcePoolId());
-            if (pool != null && pool.getApi() && pool.getType().equals(ResourcePoolTypeEnum.K8S.name())) {
-                LogUtil.info("K8S 暂时不做校验 ");
-            } else {
-                List<JvmInfoDTO> testResources = resourcePoolCalculation.getPools(request.getConfig().getResourcePoolId());
-                request.getConfig().setTestResources(testResources);
-            }
-        }
-        // 环境检查
-        this.checkEnv(request, apiScenarios);
-        // 集合报告设置
-        if (request.getConfig() != null && StringUtils.equals(request.getConfig().getReportType(), RunModeConstants.SET_REPORT.toString()) && StringUtils.isNotEmpty(request.getConfig().getReportName())) {
-            if (request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
-                request.setExecuteType(ExecuteType.Completed.name());
-            } else {
-                request.setExecuteType(ExecuteType.Marge.name());
-            }
-            serialReportId = UUID.randomUUID().toString();
-        }
-        if (StringUtils.isEmpty(request.getTriggerMode())) {
-            request.setTriggerMode(ReportTriggerMode.MANUAL.name());
-        }
-
-        Map<String, RunModeDataDTO> executeQueue = new LinkedHashMap<>();
-        List<String> scenarioIds = new ArrayList<>();
-        StringBuilder scenarioNames = new StringBuilder();
-
-        if (StringUtils.equalsAny(request.getRunMode(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
-            //测试计划执行
-            this.prepareExecutedPlanScenario(apiScenarios, request, executeQueue, scenarioIds, scenarioNames);
-        } else {
-            // 按照场景执行
-            this.prepareExecutedScenario(apiScenarios, request, executeQueue, scenarioIds, scenarioNames, serialReportId);
-        }
-
-        if (request.getConfig() != null && StringUtils.equals(request.getConfig().getReportType(), RunModeConstants.SET_REPORT.toString()) && StringUtils.isNotEmpty(request.getConfig().getReportName())) {
-            request.getConfig().setReportId(UUID.randomUUID().toString());
-            APIScenarioReportResult report = createScenarioReport(request.getConfig().getReportId(),
-                    JSON.toJSONString(CollectionUtils.isNotEmpty(scenarioIds) && scenarioIds.size() > 50 ? scenarioIds.subList(0, 50) : scenarioIds),
-                    scenarioNames.length() >= 3000 ? scenarioNames.substring(0, 2000) : scenarioNames.deleteCharAt(scenarioNames.toString().length() - 1).toString(),
-                    ReportTriggerMode.MANUAL.name(), ExecuteType.Saved.name(), request.getProjectId(), request.getReportUserID(), request.getConfig(), JSON.toJSONString(scenarioIds));
-
-            report.setName(request.getConfig().getReportName());
-            report.setId(serialReportId);
-            apiScenarioReportMapper.insert(report);
-            // 增加并行集合报告
-            if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.PARALLEL.toString())) {
-                List<String> reportIds = executeQueue.entrySet().stream()
-                        .map(reports -> reports.getKey()).collect(Collectors.toList());
-                ReportCounter counter = new ReportCounter();
-                counter.setCompletedIds(new LinkedList<>());
-                if (CollectionUtils.isNotEmpty(request.getConfig().getTestResources())) {
-                    counter.setPoolUrls(request.getConfig().getTestResources());
-                }
-                counter.setReportIds(reportIds);
-                request.getConfig().setAmassReport(serialReportId);
-                MessageCache.cache.put(serialReportId, counter);
-            }
-        }
-        // 开始执行
-        if (executeQueue != null && executeQueue.size() > 0) {
-            if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
-                this.serial(executeQueue, request, serialReportId);
-            } else {
-                this.parallel(executeQueue, request);
-            }
-        }
-        return request.getId();
-    }
-
-    /**
-     * 测试计划接口场景的预执行（生成场景报告）
-     *
-     * @param apiScenarios
-     * @param request
-     * @param executeQueue
-     * @param scenarioIds
-     * @param scenarioNames
-     */
-    private void prepareExecutedPlanScenario(List<ApiScenarioWithBLOBs> apiScenarios, RunScenarioRequest request, Map<String, RunModeDataDTO> executeQueue, List<String> scenarioIds, StringBuilder scenarioNames) {
-        String reportId = request.getId();
-        Map<String, String> planScenarioIdMap = request.getScenarioTestPlanIdMap();
-        if (MapUtils.isEmpty(planScenarioIdMap)) {
-            return;
-        }
-        String projectId = request.getProjectId();
-        Map<String, ApiScenarioWithBLOBs> scenarioMap = apiScenarios.stream().collect(Collectors.toMap(ApiScenarioWithBLOBs::getId, Function.identity(), (t1, t2) -> t1));
-        for (Map.Entry<String, String> entry : planScenarioIdMap.entrySet()) {
-            String testPlanScenarioId = entry.getKey();
-            String scenarioId = entry.getValue();
-            ApiScenarioWithBLOBs scenario = scenarioMap.get(scenarioId);
-
-            if (scenario.getStepTotal() == null || scenario.getStepTotal() == 0) {
-                continue;
-            }
-            APIScenarioReportResult report;
-            Map<String, String> planEnvMap = new HashMap<>();
-
-            //测试计划页面触发的执行方式，生成报告时createScenarioReport第二个参数需要特殊处理
-            // 获取场景用例单独的执行环境
-            TestPlanApiScenario planApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(testPlanScenarioId);
-            String envJson = planApiScenario.getEnvironment();
-            String envType = planApiScenario.getEnvironmentType();
-            String envGroupId = planApiScenario.getEnvironmentGroupId();
-            if (StringUtils.equals(envType, EnvironmentType.JSON.toString()) && StringUtils.isNotBlank(envJson)) {
-                planEnvMap = JSON.parseObject(envJson, Map.class);
-            } else if (StringUtils.equals(envType, EnvironmentType.GROUP.toString()) && StringUtils.isNotBlank(envGroupId)) {
-                planEnvMap = environmentGroupProjectService.getEnvMap(envGroupId);
-            }
-            if (StringUtils.isEmpty(projectId)) {
-                projectId = testPlanScenarioCaseService.getProjectIdById(testPlanScenarioId);
-            }
-            if (StringUtils.isEmpty(projectId)) {
-                projectId = scenario.getProjectId();
-            }
-            if (request.isTestPlanScheduleJob()) {
-                String savedScenarioId = testPlanScenarioId + ":" + request.getTestPlanReportId();
-                report = createScenarioReport(reportId, savedScenarioId, scenario.getName(), request.getTriggerMode(),
-                        request.getExecuteType(), projectId, request.getReportUserID(), request.getConfig(), scenario.getId());
-            } else {
-                report = createScenarioReport(reportId, testPlanScenarioId, scenario.getName(), request.getTriggerMode(),
-                        request.getExecuteType(), projectId, request.getReportUserID(), request.getConfig(), scenario.getId());
-            }
-            if (report != null && StringUtils.isNotEmpty(request.getTestPlanReportId())) {
-                Map<String, String> scenarioReportIdMap = new HashMap<>();
-                scenarioReportIdMap.put(testPlanScenarioId, report.getId());
-                TestPlanReportExecuteCatch.updateTestPlanThreadInfo(request.getTestPlanReportId(), null, scenarioReportIdMap, null);
-            }
-
-            try {
-                if (request.getConfig() != null && StringUtils.isNotBlank(request.getConfig().getResourcePoolId())) {
-                    RunModeDataDTO runModeDataDTO = new RunModeDataDTO();
-                    runModeDataDTO.setTestId(testPlanScenarioId);
-                    runModeDataDTO.setPlanEnvMap(planEnvMap);
-                    runModeDataDTO.setReport(report);
-                    executeQueue.put(report.getId(), runModeDataDTO);
-                } else {
-                    // 生成报告和HashTree
-                    try {
-                        HashTree hashTree = generateHashTree(scenario, reportId, planEnvMap);
-                        executeQueue.put(report.getId(), new RunModeDataDTO(hashTree, report));
-                    } catch (Exception ex) {
-                        if (StringUtils.equalsAny(request.getTriggerMode(), TriggerMode.BATCH.name(), TriggerMode.SCHEDULE.name())) {
-                            remakeReportService.remakeScenario(request.getRunMode(), testPlanScenarioId, request.getConfig(), scenario, report);
-                        } else {
-                            MSException.throwException(ex);
-                        }
-                    }
-                }
-                scenarioIds.add(scenario.getId());
-                scenarioNames.append(scenario.getName()).append(",");
-                // 重置报告ID
-                reportId = UUID.randomUUID().toString();
-            } catch (Exception ex) {
-                ex.printStackTrace();
-                MSException.throwException("解析运行步骤失败！场景名称：" + scenario.getName());
-            }
-        }
-    }
-
-    /**
-     * 接口场景的预执行（生成场景报告）
-     *
-     * @param apiScenarios
-     * @param request
-     * @param executeQueue
-     * @param scenarioIds
-     * @param scenarioNames
-     * @param serialReportId
-     */
-    private void prepareExecutedScenario(List<ApiScenarioWithBLOBs> apiScenarios, RunScenarioRequest request, Map<String, RunModeDataDTO> executeQueue, List<String> scenarioIds, StringBuilder scenarioNames, String serialReportId) {
-        String reportId = request.getId();
-        for (ApiScenarioWithBLOBs item : apiScenarios) {
-            if (item.getStepTotal() == null || item.getStepTotal() == 0) {
-                continue;
-            }
-            APIScenarioReportResult report;
-            Map<String, String> planEnvMap = new HashMap<>();
-            report = createScenarioReport(reportId, ExecuteType.Marge.name().equals(request.getExecuteType()) ? serialReportId : item.getId(), item.getName(), request.getTriggerMode(),
-                    request.getExecuteType(), item.getProjectId(), request.getReportUserID(), request.getConfig(), item.getId());
-
-            try {
-                if (request.getConfig() != null && StringUtils.isNotBlank(request.getConfig().getResourcePoolId())) {
-                    RunModeDataDTO runModeDataDTO = new RunModeDataDTO();
-                    runModeDataDTO.setTestId(item.getId());
-                    runModeDataDTO.setPlanEnvMap(planEnvMap);
-                    runModeDataDTO.setReport(report);
-                    executeQueue.put(report.getId(), runModeDataDTO);
-                } else {
-                    // 生成报告和HashTree
-                    try {
-                        HashTree hashTree = generateHashTree(item, reportId, planEnvMap);
-                        executeQueue.put(report.getId(), new RunModeDataDTO(hashTree, report));
-                    } catch (Exception ex) {
-                        if (StringUtils.equalsAny(request.getTriggerMode(), TriggerMode.BATCH.name(), TriggerMode.SCHEDULE.name())) {
-                            String testPlanScenarioId;
-                            if (request.getScenarioTestPlanIdMap() != null && request.getScenarioTestPlanIdMap().containsKey(item.getId())) {
-                                testPlanScenarioId = request.getScenarioTestPlanIdMap().get(item.getId());
-                            } else {
-                                testPlanScenarioId = request.getPlanScenarioId();
-                            }
-                            remakeReportService.remakeScenario(request.getRunMode(), testPlanScenarioId, request.getConfig(), item, report);
-                        } else {
-                            MSException.throwException(ex);
-                        }
-                    }
-                }
-                scenarioIds.add(item.getId());
-                scenarioNames.append(item.getName()).append(",");
-                // 重置报告ID
-                reportId = UUID.randomUUID().toString();
-            } catch (Exception ex) {
-                ex.printStackTrace();
-                MSException.throwException("解析运行步骤失败！场景名称：" + item.getName());
-            }
-        }
-    }
-
-    /**
-     * 串行
-     *
-     * @param executeQueue
-     * @param request
-     * @param serialReportId
-     */
-    private void serial(Map<String, RunModeDataDTO> executeQueue, RunScenarioRequest request, String serialReportId) {
-        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
-        ApiScenarioReportMapper batchMapper = sqlSession.getMapper(ApiScenarioReportMapper.class);
-        // 非集合报告，先生成执行队列
-        if (StringUtils.isEmpty(serialReportId)) {
-            for (String reportId : executeQueue.keySet()) {
-                APIScenarioReportResult report = executeQueue.get(reportId).getReport();
-                report.setStatus(APITestStatus.Waiting.name());
-                batchMapper.insert(report);
-            }
-            sqlSession.flushStatements();
-            if (sqlSession != null && sqlSessionFactory != null) {
-                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
-            }
-        }
-
-        // 开始串行执行
-        Thread thread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                Thread.currentThread().setName("Scenario串行执行线程");
-                ExecutorService executorService = Executors.newFixedThreadPool(1, new NamedThreadFactory("串行执行等待线程池"));
-                try {
-                    List<String> reportIds = new LinkedList<>();
-                    //记录串行执行中的环境参数，供下一个场景执行时使用。 <envId,<key,data>>
-                    Map<String, Map<String, String>> executeEnvParams = new LinkedHashMap<>();
-                    ApiTestEnvironmentService apiTestEnvironmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
-                    HashTreeUtil hashTreeUtil = new HashTreeUtil();
-                    for (String key : executeQueue.keySet()) {
-                        // 终止执行
-                        if (MessageCache.terminationOrderDeque.contains(key)) {
-                            MessageCache.terminationOrderDeque.remove(key);
-                            break;
-                        }
-                        MessageCache.executionQueue.put(key, System.currentTimeMillis());
-                        reportIds.add(key);
-                        APIScenarioReportResult report = executeQueue.get(key).getReport();
-                        if (StringUtils.isNotEmpty(serialReportId)) {
-                            report.setExecuteType(ExecuteType.Marge.name());
-                            apiScenarioReportMapper.insert(report);
-                        } else {
-                            report.setStatus(APITestStatus.Running.name());
-                            report.setCreateTime(System.currentTimeMillis());
-                            report.setUpdateTime(System.currentTimeMillis());
-                            apiScenarioReportMapper.updateByPrimaryKey(report);
-                        }
-                        try {
-                            if (!executeEnvParams.isEmpty()) {
-                                HashTree hashTree = executeQueue.get(key).getHashTree();
-                                hashTreeUtil.setEnvParamsMapToHashTree(hashTree, executeEnvParams);
-                                executeQueue.get(key).setHashTree(hashTree);
-                            }
-                            if (request.getConfig() != null && StringUtils.isNotEmpty(serialReportId)) {
-                                request.getConfig().setAmassReport(serialReportId);
-                            }
-                            Future<ApiScenarioReport> future = executorService.submit(new SerialScenarioExecTask(jMeterService, apiScenarioReportMapper, executeQueue.get(key), request));
-                            future.get();
-                            // 如果开启失败结束执行，则判断返回结果状态
-                            if (request.getConfig().isOnSampleError()) {
-                                ApiScenarioReport scenarioReport = apiScenarioReportMapper.selectByPrimaryKey(key);
-                                if (scenarioReport == null || !scenarioReport.getStatus().equals("Success")) {
-                                    reportIds.remove(key);
-                                    break;
-                                }
-                            }
-
-                            Map<String, Map<String, String>> envParamsMap = hashTreeUtil.getEnvParamsDataByHashTree(executeQueue.get(key).getHashTree(), apiTestEnvironmentService);
-                            executeEnvParams = hashTreeUtil.mergeParamDataMap(executeEnvParams, envParamsMap);
-                        } catch (Exception e) {
-                            reportIds.remove(key);
-                            MessageCache.executionQueue.remove(key);
-                            LogUtil.error("执行终止：" + e.getMessage());
-                            break;
-                        }
-                    }
-                    // 清理未执行的队列
-                    if (reportIds.size() < executeQueue.size() && StringUtils.isNotEmpty(serialReportId)) {
-                        List<String> removeList = executeQueue.entrySet().stream().filter(map -> !reportIds.contains(map.getKey()))
-                                .map(map -> map.getKey()).collect(Collectors.toList());
-                        ApiScenarioReportExample example = new ApiScenarioReportExample();
-                        example.createCriteria().andIdIn(removeList);
-                        apiScenarioReportMapper.deleteByExample(example);
-                    }
-                    // 更新集成报告
-                    if (StringUtils.isNotEmpty(serialReportId)) {
-                        apiScenarioReportService.margeReport(serialReportId, reportIds);
-                        executeQueue.clear();
-                    }
-
-                } catch (Exception e) {
-                    LogUtil.error(e);
-                } finally {
-                    executorService.shutdownNow();
-                }
-            }
-        });
-        thread.start();
-    }
-
-    /**
-     * 并行
-     *
-     * @param executeQueue
-     * @param request
-     */
-    private void parallel(Map<String, RunModeDataDTO> executeQueue, RunScenarioRequest request) {
-        Thread thread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
-                ApiScenarioReportMapper batchMapper = sqlSession.getMapper(ApiScenarioReportMapper.class);
-                // 开始并发执行
-                for (String reportId : executeQueue.keySet()) {
-                    //存储报告
-                    APIScenarioReportResult report = executeQueue.get(reportId).getReport();
-                    batchMapper.insert(report);
-                }
-                sqlSession.flushStatements();
-                if (sqlSession != null && sqlSessionFactory != null) {
-                    SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
-                }
-            }
-        });
-
-        try {
-            thread.start();
-            while (!StringUtils.equals(thread.getState().name(), Thread.State.TERMINATED.name())){
-                Thread.sleep(500);
-            }
-        }catch (Exception e){
-            LogUtil.error("场景报告入库异常 报错：["+e.getMessage()+"]. 场景报告ID list："+JSONArray.toJSONString(executeQueue.keySet()));
-            LogUtil.error(e);
-        }
-
-        for (String reportId : executeQueue.keySet()) {
-            MessageCache.scenarioExecResourceLock.put(reportId, executeQueue.get(reportId).getReport());
-            // 增加一个本地锁，防止并发找不到资源
-            if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) {
-                String testPlanScenarioId = "";
-                String testId = executeQueue.get(reportId).getTestId();
-                if (request.getScenarioTestPlanIdMap() != null && request.getScenarioTestPlanIdMap().containsKey(executeQueue.get(reportId).getTestId())) {
-                    testPlanScenarioId = executeQueue.get(reportId).getTestId();
-                    testId = request.getScenarioTestPlanIdMap().get(executeQueue.get(reportId).getTestId());
-                } else {
-                    testPlanScenarioId = request.getPlanScenarioId();
-                }
-                jMeterService.runTest(testId, reportId, request.getRunMode(), testPlanScenarioId, request.getConfig());
-            } else {
-                jMeterService.runLocal(reportId, request.getConfig(), executeQueue.get(reportId).getHashTree(),
-                        TriggerMode.BATCH.name().equals(request.getTriggerMode()) ? TriggerMode.BATCH.name() : request.getReportId(), request.getRunMode());
-            }
-        }
-    }
-
-    /**
-     * 生成HashTree
-     *
-     * @param apiScenarios 场景
-     * @param request      请求参数
-     * @param reportIds    报告ID
-     * @return hashTree
-     */
-    private HashTree generateHashTree(List<ApiScenarioWithBLOBs> apiScenarios, RunScenarioRequest request, List<String> reportIds) {
-        HashTree jmeterHashTree = new ListedHashTree();
-        MsTestPlan testPlan = new MsTestPlan();
-        testPlan.setHashTree(new LinkedList<>());
-        try {
-            boolean isFirst = true;
-            SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
-            ApiScenarioReportMapper batchMapper = sqlSession.getMapper(ApiScenarioReportMapper.class);
-            for (ApiScenarioWithBLOBs item : apiScenarios) {
-                if (item.getStepTotal() == null || item.getStepTotal() == 0) {
-                    // 只有 一个场景且没有测试步骤，则提示
-                    if (apiScenarios.size() == 1) {
-                        MSException.throwException((item.getName() + "，" + Translator.get("automation_exec_info")));
-                    }
-                    LogUtil.warn(item.getName() + "，" + Translator.get("automation_exec_info"));
-                    continue;
-                }
-                MsThreadGroup group = new MsThreadGroup();
-                group.setLabel(item.getName());
-                group.setName(UUID.randomUUID().toString());
-                if (request.getConfig() != null) {
-                    group.setOnSampleError(request.getConfig().isOnSampleError());
-                }
-                // 批量执行的结果直接存储为报告
-                if (isFirst && StringUtils.isNotEmpty(request.getId())) {
-                    group.setName(request.getId());
-                }
-                ObjectMapper mapper = new ObjectMapper();
-                mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-                JSONObject element = JSON.parseObject(item.getScenarioDefinition());
-                // 历史数据处理
-                ElementUtil.dataFormatting(element.getJSONArray("hashTree"));
-
-                MsScenario scenario = JSONObject.parseObject(item.getScenarioDefinition(), MsScenario.class);
-                group.setOnSampleError(scenario.getOnSampleError());
-                // 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取
-                if (element != null && StringUtils.isNotEmpty(element.getString("hashTree"))) {
-                    LinkedList<MsTestElement> elements = mapper.readValue(element.getString("hashTree"),
-                            new TypeReference<LinkedList<MsTestElement>>() {
-                            });
-                    scenario.setHashTree(elements);
-                }
-                if (StringUtils.isNotEmpty(element.getString("variables"))) {
-                    LinkedList<ScenarioVariable> variables = mapper.readValue(element.getString("variables"),
-                            new TypeReference<LinkedList<ScenarioVariable>>() {
-                            });
-                    scenario.setVariables(variables);
-                }
-                group.setEnableCookieShare(scenario.isEnableCookieShare());
-                group.setOnSampleError(scenario.getOnSampleError());
-                LinkedList<MsTestElement> scenarios = new LinkedList<>();
-                scenarios.add(scenario);
-                // 创建场景报告
-                if (reportIds != null) {
-                    //如果是测试计划页面触发的执行方式，生成报告时createScenarioReport第二个参数需要特殊处理
-                    APIScenarioReportResult report = null;
-                    if (StringUtils.equalsAny(request.getRunMode(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
-                        String testPlanScenarioId = item.getId();
-                        if (request.getScenarioTestPlanIdMap() != null && request.getScenarioTestPlanIdMap().containsKey(item.getId())) {
-                            testPlanScenarioId = request.getScenarioTestPlanIdMap().get(item.getId());
-                            // 获取场景用例单独的执行环境
-                            TestPlanApiScenario planApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(testPlanScenarioId);
-                            String envJson = planApiScenario.getEnvironment();
-                            String envType = planApiScenario.getEnvironmentType();
-                            String envGroupId = planApiScenario.getEnvironmentGroupId();
-                            if (StringUtils.equals(envType, EnvironmentType.JSON.toString()) && StringUtils.isNotBlank(envJson)) {
-                                scenario.setEnvironmentMap(JSON.parseObject(envJson, Map.class));
-                            } else if (StringUtils.equals(envType, EnvironmentType.GROUP.toString()) && StringUtils.isNotBlank(envGroupId)) {
-                                Map<String, String> envMap = environmentGroupProjectService.getEnvMap(envGroupId);
-                                scenario.setEnvironmentMap(envMap);
-                            }
-                        }
-
-                        String projectId = testPlanScenarioCaseService.getProjectIdById(testPlanScenarioId);
-                        if (StringUtils.isEmpty(projectId)) {
-                            projectId = item.getProjectId();
-                        }
-
-                        if (request.isTestPlanScheduleJob()) {
-                            String savedScenarioId = testPlanScenarioId + ":" + request.getTestPlanReportId();
-                            report = createScenarioReport(group.getName(), savedScenarioId, item.getName(), request.getTriggerMode(),
-                                    request.getExecuteType(), projectId, request.getReportUserID(), request.getConfig(), item.getId());
-                        } else {
-                            report = createScenarioReport(group.getName(), testPlanScenarioId, item.getName(), request.getTriggerMode() == null ? ReportTriggerMode.MANUAL.name() : request.getTriggerMode(),
-                                    request.getExecuteType(), projectId, request.getReportUserID(), request.getConfig(), item.getId());
-                        }
-                    } else {
-                        report = createScenarioReport(group.getName(), item.getId(), item.getName(), request.getTriggerMode() == null ? ReportTriggerMode.MANUAL.name() : request.getTriggerMode(),
-                                request.getExecuteType(), item.getProjectId(), request.getReportUserID(), request.getConfig(), item.getId());
-                    }
-                    batchMapper.insert(report);
-                    reportIds.add(group.getName());
-                }
-                group.setHashTree(scenarios);
-                testPlan.getHashTree().add(group);
-                isFirst = false;
-            }
-            testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), new ParameterConfig());
-            sqlSession.flushStatements();
-            if (sqlSession != null && sqlSessionFactory != null) {
-                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
-            }
-        } catch (Exception ex) {
-            MSException.throwException(ex.getMessage());
-        }
-
-        return jmeterHashTree;
-    }
-
-    private boolean checkScenarioEnv(ApiScenarioWithBLOBs apiScenarioWithBLOBs, TestPlanApiScenario testPlanApiScenarios) {
-        String definition = apiScenarioWithBLOBs.getScenarioDefinition();
-        MsScenario scenario = JSONObject.parseObject(definition, MsScenario.class);
-        boolean isEnv = true;
-        Map<String, String> envMap = scenario.getEnvironmentMap();
-        if (testPlanApiScenarios != null) {
-            String envType = testPlanApiScenarios.getEnvironmentType();
-            String envJson = testPlanApiScenarios.getEnvironment();
-            String envGroupId = testPlanApiScenarios.getEnvironmentGroupId();
-            if (StringUtils.equals(envType, EnvironmentType.JSON.toString())
-                    && StringUtils.isNotBlank(envJson)) {
-                envMap = JSON.parseObject(testPlanApiScenarios.getEnvironment(), Map.class);
-            } else if (StringUtils.equals(envType, EnvironmentType.GROUP.name())
-                    && StringUtils.isNotBlank(envGroupId)) {
-                envMap = environmentGroupProjectService.getEnvMap(envGroupId);
-            } else {
-                envMap = new HashMap<>();
-            }
-        }
-        ScenarioEnv apiScenarioEnv = getApiScenarioEnv(definition);
-        // 所有请求非全路径检查环境
-        if (!apiScenarioEnv.getFullUrl()) {
-            try {
-                if (envMap == null || envMap.isEmpty()) {
-                    isEnv = false;
-                } else {
-                    Set<String> projectIds = apiScenarioEnv.getProjectIds();
-                    projectIds.remove(null);
-                    if (CollectionUtils.isNotEmpty(envMap.keySet())) {
-                        for (String id : projectIds) {
-                            Project project = projectMapper.selectByPrimaryKey(id);
-                            if (project == null) {
-                                id = apiScenarioWithBLOBs.getProjectId();
-                            }
-                            String s = envMap.get(id);
-                            if (StringUtils.isBlank(s)) {
-                                isEnv = false;
-                                break;
-                            } else {
-                                ApiTestEnvironmentWithBLOBs env = apiTestEnvironmentMapper.selectByPrimaryKey(s);
-                                if (env == null) {
-                                    isEnv = false;
-                                    break;
-                                }
-                            }
-                        }
-                    } else {
-                        isEnv = false;
-                    }
-                }
-            } catch (Exception e) {
-                isEnv = false;
-                LogUtil.error(e.getMessage(), e);
-            }
-        }
-
-        // 1.8 之前环境是 environmentId
-        if (!isEnv) {
-            String envId = scenario.getEnvironmentId();
-            if (StringUtils.isNotBlank(envId)) {
-                ApiTestEnvironmentWithBLOBs env = apiTestEnvironmentMapper.selectByPrimaryKey(envId);
-                if (env != null) {
-                    isEnv = true;
-                }
-            }
-        }
-        return isEnv;
-    }
-
-    /**
-     * 串行，利用JMETER自身串行机制执行
-     *
-     * @param request
-     * @return
-     */
-    public String execute(RunScenarioRequest request) {
-        ServiceUtils.getSelectAllIds(request, request.getCondition(),
-                (query) -> extApiScenarioMapper.selectIdsByQuery(query));
-        List<String> ids = request.getIds();
-        //检查是否有正在执行中的情景
-//        this.checkScenarioIsRunning(ids);
-        StringBuilder idStr = new StringBuilder();
-        ids.forEach(item -> {
-            idStr.append("\"").append(item).append("\"").append(",");
-        });
-        List<ApiScenarioWithBLOBs> apiScenarios = extApiScenarioMapper.
-                selectByIds(idStr.toString().substring(0, idStr.toString().length() - 1), "\"" + StringUtils.join(ids, ",") + "\"");
-
-        String runMode = ApiRunMode.SCENARIO.name();
-        if (StringUtils.isNotBlank(request.getRunMode()) && StringUtils.equals(request.getRunMode(), ApiRunMode.SCENARIO_PLAN.name())) {
-            runMode = ApiRunMode.SCENARIO_PLAN.name();
-        } else if (StringUtils.isNotBlank(request.getRunMode()) && StringUtils.equals(request.getRunMode(), ApiRunMode.SCHEDULE_SCENARIO.name())) {
-            runMode = ApiRunMode.SCHEDULE_SCENARIO.name();
-        }
-        if (StringUtils.isNotBlank(request.getRunMode()) && StringUtils.equals(request.getRunMode(), ApiRunMode.DEFINITION.name())) {
-            runMode = ApiRunMode.DEFINITION.name();
-        }
-
-        // 环境检查
-        this.checkEnv(request, apiScenarios);
-
-        // 调用执行方法
-        List<String> reportIds = new LinkedList<>();
-        try {
-            HashTree hashTree = generateHashTree(apiScenarios, request, reportIds);
-            jMeterService.runLocal(reportIds.size() == 1 ? reportIds.get(0) : JSON.toJSONString(reportIds), request.getConfig(), hashTree, request.getReportId(), runMode);
-
-            Map<String, String> scenarioReportIdMap = new HashMap<>();
-            for (String id : ids) {
-                scenarioReportIdMap.put(id, request.getReportId());
-            }
-            TestPlanReportExecuteCatch.updateTestPlanThreadInfo(request.getTestPlanReportId(), null, scenarioReportIdMap, null);
-
-        } catch (Exception e) {
-            LogUtil.error(e);
-            MSException.throwException(e.getMessage());
-        }
-        return request.getId();
-    }
-
-    public String run(RunScenarioRequest request) {
-        if (request.getConfig() != null) {
-            if (request.getConfig().getMode().equals(RunModeConstants.PARALLEL.toString())) {
-                // 校验并发数量
-                int count = 50;
-                BaseSystemConfigDTO dto = systemParameterService.getBaseInfo();
-                if (StringUtils.isNotEmpty(dto.getConcurrency())) {
-                    count = Integer.parseInt(dto.getConcurrency());
-                }
-                if (request.getIds().size() > count) {
-                    MSException.throwException("并发数量过大，请重新选择！");
-                }
-            }
-            return this.modeRun(request);
-        } else {
-            return this.execute(request);
-        }
-    }
 
     /**
      * 场景测试执行
@@ -1877,58 +762,9 @@ public class ApiAutomationService {
      * @return
      */
     public String debugRun(RunDefinitionRequest request, List<MultipartFile> bodyFiles, List<MultipartFile> scenarioFiles) {
-        Map<String, EnvironmentConfig> envConfig = new HashMap<>();
-        Map<String, String> map = request.getEnvironmentMap();
-        String envType = request.getEnvironmentType();
-        if (StringUtils.equals(envType, EnvironmentType.GROUP.toString())) {
-            String environmentGroupId = request.getEnvironmentGroupId();
-            map = environmentGroupProjectService.getEnvMap(environmentGroupId);
-        }
-
-        if (map != null) {
-            Map<String, String> finalMap = map;
-            map.keySet().forEach(id -> {
-                ApiTestEnvironmentWithBLOBs environment = environmentService.get(finalMap.get(id));
-                if (environment != null && environment.getConfig() != null) {
-                    EnvironmentConfig env = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
-                    env.setApiEnvironmentid(environment.getId());
-                    envConfig.put(id, env);
-                }
-            });
-        }
-        try {
-            this.preduceTestElement(request);
-        } catch (Exception e) {
-        }
-        ParameterConfig config = new ParameterConfig();
-        config.setConfig(envConfig);
-        HashTree hashTree = null;
-        try {
-            hashTree = request.getTestElement().generateHashTree(config);
-            LogUtil.info(request.getTestElement().getJmx(hashTree));
-        } catch (Exception e) {
-            MSException.throwException(e.getMessage());
-        }
-
-        APIScenarioReportResult report = createScenarioReport(request.getId(), request.getScenarioId(), request.getScenarioName(), ReportTriggerMode.MANUAL.name(), request.getExecuteType(), request.getProjectId(),
-                SessionUtils.getUserId(), request.getConfig(), request.getId());
-        apiScenarioReportMapper.insert(report);
-
-        uploadBodyFiles(request.getBodyFileRequestIds(), bodyFiles);
-        FileUtils.createBodyFiles(request.getScenarioFileIds(), scenarioFiles);
-
-        // 调用执行方法
-        jMeterService.runLocal(request.getId(), request.getConfig(), hashTree, request.getExecuteType(), ApiRunMode.SCENARIO.name());
-        return request.getId();
+        return apiScenarioExecuteService.debug(request, bodyFiles, scenarioFiles);
     }
 
-    public void preduceTestElement(RunDefinitionRequest request) throws Exception {
-        if (request.getTestElement() != null) {
-            tcpApiParamService.checkTestElement(request.getTestElement());
-        }
-    }
-
-
     public ReferenceDTO getReference(ApiScenarioRequest request) {
         ReferenceDTO dto = new ReferenceDTO();
         dto.setScenarioList(extApiScenarioMapper.selectReference(request));
@@ -2132,7 +968,7 @@ public class ApiAutomationService {
 
     }
 
-    public JmxInfoDTO genPerformanceTestJmx(RunScenarioRequest request) {
+    public JmxInfoDTO genPerformanceTestJmx(GenScenarioRequest request) {
         List<ApiScenarioWithBLOBs> apiScenarios = null;
         List<String> ids = request.getIds();
         apiScenarios = extApiScenarioMapper.selectIds(ids);
@@ -2354,12 +1190,12 @@ public class ApiAutomationService {
     }
 
     public ScenarioImport scenarioImport(MultipartFile file, ApiTestImportRequest request) {
-        ApiImportParser apiImportParser = ScenarioImportParserFactory.getImportParser(request.getPlatform());
+        ApiImportParser runService = ScenarioImportParserFactory.getImportParser(request.getPlatform());
         ScenarioImport apiImport = null;
         Optional.ofNullable(file)
                 .ifPresent(item -> request.setFileName(file.getOriginalFilename().substring(0, file.getOriginalFilename().lastIndexOf("."))));
         try {
-            apiImport = (ScenarioImport) Objects.requireNonNull(apiImportParser).parse(file == null ? null : file.getInputStream(), request);
+            apiImport = (ScenarioImport) Objects.requireNonNull(runService).parse(file == null ? null : file.getInputStream(), request);
         } catch (Exception e) {
             LogUtil.error(e.getMessage(), e);
             MSException.throwException(Translator.get("parse_data_error"));
@@ -2751,7 +1587,7 @@ public class ApiAutomationService {
             return scenarioEnv;
         }
 
-        scenarioEnv = getApiScenarioEnv(definition);
+        scenarioEnv = apiScenarioEnvService.getApiScenarioEnv(definition);
         scenarioEnv.getProjectIds().remove(null);
         scenarioEnv.getProjectIds().add(scenario.getProjectId());
         return scenarioEnv;
@@ -2778,7 +1614,7 @@ public class ApiAutomationService {
                 if (StringUtils.isBlank(definition)) {
                     continue;
                 }
-                scenarioEnv = getApiScenarioEnv(definition);
+                scenarioEnv = apiScenarioEnvService.getApiScenarioEnv(definition);
                 scenarioEnv.getProjectIds().add(scenario.getProjectId());
                 ScenarioIdProjectInfo info = new ScenarioIdProjectInfo();
 
@@ -3060,13 +1896,13 @@ public class ApiAutomationService {
     }
 
     public boolean checkScenarioEnv(ApiScenarioWithBLOBs request) {
-        return this.checkScenarioEnv(request, null);
+        return apiScenarioEnvService.checkScenarioEnv(request, null);
     }
 
     public boolean checkScenarioEnv(String scenarioId) {
         ApiScenarioWithBLOBs apiScenarioWithBLOBs = apiScenarioMapper.selectByPrimaryKey(scenarioId);
-        this.setScenarioEnv(apiScenarioWithBLOBs);
-        return this.checkScenarioEnv(apiScenarioWithBLOBs, null);
+        apiScenarioEnvService.setScenarioEnv(apiScenarioWithBLOBs);
+        return apiScenarioEnvService.checkScenarioEnv(apiScenarioWithBLOBs, null);
     }
 
     public List<String> getFollows(String scenarioId) {
@@ -3083,4 +1919,12 @@ public class ApiAutomationService {
     public void setScenarioEnvGroupIdNull(String envGroupId) {
         extApiScenarioMapper.setScenarioEnvGroupIdNull(envGroupId);
     }
+
+    public ScenarioEnv getApiScenarioEnv(String definition) {
+        return apiScenarioEnvService.getApiScenarioEnv(definition);
+    }
+
+    public List<MsExecResponseDTO> run(RunScenarioRequest request) {
+        return apiScenarioExecuteService.run(request);
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index 19c1a5c9d3..008bb81bca 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -4,9 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import io.metersphere.api.cache.TestPlanReportExecuteCatch;
 import io.metersphere.api.dto.datacount.ExecutedCaseInfoResult;
+import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.jmeter.MessageCache;
-import io.metersphere.api.jmeter.RequestResult;
-import io.metersphere.api.jmeter.TestResult;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiDefinitionExecResultMapper;
 import io.metersphere.base.mapper.ApiDefinitionMapper;
@@ -17,6 +16,8 @@ import io.metersphere.commons.constants.*;
 import io.metersphere.commons.utils.DateUtils;
 import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.dto.RequestResult;
+import io.metersphere.dto.ResultDTO;
 import io.metersphere.notice.sender.NoticeModel;
 import io.metersphere.notice.service.NoticeSendService;
 import io.metersphere.track.dto.TestPlanDTO;
@@ -26,6 +27,7 @@ import io.metersphere.track.service.TestCaseReviewApiCaseService;
 import io.metersphere.track.service.TestPlanApiCaseService;
 import io.metersphere.track.service.TestPlanService;
 import io.metersphere.track.service.TestPlanTestCaseService;
+import io.metersphere.utils.LoggerUtil;
 import org.apache.commons.beanutils.BeanMap;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -36,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -56,107 +59,36 @@ public class ApiDefinitionExecResultService {
     @Resource
     private ApiDefinitionMapper apiDefinitionMapper;
     @Resource
-    TestCaseReviewApiCaseMapper testCaseReviewApiCaseMapper;
-
-    @Resource
-    private ApiDefinitionService apiDefinitionService;
-
+    private TestCaseReviewApiCaseMapper testCaseReviewApiCaseMapper;
     @Resource
     private NoticeSendService noticeSendService;
-
     @Resource
     private TestPlanTestCaseService testPlanTestCaseService;
-
     @Resource
     private ApiTestCaseService apiTestCaseService;
 
-    public ApiDefinitionExecResult getInfo(String id) {
-        return apiDefinitionExecResultMapper.selectByPrimaryKey(id);
-    }
+    public void saveApiResult(List<RequestResult> requestResults, ResultDTO dto) {
+        boolean isFirst = true;
+        int count = requestResults.stream()
+                .filter(item -> !StringUtils.startsWithAny(item.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_"))
+                .collect(Collectors.toList()).size();
 
-    public void saveApiResult(TestResult result, String type, String triggerMode) {
-        if (CollectionUtils.isNotEmpty(result.getScenarios())) {
-            final boolean[] isFirst = {true};
-            result.getScenarios().forEach(scenarioResult -> {
-                if (scenarioResult != null && CollectionUtils.isNotEmpty(scenarioResult.getRequestResults())) {
-                    int countExpectProcessResultCount = 0;
-                    for (RequestResult resultItem : scenarioResult.getRequestResults()) {
-                        if (!StringUtils.startsWithAny(resultItem.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
-                            countExpectProcessResultCount++;
-                        }
-                    }
-                    final int expectProcessResultCount = countExpectProcessResultCount;
-                    scenarioResult.getRequestResults().forEach(item -> {
-                        if (!StringUtils.startsWithAny(item.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
-                            ApiDefinitionExecResult saveResult = MessageCache.caseExecResourceLock.get(result.getTestId());
-                            if (saveResult == null) {
-                                saveResult = apiDefinitionExecResultMapper.selectByPrimaryKey(result.getTestId());
-                            }
-                            item.getResponseResult().setConsole(result.getConsole());
-                            boolean saved = true;
-                            if (saveResult == null || expectProcessResultCount > 1) {
-                                saveResult = new ApiDefinitionExecResult();
-                                if (isFirst[0]) {
-                                    isFirst[0] = false;
-                                    saveResult.setId(result.getTestId());
-                                } else {
-                                    saveResult.setId(UUID.randomUUID().toString());
-                                }
-                                saveResult.setActuator("LOCAL");
-                                saveResult.setName(item.getName());
-                                saveResult.setTriggerMode(triggerMode);
-                                saveResult.setType(type);
-                                saveResult.setCreateTime(item.getStartTime());
-                                if (StringUtils.isNotEmpty(result.getUserId())) {
-                                    saveResult.setUserId(result.getUserId());
-                                } else {
-                                    if (SessionUtils.getUser() != null) {
-                                        saveResult.setUserId(SessionUtils.getUser().getId());
-                                    }
-                                }
-                                saved = false;
-                            }
+        LoggerUtil.info("接收到API/CASE执行结果【 " + requestResults.size() + " 】");
 
-                            String status = item.isSuccess() ? "success" : "error";
-                            saveResult.setName(getName(type, item.getName(), status, saveResult.getCreateTime(), saveResult.getId()));
-                            saveResult.setStatus(status);
-                            saveResult.setResourceId(item.getName());
-                            saveResult.setContent(JSON.toJSONString(item));
-                            saveResult.setStartTime(item.getStartTime());
-                            saveResult.setEndTime(item.getResponseResult().getResponseTime());
-
-                            // 清空上次执行结果的内容，只保留近五条结果
-                            ApiDefinitionExecResult prevResult = extApiDefinitionExecResultMapper.selectMaxResultByResourceIdAndType(item.getName(), type);
-                            if (prevResult != null) {
-                                prevResult.setContent(null);
-                                apiDefinitionExecResultMapper.updateByPrimaryKeyWithBLOBs(prevResult);
-                            }
-
-                            if (StringUtils.isNotEmpty(saveResult.getTriggerMode()) && saveResult.getTriggerMode().equals("CASE")) {
-                                saveResult.setTriggerMode(TriggerMode.MANUAL.name());
-                            }
-                            if (!saved) {
-                                apiDefinitionExecResultMapper.insert(saveResult);
-                            } else {
-                                apiDefinitionExecResultMapper.updateByPrimaryKeyWithBLOBs(saveResult);
-                            }
-
-                            updateTestCaseStates(saveResult.getResourceId());
-
-                            apiDefinitionService.removeCache(result.getTestId());
-                            if (StringUtils.isNotEmpty(result.getTestId())) {
-                                MessageCache.caseExecResourceLock.remove(result.getTestId());
-                            }
-                            // 发送通知
-                            sendNotice(saveResult);
-                        }
-                    });
+        for (RequestResult item : requestResults) {
+            if (!StringUtils.startsWithAny(item.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
+                ApiDefinitionExecResult result = this.save(item, dto.getReportId(), dto.getConsole(), count, dto.getRunMode(), dto.getTestId(), isFirst);
+                // 串行队列
+                SerialBlockingQueueUtil.offer(dto, "testEnd");
+                if (result != null) {
+                    // 发送通知
+                    sendNotice(result);
                 }
-            });
+                isFirst = false;
+            }
         }
     }
 
-
     private void sendNotice(ApiDefinitionExecResult result) {
         String resourceId = result.getResourceId();
         ApiTestCaseWithBLOBs apiTestCaseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(resourceId);
@@ -164,7 +96,6 @@ public class ApiDefinitionExecResultService {
         if (apiTestCaseWithBLOBs == null) {
             return;
         }
-
         BeanMap beanMap = new BeanMap(apiTestCaseWithBLOBs);
 
         String event;
@@ -199,195 +130,107 @@ public class ApiDefinitionExecResultService {
         }
     }
 
-    private String getName(String type, String id, String status, Long time, String resourceId) {
-        if (id.indexOf(DelimiterConstants.SEPARATOR.toString()) != -1) {
-            return id.substring(0, id.indexOf(DelimiterConstants.SEPARATOR.toString()));
-        }
+    private String editStatus(String type, String status, Long time, String reportId, String testId) {
         if (StringUtils.equalsAnyIgnoreCase(type, ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name(), ApiRunMode.MANUAL_PLAN.name())) {
-            TestPlanApiCase testPlanApiCase = testPlanApiCaseService.getById(id);
+            TestPlanApiCase testPlanApiCase = testPlanApiCaseService.getById(testId);
             ApiTestCaseWithBLOBs caseWithBLOBs = null;
             if (testPlanApiCase != null) {
-                testPlanApiCaseService.setExecResult(id, status, time);
+                testPlanApiCaseService.setExecResult(testId, status, time);
                 caseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(testPlanApiCase.getApiCaseId());
                 testPlanApiCase.setStatus(status);
                 testPlanApiCase.setUpdateTime(System.currentTimeMillis());
                 testPlanApiCaseService.updateByPrimaryKeySelective(testPlanApiCase);
+                if (LoggerUtil.getLogger().isDebugEnabled()) {
+                    LoggerUtil.debug("更新测试计划用例【 " + testPlanApiCase.getId() + " 】");
+                }
             }
-            TestCaseReviewApiCase testCaseReviewApiCase = testCaseReviewApiCaseMapper.selectByPrimaryKey(id);
+            TestCaseReviewApiCase testCaseReviewApiCase = testCaseReviewApiCaseMapper.selectByPrimaryKey(testId);
             if (testCaseReviewApiCase != null) {
-                testCaseReviewApiCaseService.setExecResult(id, status, time);
+                testCaseReviewApiCaseService.setExecResult(testId, status, time);
                 caseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(testCaseReviewApiCase.getApiCaseId());
                 testCaseReviewApiCase.setStatus(status);
                 testCaseReviewApiCase.setUpdateTime(System.currentTimeMillis());
                 testCaseReviewApiCaseService.updateByPrimaryKeySelective(testCaseReviewApiCase);
+
+                if (LoggerUtil.getLogger().isDebugEnabled()) {
+                    LoggerUtil.debug("更新用例评审用例【 " + testCaseReviewApiCase.getId() + " 】");
+                }
             }
             if (caseWithBLOBs != null) {
                 return caseWithBLOBs.getName();
             }
         } else {
-            ApiDefinition apiDefinition = apiDefinitionMapper.selectByPrimaryKey(id);
+            ApiDefinition apiDefinition = apiDefinitionMapper.selectByPrimaryKey(testId);
             if (apiDefinition != null) {
                 return apiDefinition.getName();
             } else {
-                ApiTestCaseWithBLOBs caseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(id);
+                ApiTestCaseWithBLOBs caseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(testId);
                 if (caseWithBLOBs != null) {
                     // 更新用例最后执行结果
-                    caseWithBLOBs.setLastResultId(resourceId);
+                    caseWithBLOBs.setLastResultId(reportId);
                     caseWithBLOBs.setStatus(status);
                     caseWithBLOBs.setUpdateTime(System.currentTimeMillis());
                     apiTestCaseMapper.updateByPrimaryKey(caseWithBLOBs);
+
+                    if (LoggerUtil.getLogger().isDebugEnabled()) {
+                        LoggerUtil.debug("更新用例【 " + caseWithBLOBs.getId() + " 】");
+                    }
                     return caseWithBLOBs.getName();
                 }
             }
         }
-        return id;
+        return testId;
     }
 
     /**
      * 定时任务触发的保存逻辑
      * 定时任务时，userID要改为定时任务中的用户
-     *
-     * @param result
-     * @param type
      */
-    public void saveApiResultByScheduleTask(TestResult result, String testPlanReportId, String type) {
-        String saveResultType = type;
-        if (StringUtils.equalsAny(saveResultType, ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name(), ApiRunMode.MANUAL_PLAN.name())) {
-            saveResultType = ApiRunMode.API_PLAN.name();
-        }
-
+    public void saveApiResultByScheduleTask(List<RequestResult> requestResults, ResultDTO dto) {
         Map<String, String> apiIdResultMap = new HashMap<>();
         Map<String, String> caseReportMap = new HashMap<>();
-
-        String testId = result.getTestId();
-        if (testId.contains(":")) {
-            String[] testIdArr = testId.split(":");
-            if (testIdArr.length == 3) {
-                result.setTestId(testIdArr[2]);
-            } else {
-                result.setTestId(testIdArr[0]);
+        boolean isFirst = true;
+        int countExpectProcessResultCount = 0;
+        for (RequestResult resultItem : requestResults) {
+            if (!StringUtils.startsWithAny(resultItem.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
+                countExpectProcessResultCount++;
             }
-            testPlanReportId = testIdArr[1];
         }
-        LogUtil.info("收到测试计划案例[" + result.getTestId() + "]的执行信息，开始保存. testID:[" + testId + "] 测试计划ID:[" + testPlanReportId + "]");
-        if (CollectionUtils.isNotEmpty(result.getScenarios())) {
-            result.getScenarios().forEach(scenarioResult -> {
-                final boolean[] isFirst = {true};
-                if (scenarioResult != null && CollectionUtils.isNotEmpty(scenarioResult.getRequestResults())) {
+        LoggerUtil.info("接收到定时任务执行结果【 " + requestResults.size() + " 】");
 
-                    int countExpectProcessResultCount = 0;
-                    for (RequestResult resultItem : scenarioResult.getRequestResults()) {
-                        if (!StringUtils.startsWithAny(resultItem.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
-                            countExpectProcessResultCount++;
-                        }
+        for (RequestResult item : requestResults) {
+            if (!StringUtils.startsWithAny(item.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
+                ApiDefinitionExecResult saveResult = this.save(item, dto.getReportId(), dto.getConsole(), countExpectProcessResultCount, dto.getRunMode(), dto.getTestId(), isFirst);
+                String status = item.isSuccess() ? "success" : "error";
+                if (StringUtils.equalsAny(dto.getRunMode(), ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name())) {
+                    TestPlanApiCase apiCase = testPlanApiCaseService.getById(dto.getTestId());
+                    if (apiCase != null) {
+                        apiCase.setStatus(status);
+                        apiCase.setUpdateTime(System.currentTimeMillis());
+                        testPlanApiCaseService.updateByPrimaryKeySelective(apiCase);
                     }
-                    final int expectProcessResultCount = countExpectProcessResultCount;
-
-                    scenarioResult.getRequestResults().forEach(item -> {
-                        if (!StringUtils.startsWithAny(item.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
-                            ApiDefinitionExecResult saveResult = MessageCache.caseExecResourceLock.get(result.getTestId());
-
-                            if (saveResult == null) {
-                                saveResult = apiDefinitionExecResultMapper.selectByPrimaryKey(result.getTestId());
-                            }
-                            item.getResponseResult().setConsole(result.getConsole());
-                            boolean saved = true;
-                            if (saveResult == null || expectProcessResultCount > 1) {
-                                LogUtil.info("测试计划案例[" + result.getTestId() + "]的执行结果信息未保存，新增。");
-                                saveResult = new ApiDefinitionExecResult();
-                                if (isFirst[0]) {
-                                    isFirst[0] = false;
-                                    saveResult.setId(result.getTestId());
-                                } else {
-                                    saveResult.setId(UUID.randomUUID().toString());
-                                }
-                                saveResult.setActuator("LOCAL");
-                                saveResult.setName(item.getName());
-                                if (StringUtils.equals(type, ApiRunMode.JENKINS_API_PLAN.name())) {
-                                    saveResult.setTriggerMode(TriggerMode.API.name());
-                                } else if (StringUtils.equals(type, ApiRunMode.MANUAL_PLAN.name())) {
-                                    saveResult.setTriggerMode(TriggerMode.MANUAL.name());
-                                } else {
-                                    saveResult.setTriggerMode(TriggerMode.SCHEDULE.name());
-                                }
-                                saveResult.setType(type);
-                                saveResult.setCreateTime(item.getStartTime());
-                                if (StringUtils.isNotEmpty(result.getUserId())) {
-                                    saveResult.setUserId(result.getUserId());
-                                } else {
-                                    if (SessionUtils.getUser() != null) {
-                                        saveResult.setUserId(SessionUtils.getUser().getId());
-                                    }
-                                }
-                                saved = false;
-                            }
-
-                            String status = item.isSuccess() ? "success" : "error";
-                            saveResult.setName(getName(type, item.getName(), status, saveResult.getCreateTime(), saveResult.getId()));
-                            saveResult.setStatus(status);
-                            saveResult.setResourceId(item.getName());
-                            saveResult.setContent(JSON.toJSONString(item));
-                            saveResult.setStartTime(item.getStartTime());
-                            saveResult.setEndTime(item.getResponseResult().getResponseTime());
-
-                            // 清空上次执行结果的内容，只保留近五条结果
-                            ApiDefinitionExecResult prevResult = extApiDefinitionExecResultMapper.selectMaxResultByResourceIdAndType(item.getName(), type);
-                            if (prevResult != null) {
-                                prevResult.setContent(null);
-                                apiDefinitionExecResultMapper.updateByPrimaryKeyWithBLOBs(prevResult);
-                            }
-
-                            if (StringUtils.isNotEmpty(saveResult.getTriggerMode()) && saveResult.getTriggerMode().equals("CASE")) {
-                                saveResult.setTriggerMode(TriggerMode.MANUAL.name());
-                            }
-                            if (!saved) {
-                                LogUtil.info("插入案例[" + saveResult.getId() + "]的执行结果。");
-                                apiDefinitionExecResultMapper.insert(saveResult);
-                            } else {
-                                LogUtil.info("更新案例[" + saveResult.getId() + "]的执行结果。");
-                                apiDefinitionExecResultMapper.updateByPrimaryKeyWithBLOBs(saveResult);
-                            }
-                            apiDefinitionService.removeCache(result.getTestId());
-                            if (StringUtils.isNotEmpty(result.getTestId())) {
-                                MessageCache.caseExecResourceLock.remove(result.getTestId());
-                            }
-
-                            String caseId = item.getName();
-                            if (StringUtils.equalsAny(type, ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name())) {
-                                TestPlanApiCase apiCase = testPlanApiCaseService.getById(caseId);
-                                if(apiCase != null){
-                                    apiCase.setStatus(status);
-                                    apiCase.setUpdateTime(System.currentTimeMillis());
-                                    testPlanApiCaseService.updateByPrimaryKeySelective(apiCase);
-                                }else {
-                                    LogUtil.error("存储测试计划案例[" + result.getTestId() + "]的执行信息出错，TestPlanApiCase id:["+caseId+"] 未找到！ ");
-                                }
-                            } else {
-                                testPlanApiCaseService.setExecResult(caseId, status, item.getStartTime());
-                                testCaseReviewApiCaseService.setExecResult(caseId, status, item.getStartTime());
-                            }
-
-                            updateTestCaseStates(caseId);
-
-                            if (StringUtils.isNotEmpty(caseId)) {
-                                apiIdResultMap.put(caseId, item.isSuccess() ? TestPlanApiExecuteStatus.SUCCESS.name() : TestPlanApiExecuteStatus.FAILD.name());
-                            }
-                            //更新报告ID
-                            caseReportMap.put(caseId, saveResult.getId());
-                        }
-
-                    });
+                } else {
+                    testPlanApiCaseService.setExecResult(dto.getTestId(), status, item.getStartTime());
+                    testCaseReviewApiCaseService.setExecResult(dto.getTestId(), status, item.getStartTime());
                 }
-            });
+                if (StringUtils.isNotEmpty(dto.getTestId())) {
+                    apiIdResultMap.put(dto.getTestId(), item.isSuccess() ? TestPlanApiExecuteStatus.SUCCESS.name() : TestPlanApiExecuteStatus.FAILD.name());
+                }
+                //更新报告ID
+                caseReportMap.put(dto.getTestId(), saveResult.getId());
+                isFirst = false;
+                // 串行队列
+                SerialBlockingQueueUtil.offer(dto, "testEnd");
+            }
         }
-        testPlanLog.info("TestPlanReportId[" + testPlanReportId + "] APICASE OVER. API CASE STATUS:" + JSONObject.toJSONString(apiIdResultMap));
-        TestPlanReportExecuteCatch.updateApiTestPlanExecuteInfo(testPlanReportId, apiIdResultMap, null, null);
-        TestPlanReportExecuteCatch.updateTestPlanReport(testPlanReportId, caseReportMap, null);
+        updateTestCaseStates(dto.getTestId());
+        testPlanLog.info("TestPlanReportId[" + dto.getTestPlanReportId() + "] APICASE OVER. API CASE STATUS:" + JSONObject.toJSONString(apiIdResultMap));
+        TestPlanReportExecuteCatch.updateApiTestPlanExecuteInfo(dto.getTestPlanReportId(), apiIdResultMap, null, null);
+        TestPlanReportExecuteCatch.updateTestPlanReport(dto.getTestPlanReportId(), caseReportMap, null);
     }
 
     /**
      * 更新测试计划中, 关联接口测试的功能用例的状态
-     *
      */
     public void updateTestCaseStates(String testPlanApiCaseId) {
         try {
@@ -416,11 +259,8 @@ public class ApiDefinitionExecResultService {
     }
 
     public long countByTestCaseIDInProjectAndExecutedInThisWeek(String projectId) {
-        Map<String, Date> startAndEndDateInWeek = DateUtils.getWeedFirstTimeAndLastTime(new Date());
-
-        Date firstTime = startAndEndDateInWeek.get("firstTime");
-        Date lastTime = startAndEndDateInWeek.get("lastTime");
-
+        Date firstTime = DateUtils.getWeedFirstTimeAndLastTime(new Date()).get("firstTime");
+        Date lastTime = DateUtils.getWeedFirstTimeAndLastTime(new Date()).get("lastTime");
         if (firstTime == null || lastTime == null) {
             return 0;
         } else {
@@ -433,7 +273,7 @@ public class ApiDefinitionExecResultService {
 
     }
 
-    public List<ExecutedCaseInfoResult> findFaliureCaseInfoByProjectIDAndLimitNumberInSevenDays(String projectId, int limitNumber) {
+    public List<ExecutedCaseInfoResult> findFailureCaseInfoByProjectIDAndLimitNumberInSevenDays(String projectId, int limitNumber) {
 
         //获取7天之前的日期
         Date startDay = DateUtils.dateSum(new Date(), -6);
@@ -477,6 +317,68 @@ public class ApiDefinitionExecResultService {
         }
     }
 
+    private ApiDefinitionExecResult save(RequestResult item, String reportId, String console, int expectProcessResultCount, String type, String testId, boolean isFirst) {
+        if (!StringUtils.startsWithAny(item.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
+            ApiDefinitionExecResult saveResult = MessageCache.caseExecResourceLock.get(reportId);
+            if (saveResult == null) {
+                saveResult = apiDefinitionExecResultMapper.selectByPrimaryKey(reportId);
+            }
+            item.getResponseResult().setConsole(console);
+            boolean saved = true;
+            if (saveResult == null || expectProcessResultCount > 1) {
+                saveResult = new ApiDefinitionExecResult();
+                if (isFirst) {
+                    saveResult.setId(reportId);
+                } else {
+                    saveResult.setId(UUID.randomUUID().toString());
+                }
+                saveResult.setActuator("LOCAL");
+                saveResult.setName(item.getName());
+                if (StringUtils.equals(type, ApiRunMode.JENKINS_API_PLAN.name())) {
+                    saveResult.setTriggerMode(TriggerMode.API.name());
+                } else if (StringUtils.equals(type, ApiRunMode.MANUAL_PLAN.name())) {
+                    saveResult.setTriggerMode(TriggerMode.MANUAL.name());
+                } else {
+                    saveResult.setTriggerMode(TriggerMode.SCHEDULE.name());
+                }
+                saveResult.setType(type);
+                saveResult.setCreateTime(item.getStartTime());
+                if (SessionUtils.getUser() != null) {
+                    saveResult.setUserId(SessionUtils.getUser().getId());
+                }
+                saved = false;
+            }
+
+            String status = item.isSuccess() ? "success" : "error";
+            saveResult.setName(editStatus(type, status, saveResult.getCreateTime(), saveResult.getId(), testId));
+            saveResult.setStatus(status);
+            saveResult.setResourceId(item.getName());
+            saveResult.setContent(JSON.toJSONString(item));
+            saveResult.setStartTime(item.getStartTime());
+            saveResult.setEndTime(item.getResponseResult().getResponseTime());
+            // 清空上次执行结果的内容，只保留近五条结果
+            ApiDefinitionExecResult prevResult = extApiDefinitionExecResultMapper.selectMaxResultByResourceIdAndType(item.getName(), type);
+            if (prevResult != null) {
+                prevResult.setContent(null);
+                apiDefinitionExecResultMapper.updateByPrimaryKeyWithBLOBs(prevResult);
+            }
+
+            if (StringUtils.isNotEmpty(saveResult.getTriggerMode()) && saveResult.getTriggerMode().equals("CASE")) {
+                saveResult.setTriggerMode(TriggerMode.MANUAL.name());
+            }
+            if (!saved) {
+                apiDefinitionExecResultMapper.insert(saveResult);
+            } else {
+                apiDefinitionExecResultMapper.updateByPrimaryKeyWithBLOBs(saveResult);
+            }
+            if (StringUtils.isNotEmpty(reportId)) {
+                MessageCache.caseExecResourceLock.remove(reportId);
+            }
+            return saveResult;
+        }
+        return null;
+    }
+
     public Map<String, String> selectReportResultByReportIds(Collection<String> values) {
         if (CollectionUtils.isEmpty(values)) {
             return new HashMap<>();
@@ -491,4 +393,8 @@ public class ApiDefinitionExecResultService {
             return returnMap;
         }
     }
+
+    public ApiDefinitionExecResult getInfo(String id) {
+        return apiDefinitionExecResultMapper.selectByPrimaryKey(id);
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index 961d706d68..15dc218b46 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -13,20 +13,15 @@ import io.metersphere.api.dto.definition.*;
 import io.metersphere.api.dto.definition.parse.ApiDefinitionImport;
 import io.metersphere.api.dto.definition.parse.ApiDefinitionImportParserFactory;
 import io.metersphere.api.dto.definition.parse.Swagger3Parser;
-import io.metersphere.api.dto.definition.request.ParameterConfig;
 import io.metersphere.api.dto.definition.request.assertions.document.DocumentElement;
 import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
 import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
 import io.metersphere.api.dto.mockconfig.MockConfigImportDTO;
-import io.metersphere.api.dto.scenario.Body;
 import io.metersphere.api.dto.scenario.Scenario;
-import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
 import io.metersphere.api.dto.scenario.request.RequestType;
 import io.metersphere.api.dto.swaggerurl.SwaggerTaskResult;
 import io.metersphere.api.dto.swaggerurl.SwaggerUrlRequest;
-import io.metersphere.api.jmeter.JMeterService;
-import io.metersphere.api.jmeter.RequestResult;
-import io.metersphere.api.jmeter.TestResult;
+import io.metersphere.api.exec.api.ApiExecuteService;
 import io.metersphere.api.parse.ApiImportParser;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
@@ -38,7 +33,7 @@ import io.metersphere.commons.json.JSONToDocumentUtils;
 import io.metersphere.commons.utils.*;
 import io.metersphere.controller.request.ResetOrderRequest;
 import io.metersphere.controller.request.ScheduleRequest;
-import io.metersphere.dto.BaseSystemConfigDTO;
+import io.metersphere.dto.MsExecResponseDTO;
 import io.metersphere.dto.RelationshipEdgeDTO;
 import io.metersphere.i18n.Translator;
 import io.metersphere.job.sechedule.SwaggerUrlImportJob;
@@ -58,14 +53,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.jorphan.collections.HashTree;
 import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.multipart.MultipartFile;
-import sun.security.util.Cache;
+
 import javax.annotation.Resource;
 import java.net.MalformedURLException;
 import java.util.*;
@@ -90,7 +84,7 @@ public class ApiDefinitionService {
     @Resource
     private ApiDefinitionExecResultMapper apiDefinitionExecResultMapper;
     @Resource
-    private JMeterService jMeterService;
+    private ApiExecuteService apiExecuteService;
     @Resource
     private SqlSessionFactory sqlSessionFactory;
     @Resource
@@ -131,8 +125,6 @@ public class ApiDefinitionService {
     @Lazy
     private TestPlanService testPlanService;
 
-    private static Cache cache = Cache.newHardMemoryCache(0, 3600);
-
     private ThreadLocal<Long> currentApiOrder = new ThreadLocal<>();
     private ThreadLocal<Long> currentApiCaseOrder = new ThreadLocal<>();
 
@@ -862,111 +854,8 @@ public class ApiDefinitionService {
      * @param bodyFiles
      * @return
      */
-    public String run(RunDefinitionRequest request, List<MultipartFile> bodyFiles) {
-        int count = 100;
-        BaseSystemConfigDTO dto = systemParameterService.getBaseInfo();
-        if (StringUtils.isNotEmpty(dto.getConcurrency())) {
-            count = Integer.parseInt(dto.getConcurrency());
-        }
-        if (request.getTestElement() != null && request.getTestElement().getHashTree().size() == 1 && request.getTestElement().getHashTree().get(0).getHashTree().size() > count) {
-            MSException.throwException("并发数量过大，请重新选择！");
-        }
-
-        ParameterConfig config = new ParameterConfig();
-        config.setProjectId(request.getProjectId());
-
-        Map<String, EnvironmentConfig> envConfig = new HashMap<>();
-        Map<String, String> map = request.getEnvironmentMap();
-        if (map != null && map.size() > 0) {
-            for (String key : map.keySet()) {
-                ApiTestEnvironmentWithBLOBs environment = environmentService.get(map.get(key));
-                if (environment != null) {
-                    EnvironmentConfig env = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
-                    env.setApiEnvironmentid(environment.getId());
-                    envConfig.put(key, env);
-                }
-            }
-            config.setConfig(envConfig);
-        }
-
-        if (CollectionUtils.isNotEmpty(bodyFiles)) {
-            List<MsHTTPSamplerProxy> requests = MsHTTPSamplerProxy.findHttpSampleFromHashTree(request.getTestElement());
-            // 单接口调试生成tmp临时目录
-            requests.forEach(item -> {
-                Body body = item.getBody();
-                String tmpFilePath = "tmp/" + UUID.randomUUID().toString();
-                body.setTmpFilePath(tmpFilePath);
-                FileUtils.copyBdyFile(item.getId(), tmpFilePath);
-                FileUtils.createBodyFiles(tmpFilePath, bodyFiles);
-            });
-        }
-
-
-        try {
-            //检查TCP数据结构，等其他进行处理
-            tcpApiParamService.checkTestElement(request.getTestElement());
-        } catch (Exception e) {
-        }
-
-        HashTree hashTree = request.getTestElement().generateHashTree(config);
-        String runMode = ApiRunMode.DEFINITION.name();
-        if (StringUtils.isNotBlank(request.getType()) && StringUtils.equals(request.getType(), ApiRunMode.API_PLAN.name())) {
-            runMode = ApiRunMode.API_PLAN.name();
-        }
-
-        // 调用执行方法
-        if (request.getConfig() != null && StringUtils.isNotBlank(request.getConfig().getResourcePoolId())) {
-            jMeterService.runTest(request.getId(), request.getId(), runMode, null, request.getConfig());
-        } else {
-            jMeterService.runLocal(request.getId(), request.getConfig(), hashTree, request.getReportId(), runMode);
-        }
-        return request.getId();
-    }
-
-    public void addResult(TestResult res) {
-        if (res != null && CollectionUtils.isNotEmpty(res.getScenarios()) && res.getScenarios().get(0) != null && CollectionUtils.isNotEmpty(res.getScenarios().get(0).getRequestResults())) {
-            RequestResult result = null;
-            for (RequestResult itemResult : res.getScenarios().get(0).getRequestResults()) {
-                if (!StringUtils.startsWithAny(itemResult.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
-                    result = itemResult;
-                    break;
-                }
-            }
-            if (result.getName().indexOf(DelimiterConstants.SEPARATOR.toString()) != -1) {
-                result.setName(result.getName().substring(0, result.getName().indexOf(DelimiterConstants.SEPARATOR.toString())));
-            }
-            result.getResponseResult().setConsole(res.getConsole());
-            cache.put(res.getTestId(), result);
-        } else {
-            RequestResult result = new RequestResult();
-            result.getResponseResult().setConsole(res.getConsole());
-            cache.put(res.getTestId(), result);
-            //MSException.throwException(Translator.get("test_not_found"));
-        }
-    }
-
-    /**
-     * 获取零时执行结果报告
-     *
-     * @param testId
-     * @param test
-     * @return
-     */
-    public APIReportResult getResult(String testId, String test) {
-        Object res = cache.get(testId);
-        if (res != null) {
-            cache.remove(testId);
-            APIReportResult reportResult = new APIReportResult();
-            reportResult.setContent(JSON.toJSONString(res));
-            return reportResult;
-        }
-        return null;
-    }
-
-    public void removeCache(String testId) {
-        if (StringUtils.isNotEmpty(testId)) {
-            cache.remove(testId);
-        }
+    public MsExecResponseDTO run(RunDefinitionRequest request, List<MultipartFile> bodyFiles) {
+        return apiExecuteService.debug(request, bodyFiles);
     }
 
     /**
@@ -1026,10 +915,10 @@ public class ApiDefinitionService {
 
     public ApiDefinitionImport apiTestImport(MultipartFile file, ApiTestImportRequest request) {
         //通过platform，获取对应的导入解析类型。
-        ApiImportParser apiImportParser = ApiDefinitionImportParserFactory.getApiImportParser(request.getPlatform());
+        ApiImportParser runService = ApiDefinitionImportParserFactory.getApiImportParser(request.getPlatform());
         ApiDefinitionImport apiImport = null;
         try {
-            apiImport = (ApiDefinitionImport) Objects.requireNonNull(apiImportParser).parse(file == null ? null : file.getInputStream(), request);
+            apiImport = (ApiDefinitionImport) Objects.requireNonNull(runService).parse(file == null ? null : file.getInputStream(), request);
         } catch (Exception e) {
             LogUtil.error(e.getMessage(), e);
             String returnThrowException = e.getMessage();
@@ -1402,22 +1291,21 @@ public class ApiDefinitionService {
 
 
     // 设置 SwaggerUrl 同步鉴权参数
-    public String setAuthParams(ScheduleRequest request){
+    public String setAuthParams(ScheduleRequest request) {
         // list 数组转化成 json 字符串
         JSONObject configObj = new JSONObject();
         configObj.put("headers", request.getHeaders());
         configObj.put("arguments", request.getArguments());
         // 设置 BaseAuth 参数
-        if(request.getAuthManager() != null
+        if (request.getAuthManager() != null
                 && StringUtils.isNotBlank(request.getAuthManager().getUsername())
-                && StringUtils.isNotBlank(request.getAuthManager().getPassword())){
+                && StringUtils.isNotBlank(request.getAuthManager().getPassword())) {
             configObj.put("authManager", request.getAuthManager());
         }
         return JSONObject.toJSONString(configObj);
     }
 
 
-
     /**
      * 列表开关切换
      *
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java b/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java
index 663b225f15..6dfd3ce48f 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java
@@ -4,7 +4,12 @@ import com.alibaba.fastjson.JSON;
 import io.metersphere.api.dto.EnvironmentType;
 import io.metersphere.api.dto.definition.request.MsTestPlan;
 import io.metersphere.api.dto.scenario.request.BodyFile;
-import io.metersphere.base.domain.*;
+import io.metersphere.api.exec.api.TestPlanApiExecuteService;
+import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
+import io.metersphere.base.domain.ApiScenarioWithBLOBs;
+import io.metersphere.base.domain.JarConfig;
+import io.metersphere.base.domain.Plugin;
+import io.metersphere.base.domain.TestPlanApiScenario;
 import io.metersphere.base.mapper.ApiScenarioMapper;
 import io.metersphere.base.mapper.TestPlanApiScenarioMapper;
 import io.metersphere.commons.constants.ApiRunMode;
@@ -15,7 +20,6 @@ import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.service.EnvironmentGroupProjectService;
 import io.metersphere.service.JarConfigService;
 import io.metersphere.service.PluginService;
-import io.metersphere.track.service.TestPlanApiCaseService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jorphan.collections.HashTree;
@@ -34,9 +38,7 @@ import java.util.zip.ZipOutputStream;
 public class ApiJmeterFileService {
 
     @Resource
-    private ApiAutomationService apiAutomationService;
-    @Resource
-    private TestPlanApiCaseService testPlanApiCaseService;
+    private TestPlanApiExecuteService testPlanApiExecuteService;
     @Resource
     private TestPlanApiScenarioMapper testPlanApiScenarioMapper;
     @Resource
@@ -56,11 +58,12 @@ public class ApiJmeterFileService {
         return listBytesToZip(files);
     }
 
-    public byte[] downloadJmeterFiles(String runMode, String remoteTestId, String reportId, String testPlanScenarioId) {
+    public byte[] downloadJmeterFiles(String runMode, String remoteTestId, String reportId) {
         Map<String, String> planEnvMap = new HashMap<>();
-        if (StringUtils.isNotEmpty(testPlanScenarioId)) {
+        ApiScenarioWithBLOBs scenario = null;
+        if (StringUtils.equalsAny(runMode, ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name())) {
             // 获取场景用例单独的执行环境
-            TestPlanApiScenario planApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(testPlanScenarioId);
+            TestPlanApiScenario planApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(remoteTestId);
             if (planApiScenario != null) {
                 String envType = planApiScenario.getEnvironmentType();
                 String environmentGroupId = planApiScenario.getEnvironmentGroupId();
@@ -70,61 +73,34 @@ public class ApiJmeterFileService {
                 } else if (StringUtils.equals(envType, EnvironmentType.GROUP.name()) && StringUtils.isNotBlank(environmentGroupId)) {
                     planEnvMap = environmentGroupProjectService.getEnvMap(environmentGroupId);
                 }
+                scenario = apiScenarioMapper.selectByPrimaryKey(planApiScenario.getApiScenarioId());
             }
         }
         HashTree hashTree;
-        if (StringUtils.equalsAnyIgnoreCase(runMode, ApiRunMode.DEFINITION.name(), ApiRunMode.JENKINS_API_PLAN.name(),ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.MANUAL_PLAN.name())) {
-            String testId = remoteTestId;
-            if (remoteTestId.contains(":")) {
-                //执行测试计划案例时会有拼接ID,ID为 planTestCaseId:测试计划报告ID
-                testId = remoteTestId.split(":")[0];
-            }
-            hashTree = testPlanApiCaseService.generateHashTree(testId);
+        if (StringUtils.equalsAnyIgnoreCase(runMode, ApiRunMode.DEFINITION.name(), ApiRunMode.JENKINS_API_PLAN.name(), ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.MANUAL_PLAN.name())) {
+            hashTree = testPlanApiExecuteService.generateHashTree(remoteTestId);
         } else {
-            ApiScenarioWithBLOBs item = apiScenarioMapper.selectByPrimaryKey(remoteTestId);
-            if (item == null) {
+            if (scenario == null) {
+                scenario = apiScenarioMapper.selectByPrimaryKey(remoteTestId);
+            }
+            if (scenario == null) {
                 MSException.throwException("未找到执行场景。");
             }
-            if (StringUtils.isBlank(testPlanScenarioId)) {
-                String envType = item.getEnvironmentType();
-                String envJson = item.getEnvironmentJson();
-                String envGroupId = item.getEnvironmentGroupId();
+            if (!StringUtils.equalsAny(runMode, ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name())) {
+                String envType = scenario.getEnvironmentType();
+                String envJson = scenario.getEnvironmentJson();
+                String envGroupId = scenario.getEnvironmentGroupId();
                 if (StringUtils.equals(envType, EnvironmentType.JSON.name()) && StringUtils.isNotBlank(envJson)) {
                     planEnvMap = JSON.parseObject(envJson, Map.class);
                 } else if (StringUtils.equals(envType, EnvironmentType.GROUP.name()) && StringUtils.isNotBlank(envGroupId)) {
                     planEnvMap = environmentGroupProjectService.getEnvMap(envGroupId);
                 }
             }
-            hashTree = apiAutomationService.generateHashTree(item, reportId, planEnvMap);
+            hashTree = GenerateHashTreeUtil.generateHashTree(scenario, reportId, planEnvMap);
         }
         return zipFilesToByteArray(remoteTestId, hashTree);
     }
 
-    public byte[] downloadJmx(String runMode, String testId, String reportId, String testPlanScenarioId) {
-        Map<String, String> planEnvMap = new HashMap<>();
-        if (StringUtils.isNotEmpty(testPlanScenarioId)) {
-            // 获取场景用例单独的执行环境
-            TestPlanApiScenario planApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(testPlanScenarioId);
-            String environment = planApiScenario.getEnvironment();
-            if (StringUtils.isNotBlank(environment)) {
-                planEnvMap = JSON.parseObject(environment, Map.class);
-            }
-        }
-        HashTree hashTree = null;
-        if (ApiRunMode.DEFINITION.name().equals(runMode) || ApiRunMode.API_PLAN.name().equals(runMode)) {
-            hashTree = testPlanApiCaseService.generateHashTree(testId);
-        } else {
-            ApiScenarioWithBLOBs item = apiScenarioMapper.selectByPrimaryKey(testId);
-            if (item == null) {
-                MSException.throwException("未找到执行场景。");
-            }
-            hashTree = apiAutomationService.generateHashTree(item, reportId, planEnvMap);
-        }
-        //jMeterService.addBackendListener(reportId, hashTree);
-        String jmx = new MsTestPlan().getJmx(hashTree);
-        return jmx.getBytes(StandardCharsets.UTF_8);
-    }
-
     public byte[] downloadJmeterJar() {
         Map<String, byte[]> files = new HashMap<>();
         // 获取JAR
@@ -254,11 +230,6 @@ public class ApiJmeterFileService {
         return listBytesToZip(files);
     }
 
-    private byte[] fileToByteArray(HashTree hashTree) {
-        String jmx = new MsTestPlan().getJmx(hashTree);
-        return jmx.getBytes(StandardCharsets.UTF_8);
-    }
-
     private byte[] listBytesToZip(Map<String, byte[]> mapReport) {
         try {
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
new file mode 100644
index 0000000000..8ce4b70198
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
@@ -0,0 +1,66 @@
+package io.metersphere.api.service;
+
+import com.alibaba.fastjson.JSON;
+import io.metersphere.base.domain.ApiScenarioReportResult;
+import io.metersphere.base.mapper.ApiScenarioReportResultMapper;
+import io.metersphere.dto.RequestResult;
+import io.metersphere.utils.LoggerUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ApiScenarioReportResultService {
+    @Resource
+    private SqlSessionFactory sqlSessionFactory;
+
+    public void save(String reportId, List<RequestResult> queue) {
+        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+        ApiScenarioReportResultMapper batchMapper = sqlSession.getMapper(ApiScenarioReportResultMapper.class);
+        queue.forEach(item -> {
+            // 事物控制器出来的结果特殊处理
+            if (StringUtils.isNotEmpty(item.getName()) && item.getName().startsWith("Transaction=") && CollectionUtils.isEmpty(item.getSubRequestResults())) {
+                LoggerUtil.debug("合并事物请求暂不入库");
+            } else if (StringUtils.isNotEmpty(item.getName()) && item.getName().startsWith("Transaction=") && CollectionUtils.isNotEmpty(item.getSubRequestResults())) {
+                item.getSubRequestResults().forEach(subItem -> {
+                    batchMapper.insert(this.newApiScenarioReportResult(reportId, subItem));
+                });
+            } else {
+                batchMapper.insert(this.newApiScenarioReportResult(reportId, item));
+            }
+        });
+        sqlSession.flushStatements();
+        if (sqlSession != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
+    }
+
+    private ApiScenarioReportResult newApiScenarioReportResult(String reportId, RequestResult result) {
+        ApiScenarioReportResult report = new ApiScenarioReportResult();
+        report.setId(UUID.randomUUID().toString());
+        String resourceId = result.getResourceId();
+        if (StringUtils.isNotEmpty(resourceId) && resourceId.contains("_")) {
+            resourceId = StringUtils.substringBefore(result.getResourceId(), "_");
+        }
+        report.setResourceId(resourceId);
+        report.setReportId(reportId);
+        report.setTotalAssertions(Long.parseLong(result.getTotalAssertions() + ""));
+        report.setPassAssertions(Long.parseLong(result.getPassAssertions() + ""));
+        report.setCreateTime(System.currentTimeMillis());
+        report.setStatus(result.getError() == 0 ? "Success" : "Error");
+        report.setRequestTime(result.getEndTime() - result.getStartTime());
+        report.setContent(JSON.toJSONString(result).getBytes(StandardCharsets.UTF_8));
+        return report;
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
index 8bff619a8d..1cb6c15ca8 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
@@ -3,29 +3,29 @@ package io.metersphere.api.service;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import io.metersphere.api.cache.TestPlanReportExecuteCatch;
-import io.metersphere.api.dto.*;
+import io.metersphere.api.dto.APIReportBatchRequest;
+import io.metersphere.api.dto.DeleteAPIReportRequest;
+import io.metersphere.api.dto.EnvironmentType;
+import io.metersphere.api.dto.QueryAPIReportRequest;
 import io.metersphere.api.dto.automation.APIScenarioReportResult;
 import io.metersphere.api.dto.automation.ExecuteType;
 import io.metersphere.api.dto.automation.ScenarioStatus;
 import io.metersphere.api.dto.datacount.ApiDataCountResult;
+import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.api.jmeter.ReportCounter;
-import io.metersphere.api.jmeter.ScenarioResult;
-import io.metersphere.api.jmeter.TestResult;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
-import io.metersphere.base.mapper.ext.ExtApiScenarioReportDetailMapper;
 import io.metersphere.base.mapper.ext.ExtApiScenarioReportMapper;
 import io.metersphere.commons.constants.*;
 import io.metersphere.commons.exception.MSException;
-import io.metersphere.commons.utils.*;
-import io.metersphere.dto.ApiReportCountDTO;
-import io.metersphere.dto.NodeDTO;
-import io.metersphere.dto.UserDTO;
+import io.metersphere.commons.utils.DateUtils;
+import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.commons.utils.ServiceUtils;
+import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.constants.RunModeConstants;
+import io.metersphere.dto.*;
 import io.metersphere.i18n.Translator;
 import io.metersphere.log.utils.ReflexObjectUtil;
 import io.metersphere.log.vo.DetailColumn;
@@ -34,18 +34,12 @@ import io.metersphere.log.vo.api.ModuleReference;
 import io.metersphere.notice.sender.NoticeModel;
 import io.metersphere.notice.service.NoticeSendService;
 import io.metersphere.service.UserService;
-import io.metersphere.track.request.testcase.TrackCount;
-import io.metersphere.track.service.TestPlanTestCaseService;
+import io.metersphere.utils.LoggerUtil;
 import org.apache.commons.beanutils.BeanMap;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.session.ExecutorType;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -68,15 +62,14 @@ public class ApiScenarioReportService {
     @Resource
     private ApiScenarioReportDetailMapper apiScenarioReportDetailMapper;
     @Resource
-    private ExtApiScenarioReportDetailMapper extApiScenarioReportDetailMapper;
-
+    private ApiScenarioReportResultMapper apiScenarioReportResultMapper;
+    @Resource
+    private ApiScenarioReportResultService apiScenarioReportResultService;
     @Resource
     private ApiScenarioMapper apiScenarioMapper;
     @Resource
     private TestPlanApiScenarioMapper testPlanApiScenarioMapper;
     @Resource
-    SqlSessionFactory sqlSessionFactory;
-    @Resource
     private NoticeSendService noticeSendService;
     @Resource
     private UserService userService;
@@ -87,31 +80,57 @@ public class ApiScenarioReportService {
     @Resource
     private ApiTestEnvironmentMapper apiTestEnvironmentMapper;
     @Resource
-    @Lazy
-    private TestPlanTestCaseService testPlanTestCaseService;
+    private ApiScenarioReportStructureService apiScenarioReportStructureService;
     @Resource
-    @Lazy
-    private ApiAutomationService apiAutomationService;
+    private MsResultService resultService;
 
-    public ApiScenarioReport complete(TestResult result, String runMode) {
-        // 更新场景
-        if (result != null) {
-            if (StringUtils.equals(runMode, ApiRunMode.SCENARIO_PLAN.name())) {
-                return updatePlanCase(result, runMode);
-            } else if (StringUtils.equalsAny(runMode, ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
-                return updateSchedulePlanCase(result, runMode);
+    public void saveResult(List<RequestResult> requestResults, ResultDTO dto) {
+        // 报告详情内容
+        apiScenarioReportResultService.save(dto.getReportId(), requestResults);
+    }
+
+    public ApiScenarioReport testEnded(ResultDTO dto) {
+        // 并发集成报告计数
+        if (StringUtils.equals(dto.getReportType(), RunModeConstants.SET_REPORT.toString())) {
+            LoggerUtil.info("接收到集合报告【" + dto.getReportId() + "】部分结果【" + dto.getTestId() + "】");
+            Object obj = MessageCache.concurrencyCounter.get(dto.getReportId());
+            if (obj != null) {
+                ReportCounter counter = (ReportCounter) obj;
+                counter.getCompletedIds().add(dto.getTestId());
+                MessageCache.concurrencyCounter.put(dto.getReportId(), counter);
+            }
+        } else {
+            // 更新控制台信息
+            apiScenarioReportStructureService.update(dto.getReportId(), dto.getConsole());
+        }
+        ApiScenarioReportResultExample example = new ApiScenarioReportResultExample();
+        example.createCriteria().andReportIdEqualTo(dto.getReportId());
+        List<ApiScenarioReportResult> requestResults = apiScenarioReportResultMapper.selectByExample(example);
+
+        ApiScenarioReport scenarioReport = null;
+        if (CollectionUtils.isNotEmpty(requestResults)) {
+            if (StringUtils.equals(dto.getRunMode(), ApiRunMode.SCENARIO_PLAN.name())) {
+                scenarioReport = updatePlanCase(requestResults, dto);
+            } else if (StringUtils.equalsAny(dto.getRunMode(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
+                scenarioReport = updateSchedulePlanCase(requestResults, dto);
             } else {
-                return updateScenario(result);
+                scenarioReport = updateScenario(requestResults, dto);
             }
         }
-        return null;
+        return scenarioReport;
     }
 
     public APIScenarioReportResult get(String reportId) {
         APIScenarioReportResult reportResult = extApiScenarioReportMapper.get(reportId);
-        ApiScenarioReportDetail detail = apiScenarioReportDetailMapper.selectByPrimaryKey(reportId);
-        if (detail != null && reportResult != null) {
-            reportResult.setContent(new String(detail.getContent(), StandardCharsets.UTF_8));
+        if (reportResult != null) {
+            if (reportResult.getReportVersion() != null && reportResult.getReportVersion() > 1) {
+                reportResult.setContent(JSON.toJSONString(apiScenarioReportStructureService.getReport(reportId)));
+            } else {
+                ApiScenarioReportDetail detail = apiScenarioReportDetailMapper.selectByPrimaryKey(reportId);
+                if (detail != null && reportResult != null) {
+                    reportResult.setContent(new String(detail.getContent(), StandardCharsets.UTF_8));
+                }
+            }
         }
         return reportResult;
     }
@@ -134,7 +153,7 @@ public class ApiScenarioReportService {
         }
     }
 
-    public APIScenarioReportResult createScenarioReport(String scenarioIds, String reportName, String status, String scenarioNames, String triggerMode, String projectId, String userID) {
+    public APIScenarioReportResult init(String scenarioIds, String reportName, String status, String scenarioNames, String triggerMode, String projectId, String userID) {
         APIScenarioReportResult report = new APIScenarioReportResult();
         if (triggerMode.equals(ApiRunMode.SCENARIO.name()) || triggerMode.equals(ApiRunMode.DEFINITION.name())) {
             triggerMode = ReportTriggerMode.MANUAL.name();
@@ -161,28 +180,39 @@ public class ApiScenarioReportService {
         return report;
     }
 
-    public ApiScenarioReport editReport(ScenarioResult test, long startTime) {
-        ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(test.getName());
-        if (report == null) {
-            LogUtil.info("从缓存中获取场景报告：【" + test.getName() + "】");
-            report = MessageCache.scenarioExecResourceLock.get(test.getName());
-            LogUtil.info("从缓存中获取场景报告：【" + test.getName() + "】是否为空：" + (report == null));
-        }
-        if (report != null) {
-            report.setName(report.getScenarioName() + "-" + DateUtils.getTimeStr(System.currentTimeMillis()));
-            report.setEndTime(System.currentTimeMillis());
-            report.setUpdateTime(startTime);
-            String status = test.getError() == 0 ? "Success" : "Error";
-            report.setStatus(status);
-            if (StringUtils.isNotEmpty(report.getTriggerMode()) && report.getTriggerMode().equals("CASE")) {
-                report.setTriggerMode(TriggerMode.MANUAL.name());
+    public ApiScenarioReport editReport(String reportType, String reportId, String status, String runMode) {
+        try {
+            ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(reportId);
+            if (report == null) {
+                int index = 0;
+                while (index < 3) {
+                    LogUtil.info("未获取到报告，尝试重新获取：【" + reportId + "】");
+                    report = apiScenarioReportMapper.selectByPrimaryKey(reportId);
+                    Thread.sleep(2000);
+                    index++;
+                }
             }
-            MessageCache.scenarioExecResourceLock.remove(report.getId());
-            apiScenarioReportMapper.updateByPrimaryKeySelective(report);
-        } else {
-            LogUtil.error("未获取到场景报告！【" + test.getName() + "】");
+            if (report != null) {
+                if (StringUtils.equals(reportType, RunModeConstants.SET_REPORT.toString())) {
+                    return report;
+                }
+                if (runMode.equals("CASE")) {
+                    report.setTriggerMode(TriggerMode.MANUAL.name());
+                }
+                report.setStatus(status);
+                report.setName(report.getScenarioName() + "-" + DateUtils.getTimeStr(System.currentTimeMillis()));
+                report.setEndTime(System.currentTimeMillis());
+                report.setUpdateTime(System.currentTimeMillis());
+                if (StringUtils.isNotEmpty(report.getTriggerMode()) && report.getTriggerMode().equals("CASE")) {
+                    report.setTriggerMode(TriggerMode.MANUAL.name());
+                }
+                apiScenarioReportMapper.updateByPrimaryKeySelective(report);
+            }
+            return report;
+        } catch (Exception e) {
+            LoggerUtil.error(e);
         }
-        return report;
+        return null;
     }
 
     public ApiScenarioReport updateReport(APIScenarioReportResult test) {
@@ -207,198 +237,83 @@ public class ApiScenarioReportService {
         return report;
     }
 
-    private TestResult createTestResult(TestResult result) {
-        TestResult testResult = new TestResult();
-        testResult.setTestId(result.getTestId());
-        testResult.setTotal(result.getTotal());
-        testResult.setError(result.getError());
-        testResult.setPassAssertions(result.getPassAssertions());
-        testResult.setSuccess(result.getSuccess());
-        testResult.setTotalAssertions(result.getTotalAssertions());
-        testResult.setConsole(result.getConsole());
-        return testResult;
-    }
-
-    private TestResult createTestResult(String testId, ScenarioResult scenarioResult) {
-        TestResult testResult = new TestResult();
-        testResult.setTestId(testId);
-        testResult.setTotal(scenarioResult.getTotal());
-        testResult.setError(scenarioResult.getError());
-        testResult.setPassAssertions(scenarioResult.getPassAssertions());
-        testResult.setSuccess(scenarioResult.getSuccess());
-        testResult.setTotalAssertions(scenarioResult.getTotalAssertions());
-        return testResult;
-    }
-
-    public ApiScenarioReport updatePlanCase(TestResult result, String runMode) {
-        List<ScenarioResult> scenarioResultList = result.getScenarios();
-        ApiScenarioReport returnReport = null;
-        StringBuilder scenarioIds = new StringBuilder();
-        StringBuilder scenarioNames = new StringBuilder();
-        TestResult fullResult = createTestResult(result);
-        List<String> reportIds = new LinkedList<>();
-        for (ScenarioResult scenarioResult : scenarioResultList) {
-            long startTime = System.currentTimeMillis();
-            if (CollectionUtils.isNotEmpty(scenarioResult.getRequestResults()) && scenarioResult.getRequestResults().get(0).getStartTime() > 0) {
-                startTime = scenarioResult.getRequestResults().get(0).getStartTime();
+    public ApiScenarioReport updatePlanCase(List<ApiScenarioReportResult> requestResults, ResultDTO dto) {
+        long errorSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), "Error")).count();
+        TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(dto.getTestId());
+        if (testPlanApiScenario != null) {
+            if (errorSize > 0) {
+                testPlanApiScenario.setLastResult(ScenarioStatus.Fail.name());
+            } else {
+                testPlanApiScenario.setLastResult(ScenarioStatus.Success.name());
             }
-            ApiScenarioReport report = editReport(scenarioResult, startTime);
+            long successSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), "Success")).count();
 
-            // 报告详情内容
-            ApiScenarioReportDetail detail = new ApiScenarioReportDetail();
-            TestResult newResult = createTestResult(result.getTestId(), scenarioResult);
-            scenarioResult.setName(report.getScenarioName());
-            newResult.addScenario(scenarioResult);
+            String passRate = new DecimalFormat("0%").format((float) successSize / requestResults.size());
+            testPlanApiScenario.setPassRate(passRate);
+            testPlanApiScenario.setReportId(dto.getReportId());
+            testPlanApiScenario.setUpdateTime(System.currentTimeMillis());
+            testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
 
-            detail.setContent(JSON.toJSONString(newResult).getBytes(StandardCharsets.UTF_8));
-            detail.setReportId(report.getId());
-            detail.setProjectId(report.getProjectId());
-            apiScenarioReportDetailMapper.insert(detail);
+            // 更新场景状态
+            ApiScenario scenario = apiScenarioMapper.selectByPrimaryKey(testPlanApiScenario.getApiScenarioId());
+            if (scenario != null) {
+                scenario.setLastResult(errorSize > 0 ? "Fail" : "Success");
+                scenario.setPassRate(passRate);
+                scenario.setReportId(dto.getReportId());
+                int executeTimes = 0;
+                if (scenario.getExecuteTimes() != null) {
+                    executeTimes = scenario.getExecuteTimes().intValue();
+                }
+                scenario.setExecuteTimes(executeTimes + 1);
+                apiScenarioMapper.updateByPrimaryKey(scenario);
+            }
+        }
+        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), errorSize > 0 ? "Error" : "Success", dto.getRunMode());
+        // 串行队列
+        SerialBlockingQueueUtil.offer(dto, report);
+        return report;
+    }
 
-            fullResult.addScenario(scenarioResult);
-            scenarioIds.append(scenarioResult.getName()).append(",");
-            scenarioNames.append(report.getName()).append(",");
+    public ApiScenarioReport updateSchedulePlanCase(List<ApiScenarioReportResult> requestResults, ResultDTO dto) {
+        List<String> testPlanReportIdList = new ArrayList<>();
+        StringBuilder scenarioNames = new StringBuilder();
 
-            TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(report.getScenarioId());
+        Map<String, String> scenarioAndErrorMap = new HashMap<>();
+        Map<String, String> planScenarioReportMap = new HashMap<>();
+
+        long errorSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), "Error")).count();
+        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), errorSize > 0 ? "Error" : "Success", dto.getRunMode());
+        if (report != null) {
+            if (StringUtils.isNotEmpty(dto.getTestPlanReportId()) && !testPlanReportIdList.contains(dto.getTestPlanReportId())) {
+                testPlanReportIdList.add(dto.getTestPlanReportId());
+            }
+            TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(dto.getTestId());
             if (testPlanApiScenario != null) {
                 report.setScenarioId(testPlanApiScenario.getApiScenarioId());
-                if (StringUtils.isNotEmpty(report.getTriggerMode()) && report.getTriggerMode().equals("CASE")) {
-                    report.setTriggerMode(TriggerMode.MANUAL.name());
-                }
                 report.setEndTime(System.currentTimeMillis());
                 apiScenarioReportMapper.updateByPrimaryKeySelective(report);
-                if (scenarioResult.getError() > 0) {
+                planScenarioReportMap.put(dto.getTestId(), report.getId());
+                if (errorSize > 0) {
+                    scenarioAndErrorMap.put(testPlanApiScenario.getId(), TestPlanApiExecuteStatus.FAILD.name());
                     testPlanApiScenario.setLastResult(ScenarioStatus.Fail.name());
                 } else {
+                    scenarioAndErrorMap.put(testPlanApiScenario.getId(), TestPlanApiExecuteStatus.SUCCESS.name());
                     testPlanApiScenario.setLastResult(ScenarioStatus.Success.name());
                 }
-                String passRate = new DecimalFormat("0%").format((float) scenarioResult.getSuccess() / (scenarioResult.getSuccess() + scenarioResult.getError()));
+                long successSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), "Success")).count();
+                String passRate = new DecimalFormat("0%").format((float) successSize / requestResults.size());
                 testPlanApiScenario.setPassRate(passRate);
+
                 testPlanApiScenario.setReportId(report.getId());
                 report.setEndTime(System.currentTimeMillis());
-                testPlanApiScenario.setUpdateTime(report.getCreateTime());
+                testPlanApiScenario.setUpdateTime(System.currentTimeMillis());
                 testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
+                scenarioNames.append(report.getName()).append(",");
 
                 // 更新场景状态
                 ApiScenario scenario = apiScenarioMapper.selectByPrimaryKey(testPlanApiScenario.getApiScenarioId());
                 if (scenario != null) {
-                    if (scenarioResult.getError() > 0) {
-                        scenario.setLastResult("Fail");
-                    } else {
-                        scenario.setLastResult("Success");
-                    }
-                    scenario.setPassRate(passRate);
-                    scenario.setReportId(report.getId());
-                    int executeTimes = 0;
-                    if (scenario.getExecuteTimes() != null) {
-                        executeTimes = scenario.getExecuteTimes().intValue();
-                    }
-                    scenario.setExecuteTimes(executeTimes + 1);
-
-                    apiScenarioMapper.updateByPrimaryKey(scenario);
-                    // 发送通知
-//                    sendNotice(scenario);
-                }
-
-                updatePlanTestCaseStates(testPlanApiScenario);
-            }
-            returnReport = report;
-            reportIds.add(report.getId());
-            MessageCache.executionQueue.remove(report.getId());
-        }
-        return returnReport;
-    }
-
-    public ApiScenarioReport updateSchedulePlanCase(TestResult result, String runMode) {
-        ApiScenarioReport lastReport = null;
-        List<ScenarioResult> scenarioResultList = result.getScenarios() == null ? new ArrayList<>(0) : result.getScenarios();
-        LogUtil.info("收到测试计划场景[" + result.getTestId() + "]的执行信息，开始保存.步骤总数：" + scenarioResultList.size());
-        List<String> testPlanReportIdList = new ArrayList<>();
-        StringBuilder scenarioNames = new StringBuilder();
-
-        List<String> reportIds = new ArrayList<>();
-        List<String> scenarioIdList = new ArrayList<>();
-        Map<String, String> scenarioAndErrorMap = new HashMap<>();
-        Map<String, String> planScenarioReportMap = new HashMap<>();
-        for (ScenarioResult scenarioResult : scenarioResultList) {
-            LogUtil.info("收到测试计划场景[" + result.getTestId() + "]的执行信息并存储报告。报告ID:" + scenarioResult.getName());
-            // 存储场景报告
-            long startTime = System.currentTimeMillis();
-            if (CollectionUtils.isNotEmpty(scenarioResult.getRequestResults())) {
-                startTime = scenarioResult.getRequestResults().get(0).getStartTime();
-            }
-            ApiScenarioReport report = editReport(scenarioResult, startTime);
-            if (report != null) {
-                TestResult newResult = createTestResult(result.getTestId(), scenarioResult);
-                newResult.setConsole(result.getConsole());
-                scenarioResult.setName(report.getScenarioName());
-
-                newResult.addScenario(scenarioResult);
-                /**
-                 * 测试计划的定时任务场景执行时，主键是提前生成的【测试报告ID】。也就是TestResult.id是【测试报告ID】。
-                 * report.getScenarioId中存放的是 TestPlanApiScenario.id:TestPlanReport.id 由于参数限制，只得将两个ID拼接起来
-                 * 拆分report.getScenarioId, 查出ScenarioId，将真正的场景ID赋值回去
-                 * 同时将testPlanReportID存入集合，逻辑走完后更新TestPlanReport
-                 */
-                String[] idArr = report.getScenarioId().split(":");
-                String planScenarioId = null;
-                if (idArr.length > 1) {
-                    planScenarioId = idArr[0];
-                    String planReportID = idArr[1];
-                    if (!testPlanReportIdList.contains(planReportID)) {
-                        testPlanReportIdList.add(planReportID);
-                    }
-                } else {
-                    planScenarioId = report.getScenarioId();
-                }
-
-                String passRate = new DecimalFormat("0%").format((float) scenarioResult.getSuccess() / (scenarioResult.getSuccess() + scenarioResult.getError()));
-
-                TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(planScenarioId);
-                if (testPlanApiScenario != null) {
-                    //更新测试计划场景相关状态
-                    report.setScenarioId(testPlanApiScenario.getApiScenarioId());
-                    if (scenarioResult.getError() > 0) {
-                        scenarioAndErrorMap.put(testPlanApiScenario.getId(), TestPlanApiExecuteStatus.FAILD.name());
-                        testPlanApiScenario.setLastResult(ScenarioStatus.Fail.name());
-                        testPlanApiScenario.setPassRate(passRate);
-                    } else {
-                        scenarioAndErrorMap.put(testPlanApiScenario.getId(), TestPlanApiExecuteStatus.SUCCESS.name());
-                        testPlanApiScenario.setLastResult(ScenarioStatus.Success.name());
-                    }
-                    testPlanApiScenario.setReportId(report.getId());
-                    testPlanApiScenario.setUpdateTime(System.currentTimeMillis());
-                    testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
-                    scenarioIdList.add(testPlanApiScenario.getApiScenarioId());
-
-                    updatePlanTestCaseStates(testPlanApiScenario);
-                } else {
-                    LogUtil.info("TestPlanReport_Id is null. scenario report id : [" + report.getId() + "]; planScenarioIdArr:[" + report.getScenarioId() + "] DATA:" + JSON.toJSONString(scenarioResult));
-                }
-
-                report.setEndTime(System.currentTimeMillis());
-                apiScenarioReportMapper.updateByPrimaryKeySelective(report);
-                planScenarioReportMap.put(planScenarioId, report.getId());
-
-                // 报告详情内容
-                ApiScenarioReportDetail detail = new ApiScenarioReportDetail();
-                detail.setContent(JSON.toJSONString(newResult).getBytes(StandardCharsets.UTF_8));
-                detail.setReportId(report.getId());
-                detail.setProjectId(report.getProjectId());
-                if (StringUtils.isNotEmpty(report.getTriggerMode()) && report.getTriggerMode().equals("CASE")) {
-                    report.setTriggerMode(TriggerMode.MANUAL.name());
-                }
-                try {
-                    apiScenarioReportDetailMapper.insert(detail);
-                } catch (Exception e) {
-                    LogUtil.error("存储场景报告出错：" + e.getMessage() + "; 步骤信息:" + JSON.toJSONString(scenarioResult));
-                    LogUtil.error(e);
-                }
-                scenarioNames.append(report.getName()).append(",");
-                // 更新场景状态
-                ApiScenario scenario = apiScenarioMapper.selectByPrimaryKey(report.getScenarioId());
-                if (scenario != null) {
-                    if (scenarioResult.getError() > 0) {
+                    if (errorSize > 0) {
                         scenario.setLastResult("Fail");
                     } else {
                         scenario.setLastResult("Success");
@@ -413,237 +328,66 @@ public class ApiScenarioReportService {
 
                     apiScenarioMapper.updateByPrimaryKey(scenario);
                 }
-                lastReport = report;
-                MessageCache.executionQueue.remove(report.getId());
-                reportIds.add(report.getId());
-            } else {
-                LogUtil.error("测试计划场景[" + result.getTestId() + "]的场景报告未找到。报告ID:" + scenarioResult.getName() + "。 步骤信息:" + JSON.toJSONString(scenarioResult));
+            }
+            // 串行队列
+            SerialBlockingQueueUtil.offer(dto, report);
+            testPlanLog.info("TestPlanReportId" + JSONArray.toJSONString(testPlanReportIdList) + " EXECUTE OVER. SCENARIO STATUS : " + JSONObject.toJSONString(scenarioAndErrorMap));
+            for (String item : testPlanReportIdList) {
+                TestPlanReportExecuteCatch.updateApiTestPlanExecuteInfo(item, null, scenarioAndErrorMap, null);
+                TestPlanReportExecuteCatch.updateTestPlanReport(item, null, planScenarioReportMap);
             }
         }
-        testPlanLog.info("TestPlanReportId" + JSONArray.toJSONString(testPlanReportIdList) + " EXECUTE OVER. SCENARIO STATUS : " + JSONObject.toJSONString(scenarioAndErrorMap));
-        for (String reportId : testPlanReportIdList) {
-            TestPlanReportExecuteCatch.updateApiTestPlanExecuteInfo(reportId, null, scenarioAndErrorMap, null);
-            TestPlanReportExecuteCatch.updateTestPlanReport(reportId, null, planScenarioReportMap);
-        }
-        LogUtil.info("测试计划场景[" + result.getTestId() + "]保存结束");
-        return lastReport;
+        return report;
     }
 
-    /**
-     * 更新测试计划，关联产经测试的功能用例的状态
-     *
-     */
-    public void updatePlanTestCaseStates(TestPlanApiScenario testPlanApiScenario) {
-        try {
-            ApiScenarioWithBLOBs apiScenario = apiAutomationService.getApiScenario(testPlanApiScenario.getApiScenarioId());
-            testPlanTestCaseService.updateTestCaseStates(apiScenario.getId(), apiScenario.getName(), testPlanApiScenario.getTestPlanId(), TrackCount.AUTOMATION);
-        } catch (Exception e) {
-            LogUtil.error(e.getMessage(), e);
-        }
-    }
-
-    /**
-     * 批量更新状态，防止重复刷新报告
-     *
-     * @param reportId
-     */
-    public void updatePrevResult(String scenarioId, String reportId) {
-        if (StringUtils.isNotEmpty(reportId)) {
-            // 把上一条调试的数据内容清空
-            ApiScenarioReport prevResult = extApiScenarioReportMapper.selectPreviousReportByScenarioId(scenarioId, reportId);
-            if (prevResult != null) {
-                ApiScenarioReportDetailExample example = new ApiScenarioReportDetailExample();
-                example.createCriteria().andReportIdEqualTo(prevResult.getId());
-                apiScenarioReportDetailMapper.deleteByExample(example);
-            }
-        }
-    }
-
-    public void margeReport(String reportId, List<String> reportIds) {
+    public void margeReport(String reportId) {
         ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(reportId);
         // 要合并的报告已经被删除
         if (report == null) {
-            MessageCache.cache.remove(reportId);
+            MessageCache.concurrencyCounter.remove(reportId);
         } else {
-            // 合并生成一份报告
-            if (CollectionUtils.isNotEmpty(reportIds)) {
-                TestResult testResult = new TestResult();
-                testResult.setTestId(UUID.randomUUID().toString());
-
-                StringBuilder idStr = new StringBuilder();
-                reportIds.forEach(item -> {
-                    idStr.append("\"").append(item).append("\"").append(",");
-                });
-                List<ApiScenarioReportDetail> details = extApiScenarioReportDetailMapper.selectByIds(idStr.toString().substring(0, idStr.toString().length() - 1), "\"" + StringUtils.join(reportIds, ",") + "\"");
-                ObjectMapper mapper = new ObjectMapper();
-                mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-                // 记录单场景通过率
-                Map<String, String> passRateMap = new HashMap<>();
-                for (ApiScenarioReportDetail detail : details) {
-                    try {
-                        String content = new String(detail.getContent(), StandardCharsets.UTF_8);
-                        TestResult scenarioResult = mapper.readValue(content, new TypeReference<TestResult>() {
-                        });
-                        testResult.getScenarios().addAll(scenarioResult.getScenarios());
-                        testResult.setTotal(testResult.getTotal() + scenarioResult.getTotal());
-                        testResult.setError(testResult.getError() + scenarioResult.getError());
-                        testResult.setPassAssertions(testResult.getPassAssertions() + scenarioResult.getPassAssertions());
-                        testResult.setSuccess(testResult.getSuccess() + scenarioResult.getSuccess());
-                        testResult.setTotalAssertions(scenarioResult.getTotalAssertions() + testResult.getTotalAssertions());
-                        testResult.setScenarioTotal(testResult.getScenarioTotal() + scenarioResult.getScenarioTotal());
-                        testResult.setScenarioSuccess(testResult.getScenarioSuccess() + scenarioResult.getScenarioSuccess());
-                        testResult.setScenarioError(testResult.getScenarioError() + scenarioResult.getScenarioError());
-                        testResult.setConsole(scenarioResult.getConsole());
-                        testResult.setScenarioStepError(scenarioResult.getScenarioStepError() + testResult.getScenarioStepError());
-                        testResult.setScenarioStepSuccess(scenarioResult.getScenarioStepSuccess() + testResult.getScenarioStepSuccess());
-                        testResult.setScenarioStepTotal(scenarioResult.getScenarioStepTotal() + testResult.getScenarioStepTotal());
-                        String passRate = new DecimalFormat("0%").format((float) scenarioResult.getSuccess() / (scenarioResult.getSuccess() + scenarioResult.getError()));
-                        passRateMap.put(detail.getReportId(), passRate);
-                    } catch (Exception e) {
-                        LogUtil.error(e);
-                    }
-                }
-
-                report.setExecuteType(ExecuteType.Saved.name());
-                report.setStatus(testResult.getError() > 0 ? "Error" : "Success");
-                if (StringUtils.isNotEmpty(report.getTriggerMode()) && report.getTriggerMode().equals("CASE")) {
-                    report.setTriggerMode(TriggerMode.MANUAL.name());
-                }
-                report.setEndTime(System.currentTimeMillis());
-                apiScenarioReportMapper.updateByPrimaryKey(report);
-
-                ApiScenarioReportDetail detail = new ApiScenarioReportDetail();
-                detail.setContent(JSON.toJSONString(testResult).getBytes(StandardCharsets.UTF_8));
-                detail.setReportId(report.getId());
-                detail.setProjectId(report.getProjectId());
-                apiScenarioReportDetailMapper.insert(detail);
-                // 更新场景状态
-                if (CollectionUtils.isNotEmpty(reportIds)) {
-                    ApiScenarioReportExample scenarioReportExample = new ApiScenarioReportExample();
-                    scenarioReportExample.createCriteria().andIdIn(reportIds);
-                    List<ApiScenarioReport> reports = apiScenarioReportMapper.selectByExampleWithBLOBs(scenarioReportExample);
-                    SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
-                    ApiScenarioMapper scenarioReportMapper = sqlSession.getMapper(ApiScenarioMapper.class);
-                    reports.forEach(apiScenarioReport -> {
-                        ApiScenarioWithBLOBs scenario = new ApiScenarioWithBLOBs();
-                        scenario.setId(apiScenarioReport.getDescription());
-                        scenario.setLastResult(StringUtils.equals("Error", apiScenarioReport.getStatus()) ? "Fail" : apiScenarioReport.getStatus());
-                        scenario.setPassRate(passRateMap.get(apiScenarioReport.getId()));
-                        scenario.setReportId(report.getId());
-                        scenarioReportMapper.updateByPrimaryKeySelective(scenario);
-                    });
-                    sqlSession.flushStatements();
-                    if (sqlSession != null && sqlSessionFactory != null) {
-                        SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
-                    }
-                }
-                passRateMap.clear();
-            }
-        }
-        // 清理其他报告保留一份合并后的报告
-        deleteByIds(reportIds);
-    }
-
-    private void counter(TestResult result) {
-        if (CollectionUtils.isEmpty(result.getScenarios()) && StringUtils.isNotEmpty(result.getTestId())) {
-            List<String> list = new LinkedList<>();
-            try {
-                list = JSON.parseObject(result.getTestId(), List.class);
-            } catch (Exception e) {
-                list.add(result.getTestId());
-            }
-            ApiScenarioReportExample scenarioReportExample = new ApiScenarioReportExample();
-            scenarioReportExample.createCriteria().andScenarioIdIn(list);
-            List<ApiScenarioReport> reportList = apiScenarioReportMapper.selectByExample(scenarioReportExample);
-
-            if (CollectionUtils.isEmpty(reportList)) {
-                ApiScenarioReportExample example = new ApiScenarioReportExample();
-                example.createCriteria().andIdIn(list);
-                reportList = apiScenarioReportMapper.selectByExample(example);
-            }
-
-            for (String item : list) {
-                if (MessageCache.scenarioExecResourceLock.containsKey(item)) {
-                    reportList.add(MessageCache.scenarioExecResourceLock.get(item));
-                }
-            }
-            for (ApiScenarioReport report : reportList) {
-                report.setStatus("Error");
-                apiScenarioReportMapper.updateByPrimaryKey(report);
-                MessageCache.scenarioExecResourceLock.remove(report.getId());
-                MessageCache.executionQueue.remove(report.getId());
-                if (StringUtils.equals(report.getExecuteType(), ExecuteType.Marge.name()) || StringUtils.equals(report.getScenarioId(), result.getSetReportId())) {
-                    Object obj = MessageCache.cache.get(result.getSetReportId());
-                    if (obj != null) {
-                        ReportCounter counter = (ReportCounter) obj;
-                        counter.getCompletedIds().add(report.getId());
-                        MessageCache.cache.put(result.getSetReportId(), counter);
-                    }
-                }
-            }
+            // 更新场景状态
+            ApiScenarioReportResultExample example = new ApiScenarioReportResultExample();
+            example.createCriteria().andReportIdEqualTo(reportId).andStatusEqualTo("Error");
+            long size = apiScenarioReportResultMapper.countByExample(example);
+            report.setStatus(size > 0 ? "Error" : "Success");
+            report.setEndTime(System.currentTimeMillis());
+            // 更新控制台信息
+            apiScenarioReportStructureService.update(reportId, resultService.getJmeterLogger(reportId));
+            // 更新报告
+            apiScenarioReportMapper.updateByPrimaryKey(report);
         }
     }
 
-    public ApiScenarioReport updateScenario(TestResult result) {
-        ApiScenarioReport lastReport = null;
-        for (ScenarioResult item : result.getScenarios()) {
-            // 更新报告状态
-            long startTime = System.currentTimeMillis();
-            if (CollectionUtils.isNotEmpty(item.getRequestResults())) {
-                startTime = item.getRequestResults().get(0).getStartTime();
-            }
-            ApiScenarioReport report = editReport(item, startTime);
-
-            if (report != null) {
-                // 合并并行报告
-                TestResult newResult = createTestResult(result.getTestId(), item);
-                newResult.setConsole(result.getConsole());
-                item.setName(report.getScenarioName());
-                newResult.addScenario(item);
-                // 报告详情内容
-                ApiScenarioReportDetail detail = new ApiScenarioReportDetail();
-                detail.setContent(JSON.toJSONString(newResult).getBytes(StandardCharsets.UTF_8));
-                detail.setReportId(report.getId());
-                detail.setProjectId(report.getProjectId());
-                apiScenarioReportDetailMapper.insert(detail);
-                // 更新场景状态
-                ApiScenarioWithBLOBs scenario = apiScenarioMapper.selectByPrimaryKey(report.getScenarioId());
-                if (scenario != null) {
-                    if (item.getError() > 0) {
-                        scenario.setLastResult("Fail");
-                    } else {
-                        scenario.setLastResult("Success");
-                    }
-                    String passRate = new DecimalFormat("0%").format((float) item.getSuccess() / (item.getSuccess() + item.getError()));
-                    scenario.setPassRate(passRate);
-                    scenario.setReportId(report.getId());
-                    int executeTimes = 0;
-                    if (scenario.getExecuteTimes() != null) {
-                        executeTimes = scenario.getExecuteTimes().intValue();
-                    }
-                    scenario.setExecuteTimes(executeTimes + 1);
-
-                    apiScenarioMapper.updateByPrimaryKey(scenario);
-                    // 发送通知
-                    sendNotice(scenario, report);
-                }
-                lastReport = report;
-                MessageCache.executionQueue.remove(report.getId());
-                if (report.getExecuteType().equals(ExecuteType.Marge.name())) {
-                    Object obj = MessageCache.cache.get(result.getSetReportId());
-                    if (obj != null) {
-                        ReportCounter counter = (ReportCounter) obj;
-                        counter.getCompletedIds().add(report.getId());
-                        MessageCache.cache.put(result.getSetReportId(), counter);
-                    }
-                }
-                updatePrevResult(report.getScenarioId(), report.getId());
-            }
+    public ApiScenarioReport updateScenario(List<ApiScenarioReportResult> requestResults, ResultDTO dto) {
+        long errorSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), "Error")).count();
+        // 更新报告状态
+        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), errorSize > 0 ? "Error" : "Success", dto.getRunMode());
+        // 更新场景状态
+        ApiScenarioWithBLOBs scenario = apiScenarioMapper.selectByPrimaryKey(dto.getTestId());
+        if (scenario == null) {
+            scenario = apiScenarioMapper.selectByPrimaryKey(report.getScenarioId());
+        }
+        if (scenario != null) {
+            scenario.setLastResult(errorSize > 0 ? "Fail" : "Success");
+            long successSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), "Success")).count();
+            scenario.setPassRate(new DecimalFormat("0%").format((float) successSize / requestResults.size()));
+            scenario.setReportId(dto.getReportId());
+            int executeTimes = 0;
+            if (scenario.getExecuteTimes() != null) {
+                executeTimes = scenario.getExecuteTimes().intValue();
+            }
+            scenario.setExecuteTimes(executeTimes + 1);
+            apiScenarioMapper.updateByPrimaryKey(scenario);
         }
-        // 针对未正常返回结果的报告计数
-        counter(result);
 
-        return lastReport;
+        // 发送通知
+        if (scenario != null && report != null) {
+            sendNotice(scenario, report);
+        }
+        // 串行队列
+        SerialBlockingQueueUtil.offer(dto, report);
+        return report;
     }
 
     public String getEnvironment(ApiScenarioWithBLOBs apiScenario) {
@@ -740,7 +484,7 @@ public class ApiScenarioReportService {
         apiScenarioReportDetailMapper.deleteByPrimaryKey(request.getId());
         // 补充逻辑，如果是集成报告则把零时报告全部删除
         ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(request.getId());
-        MessageCache.cache.remove(request.getId());
+        MessageCache.concurrencyCounter.remove(request.getId());
         if (report != null && StringUtils.isNotEmpty(report.getScenarioId())) {
             List<String> list = getReportIds(report.getScenarioId());
             if (CollectionUtils.isNotEmpty(list)) {
@@ -769,7 +513,7 @@ public class ApiScenarioReportService {
     public void deleteAPIReportBatch(APIReportBatchRequest reportRequest) {
         List<String> ids = reportRequest.getIds();
         ids.forEach(item -> {
-            MessageCache.cache.remove(item);
+            MessageCache.concurrencyCounter.remove(item);
         });
         if (reportRequest.isSelectAllDate()) {
             ids = this.idList(reportRequest);
@@ -907,7 +651,7 @@ public class ApiScenarioReportService {
         int count = 0;
         try {
             for (JvmInfoDTO item : counter.getPoolUrls()) {
-                TestResource testResource = item.getTestResource();
+                TestResourceDTO testResource = item.getTestResource();
                 String configuration = testResource.getConfiguration();
                 NodeDTO node = JSON.parseObject(configuration, NodeDTO.class);
                 String nodeIp = node.getIp();
@@ -936,4 +680,41 @@ public class ApiScenarioReportService {
         }
         return map;
     }
+
+    public APIScenarioReportResult init(String id, String scenarioId, String scenarioName, String triggerMode, String execType, String projectId, String userID, RunModeConfigDTO config, String desc) {
+        APIScenarioReportResult report = new APIScenarioReportResult();
+        if (triggerMode.equals(ApiRunMode.SCENARIO.name()) || triggerMode.equals(ApiRunMode.DEFINITION.name())) {
+            triggerMode = ReportTriggerMode.MANUAL.name();
+        }
+        report.setId(id);
+        report.setTestId(id);
+        if (StringUtils.isNotEmpty(scenarioName)) {
+            report.setName(scenarioName);
+        } else {
+            report.setName("场景调试");
+        }
+        report.setUpdateTime(System.currentTimeMillis());
+        report.setCreateTime(System.currentTimeMillis());
+
+        report.setStatus(APITestStatus.Running.name());
+        if (StringUtils.isNotEmpty(userID)) {
+            report.setUserId(userID);
+            report.setCreateUser(userID);
+        } else {
+            report.setUserId(SessionUtils.getUserId());
+            report.setCreateUser(SessionUtils.getUserId());
+        }
+        if (config != null && StringUtils.isNotBlank(config.getResourcePoolId())) {
+            report.setActuator(config.getResourcePoolId());
+        } else {
+            report.setActuator("LOCAL");
+        }
+        report.setTriggerMode(triggerMode);
+        report.setReportVersion(2);
+        report.setExecuteType(execType);
+        report.setProjectId(projectId);
+        report.setScenarioName(scenarioName);
+        report.setScenarioId(scenarioId);
+        return report;
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java
new file mode 100644
index 0000000000..55a4172a4e
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java
@@ -0,0 +1,227 @@
+package io.metersphere.api.service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import io.metersphere.api.dto.ApiScenarioReportDTO;
+import io.metersphere.api.dto.StepTreeDTO;
+import io.metersphere.base.domain.*;
+import io.metersphere.base.mapper.ApiScenarioReportResultMapper;
+import io.metersphere.base.mapper.ApiScenarioReportStructureMapper;
+import io.metersphere.dto.RequestResult;
+import io.metersphere.utils.LoggerUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ApiScenarioReportStructureService {
+
+    @Resource
+    private ApiScenarioReportStructureMapper mapper;
+    @Resource
+    private ApiScenarioReportResultMapper reportResultMapper;
+
+    private static final List<String> requests = Arrays.asList("HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "JSR223Processor", "AbstractSampler");
+
+    public void save(List<ApiScenarioWithBLOBs> apiScenarios, String reportId) {
+        List<StepTreeDTO> dtoList = new LinkedList<>();
+        for (ApiScenarioWithBLOBs bos : apiScenarios) {
+            StepTreeDTO dto = dataFormatting(bos);
+            dtoList.add(dto);
+        }
+        if (LoggerUtil.getLogger().isDebugEnabled()) {
+            LoggerUtil.debug("Scenario run-执行脚本装载-生成场景报告结构：" + JSON.toJSONString(dtoList));
+        }
+        this.save(reportId, dtoList);
+    }
+
+    public void save(ApiScenarioWithBLOBs apiScenario, String reportId) {
+        List<StepTreeDTO> dtoList = new LinkedList<>();
+        StepTreeDTO dto = dataFormatting(apiScenario);
+        dtoList.add(dto);
+        this.save(reportId, dtoList);
+    }
+
+    private void save(String reportId, List<StepTreeDTO> dtoList) {
+        ApiScenarioReportStructureWithBLOBs structure = new ApiScenarioReportStructureWithBLOBs();
+        structure.setId(UUID.randomUUID().toString());
+        structure.setCreateTime(System.currentTimeMillis());
+        structure.setReportId(reportId);
+        structure.setResourceTree(JSON.toJSONString(dtoList).getBytes(StandardCharsets.UTF_8));
+        mapper.insert(structure);
+    }
+
+    public void update(String reportId, String console) {
+        ApiScenarioReportStructureExample example = new ApiScenarioReportStructureExample();
+        example.createCriteria().andReportIdEqualTo(reportId);
+        List<ApiScenarioReportStructureWithBLOBs> structures = mapper.selectByExampleWithBLOBs(example);
+        for (ApiScenarioReportStructureWithBLOBs structure : structures) {
+            structure.setConsole(console);
+            mapper.updateByPrimaryKeyWithBLOBs(structure);
+        }
+    }
+
+    public static StepTreeDTO dataFormatting(ApiScenarioWithBLOBs apiScenario) {
+        JSONObject element = JSON.parseObject(apiScenario.getScenarioDefinition());
+        StepTreeDTO dto = null;
+        if (element != null && element.getBoolean("enable")) {
+            dto = new StepTreeDTO(apiScenario.getName(), element.getString("resourceId"), element.getString("type"), element.getIntValue("index"));
+            if (element.containsKey("hashTree") && !requests.contains(dto.getType())) {
+                JSONArray elementJSONArray = element.getJSONArray("hashTree");
+                dataFormatting(elementJSONArray, dto);
+            }
+        }
+        return dto;
+    }
+
+    public static void dataFormatting(JSONArray hashTree, StepTreeDTO dto) {
+        for (int i = 0; i < hashTree.size(); i++) {
+            JSONObject element = hashTree.getJSONObject(i);
+            if (element != null && element.getBoolean("enable")) {
+                StepTreeDTO children = new StepTreeDTO(element.getString("name"), element.getString("resourceId"), element.getString("type"), element.getIntValue("index"));
+                dto.getChildren().add(children);
+                if (element.containsKey("hashTree") && !requests.contains(children.getType())) {
+                    JSONArray elementJSONArray = element.getJSONArray("hashTree");
+                    dataFormatting(elementJSONArray, children);
+                }
+            }
+        }
+    }
+
+    private void scenarioCalculate(List<StepTreeDTO> dtoList, AtomicLong isError) {
+        for (StepTreeDTO step : dtoList) {
+            if (step.getValue() != null && step.getValue().getError() > 0) {
+                isError.set(isError.longValue() + 1);
+                break;
+            } else if (CollectionUtils.isNotEmpty(step.getChildren())) {
+                scenarioCalculate(step.getChildren(), isError);
+            }
+        }
+    }
+
+    private void calculate(List<StepTreeDTO> dtoList, AtomicLong totalScenario, AtomicLong scenarioError, AtomicLong totalTime) {
+        for (StepTreeDTO step : dtoList) {
+            if (StringUtils.equals(step.getType(), "scenario")) {
+                totalScenario.set((totalScenario.longValue() + 1));
+                // 失败结果数量
+                AtomicLong error = new AtomicLong();
+                scenarioCalculate(step.getChildren(), error);
+                if (error.longValue() > 0) {
+                    scenarioError.set((scenarioError.longValue() + 1));
+                }
+            } else if (step.getValue() != null) {
+                totalTime.set((totalTime.longValue() + (step.getValue().getEndTime() - step.getValue().getStartTime())));
+            }
+            if (CollectionUtils.isNotEmpty(step.getChildren())) {
+                calculate(step.getChildren(), totalScenario, scenarioError, totalTime);
+            }
+        }
+    }
+
+    private void calculateStep(List<StepTreeDTO> dtoList, AtomicLong stepError) {
+        for (StepTreeDTO step : dtoList) {
+            // 失败结果数量
+            AtomicLong error = new AtomicLong();
+            scenarioCalculate(step.getChildren(), error);
+            if (error.longValue() > 0) {
+                stepError.set((stepError.longValue() + 1));
+            }
+        }
+    }
+
+    public static void reportFormatting(List<StepTreeDTO> dtoList, Map<String, List<ApiScenarioReportResult>> maps) {
+        for (int index = 0; index < dtoList.size(); index++) {
+            StepTreeDTO dto = dtoList.get(index);
+            dto.setIndex((index + 1));
+            List<ApiScenarioReportResult> reportResults = maps.get(dto.getResourceId());
+            if (CollectionUtils.isNotEmpty(reportResults)) {
+                if (reportResults.size() > 1) {
+                    for (int i = 0; i < reportResults.size(); i++) {
+                        if (i == 0) {
+                            dto.setValue(JSON.parseObject(new String(reportResults.get(i).getContent(), StandardCharsets.UTF_8), RequestResult.class));
+                        } else {
+                            StepTreeDTO step = new StepTreeDTO(dto.getLabel(), UUID.randomUUID().toString(), dto.getType(), (i + 1));
+                            step.setValue(JSON.parseObject(new String(reportResults.get(i).getContent(), StandardCharsets.UTF_8), RequestResult.class));
+                            dtoList.add(step);
+                        }
+                    }
+                } else {
+                    String content = new String(reportResults.get(0).getContent(), StandardCharsets.UTF_8);
+                    dto.setValue(JSON.parseObject(content, RequestResult.class));
+                }
+            }
+            if (CollectionUtils.isNotEmpty(dto.getChildren())) {
+                reportFormatting(dto.getChildren(), maps);
+            }
+        }
+        // 循环步骤请求从新排序
+        if (dtoList.stream().filter(e -> e.getValue() != null).collect(Collectors.toList()).size() == dtoList.size()) {
+            List<StepTreeDTO> list = dtoList.stream().sorted(Comparator.comparing(x -> x.getValue().getStartTime())).collect(Collectors.toList());
+            for (int index = 0; index < list.size(); index++) {
+                list.get(index).setIndex((index + 1));
+            }
+            dtoList.clear();
+            dtoList.addAll(list);
+        }
+    }
+
+    public ApiScenarioReportDTO getReport(String reportId) {
+        ApiScenarioReportResultExample example = new ApiScenarioReportResultExample();
+        example.createCriteria().andReportIdEqualTo(reportId);
+        List<ApiScenarioReportResult> reportResults = reportResultMapper.selectByExampleWithBLOBs(example);
+
+        ApiScenarioReportStructureExample structureExample = new ApiScenarioReportStructureExample();
+        structureExample.createCriteria().andReportIdEqualTo(reportId);
+        List<ApiScenarioReportStructureWithBLOBs> reportStructureWithBLOBs = mapper.selectByExampleWithBLOBs(structureExample);
+
+        ApiScenarioReportDTO reportDTO = new ApiScenarioReportDTO();
+        // 组装报告
+        if (CollectionUtils.isNotEmpty(reportStructureWithBLOBs) && CollectionUtils.isNotEmpty(reportResults)) {
+            reportDTO.setTotal(reportResults.size());
+            reportDTO.setError(reportResults.stream().filter(e -> StringUtils.equals(e.getStatus(), "Error")).collect(Collectors.toList()).size());
+            reportDTO.setPassAssertions(reportResults.stream().mapToLong(ApiScenarioReportResult::getPassAssertions).sum());
+            reportDTO.setTotalAssertions(reportResults.stream().mapToLong(ApiScenarioReportResult::getTotalAssertions).sum());
+
+            ApiScenarioReportStructureWithBLOBs scenarioReportStructure = reportStructureWithBLOBs.get(0);
+            List<StepTreeDTO> stepList = JSONArray.parseArray(new String(scenarioReportStructure.getResourceTree(), StandardCharsets.UTF_8), StepTreeDTO.class);
+
+            reportDTO.setScenarioStepTotal(stepList.size());
+
+            // 匹配结果
+            Map<String, List<ApiScenarioReportResult>> maps = reportResults.stream().collect(Collectors.groupingBy(ApiScenarioReportResult::getResourceId));
+            this.reportFormatting(stepList, maps);
+
+            // 统计场景和步骤成功失败总量
+            AtomicLong totalScenario = new AtomicLong();
+            AtomicLong scenarioError = new AtomicLong();
+            AtomicLong totalTime = new AtomicLong();
+
+            calculate(stepList, totalScenario, scenarioError, totalTime);
+
+            reportDTO.setTotalTime(totalTime.longValue());
+            reportDTO.setScenarioTotal(totalScenario.longValue());
+            reportDTO.setScenarioError(scenarioError.longValue());
+            reportDTO.setScenarioSuccess((totalScenario.longValue() - scenarioError.longValue()));
+
+            AtomicLong stepError = new AtomicLong();
+            calculateStep(stepList, stepError);
+            reportDTO.setScenarioStepError(stepError.longValue());
+            reportDTO.setScenarioStepSuccess((stepList.size() - stepError.longValue()));
+
+            reportDTO.setConsole(scenarioReportStructure.getConsole());
+            reportDTO.setSteps(stepList);
+
+        }
+
+        return reportDTO;
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
index c5f6fa3ebf..7923a5447b 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@@ -5,7 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.metersphere.api.dto.ApiCaseBatchRequest;
+import io.metersphere.api.dto.ApiCaseEditRequest;
+import io.metersphere.api.dto.ApiCaseRunRequest;
 import io.metersphere.api.dto.DeleteCheckResult;
 import io.metersphere.api.dto.JmxInfoDTO;
 import io.metersphere.api.dto.datacount.ApiDataCountResult;
@@ -13,20 +14,22 @@ import io.metersphere.api.dto.definition.*;
 import io.metersphere.api.dto.definition.request.ElementUtil;
 import io.metersphere.api.dto.definition.request.MsTestPlan;
 import io.metersphere.api.dto.definition.request.MsThreadGroup;
-import io.metersphere.api.dto.definition.request.ParameterConfig;
 import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
-import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
 import io.metersphere.api.dto.scenario.request.RequestType;
-import io.metersphere.api.jmeter.JMeterService;
-import io.metersphere.api.jmeter.MessageCache;
+import io.metersphere.api.exec.api.ApiExecuteService;
+import io.metersphere.api.exec.utils.ApiDefinitionExecResultUtil;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
 import io.metersphere.base.mapper.ext.*;
-import io.metersphere.commons.constants.*;
+import io.metersphere.commons.constants.APITestStatus;
+import io.metersphere.commons.constants.ApiRunMode;
+import io.metersphere.commons.constants.MsTestElementConstants;
+import io.metersphere.commons.constants.TestPlanStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
 import io.metersphere.controller.request.OrderRequest;
 import io.metersphere.controller.request.ResetOrderRequest;
+import io.metersphere.dto.MsExecResponseDTO;
 import io.metersphere.i18n.Translator;
 import io.metersphere.log.utils.ReflexObjectUtil;
 import io.metersphere.log.vo.DetailColumn;
@@ -34,7 +37,6 @@ import io.metersphere.log.vo.OperatingLogDetails;
 import io.metersphere.log.vo.api.DefinitionReference;
 import io.metersphere.plugin.core.MsTestElement;
 import io.metersphere.service.FileService;
-import io.metersphere.service.QuotaService;
 import io.metersphere.service.UserService;
 import io.metersphere.track.request.testcase.ApiCaseRelevanceRequest;
 import io.metersphere.track.service.TestPlanService;
@@ -43,8 +45,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.jorphan.collections.HashTree;
-import org.apache.jorphan.collections.ListedHashTree;
 import org.aspectj.util.FileUtil;
 import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.context.annotation.Lazy;
@@ -83,12 +83,10 @@ public class ApiTestCaseService {
     @Resource
     private ApiDefinitionMapper apiDefinitionMapper;
     @Resource
-    private JMeterService jMeterService;
+    private ApiExecuteService apiCaseExecuteService;
     @Resource
     private ApiDefinitionExecResultMapper apiDefinitionExecResultMapper;
     @Resource
-    private TestPlanApiCaseMapper testPlanApiCaseMapper;
-    @Resource
     private EsbApiParamService esbApiParamService;
     @Resource
     private ApiScenarioReferenceIdService apiScenarioReferenceIdService;
@@ -470,7 +468,7 @@ public class ApiTestCaseService {
         // todo
     }
 
-    public void editApiBath(ApiCaseBatchRequest request) {
+    public void editApiBath(ApiCaseEditRequest request) {
         ApiTestCaseExample apiDefinitionExample = new ApiTestCaseExample();
         apiDefinitionExample.createCriteria().andIdIn(request.getIds());
         ApiTestCaseWithBLOBs apiDefinitionWithBLOBs = new ApiTestCaseWithBLOBs();
@@ -746,69 +744,11 @@ public class ApiTestCaseService {
         return ids;
     }
 
-    private ApiDefinitionExecResult addResult(String resourceId, String status, String reportId) {
-        ApiDefinitionExecResult apiResult = new ApiDefinitionExecResult();
-        if (StringUtils.isEmpty(reportId)) {
-            apiResult.setId(UUID.randomUUID().toString());
-        } else {
-            apiResult.setId(reportId);
-        }
-        apiResult.setCreateTime(System.currentTimeMillis());
-        apiResult.setStartTime(System.currentTimeMillis());
-        apiResult.setEndTime(System.currentTimeMillis());
-        apiResult.setTriggerMode(TriggerMode.BATCH.name());
-        apiResult.setActuator("LOCAL");
-        apiResult.setUserId(Objects.requireNonNull(SessionUtils.getUser()).getId());
-        apiResult.setResourceId(resourceId);
-        apiResult.setStartTime(System.currentTimeMillis());
-        apiResult.setType(ApiRunMode.DEFINITION.name());
-        apiResult.setStatus(status);
-        return apiResult;
+    public void batchRun(ApiCaseRunRequest request) {
+        apiCaseExecuteService.run(request);
     }
 
-    public void batchRun(ApiCaseBatchRequest request) {
-        ServiceUtils.getSelectAllIds(request, request.getCondition(),
-                (query) -> extApiTestCaseMapper.selectIdsByQuery((ApiTestCaseRequest) query));
-        List<RunCaseRequest> executeQueue = new LinkedList<>();
-        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
-        ApiDefinitionExecResultMapper batchMapper = sqlSession.getMapper(ApiDefinitionExecResultMapper.class);
-
-        ApiTestCaseExample example = new ApiTestCaseExample();
-        example.createCriteria().andIdIn(request.getIds());
-        List<ApiTestCaseWithBLOBs> list = apiTestCaseMapper.selectByExampleWithBLOBs(example);
-
-        ApiTestCaseMapper sqlSessionMapper = sqlSession.getMapper(ApiTestCaseMapper.class);
-        for (ApiTestCaseWithBLOBs caseWithBLOBs : list) {
-            ApiDefinitionExecResult report = addResult(caseWithBLOBs.getId(), APITestStatus.Running.name(), null);
-            report.setName(caseWithBLOBs.getName());
-            caseWithBLOBs.setLastResultId(report.getId());
-            caseWithBLOBs.setUpdateTime(System.currentTimeMillis());
-            caseWithBLOBs.setStatus(APITestStatus.Running.name());
-            sqlSessionMapper.updateByPrimaryKey(caseWithBLOBs);
-
-            // 执行对象
-            RunCaseRequest runCaseRequest = new RunCaseRequest();
-            runCaseRequest.setRunMode(ApiRunMode.DEFINITION.name());
-            runCaseRequest.setCaseId(caseWithBLOBs.getId());
-            runCaseRequest.setReportId(report.getId());
-            runCaseRequest.setEnvironmentId(request.getEnvironmentId());
-            runCaseRequest.setBloBs(caseWithBLOBs);
-            runCaseRequest.setReport(report);
-
-            batchMapper.insert(report);
-            executeQueue.add(runCaseRequest);
-        }
-        sqlSession.flushStatements();
-        if (sqlSession != null && sqlSessionFactory != null) {
-            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
-        }
-        for (RunCaseRequest runCaseRequest : executeQueue) {
-            MessageCache.caseExecResourceLock.put(runCaseRequest.getReportId(), runCaseRequest.getReport());
-            run(runCaseRequest);
-        }
-    }
-
-    public String jenkinsRun(RunCaseRequest request) {
+    public MsExecResponseDTO jenkinsRun(RunCaseRequest request) {
         ApiTestCaseWithBLOBs caseWithBLOBs = null;
         if (request.getBloBs() == null) {
             caseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(request.getCaseId());
@@ -826,7 +766,7 @@ public class ApiTestCaseService {
             request.setEnvironmentId(extApiTestCaseMapper.getApiCaseEnvironment(request.getCaseId()));
         }
         //提前生成报告
-        ApiDefinitionExecResult report = addResult(caseWithBLOBs.getId(), APITestStatus.Running.name(), request.getReportId());
+        ApiDefinitionExecResult report = ApiDefinitionExecResultUtil.add(caseWithBLOBs.getId(), APITestStatus.Running.name(), request.getReportId());
         report.setName(caseWithBLOBs.getName());
         report.setTriggerMode(ApiRunMode.API.name());
         report.setType(ApiRunMode.JENKINS.name());
@@ -837,104 +777,12 @@ public class ApiTestCaseService {
         caseWithBLOBs.setStatus(APITestStatus.Running.name());
         apiTestCaseMapper.updateByPrimaryKey(caseWithBLOBs);
         request.setReport(report);
-        return this.run(request);
-    }
 
-    public String run(RunCaseRequest request) {
-        ApiTestCaseWithBLOBs testCaseWithBLOBs = request.getBloBs();
-        if (StringUtils.equals(request.getRunMode(), ApiRunMode.JENKINS_API_PLAN.name())) {
-            testCaseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(request.getReportId());
-            request.setCaseId(request.getReportId());
-            //通过测试计划id查询环境
-            request.setReportId(request.getTestPlanId());
+        if (StringUtils.isEmpty(request.getRunMode())) {
+            request.setRunMode(ApiRunMode.DEFINITION.name());
         }
 
-        // 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取
-        if (testCaseWithBLOBs != null && StringUtils.isNotEmpty(testCaseWithBLOBs.getRequest())) {
-            try {
-                HashTree jmeterHashTree = this.generateHashTree(request, testCaseWithBLOBs);
-                // 调用执行方法
-                jMeterService.runLocal(request.getReportId(), null, jmeterHashTree, null, request.getRunMode());
-
-            } catch (Exception ex) {
-                ApiDefinitionExecResult result = MessageCache.caseExecResourceLock.get(request.getReportId());
-                result.setStatus("error");
-                apiDefinitionExecResultMapper.updateByPrimaryKey(result);
-                ApiTestCaseWithBLOBs caseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(request.getCaseId());
-                caseWithBLOBs.setStatus("error");
-                apiTestCaseMapper.updateByPrimaryKey(caseWithBLOBs);
-                MessageCache.caseExecResourceLock.remove(request.getReportId());
-                LogUtil.error(ex.getMessage(), ex);
-            }
-        }
-        return request.getReportId();
-    }
-
-    public String run(ApiTestCaseWithBLOBs apiCaseBolbs, String id, String debugReportId, String testPlanID, String runMode) {
-        // 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取
-        if (apiCaseBolbs != null && StringUtils.isNotEmpty(apiCaseBolbs.getRequest())) {
-            try {
-                ApiTestCase apiTestCase = apiTestCaseMapper.selectByPrimaryKey(apiCaseBolbs.getId());
-                RunCaseRequest request = new RunCaseRequest();
-                request.setCaseId(apiTestCase.getId());
-                request.setTestPlanId(testPlanID);
-                HashTree jmeterHashTree = this.generateHashTree(request, apiCaseBolbs);
-                // 调用执行方法
-                jMeterService.runLocal(id, null, jmeterHashTree, debugReportId, runMode);
-            } catch (Exception ex) {
-                LogUtil.error(ex);
-            }
-        }
-        return id;
-    }
-
-    public HashTree generateHashTree(RunCaseRequest request, ApiTestCaseWithBLOBs testCaseWithBLOBs) throws Exception {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        JSONObject elementObj = JSON.parseObject(testCaseWithBLOBs.getRequest());
-        ElementUtil.dataFormatting(elementObj);
-
-        MsTestElement element = mapper.readValue(elementObj.toJSONString(), new TypeReference<MsTestElement>() {
-        });
-        element.setProjectId(testCaseWithBLOBs.getProjectId());
-        if (StringUtils.isBlank(request.getEnvironmentId())) {
-            TestPlanApiCaseExample example = new TestPlanApiCaseExample();
-            example.createCriteria().andTestPlanIdEqualTo(request.getTestPlanId()).andApiCaseIdEqualTo(request.getCaseId());
-            List<TestPlanApiCase> list = testPlanApiCaseMapper.selectByExample(example);
-            request.setEnvironmentId(list.get(0).getEnvironmentId());
-            element.setName(list.get(0).getId());
-        } else {
-            element.setName(request.getCaseId());
-        }
-
-        // 测试计划
-        MsTestPlan testPlan = new MsTestPlan();
-        testPlan.setHashTree(new LinkedList<>());
-        HashTree jmeterHashTree = new ListedHashTree();
-
-        // 线程组
-        MsThreadGroup group = new MsThreadGroup();
-        group.setLabel(testCaseWithBLOBs.getName());
-        group.setName(testCaseWithBLOBs.getId());
-        group.setOnSampleError(true);
-        LinkedList<MsTestElement> hashTrees = new LinkedList<>();
-        hashTrees.add(element);
-        group.setHashTree(hashTrees);
-        testPlan.getHashTree().add(group);
-        ApiTestEnvironmentService environmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
-        ApiTestEnvironmentWithBLOBs environment = environmentService.get(request.getEnvironmentId());
-        ParameterConfig parameterConfig = new ParameterConfig();
-
-        Map<String, EnvironmentConfig> envConfig = new HashMap<>(16);
-        if (environment != null && environment.getConfig() != null) {
-            EnvironmentConfig environmentConfig = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
-            environmentConfig.setApiEnvironmentid(environment.getId());
-            envConfig.put(testCaseWithBLOBs.getProjectId(), environmentConfig);
-            parameterConfig.setConfig(envConfig);
-        }
-
-        testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), parameterConfig);
-        return jmeterHashTree;
+        return apiCaseExecuteService.exec(request);
     }
 
     public String getExecResult(String id) {
diff --git a/backend/src/main/java/io/metersphere/api/service/MsResultService.java b/backend/src/main/java/io/metersphere/api/service/MsResultService.java
index 25c5afdfb7..69f0fb6bb9 100644
--- a/backend/src/main/java/io/metersphere/api/service/MsResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/MsResultService.java
@@ -1,146 +1,20 @@
 package io.metersphere.api.service;
 
-import com.alibaba.fastjson.JSON;
-import io.metersphere.api.dto.scenario.request.RequestType;
-import io.metersphere.api.jmeter.*;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.jmeter.assertions.AssertionResult;
-import org.apache.jmeter.protocol.http.sampler.HTTPSampleResult;
-import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.threads.JMeterVariables;
-import org.springframework.http.HttpMethod;
+import io.metersphere.api.jmeter.FixedCapacityUtils;
+import io.metersphere.api.jmeter.MessageCache;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import sun.security.util.Cache;
 
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class MsResultService {
-    // 零时存放实时结果
-    private final Cache cache = Cache.newHardMemoryCache(0, 3600 * 2);
-    private final ConcurrentHashMap<String, List<SampleResult>> processCache = new ConcurrentHashMap<>();
-
-    public ConcurrentHashMap<String, List<SampleResult>> getProcessCache() {
-        return processCache;
-    }
-
-    private final static String THREAD_SPLIT = " ";
-
-    private final static String ID_SPLIT = "-";
-
-    public TestResult getResult(String key) {
-        if (this.cache.get(key) != null) {
-            return (TestResult) this.cache.get(key);
-        }
-        return null;
-    }
-
-    public List<SampleResult> procResult(String key) {
-        if (this.processCache.get(key) != null) {
-            return this.processCache.get(key);
-        }
-        return new LinkedList<>();
-    }
-
-    public void setCache(String key, SampleResult result) {
-        if (key.startsWith("[") && key.endsWith("]")) {
-            key = JSON.parseArray(key).get(0).toString();
-        }
-        List<SampleResult> testResult = this.procResult(key);
-        testResult.add(result);
-        this.processCache.put(key, testResult);
-    }
-
-    public TestResult synSampleResult(String key) {
-        if (key.startsWith("[") && key.endsWith("]")) {
-            key = JSON.parseArray(key).get(0).toString();
-        }
-        String logs = getJmeterLogger(key, false);
-        List<SampleResult> results = this.processCache.get(key);
-        boolean isRemove = false;
-        TestResult testResult = (TestResult) cache.get(key);
-        if (testResult == null) {
-            testResult = new TestResult();
-        }
-        if (CollectionUtils.isNotEmpty(results)) {
-            final Map<String, ScenarioResult> scenarios = new LinkedHashMap<>();
-            for (SampleResult result : results) {
-                if (result.getResponseCode().equals(MsResultCollector.TEST_END)) {
-                    testResult.setEnd(true);
-                    this.cache.put(key, testResult);
-                    isRemove = true;
-                    break;
-                }
-                testResult.setTestId(key);
-                if (StringUtils.isNotEmpty(logs)) {
-                    testResult.setConsole(logs);
-                }
-                testResult.setTotal(0);
-                this.formatTestResult(testResult, scenarios, result);
-            }
-            testResult.getScenarios().clear();
-            testResult.getScenarios().addAll(scenarios.values());
-            testResult.getScenarios().sort(Comparator.comparing(ScenarioResult::getId));
-            this.cache.put(key, testResult);
-
-            if (isRemove) {
-                this.processCache.remove(key);
-            }
-        }
-        return (TestResult) cache.get(key);
-    }
-
-    public void delete(String testId) {
-        this.cache.remove(testId);
-        MessageCache.reportCache.remove(testId);
-    }
-
-    public void formatTestResult(TestResult testResult, Map<String, ScenarioResult> scenarios, SampleResult result) {
-        String scenarioName = StringUtils.substringBeforeLast(result.getThreadName(), THREAD_SPLIT);
-        if (StringUtils.equals(scenarioName, "parallel")) {
-            scenarioName = testResult.getTestId();
-        }
-        ScenarioResult scenarioResult;
-        if (!scenarios.containsKey(scenarioName)) {
-            scenarioResult = new ScenarioResult();
-            scenarioResult.setId(1);
-            if (StringUtils.equals(testResult.getTestId(), scenarioName)) {
-                scenarioResult.setName(scenarioName);
-            } else {
-                scenarioResult.setName(testResult.getTestId());
-            }
-            scenarios.put(scenarioName, scenarioResult);
-        } else {
-            scenarioResult = scenarios.get(scenarioName);
-        }
-        if (result.isSuccessful()) {
-            scenarioResult.addSuccess();
-            testResult.addSuccess();
-        } else {
-            scenarioResult.addError(result.getErrorCount());
-            testResult.addError(result.getErrorCount());
-        }
-        RequestResult requestResult = this.getRequestResult(result);
-        scenarioResult.getRequestResults().add(requestResult);
-        scenarioResult.addResponseTime(result.getTime());
-
-        testResult.addPassAssertions(requestResult.getPassAssertions());
-        testResult.addTotalAssertions(requestResult.getTotalAssertions());
-        testResult.setTotal(testResult.getTotal() + 1);
-        scenarioResult.addPassAssertions(requestResult.getPassAssertions());
-        scenarioResult.addTotalAssertions(requestResult.getTotalAssertions());
-    }
-
-    public String getJmeterLogger(String testId, boolean removed) {
+    public String getJmeterLogger(String testId) {
         try {
-            Long startTime = FixedTask.tasks.get(testId);
+            Long startTime = MessageCache.jmeterLogTask.get(testId);
             if (startTime == null) {
-                startTime = FixedTask.tasks.get("[" + testId + "]");
+                startTime = MessageCache.jmeterLogTask.get("[" + testId + "]");
             }
             if (startTime == null) {
                 startTime = System.currentTimeMillis();
@@ -150,139 +24,9 @@ public class MsResultService {
             String logMessage = FixedCapacityUtils.fixedCapacityCache.entrySet().stream()
                     .filter(map -> map.getKey() > finalStartTime && map.getKey() < endTime)
                     .map(map -> map.getValue()).collect(Collectors.joining());
-            if (removed) {
-                if (processCache.get(testId) != null) {
-                    try {
-                        Thread.sleep(2000);
-                    } catch (Exception e) {
-                    }
-                }
-                FixedTask.tasks.remove(testId);
-            }
             return logMessage;
         } catch (Exception e) {
             return "";
         }
     }
-
-    public RequestResult getRequestResult(SampleResult result) {
-        RequestResult requestResult = new RequestResult();
-        requestResult.setId(result.getSamplerId());
-        requestResult.setResourceId(result.getResourceId());
-        requestResult.setName(result.getSampleLabel());
-        requestResult.setUrl(result.getUrlAsString());
-        requestResult.setMethod(getMethod(result));
-        requestResult.setBody(result.getSamplerData());
-        requestResult.setHeaders(result.getRequestHeaders());
-        requestResult.setRequestSize(result.getSentBytes());
-        requestResult.setStartTime(result.getStartTime());
-        requestResult.setEndTime(result.getEndTime());
-        requestResult.setTotalAssertions(result.getAssertionResults().length);
-        requestResult.setSuccess(result.isSuccessful());
-        requestResult.setError(result.getErrorCount());
-        requestResult.setScenario(result.getScenario());
-        if (result instanceof HTTPSampleResult) {
-            HTTPSampleResult res = (HTTPSampleResult) result;
-            requestResult.setCookies(res.getCookies());
-        }
-
-        for (SampleResult subResult : result.getSubResults()) {
-            requestResult.getSubRequestResults().add(getRequestResult(subResult));
-        }
-        ResponseResult responseResult = requestResult.getResponseResult();
-        responseResult.setBody(result.getResponseDataAsString());
-        responseResult.setHeaders(result.getResponseHeaders());
-        responseResult.setLatency(result.getLatency());
-        responseResult.setResponseCode(result.getResponseCode());
-        responseResult.setResponseSize(result.getResponseData().length);
-        responseResult.setResponseTime(result.getTime());
-        responseResult.setResponseMessage(result.getResponseMessage());
-        JMeterVariables variables = JMeterVars.get(result.hashCode());
-        if (StringUtils.isNotEmpty(result.getExtVars())) {
-            responseResult.setVars(result.getExtVars());
-            JMeterVars.remove(result.hashCode());
-        } else if (variables != null && CollectionUtils.isNotEmpty(variables.entrySet())) {
-            StringBuilder builder = new StringBuilder();
-            for (Map.Entry<String, Object> entry : variables.entrySet()) {
-                builder.append(entry.getKey()).append("：").append(entry.getValue()).append("\n");
-            }
-            if (StringUtils.isNotEmpty(builder)) {
-                responseResult.setVars(builder.toString());
-            }
-            JMeterVars.remove(result.hashCode());
-        }
-
-        for (AssertionResult assertionResult : result.getAssertionResults()) {
-            ResponseAssertionResult responseAssertionResult = getResponseAssertionResult(assertionResult);
-            if (responseAssertionResult.isPass()) {
-                requestResult.addPassAssertions();
-            }
-            //xpath 提取错误会添加断言错误
-            if (StringUtils.isBlank(responseAssertionResult.getMessage()) ||
-                    (StringUtils.isNotBlank(responseAssertionResult.getName()) && !responseAssertionResult.getName().endsWith("XPath2Extractor"))
-                    || (StringUtils.isNotBlank(responseAssertionResult.getContent()) && !responseAssertionResult.getContent().endsWith("XPath2Extractor"))
-            ) {
-                responseResult.getAssertions().add(responseAssertionResult);
-            }
-        }
-        return requestResult;
-    }
-
-    private String getMethod(SampleResult result) {
-        String body = result.getSamplerData();
-        String start = "RPC Protocol: ";
-        String end = "://";
-        if (StringUtils.contains(body, start)) {
-            String protocol = StringUtils.substringBetween(body, start, end);
-            if (StringUtils.isNotEmpty(protocol)) {
-                return protocol.toUpperCase();
-            }
-            return RequestType.DUBBO;
-        } else if (StringUtils.contains(result.getResponseHeaders(), "url:jdbc")) {
-            return "SQL";
-        } else {
-            String method = StringUtils.substringBefore(body, " ");
-            for (HttpMethod value : HttpMethod.values()) {
-                if (StringUtils.equals(method, value.name())) {
-                    return method;
-                }
-            }
-            return "Request";
-        }
-    }
-
-    private ResponseAssertionResult getResponseAssertionResult(AssertionResult assertionResult) {
-        ResponseAssertionResult responseAssertionResult = new ResponseAssertionResult();
-        responseAssertionResult.setName(assertionResult.getName());
-        if (StringUtils.isNotEmpty(assertionResult.getName()) && assertionResult.getName().indexOf("==") != -1) {
-            if (assertionResult.getName().indexOf("JSR223") != -1) {
-                String[] array = assertionResult.getName().split("==", 3);
-                if ("JSR223".equals(array[0])) {
-                    responseAssertionResult.setName(array[1]);
-                    if (array[2].indexOf("&&") != -1) {
-                        String[] content = array[2].split("&&");
-                        responseAssertionResult.setContent(content[0]);
-                        if (content.length > 1) {
-                            responseAssertionResult.setScript(content[1]);
-                        }
-                    } else {
-                        responseAssertionResult.setContent(array[2]);
-                    }
-                }
-            } else {
-                String[] array = assertionResult.getName().split("==");
-                responseAssertionResult.setName(array[0]);
-                StringBuffer content = new StringBuffer();
-                for (int i = 1; i < array.length; i++) {
-                    content.append(array[i]);
-                }
-                responseAssertionResult.setContent(content.toString());
-            }
-        }
-        responseAssertionResult.setPass(!assertionResult.isFailure() && !assertionResult.isError());
-        if (!responseAssertionResult.isPass()) {
-            responseAssertionResult.setMessage(assertionResult.getFailureMessage());
-        }
-        return responseAssertionResult;
-    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/NodeKafkaService.java b/backend/src/main/java/io/metersphere/api/service/NodeKafkaService.java
deleted file mode 100644
index c783081983..0000000000
--- a/backend/src/main/java/io/metersphere/api/service/NodeKafkaService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.metersphere.api.service;
-
-import io.metersphere.config.KafkaProperties;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-
-@Service
-public class NodeKafkaService {
-    @Resource
-    private KafkaProperties kafkaProperties;
-
-    @Value("${spring.kafka.producer.properties.max.request.size}")
-    private String maxRequestSize;
-
-    public Map<String, Object> getKafka() {
-        Map<String, Object> producerProps = new HashMap<>();
-        producerProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, kafkaProperties.getBootstrapServers());
-        producerProps.put(ProducerConfig.MAX_REQUEST_SIZE_CONFIG, maxRequestSize);
-        return producerProps;
-    }
-}
diff --git a/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java b/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java
index 632dbe8dd2..4a55bb5a32 100644
--- a/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java
@@ -1,15 +1,17 @@
 package io.metersphere.api.service;
 
-import io.metersphere.api.dto.RunRequest;
-import io.metersphere.api.dto.automation.RunModeConfig;
 import io.metersphere.api.dto.automation.ScenarioStatus;
+import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.jmeter.MessageCache;
+import io.metersphere.api.jmeter.ReportCounter;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
 import io.metersphere.commons.constants.APITestStatus;
 import io.metersphere.commons.constants.ApiRunMode;
+import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.constants.RunModeConstants;
+import io.metersphere.dto.JmeterRunRequestDTO;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -30,44 +32,40 @@ public class RemakeReportService {
     private TestCaseReviewApiCaseMapper testCaseReviewApiCaseMapper;
     @Resource
     private TestPlanApiScenarioMapper testPlanApiScenarioMapper;
-    @Resource
-    @Lazy
-    private ApiScenarioReportService apiScenarioReportService;
-    @Resource
-    @Lazy
-    private ApiDefinitionExecResultService apiDefinitionExecResultService;
 
-    public void remake(RunRequest runRequest, RunModeConfig config, String reportId) {
-        if (config != null && config.getAmassReport() != null && MessageCache.cache.get(config.getAmassReport()) != null
-                && MessageCache.cache.get(config.getAmassReport()).getReportIds() != null) {
-            MessageCache.cache.get(config.getAmassReport()).getReportIds().remove(reportId);
-        }
-        // 重置报告状态
-        if (StringUtils.isNotEmpty(reportId)) {
+    public void remake(JmeterRunRequestDTO request) {
+        try {
+            if (StringUtils.equals(request.getReportType(), RunModeConstants.SET_REPORT.toString())) {
+                Object obj = MessageCache.concurrencyCounter.get(request.getReportId());
+                if (obj != null) {
+                    ReportCounter counter = (ReportCounter) obj;
+                    counter.getCompletedIds().add(request.getTestId());
+                    MessageCache.concurrencyCounter.put(request.getReportId(), counter);
+                }
+            }
             // 清理零时报告
-            if (StringUtils.equalsAnyIgnoreCase(runRequest.getRunMode(), ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name())) {
-                ApiDefinitionExecResult result = execResultMapper.selectByPrimaryKey(reportId);
+            if (StringUtils.equalsAnyIgnoreCase(request.getRunMode(), ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name())) {
+                ApiDefinitionExecResult result = execResultMapper.selectByPrimaryKey(request.getReportId());
                 if (result != null) {
                     result.setStatus("error");
                     result.setEndTime(System.currentTimeMillis());
                     execResultMapper.updateByPrimaryKeySelective(result);
 
-                    TestPlanApiCase testPlanApiCase = testPlanApiCaseMapper.selectByPrimaryKey(runRequest.getTestId());
+                    TestPlanApiCase testPlanApiCase = testPlanApiCaseMapper.selectByPrimaryKey(request.getTestId());
                     if (testPlanApiCase != null) {
                         testPlanApiCase.setStatus("error");
                         testPlanApiCase.setUpdateTime(System.currentTimeMillis());
                         testPlanApiCaseMapper.updateByPrimaryKeySelective(testPlanApiCase);
-                        apiDefinitionExecResultService.updateTestCaseStates(testPlanApiCase.getId());
                     }
-                    TestCaseReviewApiCase testCaseReviewApiCase = testCaseReviewApiCaseMapper.selectByPrimaryKey(runRequest.getTestId());
+                    TestCaseReviewApiCase testCaseReviewApiCase = testCaseReviewApiCaseMapper.selectByPrimaryKey(request.getTestId());
                     if (testCaseReviewApiCase != null) {
                         testCaseReviewApiCase.setStatus("error");
                         testCaseReviewApiCase.setUpdateTime(System.currentTimeMillis());
                         testCaseReviewApiCaseMapper.updateByPrimaryKeySelective(testCaseReviewApiCase);
                     }
                 }
-            } else if (StringUtils.equals(runRequest.getRunMode(), ApiRunMode.SCENARIO_PLAN.name())) {
-                ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(reportId);
+            } else if (StringUtils.equals(request.getRunMode(), ApiRunMode.SCENARIO_PLAN.name())) {
+                ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(request.getReportId());
                 if (report != null) {
                     report.setEndTime(System.currentTimeMillis());
                     report.setStatus(APITestStatus.Error.name());
@@ -81,11 +79,9 @@ public class RemakeReportService {
                         testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
                     }
                     apiScenarioReportMapper.updateByPrimaryKey(report);
-
-                    apiScenarioReportService.updatePlanTestCaseStates(testPlanApiScenario);
                 }
-            } else if (StringUtils.equalsAny(runRequest.getRunMode(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
-                ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(reportId);
+            } else if (StringUtils.equalsAny(request.getRunMode(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
+                ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(request.getReportId());
                 if (report != null) {
                     report.setEndTime(System.currentTimeMillis());
                     report.setStatus(APITestStatus.Error.name());
@@ -102,17 +98,15 @@ public class RemakeReportService {
                         testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
                     }
                     apiScenarioReportMapper.updateByPrimaryKeySelective(report);
-
-                    apiScenarioReportService.updatePlanTestCaseStates(testPlanApiScenario);
                 }
             } else {
-                ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(reportId);
+                ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(request.getReportId());
                 if (report != null) {
                     report.setStatus(APITestStatus.Error.name());
                     apiScenarioReportMapper.updateByPrimaryKey(report);
                 }
-                if (StringUtils.isNotEmpty(runRequest.getTestId())) {
-                    ApiScenarioWithBLOBs scenarioWithBLOBs = apiScenarioMapper.selectByPrimaryKey(runRequest.getTestId());
+                if (StringUtils.isNotEmpty(request.getTestId())) {
+                    ApiScenarioWithBLOBs scenarioWithBLOBs = apiScenarioMapper.selectByPrimaryKey(request.getTestId());
                     if (scenarioWithBLOBs != null) {
                         scenarioWithBLOBs.setLastResult("Fail");
                         scenarioWithBLOBs.setPassRate("0%");
@@ -122,20 +116,17 @@ public class RemakeReportService {
                     }
                 }
             }
-            MessageCache.caseExecResourceLock.remove(reportId);
-            MessageCache.scenarioExecResourceLock.remove(reportId);
-            MessageCache.executionQueue.remove(reportId);
+            MessageCache.caseExecResourceLock.remove(request.getReportId());
+            SerialBlockingQueueUtil.remove(request.getReportId());
+        } catch (Exception e) {
+            LogUtil.error(e);
         }
     }
 
-    public void remakeScenario(String runMode, String testId, RunModeConfig config, ApiScenarioWithBLOBs scenarioWithBLOBs, ApiScenarioReport report) {
-        if (MessageCache.cache.get(config.getAmassReport()) != null
-                && MessageCache.cache.get(config.getAmassReport()).getReportIds() != null) {
-            MessageCache.cache.get(config.getAmassReport()).getReportIds().remove(report.getId());
-        }
+    public void remakeScenario(String runMode, String scenarioId, ApiScenarioWithBLOBs scenarioWithBLOBs, ApiScenarioReport report) {
         // 生成失败报告
         if (StringUtils.equalsAny(runMode, ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name(), ApiRunMode.SCENARIO_PLAN.name())) {
-            TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(testId);
+            TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(scenarioId);
             if (testPlanApiScenario != null) {
                 report.setScenarioId(scenarioWithBLOBs.getId());
                 report.setEndTime(System.currentTimeMillis());
@@ -145,8 +136,6 @@ public class RemakeReportService {
                 testPlanApiScenario.setReportId(report.getId());
                 testPlanApiScenario.setUpdateTime(report.getCreateTime());
                 testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
-
-                apiScenarioReportService.updatePlanTestCaseStates(testPlanApiScenario);
             }
         } else {
             scenarioWithBLOBs.setLastResult("Fail");
@@ -158,7 +147,6 @@ public class RemakeReportService {
         report.setStatus(APITestStatus.Error.name());
         apiScenarioReportMapper.insert(report);
         MessageCache.caseExecResourceLock.remove(report.getId());
-        MessageCache.scenarioExecResourceLock.remove(report.getId());
-        MessageCache.executionQueue.remove(report.getId());
+        SerialBlockingQueueUtil.remove(report.getId());
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/TcpApiParamService.java b/backend/src/main/java/io/metersphere/api/service/TcpApiParamService.java
index f842b13b82..70f17a0ab8 100644
--- a/backend/src/main/java/io/metersphere/api/service/TcpApiParamService.java
+++ b/backend/src/main/java/io/metersphere/api/service/TcpApiParamService.java
@@ -3,9 +3,10 @@ package io.metersphere.api.service;
 import io.metersphere.api.dto.automation.TcpTreeTableDataStruct;
 import io.metersphere.api.dto.automation.parse.TcpTreeTableDataParser;
 import io.metersphere.api.dto.definition.SaveApiDefinitionRequest;
+import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
 import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.plugin.core.MsTestElement;
-import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
+import io.metersphere.utils.LoggerUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,16 +24,17 @@ public class TcpApiParamService {
 
     public SaveApiDefinitionRequest handleTcpRequest(SaveApiDefinitionRequest request) {
         MsTCPSampler tcpSampler = this.handleTcpRequest(request.getRequest());
-        if(tcpSampler != null){
+        if (tcpSampler != null) {
             request.setRequest(tcpSampler);
         }
         return request;
     }
-    public MsTCPSampler  handleTcpRequest(MsTestElement testElement){
+
+    public MsTCPSampler handleTcpRequest(MsTestElement testElement) {
         MsTCPSampler tcpSampler = null;
         try {
-            if(testElement instanceof  MsTCPSampler){
-                tcpSampler = (MsTCPSampler)testElement;
+            if (testElement instanceof MsTCPSampler) {
+                tcpSampler = (MsTCPSampler) testElement;
                 String reportType = tcpSampler.getReportType();
                 if (StringUtils.isNotEmpty(reportType)) {
                     switch (reportType) {
@@ -62,16 +64,22 @@ public class TcpApiParamService {
     }
 
     public void checkTestElement(MsTestElement testElement) {
-        if(testElement != null){
-            if(testElement instanceof MsTCPSampler){
-                this.handleTcpRequest(testElement);
-            }
-
-            if(testElement.getHashTree() != null){
-                for (MsTestElement itemElement : testElement.getHashTree()) {
-                    this.checkTestElement(itemElement);
+        try {
+            if (testElement != null) {
+                if (testElement instanceof MsTCPSampler) {
+                    LoggerUtil.info("处理TCP请求【 " + testElement.getId() + " 】开始");
+                    this.handleTcpRequest(testElement);
+                    LoggerUtil.info("处理TCP请求【 " + testElement.getId() + " 】完成");
+                }
+                if (testElement.getHashTree() != null) {
+                    for (MsTestElement itemElement : testElement.getHashTree()) {
+                        this.checkTestElement(itemElement);
+                    }
                 }
             }
+
+        } catch (Exception e) {
+            LogUtil.error(e);
         }
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/TestResultService.java b/backend/src/main/java/io/metersphere/api/service/TestResultService.java
index 45d2a66848..92d978cb72 100644
--- a/backend/src/main/java/io/metersphere/api/service/TestResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/TestResultService.java
@@ -1,129 +1,152 @@
 package io.metersphere.api.service;
 
 import io.metersphere.api.dto.automation.ApiTestReportVariable;
-import io.metersphere.api.jmeter.TestResult;
+import io.metersphere.api.jmeter.ExecutedHandleSingleton;
 import io.metersphere.base.domain.*;
 import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.constants.NoticeConstants;
 import io.metersphere.commons.constants.ReportTriggerMode;
-import io.metersphere.commons.constants.TriggerMode;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.DateUtils;
 import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.dto.BaseSystemConfigDTO;
+import io.metersphere.dto.RequestResult;
+import io.metersphere.dto.ResultDTO;
 import io.metersphere.i18n.Translator;
 import io.metersphere.notice.sender.NoticeModel;
 import io.metersphere.notice.service.NoticeSendService;
 import io.metersphere.service.SystemParameterService;
+import io.metersphere.track.request.testcase.TrackCount;
+import io.metersphere.track.service.TestPlanApiCaseService;
+import io.metersphere.track.service.TestPlanScenarioCaseService;
+import io.metersphere.track.service.TestPlanTestCaseService;
 import org.apache.commons.beanutils.BeanMap;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class TestResultService {
-    @Resource
-    private ApiDefinitionService apiDefinitionService;
     @Resource
     private ApiDefinitionExecResultService apiDefinitionExecResultService;
     @Resource
     private ApiScenarioReportService apiScenarioReportService;
     @Resource
-    private ApiTestCaseService apiTestCaseService;
-    @Resource
     private ApiAutomationService apiAutomationService;
+    @Resource
+    private TestPlanApiCaseService testPlanApiCaseService;
+    @Resource
+    private TestPlanTestCaseService testPlanTestCaseService;
+    @Resource
+    private ApiTestCaseService apiTestCaseService;
 
-    public void saveResult(TestResult testResult, String runMode, String debugReportId, String testId) {
-        LogUtil.info("Save result:["+testId+"]; RUN MODE:"+runMode);
-        try {
-            ApiTestReportVariable reportTask = null;
-            if (StringUtils.equals(runMode, ApiRunMode.DEFINITION.name())) {
-                // 调试操作，不需要存储结果
-                apiDefinitionService.addResult(testResult);
-                if (StringUtils.isBlank(debugReportId)) {
-                    apiDefinitionExecResultService.saveApiResult(testResult, ApiRunMode.DEFINITION.name(), TriggerMode.MANUAL.name());
-                }
-                //jenkins单接口执行
-            } else if (StringUtils.equals(runMode, ApiRunMode.JENKINS.name())) {
-                apiDefinitionExecResultService.saveApiResult(testResult, ApiRunMode.DEFINITION.name(), TriggerMode.API.name());
-                ApiTestCaseWithBLOBs apiTestCaseWithBLOBs = apiTestCaseService.getInfoJenkins(testResult.getTestId());
-                ApiDefinitionExecResult apiResult = apiDefinitionExecResultService.getInfo(apiTestCaseWithBLOBs.getLastResultId());
-                //环境
-                String name = apiAutomationService.getEnvironment(debugReportId).getName();
+    public void saveResults(ResultDTO dto) {
+        // 处理环境
+        List<String> environmentList = new LinkedList<>();
+        if (dto.getArbitraryData() != null && dto.getArbitraryData().containsKey("ENV")) {
+            environmentList = (List<String>) dto.getArbitraryData().get("ENV");
+        }
+        List<RequestResult> requestResults = dto.getRequestResults();
+        //处理环境参数
+        if (CollectionUtils.isNotEmpty(environmentList)) {
+            ExecutedHandleSingleton.parseEnvironment(environmentList);
+        }
+        //测试计划定时任务-接口执行逻辑的话，需要同步测试计划的报告数据
+        if (StringUtils.equalsAny(dto.getRunMode(), ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name(), ApiRunMode.MANUAL_PLAN.name())) {
+            apiDefinitionExecResultService.saveApiResultByScheduleTask(requestResults, dto);
+        } else if (StringUtils.equalsAny(dto.getRunMode(), ApiRunMode.DEFINITION.name(), ApiRunMode.JENKINS.name(), ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name(), ApiRunMode.MANUAL_PLAN.name())) {
+            apiDefinitionExecResultService.saveApiResult(requestResults, dto);
+        } else if (StringUtils.equalsAny(dto.getRunMode(), ApiRunMode.SCENARIO.name(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
+            apiScenarioReportService.saveResult(requestResults, dto);
+        }
+        updateTestCaseStates(requestResults, dto.getRunMode());
+    }
+
+    public void testEnded(ResultDTO dto) {
+        if (StringUtils.equalsAny(dto.getRunMode(), ApiRunMode.SCENARIO.name(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
+            ApiScenarioReport scenarioReport = apiScenarioReportService.testEnded(dto);
+            if (scenarioReport != null) {
+                ApiScenarioWithBLOBs apiScenario = apiAutomationService.getApiScenario(scenarioReport.getScenarioId());
+                String environment = "";
                 //执行人
-                String userName = apiAutomationService.getUser(apiTestCaseWithBLOBs.getCreateUserId());
+                String userName = "";
+                //负责人
+                String principal = "";
+                if (apiScenario != null) {
+                    environment = apiScenarioReportService.getEnvironment(apiScenario);
+                    userName = apiAutomationService.getUser(apiScenario.getUserId());
+                    principal = apiAutomationService.getUser(apiScenario.getPrincipal());
+                }
                 //报告内容
-                reportTask = new ApiTestReportVariable();
-                reportTask.setStatus(apiResult.getStatus());
-                reportTask.setId(apiResult.getId());
-                reportTask.setTriggerMode(TriggerMode.API.name());
-                reportTask.setName(apiTestCaseWithBLOBs.getName());
+                ApiTestReportVariable reportTask = new ApiTestReportVariable();
+                reportTask.setStatus(scenarioReport.getStatus());
+                reportTask.setId(scenarioReport.getId());
+                reportTask.setTriggerMode(scenarioReport.getTriggerMode());
+                reportTask.setName(scenarioReport.getName());
                 reportTask.setExecutor(userName);
-                reportTask.setUserId(apiTestCaseWithBLOBs.getCreateUserId());
-                reportTask.setExecutionTime(DateUtils.getTimeString(apiTestCaseWithBLOBs.getCreateTime()));
-                reportTask.setEnvironment(name);
-                //测试计划用例，定时，jenkins
-            } else if (StringUtils.equalsAny(runMode, ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name(), ApiRunMode.MANUAL_PLAN.name())) {
-                //测试计划定时任务-接口执行逻辑的话，需要同步测试计划的报告数据
-                if (StringUtils.equalsAny(runMode, ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name(), ApiRunMode.MANUAL_PLAN.name())) {
-                    apiDefinitionExecResultService.saveApiResultByScheduleTask(testResult, debugReportId, runMode);
-                } else {
-                    String testResultTestId = testResult.getTestId();
-                    if (testResultTestId.contains(":")) {
-                        testResult.setTestId(testResultTestId.split(":")[0]);
+                reportTask.setUserId(scenarioReport.getUserId());
+                reportTask.setPrincipal(principal);
+                reportTask.setExecutionTime(DateUtils.getTimeString(scenarioReport.getUpdateTime()));
+                reportTask.setEnvironment(environment);
+                dto.setTestId(scenarioReport.getScenarioId());
+
+                updateScenarioTestCaseStates(dto.getTestId(), dto.getRunMode());
+                if (reportTask != null) {
+                    if (StringUtils.equals(ReportTriggerMode.API.name(), reportTask.getTriggerMode())
+                            || StringUtils.equals(ReportTriggerMode.SCHEDULE.name(), reportTask.getTriggerMode())) {
+                        sendTask(reportTask, dto.getTestId());
                     }
-                    apiDefinitionExecResultService.saveApiResult(testResult, ApiRunMode.API_PLAN.name(), TriggerMode.MANUAL.name());
-                }
-            } else if (StringUtils.equalsAny(runMode, ApiRunMode.SCENARIO.name(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
-                // 执行报告不需要存储，由用户确认后在存储
-                testResult.setTestId(testId);
-                ApiScenarioReport scenarioReport = apiScenarioReportService.complete(testResult, runMode);
-                //环境
-                if (scenarioReport != null) {
-                    ApiScenarioWithBLOBs apiScenario = apiAutomationService.getApiScenario(scenarioReport.getScenarioId());
-                    String environment = "";
-                    //执行人
-                    String userName = "";
-                    //负责人
-                    String principal = "";
-                    if (apiScenario != null) {
-                        environment = apiScenarioReportService.getEnvironment(apiScenario);
-                        userName = apiAutomationService.getUser(apiScenario.getUserId());
-                        principal = apiAutomationService.getUser(apiScenario.getPrincipal());
-                    }
-                    //报告内容
-                    reportTask = new ApiTestReportVariable();
-                    reportTask.setStatus(scenarioReport.getStatus());
-                    reportTask.setId(scenarioReport.getId());
-                    reportTask.setTriggerMode(scenarioReport.getTriggerMode());
-                    reportTask.setName(scenarioReport.getName());
-                    reportTask.setExecutor(userName);
-                    reportTask.setUserId(scenarioReport.getUserId());
-                    reportTask.setPrincipal(principal);
-                    reportTask.setExecutionTime(DateUtils.getTimeString(scenarioReport.getUpdateTime()));
-                    reportTask.setEnvironment(environment);
-                    SystemParameterService systemParameterService = CommonBeanFactory.getBean(SystemParameterService.class);
-                    assert systemParameterService != null;
-                    testResult.setTestId(scenarioReport.getScenarioId());
                 }
             }
-            if (reportTask != null) {
-                if (StringUtils.equals(ReportTriggerMode.API.name(), reportTask.getTriggerMode())
-                        || StringUtils.equals(ReportTriggerMode.SCHEDULE.name(), reportTask.getTriggerMode())) {
-                    sendTask(reportTask, testResult);
-                }
-            }
-        } catch (Exception e) {
-            LogUtil.error(e);
         }
     }
 
-    private void sendTask(ApiTestReportVariable report, TestResult testResult) {
+    /**
+     * 更新测试计划关联接口测试的功能用例的状态
+     */
+    private void updateScenarioTestCaseStates(String testPlanScenarioId, String runMode) {
+        try {
+            if (StringUtils.equalsAny(runMode, ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
+                TestPlanScenarioCaseService testPlanScenarioCaseService = CommonBeanFactory.getBean(TestPlanScenarioCaseService.class);
+                TestPlanApiScenario testPlanApiScenario = testPlanScenarioCaseService.get(testPlanScenarioId);
+                ApiScenarioWithBLOBs apiScenario = CommonBeanFactory.getBean(ApiAutomationService.class).getApiScenario(testPlanApiScenario.getApiScenarioId());
+                testPlanTestCaseService.updateTestCaseStates(apiScenario.getId(), apiScenario.getName(), testPlanApiScenario.getTestPlanId(), TrackCount.AUTOMATION);
+            }
+        } catch (Exception e) {
+            LogUtil.error(e.getMessage(), e);
+        }
+    }
+
+    private void updateTestCaseStates(List<RequestResult> requestResults, String runMode) {
+        try {
+            if (StringUtils.equalsAny(runMode, ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name(),
+                    ApiRunMode.JENKINS_API_PLAN.name(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
+                if (CollectionUtils.isNotEmpty(requestResults)) {
+                    requestResults.forEach(item -> {
+                        if (StringUtils.equalsAny(runMode, ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name(),
+                                ApiRunMode.JENKINS_API_PLAN.name())) {
+                            TestPlanApiCase testPlanApiCase = testPlanApiCaseService.getById(item.getName());
+                            ApiTestCaseWithBLOBs apiTestCase = apiTestCaseService.get(testPlanApiCase.getApiCaseId());
+                            testPlanTestCaseService.updateTestCaseStates(apiTestCase.getId(), apiTestCase.getName(), testPlanApiCase.getTestPlanId(), TrackCount.TESTCASE);
+                        }
+                    });
+                }
+            }
+        } catch (Exception e) {
+            LogUtil.error(e.getMessage(), e);
+        }
+    }
+
+
+    private void sendTask(ApiTestReportVariable report, String testId) {
         if (report == null) {
             return;
         }
@@ -169,7 +192,7 @@ public class TestResultService {
                 .successMailTemplate("ApiSuccessfulNotification")
                 .failedContext(failedContext)
                 .failedMailTemplate("ApiFailedNotification")
-                .testId(testResult.getTestId())
+                .testId(testId)
                 .status(report.getStatus())
                 .event(event)
                 .subject(subject)
diff --git a/backend/src/main/java/io/metersphere/api/service/task/SerialScenarioExecTask.java b/backend/src/main/java/io/metersphere/api/service/task/SerialScenarioExecTask.java
deleted file mode 100644
index f8330260ee..0000000000
--- a/backend/src/main/java/io/metersphere/api/service/task/SerialScenarioExecTask.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- *
- */
-package io.metersphere.api.service.task;
-
-import io.metersphere.api.dto.RunModeDataDTO;
-import io.metersphere.api.dto.automation.RunScenarioRequest;
-import io.metersphere.api.jmeter.JMeterService;
-import io.metersphere.api.jmeter.MessageCache;
-import io.metersphere.base.domain.ApiScenarioReport;
-import io.metersphere.base.mapper.ApiScenarioReportMapper;
-import io.metersphere.commons.constants.APITestStatus;
-import io.metersphere.commons.constants.TriggerMode;
-import io.metersphere.commons.utils.LogUtil;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.concurrent.Callable;
-
-public class SerialScenarioExecTask<T> implements Callable<T> {
-    private RunScenarioRequest request;
-    private JMeterService jMeterService;
-    private ApiScenarioReportMapper apiScenarioReportMapper;
-    private RunModeDataDTO runModeDataDTO;
-    ApiScenarioReport report = null;
-
-    public SerialScenarioExecTask(JMeterService jMeterService, ApiScenarioReportMapper apiScenarioReportMapper, RunModeDataDTO runModeDataDTO, RunScenarioRequest request) {
-        this.jMeterService = jMeterService;
-        this.apiScenarioReportMapper = apiScenarioReportMapper;
-        this.request = request;
-        this.runModeDataDTO = runModeDataDTO;
-    }
-
-    @Override
-    public T call() {
-        try {
-            if (runModeDataDTO.getReport() != null && MessageCache.terminationOrderDeque.contains(runModeDataDTO.getReport().getId())) {
-                MessageCache.terminationOrderDeque.remove(runModeDataDTO.getReport().getId());
-                return null;
-            }
-            String reportId;
-            if (request.getConfig() != null && StringUtils.isNotBlank(request.getConfig().getResourcePoolId())) {
-                String testPlanScenarioId = "";
-                if (request.getScenarioTestPlanIdMap() != null && request.getScenarioTestPlanIdMap().containsKey(runModeDataDTO.getTestId())) {
-                    testPlanScenarioId = runModeDataDTO.getTestId();
-                    String scenarioId = request.getScenarioTestPlanIdMap().get(runModeDataDTO.getTestId());
-                    runModeDataDTO.setTestId(scenarioId);
-                } else {
-                    testPlanScenarioId = request.getPlanScenarioId();
-                }
-                if(runModeDataDTO.getReport()!= null){
-                    reportId = runModeDataDTO.getReport().getId();
-                }else {
-                    reportId = runModeDataDTO.getTestId();
-                }
-                jMeterService.runTest(runModeDataDTO.getTestId(), reportId, request.getRunMode(), testPlanScenarioId, request.getConfig());
-            } else {
-                reportId = runModeDataDTO.getReport().getId();
-                jMeterService.runLocal(runModeDataDTO.getReport().getId(),request.getConfig(), runModeDataDTO.getHashTree(), TriggerMode.BATCH.name().equals(request.getTriggerMode()) ? TriggerMode.BATCH.name() : request.getReportId(), request.getRunMode());
-            }
-            while (MessageCache.executionQueue.containsKey(reportId)) {
-                long time = MessageCache.executionQueue.get(runModeDataDTO.getReport().getId());
-                long currentSecond = (System.currentTimeMillis() - time) / 1000 / 60;
-                // 设置五分钟超时
-                if (currentSecond > 5) {
-                    // 执行失败了，恢复报告状态
-                    report = apiScenarioReportMapper.selectByPrimaryKey(runModeDataDTO.getReport().getId());
-                    if (report != null) {
-                        report.setStatus(APITestStatus.Error.name());
-                        apiScenarioReportMapper.updateByPrimaryKey(report);
-                    }
-                    break;
-                }
-                if (MessageCache.terminationOrderDeque.contains(reportId)) {
-                    MessageCache.terminationOrderDeque.remove(reportId);
-                    break;
-                }
-                Thread.sleep(1000);
-            }
-            return null;
-        } catch (Exception ex) {
-            LogUtil.error(ex);
-            return null;
-        }
-    }
-}
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReport.java b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReport.java
index 60c928d4b8..3b6ee7e545 100644
--- a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReport.java
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReport.java
@@ -34,6 +34,8 @@ public class ApiScenarioReport implements Serializable {
 
     private String description;
 
+    private Integer reportVersion;
+
     private Long endTime;
 
     private static final long serialVersionUID = 1L;
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportExample.java b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportExample.java
index c2c3a59059..5d8c3a403d 100644
--- a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportExample.java
@@ -1053,6 +1053,66 @@ public class ApiScenarioReportExample {
             addCriterion("end_time not between", value1, value2, "endTime");
             return (Criteria) this;
         }
+
+        public Criteria andReportVersionIsNull() {
+            addCriterion("report_version is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportVersionIsNotNull() {
+            addCriterion("report_version is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportVersionEqualTo(Integer value) {
+            addCriterion("report_version =", value, "reportVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportVersionNotEqualTo(Integer value) {
+            addCriterion("report_version <>", value, "reportVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportVersionGreaterThan(Integer value) {
+            addCriterion("report_version >", value, "reportVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportVersionGreaterThanOrEqualTo(Integer value) {
+            addCriterion("report_version >=", value, "reportVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportVersionLessThan(Integer value) {
+            addCriterion("report_version <", value, "reportVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportVersionLessThanOrEqualTo(Integer value) {
+            addCriterion("report_version <=", value, "reportVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportVersionIn(List<Integer> values) {
+            addCriterion("report_version in", values, "reportVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportVersionNotIn(List<Integer> values) {
+            addCriterion("report_version not in", values, "reportVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportVersionBetween(Integer value1, Integer value2) {
+            addCriterion("report_version between", value1, value2, "reportVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportVersionNotBetween(Integer value1, Integer value2) {
+            addCriterion("report_version not between", value1, value2, "reportVersion");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportResult.java b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportResult.java
new file mode 100644
index 0000000000..5cf9eb7eec
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportResult.java
@@ -0,0 +1,28 @@
+package io.metersphere.base.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ApiScenarioReportResult implements Serializable {
+    private String id;
+
+    private String resourceId;
+
+    private String reportId;
+
+    private Long createTime;
+
+    private String status;
+
+    private Long requestTime;
+
+    private Long totalAssertions;
+
+    private Long passAssertions;
+
+    private byte[] content;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportResultExample.java b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportResultExample.java
new file mode 100644
index 0000000000..f75532892a
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportResultExample.java
@@ -0,0 +1,720 @@
+package io.metersphere.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ApiScenarioReportResultExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public ApiScenarioReportResultExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdIsNull() {
+            addCriterion("resource_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdIsNotNull() {
+            addCriterion("resource_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdEqualTo(String value) {
+            addCriterion("resource_id =", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdNotEqualTo(String value) {
+            addCriterion("resource_id <>", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdGreaterThan(String value) {
+            addCriterion("resource_id >", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdGreaterThanOrEqualTo(String value) {
+            addCriterion("resource_id >=", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdLessThan(String value) {
+            addCriterion("resource_id <", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdLessThanOrEqualTo(String value) {
+            addCriterion("resource_id <=", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdLike(String value) {
+            addCriterion("resource_id like", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdNotLike(String value) {
+            addCriterion("resource_id not like", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdIn(List<String> values) {
+            addCriterion("resource_id in", values, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdNotIn(List<String> values) {
+            addCriterion("resource_id not in", values, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdBetween(String value1, String value2) {
+            addCriterion("resource_id between", value1, value2, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdNotBetween(String value1, String value2) {
+            addCriterion("resource_id not between", value1, value2, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNull() {
+            addCriterion("report_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNotNull() {
+            addCriterion("report_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdEqualTo(String value) {
+            addCriterion("report_id =", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotEqualTo(String value) {
+            addCriterion("report_id <>", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThan(String value) {
+            addCriterion("report_id >", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThanOrEqualTo(String value) {
+            addCriterion("report_id >=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThan(String value) {
+            addCriterion("report_id <", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThanOrEqualTo(String value) {
+            addCriterion("report_id <=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLike(String value) {
+            addCriterion("report_id like", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotLike(String value) {
+            addCriterion("report_id not like", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIn(List<String> values) {
+            addCriterion("report_id in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotIn(List<String> values) {
+            addCriterion("report_id not in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdBetween(String value1, String value2) {
+            addCriterion("report_id between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotBetween(String value1, String value2) {
+            addCriterion("report_id not between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Long value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Long value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Long value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Long value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Long value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Long> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Long> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Long value1, Long value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Long value1, Long value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(String value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(String value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(String value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(String value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(String value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLike(String value) {
+            addCriterion("`status` like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotLike(String value) {
+            addCriterion("`status` not like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<String> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<String> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(String value1, String value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(String value1, String value2) {
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeIsNull() {
+            addCriterion("request_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeIsNotNull() {
+            addCriterion("request_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeEqualTo(Long value) {
+            addCriterion("request_time =", value, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeNotEqualTo(Long value) {
+            addCriterion("request_time <>", value, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeGreaterThan(Long value) {
+            addCriterion("request_time >", value, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("request_time >=", value, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeLessThan(Long value) {
+            addCriterion("request_time <", value, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeLessThanOrEqualTo(Long value) {
+            addCriterion("request_time <=", value, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeIn(List<Long> values) {
+            addCriterion("request_time in", values, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeNotIn(List<Long> values) {
+            addCriterion("request_time not in", values, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeBetween(Long value1, Long value2) {
+            addCriterion("request_time between", value1, value2, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeNotBetween(Long value1, Long value2) {
+            addCriterion("request_time not between", value1, value2, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssertionsIsNull() {
+            addCriterion("total_assertions is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssertionsIsNotNull() {
+            addCriterion("total_assertions is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssertionsEqualTo(Long value) {
+            addCriterion("total_assertions =", value, "totalAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssertionsNotEqualTo(Long value) {
+            addCriterion("total_assertions <>", value, "totalAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssertionsGreaterThan(Long value) {
+            addCriterion("total_assertions >", value, "totalAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssertionsGreaterThanOrEqualTo(Long value) {
+            addCriterion("total_assertions >=", value, "totalAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssertionsLessThan(Long value) {
+            addCriterion("total_assertions <", value, "totalAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssertionsLessThanOrEqualTo(Long value) {
+            addCriterion("total_assertions <=", value, "totalAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssertionsIn(List<Long> values) {
+            addCriterion("total_assertions in", values, "totalAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssertionsNotIn(List<Long> values) {
+            addCriterion("total_assertions not in", values, "totalAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssertionsBetween(Long value1, Long value2) {
+            addCriterion("total_assertions between", value1, value2, "totalAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssertionsNotBetween(Long value1, Long value2) {
+            addCriterion("total_assertions not between", value1, value2, "totalAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassAssertionsIsNull() {
+            addCriterion("pass_assertions is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassAssertionsIsNotNull() {
+            addCriterion("pass_assertions is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassAssertionsEqualTo(Long value) {
+            addCriterion("pass_assertions =", value, "passAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassAssertionsNotEqualTo(Long value) {
+            addCriterion("pass_assertions <>", value, "passAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassAssertionsGreaterThan(Long value) {
+            addCriterion("pass_assertions >", value, "passAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassAssertionsGreaterThanOrEqualTo(Long value) {
+            addCriterion("pass_assertions >=", value, "passAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassAssertionsLessThan(Long value) {
+            addCriterion("pass_assertions <", value, "passAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassAssertionsLessThanOrEqualTo(Long value) {
+            addCriterion("pass_assertions <=", value, "passAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassAssertionsIn(List<Long> values) {
+            addCriterion("pass_assertions in", values, "passAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassAssertionsNotIn(List<Long> values) {
+            addCriterion("pass_assertions not in", values, "passAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassAssertionsBetween(Long value1, Long value2) {
+            addCriterion("pass_assertions between", value1, value2, "passAssertions");
+            return (Criteria) this;
+        }
+
+        public Criteria andPassAssertionsNotBetween(Long value1, Long value2) {
+            addCriterion("pass_assertions not between", value1, value2, "passAssertions");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportStructure.java b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportStructure.java
new file mode 100644
index 0000000000..ae48a13f21
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportStructure.java
@@ -0,0 +1,15 @@
+package io.metersphere.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class ApiScenarioReportStructure implements Serializable {
+    private String id;
+
+    private String reportId;
+
+    private Long createTime;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportStructureExample.java b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportStructureExample.java
new file mode 100644
index 0000000000..19de829510
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportStructureExample.java
@@ -0,0 +1,400 @@
+package io.metersphere.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ApiScenarioReportStructureExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public ApiScenarioReportStructureExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNull() {
+            addCriterion("report_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNotNull() {
+            addCriterion("report_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdEqualTo(String value) {
+            addCriterion("report_id =", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotEqualTo(String value) {
+            addCriterion("report_id <>", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThan(String value) {
+            addCriterion("report_id >", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThanOrEqualTo(String value) {
+            addCriterion("report_id >=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThan(String value) {
+            addCriterion("report_id <", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThanOrEqualTo(String value) {
+            addCriterion("report_id <=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLike(String value) {
+            addCriterion("report_id like", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotLike(String value) {
+            addCriterion("report_id not like", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIn(List<String> values) {
+            addCriterion("report_id in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotIn(List<String> values) {
+            addCriterion("report_id not in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdBetween(String value1, String value2) {
+            addCriterion("report_id between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotBetween(String value1, String value2) {
+            addCriterion("report_id not between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Long value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Long value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Long value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Long value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Long value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Long> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Long> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Long value1, Long value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Long value1, Long value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportStructureWithBLOBs.java b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportStructureWithBLOBs.java
new file mode 100644
index 0000000000..f5c4da4779
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportStructureWithBLOBs.java
@@ -0,0 +1,18 @@
+package io.metersphere.base.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ApiScenarioReportStructureWithBLOBs extends ApiScenarioReportStructure implements Serializable {
+    private byte[] resourceTree;
+
+    private String console;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportMapper.xml
index 502ff02d99..21986d621f 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportMapper.xml
@@ -16,6 +16,7 @@
     <result column="create_user" jdbcType="VARCHAR" property="createUser" />
     <result column="actuator" jdbcType="VARCHAR" property="actuator" />
     <result column="end_time" jdbcType="BIGINT" property="endTime" />
+    <result column="report_version" jdbcType="INTEGER" property="reportVersion" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.ApiScenarioReport">
     <result column="description" jdbcType="LONGVARCHAR" property="description" />
@@ -80,7 +81,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, project_id, `name`, create_time, update_time, `status`, user_id, trigger_mode, 
-    execute_type, scenario_name, scenario_id, create_user, actuator, end_time
+    execute_type, scenario_name, scenario_id, create_user, actuator, end_time, report_version
   </sql>
   <sql id="Blob_Column_List">
     description
@@ -138,14 +139,14 @@
       create_time, update_time, `status`, 
       user_id, trigger_mode, execute_type, 
       scenario_name, scenario_id, create_user, 
-      actuator, end_time, description
-      )
+      actuator, end_time, report_version, 
+      description)
     values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR}, 
       #{userId,jdbcType=VARCHAR}, #{triggerMode,jdbcType=VARCHAR}, #{executeType,jdbcType=VARCHAR}, 
       #{scenarioName,jdbcType=VARCHAR}, #{scenarioId,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
-      #{actuator,jdbcType=VARCHAR}, #{endTime,jdbcType=BIGINT}, #{description,jdbcType=LONGVARCHAR}
-      )
+      #{actuator,jdbcType=VARCHAR}, #{endTime,jdbcType=BIGINT}, #{reportVersion,jdbcType=INTEGER}, 
+      #{description,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.ApiScenarioReport">
     insert into api_scenario_report
@@ -192,6 +193,9 @@
       <if test="endTime != null">
         end_time,
       </if>
+      <if test="reportVersion != null">
+        report_version,
+      </if>
       <if test="description != null">
         description,
       </if>
@@ -239,6 +243,9 @@
       <if test="endTime != null">
         #{endTime,jdbcType=BIGINT},
       </if>
+      <if test="reportVersion != null">
+        #{reportVersion,jdbcType=INTEGER},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -295,6 +302,9 @@
       <if test="record.endTime != null">
         end_time = #{record.endTime,jdbcType=BIGINT},
       </if>
+      <if test="record.reportVersion != null">
+        report_version = #{record.reportVersion,jdbcType=INTEGER},
+      </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
@@ -319,6 +329,7 @@
       create_user = #{record.createUser,jdbcType=VARCHAR},
       actuator = #{record.actuator,jdbcType=VARCHAR},
       end_time = #{record.endTime,jdbcType=BIGINT},
+      report_version = #{record.reportVersion,jdbcType=INTEGER},
       description = #{record.description,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -339,7 +350,8 @@
       scenario_id = #{record.scenarioId,jdbcType=VARCHAR},
       create_user = #{record.createUser,jdbcType=VARCHAR},
       actuator = #{record.actuator,jdbcType=VARCHAR},
-      end_time = #{record.endTime,jdbcType=BIGINT}
+      end_time = #{record.endTime,jdbcType=BIGINT},
+      report_version = #{record.reportVersion,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -386,6 +398,9 @@
       <if test="endTime != null">
         end_time = #{endTime,jdbcType=BIGINT},
       </if>
+      <if test="reportVersion != null">
+        report_version = #{reportVersion,jdbcType=INTEGER},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -407,6 +422,7 @@
       create_user = #{createUser,jdbcType=VARCHAR},
       actuator = #{actuator,jdbcType=VARCHAR},
       end_time = #{endTime,jdbcType=BIGINT},
+      report_version = #{reportVersion,jdbcType=INTEGER},
       description = #{description,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -424,7 +440,8 @@
       scenario_id = #{scenarioId,jdbcType=VARCHAR},
       create_user = #{createUser,jdbcType=VARCHAR},
       actuator = #{actuator,jdbcType=VARCHAR},
-      end_time = #{endTime,jdbcType=BIGINT}
+      end_time = #{endTime,jdbcType=BIGINT},
+      report_version = #{reportVersion,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportResultMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportResultMapper.java
new file mode 100644
index 0000000000..5516e30009
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportResultMapper.java
@@ -0,0 +1,36 @@
+package io.metersphere.base.mapper;
+
+import io.metersphere.base.domain.ApiScenarioReportResult;
+import io.metersphere.base.domain.ApiScenarioReportResultExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ApiScenarioReportResultMapper {
+    long countByExample(ApiScenarioReportResultExample example);
+
+    int deleteByExample(ApiScenarioReportResultExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(ApiScenarioReportResult record);
+
+    int insertSelective(ApiScenarioReportResult record);
+
+    List<ApiScenarioReportResult> selectByExampleWithBLOBs(ApiScenarioReportResultExample example);
+
+    List<ApiScenarioReportResult> selectByExample(ApiScenarioReportResultExample example);
+
+    ApiScenarioReportResult selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") ApiScenarioReportResult record, @Param("example") ApiScenarioReportResultExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") ApiScenarioReportResult record, @Param("example") ApiScenarioReportResultExample example);
+
+    int updateByExample(@Param("record") ApiScenarioReportResult record, @Param("example") ApiScenarioReportResultExample example);
+
+    int updateByPrimaryKeySelective(ApiScenarioReportResult record);
+
+    int updateByPrimaryKeyWithBLOBs(ApiScenarioReportResult record);
+
+    int updateByPrimaryKey(ApiScenarioReportResult record);
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportResultMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportResultMapper.xml
new file mode 100644
index 0000000000..5c8fddd423
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportResultMapper.xml
@@ -0,0 +1,324 @@
+<?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.base.mapper.ApiScenarioReportResultMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.base.domain.ApiScenarioReportResult">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="resource_id" jdbcType="VARCHAR" property="resourceId" />
+    <result column="report_id" jdbcType="VARCHAR" property="reportId" />
+    <result column="create_time" jdbcType="BIGINT" property="createTime" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="request_time" jdbcType="BIGINT" property="requestTime" />
+    <result column="total_assertions" jdbcType="BIGINT" property="totalAssertions" />
+    <result column="pass_assertions" jdbcType="BIGINT" property="passAssertions" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.ApiScenarioReportResult">
+    <result column="content" jdbcType="LONGVARBINARY" property="content" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, resource_id, report_id, create_time, `status`, request_time, total_assertions, 
+    pass_assertions
+  </sql>
+  <sql id="Blob_Column_List">
+    content
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.base.domain.ApiScenarioReportResultExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from api_scenario_report_result
+    <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.base.domain.ApiScenarioReportResultExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from api_scenario_report_result
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from api_scenario_report_result
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from api_scenario_report_result
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.metersphere.base.domain.ApiScenarioReportResultExample">
+    delete from api_scenario_report_result
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.metersphere.base.domain.ApiScenarioReportResult">
+    insert into api_scenario_report_result (id, resource_id, report_id, 
+      create_time, `status`, request_time, 
+      total_assertions, pass_assertions, content
+      )
+    values (#{id,jdbcType=VARCHAR}, #{resourceId,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR}, #{requestTime,jdbcType=BIGINT}, 
+      #{totalAssertions,jdbcType=BIGINT}, #{passAssertions,jdbcType=BIGINT}, #{content,jdbcType=LONGVARBINARY}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="io.metersphere.base.domain.ApiScenarioReportResult">
+    insert into api_scenario_report_result
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="resourceId != null">
+        resource_id,
+      </if>
+      <if test="reportId != null">
+        report_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="requestTime != null">
+        request_time,
+      </if>
+      <if test="totalAssertions != null">
+        total_assertions,
+      </if>
+      <if test="passAssertions != null">
+        pass_assertions,
+      </if>
+      <if test="content != null">
+        content,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="resourceId != null">
+        #{resourceId,jdbcType=VARCHAR},
+      </if>
+      <if test="reportId != null">
+        #{reportId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="requestTime != null">
+        #{requestTime,jdbcType=BIGINT},
+      </if>
+      <if test="totalAssertions != null">
+        #{totalAssertions,jdbcType=BIGINT},
+      </if>
+      <if test="passAssertions != null">
+        #{passAssertions,jdbcType=BIGINT},
+      </if>
+      <if test="content != null">
+        #{content,jdbcType=LONGVARBINARY},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.metersphere.base.domain.ApiScenarioReportResultExample" resultType="java.lang.Long">
+    select count(*) from api_scenario_report_result
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update api_scenario_report_result
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.resourceId != null">
+        resource_id = #{record.resourceId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reportId != null">
+        report_id = #{record.reportId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.status != null">
+        `status` = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.requestTime != null">
+        request_time = #{record.requestTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.totalAssertions != null">
+        total_assertions = #{record.totalAssertions,jdbcType=BIGINT},
+      </if>
+      <if test="record.passAssertions != null">
+        pass_assertions = #{record.passAssertions,jdbcType=BIGINT},
+      </if>
+      <if test="record.content != null">
+        content = #{record.content,jdbcType=LONGVARBINARY},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update api_scenario_report_result
+    set id = #{record.id,jdbcType=VARCHAR},
+      resource_id = #{record.resourceId,jdbcType=VARCHAR},
+      report_id = #{record.reportId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT},
+      `status` = #{record.status,jdbcType=VARCHAR},
+      request_time = #{record.requestTime,jdbcType=BIGINT},
+      total_assertions = #{record.totalAssertions,jdbcType=BIGINT},
+      pass_assertions = #{record.passAssertions,jdbcType=BIGINT},
+      content = #{record.content,jdbcType=LONGVARBINARY}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update api_scenario_report_result
+    set id = #{record.id,jdbcType=VARCHAR},
+      resource_id = #{record.resourceId,jdbcType=VARCHAR},
+      report_id = #{record.reportId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT},
+      `status` = #{record.status,jdbcType=VARCHAR},
+      request_time = #{record.requestTime,jdbcType=BIGINT},
+      total_assertions = #{record.totalAssertions,jdbcType=BIGINT},
+      pass_assertions = #{record.passAssertions,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.ApiScenarioReportResult">
+    update api_scenario_report_result
+    <set>
+      <if test="resourceId != null">
+        resource_id = #{resourceId,jdbcType=VARCHAR},
+      </if>
+      <if test="reportId != null">
+        report_id = #{reportId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="requestTime != null">
+        request_time = #{requestTime,jdbcType=BIGINT},
+      </if>
+      <if test="totalAssertions != null">
+        total_assertions = #{totalAssertions,jdbcType=BIGINT},
+      </if>
+      <if test="passAssertions != null">
+        pass_assertions = #{passAssertions,jdbcType=BIGINT},
+      </if>
+      <if test="content != null">
+        content = #{content,jdbcType=LONGVARBINARY},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.ApiScenarioReportResult">
+    update api_scenario_report_result
+    set resource_id = #{resourceId,jdbcType=VARCHAR},
+      report_id = #{reportId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT},
+      `status` = #{status,jdbcType=VARCHAR},
+      request_time = #{requestTime,jdbcType=BIGINT},
+      total_assertions = #{totalAssertions,jdbcType=BIGINT},
+      pass_assertions = #{passAssertions,jdbcType=BIGINT},
+      content = #{content,jdbcType=LONGVARBINARY}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.ApiScenarioReportResult">
+    update api_scenario_report_result
+    set resource_id = #{resourceId,jdbcType=VARCHAR},
+      report_id = #{reportId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT},
+      `status` = #{status,jdbcType=VARCHAR},
+      request_time = #{requestTime,jdbcType=BIGINT},
+      total_assertions = #{totalAssertions,jdbcType=BIGINT},
+      pass_assertions = #{passAssertions,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportStructureMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportStructureMapper.java
new file mode 100644
index 0000000000..9f358fdfee
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportStructureMapper.java
@@ -0,0 +1,38 @@
+package io.metersphere.base.mapper;
+
+import io.metersphere.base.domain.ApiScenarioReportStructure;
+import io.metersphere.base.domain.ApiScenarioReportStructureExample;
+import io.metersphere.base.domain.ApiScenarioReportStructureWithBLOBs;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ApiScenarioReportStructureMapper {
+    long countByExample(ApiScenarioReportStructureExample example);
+
+    int deleteByExample(ApiScenarioReportStructureExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(ApiScenarioReportStructureWithBLOBs record);
+
+    int insertSelective(ApiScenarioReportStructureWithBLOBs record);
+
+    List<ApiScenarioReportStructureWithBLOBs> selectByExampleWithBLOBs(ApiScenarioReportStructureExample example);
+
+    List<ApiScenarioReportStructure> selectByExample(ApiScenarioReportStructureExample example);
+
+    ApiScenarioReportStructureWithBLOBs selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") ApiScenarioReportStructureWithBLOBs record, @Param("example") ApiScenarioReportStructureExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") ApiScenarioReportStructureWithBLOBs record, @Param("example") ApiScenarioReportStructureExample example);
+
+    int updateByExample(@Param("record") ApiScenarioReportStructure record, @Param("example") ApiScenarioReportStructureExample example);
+
+    int updateByPrimaryKeySelective(ApiScenarioReportStructureWithBLOBs record);
+
+    int updateByPrimaryKeyWithBLOBs(ApiScenarioReportStructureWithBLOBs record);
+
+    int updateByPrimaryKey(ApiScenarioReportStructure record);
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportStructureMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportStructureMapper.xml
new file mode 100644
index 0000000000..e78e1c8c4f
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportStructureMapper.xml
@@ -0,0 +1,249 @@
+<?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.base.mapper.ApiScenarioReportStructureMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.base.domain.ApiScenarioReportStructure">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="report_id" jdbcType="VARCHAR" property="reportId" />
+    <result column="create_time" jdbcType="BIGINT" property="createTime" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.ApiScenarioReportStructureWithBLOBs">
+    <result column="resource_tree" jdbcType="LONGVARBINARY" property="resourceTree" />
+    <result column="console" jdbcType="LONGVARCHAR" property="console" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, report_id, create_time
+  </sql>
+  <sql id="Blob_Column_List">
+    resource_tree, console
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.base.domain.ApiScenarioReportStructureExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from api_scenario_report_structure
+    <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.base.domain.ApiScenarioReportStructureExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from api_scenario_report_structure
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from api_scenario_report_structure
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from api_scenario_report_structure
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.metersphere.base.domain.ApiScenarioReportStructureExample">
+    delete from api_scenario_report_structure
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.metersphere.base.domain.ApiScenarioReportStructureWithBLOBs">
+    insert into api_scenario_report_structure (id, report_id, create_time, 
+      resource_tree, console)
+    values (#{id,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
+      #{resourceTree,jdbcType=LONGVARBINARY}, #{console,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="io.metersphere.base.domain.ApiScenarioReportStructureWithBLOBs">
+    insert into api_scenario_report_structure
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="reportId != null">
+        report_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="resourceTree != null">
+        resource_tree,
+      </if>
+      <if test="console != null">
+        console,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="reportId != null">
+        #{reportId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="resourceTree != null">
+        #{resourceTree,jdbcType=LONGVARBINARY},
+      </if>
+      <if test="console != null">
+        #{console,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.metersphere.base.domain.ApiScenarioReportStructureExample" resultType="java.lang.Long">
+    select count(*) from api_scenario_report_structure
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update api_scenario_report_structure
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reportId != null">
+        report_id = #{record.reportId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.resourceTree != null">
+        resource_tree = #{record.resourceTree,jdbcType=LONGVARBINARY},
+      </if>
+      <if test="record.console != null">
+        console = #{record.console,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update api_scenario_report_structure
+    set id = #{record.id,jdbcType=VARCHAR},
+      report_id = #{record.reportId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT},
+      resource_tree = #{record.resourceTree,jdbcType=LONGVARBINARY},
+      console = #{record.console,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update api_scenario_report_structure
+    set id = #{record.id,jdbcType=VARCHAR},
+      report_id = #{record.reportId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.ApiScenarioReportStructureWithBLOBs">
+    update api_scenario_report_structure
+    <set>
+      <if test="reportId != null">
+        report_id = #{reportId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="resourceTree != null">
+        resource_tree = #{resourceTree,jdbcType=LONGVARBINARY},
+      </if>
+      <if test="console != null">
+        console = #{console,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.ApiScenarioReportStructureWithBLOBs">
+    update api_scenario_report_structure
+    set report_id = #{reportId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT},
+      resource_tree = #{resourceTree,jdbcType=LONGVARBINARY},
+      console = #{console,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.ApiScenarioReportStructure">
+    update api_scenario_report_structure
+    set report_id = #{reportId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/commons/constants/ApiRunMode.java b/backend/src/main/java/io/metersphere/commons/constants/ApiRunMode.java
index 1f2eec0ab8..769833c216 100644
--- a/backend/src/main/java/io/metersphere/commons/constants/ApiRunMode.java
+++ b/backend/src/main/java/io/metersphere/commons/constants/ApiRunMode.java
@@ -1,6 +1,6 @@
 package io.metersphere.commons.constants;
 
 public enum ApiRunMode {
-    RUN, DEBUG, DEFINITION, SCENARIO, API_PLAN, JENKINS_API_PLAN, JENKINS_SCENARIO_PLAN, JENKINS_PERFORMANCE_TEST, JENKINS,
+    RUN, DEBUG, DEFINITION, TEST_CASE, SCENARIO, API_PLAN, JENKINS_API_PLAN, JENKINS_SCENARIO_PLAN, JENKINS_PERFORMANCE_TEST, JENKINS,
     SCENARIO_PLAN, API, SCHEDULE_API_PLAN, SCHEDULE_SCENARIO, SCHEDULE_SCENARIO_PLAN, SCHEDULE_PERFORMANCE_TEST, MANUAL_PLAN
 }
diff --git a/backend/src/main/java/io/metersphere/commons/constants/RunModeConstants.java b/backend/src/main/java/io/metersphere/commons/constants/RunModeConstants.java
deleted file mode 100644
index 770085f189..0000000000
--- a/backend/src/main/java/io/metersphere/commons/constants/RunModeConstants.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.metersphere.commons.constants;
-
-public enum RunModeConstants {
-
-    SERIAL("serial"), SET_REPORT("setReport"), PARALLEL("parallel"), HIS_PRO_ID("historyProjectID");
-
-    private String value;
-
-    RunModeConstants(String value) {
-        this.value = value;
-    }
-
-    @Override
-    public String toString() {
-        return this.value;
-    }
-}
diff --git a/backend/src/main/java/io/metersphere/commons/utils/DateUtils.java b/backend/src/main/java/io/metersphere/commons/utils/DateUtils.java
index a3b4932d58..dcf0897a0f 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/DateUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/DateUtils.java
@@ -36,7 +36,7 @@ public class DateUtils {
         return dateFormat.format(date);
     }
 
-    public static String getTimeString(long timeStamp) throws Exception {
+    public static String getTimeString(long timeStamp) {
         SimpleDateFormat dateFormat = new SimpleDateFormat(TIME_PATTERN);
         return dateFormat.format(timeStamp);
     }
@@ -116,24 +116,6 @@ public class DateUtils {
         return dateSum (now,countDays).getTime()/1000*1000;
     }
 
-    public static void main(String[] args) throws Exception {
-        Date now = new Date();
-        long time = dateSum(now, -3).getTime()/1000*1000;
-        long time1 = dateSum(now, 0).getTime()/1000*1000;
-        Date afterDate = dateSum(now,-3);
-        System.out.println(getTimeString(afterDate));
-        /*System.out.println(getTimeString(now));
-        Date afterDate = dateSum(now,-30,Calendar.DAY_OF_MONTH);
-        System.out.println(getTimeString(afterDate));
-        afterDate = dateSum(now,-17,Calendar.MONTH);
-        System.out.println(getTimeString(afterDate));
-        afterDate = dateSum(now,-20,Calendar.YEAR);
-        System.out.println(getTimeString(afterDate));*/
-        System.out.println(time);
-        System.out.println(time1);
-    }
-
-
     /**
      * 获取当天的起始时间Date
      * @param time  指定日期  例： 2020-12-13 06:12:42
diff --git a/backend/src/main/java/io/metersphere/config/KafkaConfig.java b/backend/src/main/java/io/metersphere/config/KafkaConfig.java
index 61e8f7e699..1e6e5d5ce5 100644
--- a/backend/src/main/java/io/metersphere/config/KafkaConfig.java
+++ b/backend/src/main/java/io/metersphere/config/KafkaConfig.java
@@ -1,13 +1,17 @@
 package io.metersphere.config;
+
+import io.metersphere.commons.utils.CommonBeanFactory;
 import org.apache.kafka.clients.admin.NewTopic;
+import org.apache.kafka.clients.producer.ProducerConfig;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.config.TopicBuilder;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Configuration
 public class KafkaConfig {
-    // 执行内容监听
-    public final static String EXEC_TOPIC = "ms-automation-exec-topic";
     //执行结果回传
     public static final String TOPICS = "ms-api-exec-topic";
 
@@ -17,9 +21,11 @@ public class KafkaConfig {
                 .build();
     }
 
-    @Bean
-    public NewTopic automationTopic() {
-        return TopicBuilder.name(EXEC_TOPIC)
-                .build();
+    public static Map<String, Object> getKafka() {
+        KafkaProperties kafkaProperties = CommonBeanFactory.getBean(KafkaProperties.class);
+        Map<String, Object> producerProps = new HashMap<>();
+        producerProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, kafkaProperties.getBootstrapServers());
+        producerProps.put(ProducerConfig.MAX_REQUEST_SIZE_CONFIG, kafkaProperties.getMaxRequestSize());
+        return producerProps;
     }
 }
diff --git a/backend/src/main/java/io/metersphere/config/KafkaProperties.java b/backend/src/main/java/io/metersphere/config/KafkaProperties.java
index 9b990468df..ab46cfd3dd 100644
--- a/backend/src/main/java/io/metersphere/config/KafkaProperties.java
+++ b/backend/src/main/java/io/metersphere/config/KafkaProperties.java
@@ -2,6 +2,7 @@ package io.metersphere.config;
 
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = KafkaProperties.KAFKA_PREFIX)
@@ -29,6 +30,8 @@ public class KafkaProperties {
     private KafkaProperties.Log log = new KafkaProperties.Log();
     private KafkaProperties.Report report = new KafkaProperties.Report();
 
+    @Value("${spring.kafka.producer.properties.max.request.size}")
+    private String maxRequestSize;
     @Getter
     @Setter
     public static class Ssl {
diff --git a/backend/src/main/java/io/metersphere/controller/CustomFunctionController.java b/backend/src/main/java/io/metersphere/controller/CustomFunctionController.java
index 97c54e6451..8867f206ae 100644
--- a/backend/src/main/java/io/metersphere/controller/CustomFunctionController.java
+++ b/backend/src/main/java/io/metersphere/controller/CustomFunctionController.java
@@ -8,6 +8,7 @@ import io.metersphere.base.domain.CustomFunctionWithBLOBs;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.controller.request.CustomFunctionRequest;
+import io.metersphere.dto.MsExecResponseDTO;
 import io.metersphere.service.CustomFunctionService;
 import org.springframework.web.bind.annotation.*;
 
@@ -57,7 +58,7 @@ public class CustomFunctionController {
     }
 
     @PostMapping("/run")
-    public String run(@RequestBody RunDefinitionRequest request) {
+    public MsExecResponseDTO run(@RequestBody RunDefinitionRequest request) {
         return customFunctionService.run(request);
     }
 }
diff --git a/backend/src/main/java/io/metersphere/dto/RunResultDTO.java b/backend/src/main/java/io/metersphere/dto/RunResultDTO.java
new file mode 100644
index 0000000000..33375360bb
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/dto/RunResultDTO.java
@@ -0,0 +1,10 @@
+package io.metersphere.dto;
+
+import lombok.Data;
+
+@Data
+public class RunResultDTO {
+    private String reportId;
+    private String status;
+    private String content;
+}
diff --git a/backend/src/main/java/io/metersphere/job/sechedule/ApiScenarioTestJob.java b/backend/src/main/java/io/metersphere/job/sechedule/ApiScenarioTestJob.java
index 0638ce9158..5907a4c3a0 100644
--- a/backend/src/main/java/io/metersphere/job/sechedule/ApiScenarioTestJob.java
+++ b/backend/src/main/java/io/metersphere/job/sechedule/ApiScenarioTestJob.java
@@ -2,7 +2,6 @@ package io.metersphere.job.sechedule;
 
 import com.alibaba.fastjson.JSONObject;
 import io.metersphere.api.dto.automation.ExecuteType;
-import io.metersphere.api.dto.automation.RunModeConfig;
 import io.metersphere.api.dto.automation.RunScenarioRequest;
 import io.metersphere.api.service.ApiAutomationService;
 import io.metersphere.commons.constants.ApiRunMode;
@@ -10,6 +9,7 @@ import io.metersphere.commons.constants.ReportTriggerMode;
 import io.metersphere.commons.constants.ScheduleGroup;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.dto.RunModeConfigDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.*;
 
@@ -71,7 +71,7 @@ public class ApiScenarioTestJob extends MsScheduleJob {
         JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
         String config = jobDataMap.getString("config");
         if (StringUtils.isNotBlank(config)) {
-            RunModeConfig runModeConfig = JSONObject.parseObject(config, RunModeConfig.class);
+            RunModeConfigDTO runModeConfig = JSONObject.parseObject(config, RunModeConfigDTO.class);
             request.setConfig(runModeConfig);
         }
 
diff --git a/backend/src/main/java/io/metersphere/listener/AppStartListener.java b/backend/src/main/java/io/metersphere/listener/AppStartListener.java
index f7a9414d58..7385d38b26 100644
--- a/backend/src/main/java/io/metersphere/listener/AppStartListener.java
+++ b/backend/src/main/java/io/metersphere/listener/AppStartListener.java
@@ -1,5 +1,6 @@
 package io.metersphere.listener;
 
+import io.metersphere.api.exec.queue.ExecThreadPoolExecutor;
 import io.metersphere.api.jmeter.JMeterService;
 import io.metersphere.api.jmeter.NewDriverManager;
 import io.metersphere.api.service.ApiAutomationService;
@@ -7,14 +8,12 @@ import io.metersphere.api.service.ApiDefinitionService;
 import io.metersphere.api.service.ApiTestCaseService;
 import io.metersphere.api.service.MockConfigService;
 import io.metersphere.base.domain.JarConfig;
+import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.commons.utils.RunInterface;
+import io.metersphere.dto.BaseSystemConfigDTO;
 import io.metersphere.performance.service.PerformanceTestService;
-import io.metersphere.service.JarConfigService;
-import io.metersphere.service.ProjectService;
-import io.metersphere.service.PluginService;
-import io.metersphere.service.ScheduleService;
-import io.metersphere.service.SystemParameterService;
+import io.metersphere.service.*;
 import io.metersphere.track.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.python.core.Options;
@@ -77,6 +76,13 @@ public class AppStartListener implements ApplicationListener<ApplicationReadyEve
 
         System.setProperty("jmeter.home", jmeterHome);
 
+        // 设置并发队列核心数
+        BaseSystemConfigDTO dto = CommonBeanFactory.getBean(SystemParameterService.class).getBaseInfo();
+        if (StringUtils.isNotEmpty(dto.getConcurrency())) {
+            int size = Integer.parseInt(dto.getConcurrency());
+            CommonBeanFactory.getBean(ExecThreadPoolExecutor.class).setCorePoolSize(size);
+        }
+
         loadJars();
 
         initPythonEnv();
@@ -95,13 +101,13 @@ public class AppStartListener implements ApplicationListener<ApplicationReadyEve
         }
 
         scheduleService.startEnableSchedules();
-
     }
 
 
     /**
      * 处理初始化数据、兼容数据
      * 只在第一次升级的时候执行一次
+     *
      * @param initFuc
      * @param key
      */
@@ -135,7 +141,7 @@ public class AppStartListener implements ApplicationListener<ApplicationReadyEve
         initOnceOperate(testPlanLoadCaseService::initOrderField, "init.sort.plan.api.load");
         initOnceOperate(testReviewTestCaseService::initOrderField, "init.sort.review.test.case");
         initOnceOperate(apiDefinitionService::initDefaultModuleId, "init.default.module.id");
-        initOnceOperate(mockConfigService::initExpectNum,"init.mock.expectNum");
+        initOnceOperate(mockConfigService::initExpectNum, "init.mock.expectNum");
     }
 
     /**
diff --git a/backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java b/backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java
index c17180be46..c0f4f11cca 100644
--- a/backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java
+++ b/backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java
@@ -3,7 +3,6 @@ package io.metersphere.performance.engine;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import io.metersphere.Application;
-import io.metersphere.api.dto.RunRequest;
 import io.metersphere.base.domain.FileContent;
 import io.metersphere.base.domain.FileMetadata;
 import io.metersphere.base.domain.LoadTestReportWithBLOBs;
@@ -13,6 +12,7 @@ import io.metersphere.commons.constants.ResourcePoolTypeEnum;
 import io.metersphere.commons.constants.ResourceStatusEnum;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.dto.JmeterRunRequestDTO;
 import io.metersphere.i18n.Translator;
 import io.metersphere.performance.engine.docker.DockerTestEngine;
 import io.metersphere.performance.parse.EngineSourceParser;
@@ -96,7 +96,7 @@ public class EngineFactory {
         return null;
     }
 
-    public static Engine createApiEngine(RunRequest runRequest) {
+    public static Engine createApiEngine(JmeterRunRequestDTO runRequest) {
         try {
             return (Engine) ConstructorUtils.invokeConstructor(kubernetesTestEngineClass, runRequest);
         } catch (Exception e) {
diff --git a/backend/src/main/java/io/metersphere/service/CustomFunctionService.java b/backend/src/main/java/io/metersphere/service/CustomFunctionService.java
index 200d442842..a3b0617952 100644
--- a/backend/src/main/java/io/metersphere/service/CustomFunctionService.java
+++ b/backend/src/main/java/io/metersphere/service/CustomFunctionService.java
@@ -2,24 +2,23 @@ package io.metersphere.service;
 
 
 import io.metersphere.api.dto.definition.RunDefinitionRequest;
-import io.metersphere.api.dto.definition.request.ParameterConfig;
-import io.metersphere.api.jmeter.JMeterService;
+import io.metersphere.api.service.ApiDefinitionService;
 import io.metersphere.base.domain.CustomFunction;
 import io.metersphere.base.domain.CustomFunctionExample;
 import io.metersphere.base.domain.CustomFunctionWithBLOBs;
 import io.metersphere.base.mapper.CustomFunctionMapper;
 import io.metersphere.base.mapper.ext.ExtCustomFunctionMapper;
-import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.BeanUtils;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.CustomFunctionRequest;
+import io.metersphere.dto.MsExecResponseDTO;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.jorphan.collections.HashTree;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
 
@@ -37,7 +36,7 @@ public class CustomFunctionService {
     @Resource
     private ExtCustomFunctionMapper extCustomFunctionMapper;
     @Resource
-    private JMeterService jMeterService;
+    private ApiDefinitionService apiDefinitionService;
 
     public CustomFunctionWithBLOBs save(CustomFunctionRequest request) {
         request.setId(UUID.randomUUID().toString());
@@ -116,12 +115,7 @@ public class CustomFunctionService {
         return customFunctionMapper.selectByPrimaryKey(id);
     }
 
-    public String run(RunDefinitionRequest request) {
-        ParameterConfig config = new ParameterConfig();
-        config.setProjectId(request.getProjectId());
-        HashTree hashTree = request.getTestElement().generateHashTree(config);
-        String runMode = ApiRunMode.DEFINITION.name();
-        jMeterService.runLocal(request.getId(),request.getConfig(), hashTree, request.getReportId(), runMode);
-        return request.getId();
+    public MsExecResponseDTO run(RunDefinitionRequest request) {
+        return apiDefinitionService.run(request, new LinkedList<>());
     }
 }
diff --git a/backend/src/main/java/io/metersphere/service/SystemParameterService.java b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
index 31fbee07ff..dd87660a8d 100644
--- a/backend/src/main/java/io/metersphere/service/SystemParameterService.java
+++ b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
@@ -1,6 +1,7 @@
 package io.metersphere.service;
 
 import com.alibaba.fastjson.JSON;
+import io.metersphere.api.exec.queue.ExecThreadPoolExecutor;
 import io.metersphere.api.service.ApiTestEnvironmentService;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.SystemHeaderMapper;
@@ -9,6 +10,7 @@ import io.metersphere.base.mapper.UserHeaderMapper;
 import io.metersphere.base.mapper.ext.ExtSystemParameterMapper;
 import io.metersphere.commons.constants.ParamConstants;
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.EncryptUtils;
 import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.controller.request.HeaderRequest;
@@ -260,6 +262,12 @@ public class SystemParameterService {
         SystemParameterExample example = new SystemParameterExample();
 
         parameters.forEach(param -> {
+            if (param.getParamKey().equals("base.concurrency")) {
+                if (StringUtils.isNotEmpty(param.getParamValue())) {
+                    int poolSize = Integer.parseInt(param.getParamValue());
+                    CommonBeanFactory.getBean(ExecThreadPoolExecutor.class).setCorePoolSize(poolSize);
+                }
+            }
             // 去掉路径最后的 /
             param.setParamValue(StringUtils.removeEnd(param.getParamValue(), "/"));
             example.createCriteria().andParamKeyEqualTo(param.getParamKey());
diff --git a/backend/src/main/java/io/metersphere/service/utils/MsClassLoader.java b/backend/src/main/java/io/metersphere/service/utils/MsClassLoader.java
index b4f438680d..8aaadd1ea8 100644
--- a/backend/src/main/java/io/metersphere/service/utils/MsClassLoader.java
+++ b/backend/src/main/java/io/metersphere/service/utils/MsClassLoader.java
@@ -1,5 +1,6 @@
 package io.metersphere.service.utils;
 
+import com.github.pagehelper.util.StringUtil;
 import io.metersphere.commons.utils.LogUtil;
 import org.springframework.stereotype.Service;
 
@@ -11,11 +12,14 @@ import java.util.concurrent.ConcurrentHashMap;
 @Service
 public class MsClassLoader {
 
-    private final static ConcurrentHashMap<String, MsURLClassLoader> LOADER_CACHE = new ConcurrentHashMap<>();
+    public final static ConcurrentHashMap<String, MsURLClassLoader> LOADER_CACHE = new ConcurrentHashMap<>();
 
     public MsURLClassLoader loadJar(String path) {
         try {
             String jarName = path.substring(path.indexOf("_") + 1);
+            if (StringUtil.isNotEmpty(jarName) && jarName.endsWith(".jar")) {
+                jarName = jarName.substring(0, jarName.length() - 4);
+            }
             MsURLClassLoader urlClassLoader = LOADER_CACHE.get(jarName);
             if (urlClassLoader != null) {
                 return urlClassLoader;
@@ -33,6 +37,9 @@ public class MsClassLoader {
     }
 
     public Class loadClass(String jarName, String name) throws ClassNotFoundException {
+        if (StringUtil.isNotEmpty(jarName) && jarName.endsWith(".jar")) {
+            jarName = jarName.substring(0, jarName.length() - 4);
+        }
         MsURLClassLoader urlClassLoader = LOADER_CACHE.get(jarName);
         if (urlClassLoader == null) {
             return null;
@@ -42,6 +49,9 @@ public class MsClassLoader {
 
     public void unloadJarFile(String path) throws MalformedURLException {
         String jarName = path.substring(path.indexOf("_") + 1);
+        if (StringUtil.isNotEmpty(jarName) && jarName.endsWith(".jar")) {
+            jarName = jarName.substring(0, jarName.length() - 4);
+        }
         MsURLClassLoader urlClassLoader = LOADER_CACHE.get(jarName);
         if (urlClassLoader == null) {
             return;
diff --git a/backend/src/main/java/io/metersphere/task/service/TaskService.java b/backend/src/main/java/io/metersphere/task/service/TaskService.java
index 1b8786e3e7..82e733debb 100644
--- a/backend/src/main/java/io/metersphere/task/service/TaskService.java
+++ b/backend/src/main/java/io/metersphere/task/service/TaskService.java
@@ -2,8 +2,8 @@ package io.metersphere.task.service;
 
 import com.alibaba.fastjson.JSON;
 import io.metersphere.api.dto.automation.TaskRequest;
+import io.metersphere.api.exec.queue.ExecThreadPoolExecutor;
 import io.metersphere.api.jmeter.JMeterService;
-import io.metersphere.api.jmeter.LocalRunner;
 import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiDefinitionExecResultMapper;
@@ -16,6 +16,7 @@ import io.metersphere.base.mapper.ext.ExtLoadTestReportMapper;
 import io.metersphere.base.mapper.ext.ExtTaskMapper;
 import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.dto.NodeDTO;
+import io.metersphere.jmeter.LocalRunner;
 import io.metersphere.performance.service.PerformanceTestService;
 import io.metersphere.task.dto.TaskCenterDTO;
 import io.metersphere.task.dto.TaskCenterRequest;
@@ -55,6 +56,8 @@ public class TaskService {
     private ExtApiScenarioReportMapper extApiScenarioReportMapper;
     @Resource
     private ExtLoadTestReportMapper extLoadTestReportMapper;
+    @Resource
+    private ExecThreadPoolExecutor execThreadPoolExecutor;
 
     public List<TaskCenterDTO> getTasks(TaskCenterRequest request) {
         if (StringUtils.isEmpty(request.getProjectId())) {
@@ -110,6 +113,9 @@ public class TaskService {
             // 聚类，同一批资源池的一批发送
             Map<String, List<String>> poolMap = new HashMap<>();
             for (TaskRequest request : reportIds) {
+                // 从队列移除
+                execThreadPoolExecutor.removeQueue(request.getReportId());
+
                 String actuator = null;
                 if (StringUtils.isNotEmpty(request.getReportId())) {
                     if (StringUtils.equals(request.getType(), "API")) {
@@ -186,7 +192,6 @@ public class TaskService {
         } else {
             new LocalRunner().stop(request.getReportId());
         }
-        MessageCache.cache.remove(request.getReportId());
-        MessageCache.terminationOrderDeque.add(request.getReportId());
+        MessageCache.concurrencyCounter.remove(request.getReportId());
     }
 }
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewScenarioCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewScenarioCaseController.java
index 87108d019e..d8505bfedb 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewScenarioCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewScenarioCaseController.java
@@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper;
 import io.metersphere.api.dto.automation.*;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
+import io.metersphere.dto.MsExecResponseDTO;
 import io.metersphere.track.dto.RelevanceScenarioRequest;
 import io.metersphere.track.request.testcase.TestPlanApiCaseBatchRequest;
 import io.metersphere.track.service.TestCaseReviewScenarioCaseService;
@@ -42,7 +43,7 @@ public class TestCaseReviewScenarioCaseController {
     }
 
     @PostMapping(value = "/run")
-    public String run(@RequestBody RunScenarioRequest request) {
+    public List<MsExecResponseDTO> run(@RequestBody RunScenarioRequest request) {
         request.setExecuteType(ExecuteType.Completed.name());
         return testCaseReviewScenarioCaseService.run(request);
     }
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestPlanApiCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestPlanApiCaseController.java
index 0463921d72..4560b07c42 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestPlanApiCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanApiCaseController.java
@@ -12,6 +12,7 @@ import io.metersphere.commons.constants.PermissionConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.controller.request.ResetOrderRequest;
+import io.metersphere.dto.MsExecResponseDTO;
 import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.track.request.testcase.TestPlanApiCaseBatchRequest;
 import io.metersphere.track.service.TestPlanApiCaseService;
@@ -78,7 +79,7 @@ public class TestPlanApiCaseController {
 
     @PostMapping(value = "/run")
     @MsAuditLog(module = "track_test_plan", type = OperLogConstants.EXECUTE, content = "#msClass.getLogDetails(#request.planIds)", msClass = TestPlanApiCaseService.class)
-    public String run(@RequestBody BatchRunDefinitionRequest request) {
+    public List<MsExecResponseDTO> run(@RequestBody BatchRunDefinitionRequest request) {
         return testPlanApiCaseService.run(request);
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestPlanScenarioCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestPlanScenarioCaseController.java
index fffdcec097..8f095412a3 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestPlanScenarioCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanScenarioCaseController.java
@@ -5,10 +5,12 @@ import com.github.pagehelper.PageHelper;
 import io.metersphere.api.dto.automation.*;
 import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.constants.OperLogConstants;
-import io.metersphere.commons.constants.RunModeConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
+import io.metersphere.constants.RunModeConstants;
 import io.metersphere.controller.request.ResetOrderRequest;
+import io.metersphere.dto.MsExecResponseDTO;
+import io.metersphere.dto.RunModeConfigDTO;
 import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.track.dto.RelevanceScenarioRequest;
 import io.metersphere.track.request.testcase.TestPlanScenarioCaseBatchRequest;
@@ -67,10 +69,10 @@ public class TestPlanScenarioCaseController {
 
     @PostMapping(value = "/run")
     @MsAuditLog(module = "track_test_plan", type = OperLogConstants.EXECUTE, content = "#msClass.getLogDetails(#request.planCaseIds)", msClass = TestPlanScenarioCaseService.class)
-    public String run(@RequestBody RunTestPlanScenarioRequest request) {
+    public List<MsExecResponseDTO> run(@RequestBody RunTestPlanScenarioRequest request) {
         request.setExecuteType(ExecuteType.Completed.name());
         if(request.getConfig() == null){
-            RunModeConfig config = new RunModeConfig();
+            RunModeConfigDTO config = new RunModeConfigDTO();
             config.setMode(RunModeConstants.PARALLEL.toString());
             config.setEnvMap(new HashMap<>());
             request.setConfig(config);
@@ -80,7 +82,7 @@ public class TestPlanScenarioCaseController {
 
     @PostMapping(value = "/jenkins/run")
     @MsAuditLog(module = "track_test_plan", type = OperLogConstants.EXECUTE, content = "#msClass.getLogDetails(#request.ids)", msClass = TestPlanScenarioCaseService.class)
-    public String runByRun(@RequestBody RunTestPlanScenarioRequest request) {
+    public List<MsExecResponseDTO> runByRun(@RequestBody RunTestPlanScenarioRequest request) {
         request.setExecuteType(ExecuteType.Saved.name());
         request.setTriggerMode(ApiRunMode.API.name());
         request.setRunMode(ApiRunMode.SCENARIO.name());
diff --git a/backend/src/main/java/io/metersphere/track/request/testplan/RunBatchTestPlanRequest.java b/backend/src/main/java/io/metersphere/track/request/testplan/RunBatchTestPlanRequest.java
index b8670f1a85..4538fd0120 100644
--- a/backend/src/main/java/io/metersphere/track/request/testplan/RunBatchTestPlanRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testplan/RunBatchTestPlanRequest.java
@@ -1,6 +1,6 @@
 package io.metersphere.track.request.testplan;
 
-import io.metersphere.api.dto.automation.RunModeConfig;
+import io.metersphere.dto.RunModeConfigDTO;
 import io.metersphere.performance.request.RunTestPlanRequest;
 import lombok.Getter;
 import lombok.Setter;
@@ -11,6 +11,6 @@ import java.util.List;
 @Setter
 public class RunBatchTestPlanRequest  {
     private List<RunTestPlanRequest> requests;
-    private RunModeConfig config;
+    private RunModeConfigDTO config;
     private String userId;
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java
index 17e0795411..0f83bcf5ce 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java
@@ -13,12 +13,13 @@ import io.metersphere.base.mapper.TestCaseReviewScenarioMapper;
 import io.metersphere.base.mapper.ext.ExtTestCaseReviewScenarioCaseMapper;
 import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.utils.ServiceUtils;
+import io.metersphere.dto.MsExecResponseDTO;
 import io.metersphere.track.dto.RelevanceScenarioRequest;
 import io.metersphere.track.request.testcase.TestPlanApiCaseBatchRequest;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -77,7 +78,7 @@ public class TestCaseReviewScenarioCaseService {
         testCaseReviewScenarioMapper.deleteByExample(example);
     }
 
-    public String run(RunScenarioRequest request) {
+    public List<MsExecResponseDTO> run(RunScenarioRequest request) {
         TestCaseReviewScenarioExample example = new TestCaseReviewScenarioExample();
         example.createCriteria().andIdIn(request.getPlanCaseIds());
         List<TestCaseReviewScenario> testPlanApiScenarioList = testCaseReviewScenarioMapper.selectByExample(example);
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
index 2ad5b53622..574d209007 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
@@ -1,61 +1,37 @@
 package io.metersphere.track.service;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import io.metersphere.api.cache.TestPlanReportExecuteCatch;
 import io.metersphere.api.dto.EnvironmentType;
-import io.metersphere.api.dto.JvmInfoDTO;
-import io.metersphere.api.dto.RunModeDataDTO;
-import io.metersphere.api.dto.RunRequest;
-import io.metersphere.api.dto.automation.RunModeConfig;
 import io.metersphere.api.dto.automation.TestPlanFailureApiDTO;
 import io.metersphere.api.dto.definition.ApiTestCaseDTO;
 import io.metersphere.api.dto.definition.ApiTestCaseRequest;
 import io.metersphere.api.dto.definition.BatchRunDefinitionRequest;
 import io.metersphere.api.dto.definition.TestPlanApiCaseDTO;
-import io.metersphere.api.dto.definition.request.ElementUtil;
-import io.metersphere.api.dto.definition.request.MsTestPlan;
-import io.metersphere.api.dto.definition.request.MsThreadGroup;
-import io.metersphere.api.dto.definition.request.ParameterConfig;
-import io.metersphere.api.dto.definition.request.sampler.MsDubboSampler;
-import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
-import io.metersphere.api.dto.definition.request.sampler.MsJDBCSampler;
-import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
-import io.metersphere.api.jmeter.JMeterService;
-import io.metersphere.api.jmeter.MessageCache;
-import io.metersphere.api.jmeter.ResourcePoolCalculation;
+import io.metersphere.api.exec.api.TestPlanApiExecuteService;
 import io.metersphere.api.service.ApiDefinitionExecResultService;
 import io.metersphere.api.service.ApiTestCaseService;
-import io.metersphere.api.service.RemakeReportService;
-import io.metersphere.api.service.task.NamedThreadFactory;
 import io.metersphere.base.domain.*;
-import io.metersphere.base.mapper.*;
+import io.metersphere.base.mapper.ApiTestCaseMapper;
+import io.metersphere.base.mapper.TestPlanApiCaseMapper;
+import io.metersphere.base.mapper.TestPlanMapper;
 import io.metersphere.base.mapper.ext.ExtTestPlanApiCaseMapper;
-import io.metersphere.commons.constants.*;
-import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
 import io.metersphere.controller.request.ResetOrderRequest;
-import io.metersphere.dto.BaseSystemConfigDTO;
+import io.metersphere.dto.MsExecResponseDTO;
+import io.metersphere.dto.RunModeConfigDTO;
 import io.metersphere.log.vo.OperatingLogDetails;
-import io.metersphere.plugin.core.MsTestElement;
 import io.metersphere.service.EnvironmentGroupProjectService;
-import io.metersphere.service.SystemParameterService;
 import io.metersphere.track.dto.PlanReportCaseDTO;
 import io.metersphere.track.dto.TestCaseReportStatusResultDTO;
 import io.metersphere.track.dto.TestPlanApiResultReportDTO;
 import io.metersphere.track.dto.TestPlanSimpleReportDTO;
 import io.metersphere.track.request.testcase.TestPlanApiCaseBatchRequest;
-import io.metersphere.track.service.task.SerialApiExecTask;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.jorphan.collections.HashTree;
 import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -64,9 +40,6 @@ import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
 @Service
@@ -87,23 +60,13 @@ public class TestPlanApiCaseService {
     @Resource
     ApiTestCaseMapper apiTestCaseMapper;
     @Resource
-    private SystemParameterService systemParameterService;
-    @Resource
-    private JMeterService jMeterService;
-    @Resource
-    private ApiDefinitionExecResultMapper mapper;
+    private TestPlanApiExecuteService testPlanApiCaseExecuteService;
     @Resource
     SqlSessionFactory sqlSessionFactory;
     @Resource
-    private ResourcePoolCalculation resourcePoolCalculation;
-    @Resource
     @Lazy
     private TestPlanService testPlanService;
     @Resource
-    private TestResourcePoolMapper testResourcePoolMapper;
-    @Resource
-    private RemakeReportService remakeReportService;
-    @Resource
     private EnvironmentGroupProjectService environmentGroupProjectService;
 
     public TestPlanApiCase getInfo(String caseId, String testPlanId) {
@@ -311,336 +274,15 @@ public class TestPlanApiCaseService {
         return null;
     }
 
-
-    private MsTestElement parse(ApiTestCaseWithBLOBs caseWithBLOBs, String planId) {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        try {
-            String api = caseWithBLOBs.getRequest();
-            JSONObject element = JSON.parseObject(api);
-            ElementUtil.dataFormatting(element);
-
-            LinkedList<MsTestElement> list = new LinkedList<>();
-            if (element != null && StringUtils.isNotEmpty(element.getString("hashTree"))) {
-                LinkedList<MsTestElement> elements = mapper.readValue(element.getString("hashTree"),
-                        new TypeReference<LinkedList<MsTestElement>>() {
-                        });
-                list.addAll(elements);
-            }
-            TestPlanApiCase apiCase = testPlanApiCaseMapper.selectByPrimaryKey(planId);
-            if (element.getString("type").equals("HTTPSamplerProxy")) {
-                MsHTTPSamplerProxy httpSamplerProxy = JSON.parseObject(api, MsHTTPSamplerProxy.class);
-                httpSamplerProxy.setHashTree(list);
-                httpSamplerProxy.setName(planId);
-                httpSamplerProxy.setUseEnvironment(apiCase.getEnvironmentId());
-                return httpSamplerProxy;
-            }
-            if (element.getString("type").equals("TCPSampler")) {
-                MsTCPSampler msTCPSampler = JSON.parseObject(api, MsTCPSampler.class);
-                msTCPSampler.setUseEnvironment(apiCase.getEnvironmentId());
-                msTCPSampler.setHashTree(list);
-                msTCPSampler.setName(planId);
-                return msTCPSampler;
-            }
-            if (element.getString("type").equals("DubboSampler")) {
-                MsDubboSampler dubboSampler = JSON.parseObject(api, MsDubboSampler.class);
-                dubboSampler.setUseEnvironment(apiCase.getEnvironmentId());
-                dubboSampler.setHashTree(list);
-                dubboSampler.setName(planId);
-                return dubboSampler;
-            }
-            if (element.getString("type").equals("JDBCSampler")) {
-                MsJDBCSampler jDBCSampler = JSON.parseObject(api, MsJDBCSampler.class);
-                jDBCSampler.setUseEnvironment(apiCase.getEnvironmentId());
-                jDBCSampler.setHashTree(list);
-                jDBCSampler.setName(planId);
-                return jDBCSampler;
-            }
-        } catch (Exception e) {
-            LogUtil.error(e);
-        }
-        return null;
-    }
-
-    public HashTree generateHashTree(String testId) {
-        TestPlanApiCase apiCase = testPlanApiCaseMapper.selectByPrimaryKey(testId);
-        if (apiCase != null) {
-            ApiTestCaseWithBLOBs caseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(apiCase.getApiCaseId());
-            HashTree jmeterHashTree = new HashTree();
-            MsTestPlan testPlan = new MsTestPlan();
-            testPlan.setHashTree(new LinkedList<>());
-            if (caseWithBLOBs != null) {
-                try {
-                    MsThreadGroup group = new MsThreadGroup();
-                    group.setLabel(caseWithBLOBs.getName());
-                    group.setName(caseWithBLOBs.getName());
-                    MsTestElement testElement = parse(caseWithBLOBs, testId);
-                    group.setHashTree(new LinkedList<>());
-                    group.getHashTree().add(testElement);
-                    testPlan.getHashTree().add(group);
-                } catch (Exception ex) {
-                    MSException.throwException(ex.getMessage());
-                }
-            }
-            testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), new ParameterConfig());
-            return jmeterHashTree;
-        }
-        return null;
-    }
-
-    private ApiDefinitionExecResult addResult(BatchRunDefinitionRequest request, TestPlanApiCase key, String status, ApiDefinitionExecResultMapper batchMapper) {
-        ApiDefinitionExecResult apiResult = new ApiDefinitionExecResult();
-        apiResult.setId(UUID.randomUUID().toString());
-        apiResult.setCreateTime(System.currentTimeMillis());
-        apiResult.setStartTime(System.currentTimeMillis());
-        apiResult.setEndTime(System.currentTimeMillis());
-        ApiTestCaseWithBLOBs caseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(key.getApiCaseId());
-        if (caseWithBLOBs != null) {
-            apiResult.setName(caseWithBLOBs.getName());
-        }
-        if (StringUtils.equalsIgnoreCase(request.getTriggerMode(), ApiRunMode.SCHEDULE_API_PLAN.name())) {
-            apiResult.setTriggerMode(TriggerMode.SCHEDULE.name());
-        } else if (StringUtils.equalsIgnoreCase(request.getTriggerMode(), ApiRunMode.JENKINS_API_PLAN.name())) {
-            apiResult.setTriggerMode(TriggerMode.MANUAL.name());
-        } else {
-            apiResult.setTriggerMode(TriggerMode.BATCH.name());
-        }
-        apiResult.setActuator("LOCAL");
-        if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) {
-            apiResult.setActuator(request.getConfig().getResourcePoolId());
-        }
-        if (StringUtils.isEmpty(request.getUserId())) {
-            if (SessionUtils.getUser() != null) {
-                apiResult.setUserId(SessionUtils.getUser().getId());
-            }
-        } else {
-            apiResult.setUserId(request.getUserId());
-        }
-
-        apiResult.setResourceId(key.getApiCaseId());
-        apiResult.setStartTime(System.currentTimeMillis());
-        apiResult.setType(ApiRunMode.API_PLAN.name());
-        apiResult.setStatus(status);
-        apiResult.setContent(request.getPlanReportId());
-        batchMapper.insert(apiResult);
-        return apiResult;
-    }
-
-    public String modeRun(BatchRunDefinitionRequest request) {
-        List<String> ids = request.getPlanIds();
-        TestPlanApiCaseExample example = new TestPlanApiCaseExample();
-        example.createCriteria().andIdIn(ids);
-        example.setOrderByClause("`order` DESC");
-        List<TestPlanApiCase> planApiCases = testPlanApiCaseMapper.selectByExample(example);
-        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
-        ApiDefinitionExecResultMapper batchMapper = sqlSession.getMapper(ApiDefinitionExecResultMapper.class);
-        if (StringUtils.isEmpty(request.getTriggerMode())) {
-            request.setTriggerMode(ApiRunMode.API_PLAN.name());
-        }
-        // 资源池
-        if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) {
-            TestResourcePool pool = testResourcePoolMapper.selectByPrimaryKey(request.getConfig().getResourcePoolId());
-            if (pool != null && pool.getApi() && pool.getType().equals(ResourcePoolTypeEnum.K8S.name())) {
-                LogUtil.info("K8S 暂时不做校验 ");
-            } else {
-                List<JvmInfoDTO> testResources = resourcePoolCalculation.getPools(request.getConfig().getResourcePoolId());
-                request.getConfig().setTestResources(testResources);
-            }
-        }
-        // 开始选择执行模式
-        if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
-            Map<TestPlanApiCase, ApiDefinitionExecResult> executeQueue = new LinkedHashMap<>();
-
-            //记录案例线程结果以及执行失败的案例ID
-            Map<String, String> executeThreadIdMap = new HashMap<>();
-
-            planApiCases.forEach(testPlanApiCase -> {
-                ApiDefinitionExecResult report = addResult(request, testPlanApiCase, APITestStatus.Waiting.name(), batchMapper);
-                executeQueue.put(testPlanApiCase, report);
-                executeThreadIdMap.put(testPlanApiCase.getId(), report.getId());
-            });
-
-            //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
-            if (TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())) {
-                if (!executeThreadIdMap.isEmpty()) {
-                    TestPlanReportExecuteCatch.updateTestPlanThreadInfo(request.getPlanReportId(), executeThreadIdMap, null, null);
-                }
-            }
-            sqlSession.flushStatements();
-            if (sqlSession != null && sqlSessionFactory != null) {
-                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
-            }
-
-            List<String> reportIds = new LinkedList<>();
-            // 开始串行执行
-            Thread thread = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    ExecutorService executorService = Executors.newFixedThreadPool(1, new NamedThreadFactory("TestPlanApiCaseService"));
-                    try {
-                        Thread.currentThread().setName("TestPlanCase串行执行线程");
-
-                        List<String> executeErrorList = new ArrayList<>();
-
-                        for (TestPlanApiCase testPlanApiCase : executeQueue.keySet()) {
-                            try {
-                                if (executeQueue.get(testPlanApiCase) != null && MessageCache.terminationOrderDeque.contains(executeQueue.get(testPlanApiCase).getId())) {
-                                    MessageCache.terminationOrderDeque.remove(executeQueue.get(testPlanApiCase).getId());
-                                    break;
-                                }
-                                ApiDefinitionExecResult execResult = executeQueue.get(testPlanApiCase);
-                                execResult.setId(executeQueue.get(testPlanApiCase).getId());
-                                execResult.setStatus(APITestStatus.Running.name());
-                                reportIds.add(execResult.getId());
-                                RunModeDataDTO modeDataDTO;
-
-                                String randomUUID = UUID.randomUUID().toString();
-                                if (request.getConfig() != null && StringUtils.isNotBlank(request.getConfig().getResourcePoolId())) {
-                                    modeDataDTO = new RunModeDataDTO(testPlanApiCase.getId(), randomUUID);
-                                } else {
-                                    // 生成报告和HashTree
-                                    try {
-                                        HashTree hashTree = generateHashTree(testPlanApiCase.getId());
-                                        modeDataDTO = new RunModeDataDTO(hashTree, randomUUID);
-                                    } catch (Exception e) {
-                                        RunRequest runRequest = new RunRequest();
-                                        runRequest.setTestId(testPlanApiCase.getId());
-                                        runRequest.setRunMode(request.getTriggerMode());
-                                        remakeReportService.remake(runRequest, request.getConfig(), execResult.getId());
-                                        reportIds.remove(executeQueue.get(testPlanApiCase).getId());
-                                        continue;
-                                    }
-                                }
-                                mapper.updateByPrimaryKey(execResult);
-                                modeDataDTO.setApiCaseId(execResult.getId());
-                                modeDataDTO.setDebugReportId(request.getPlanReportId());
-                                modeDataDTO.setTestId(modeDataDTO.getTestId() + ":" + request.getPlanReportId() + ":" + execResult.getId());
-                                Future<ApiDefinitionExecResult> future = executorService.submit(new SerialApiExecTask(jMeterService, mapper, modeDataDTO, request.getConfig(), request.getTriggerMode()));
-                                ApiDefinitionExecResult report = future.get();
-                                // 如果开启失败结束执行，则判断返回结果状态
-                                if (request.getConfig().isOnSampleError()) {
-                                    if (report == null || !report.getStatus().equals("Success")) {
-                                        reportIds.remove(execResult.getId());
-                                        break;
-                                    }
-                                }
-
-                            } catch (Exception e) {
-                                executeErrorList.add(testPlanApiCase.getId());
-                                reportIds.remove(executeQueue.get(testPlanApiCase).getId());
-                                LogUtil.error("执行终止：" + e.getMessage());
-                                break;
-                            }
-                        }
-                        // 清理未执行的队列
-                        if (reportIds.size() < executeQueue.size()) {
-                            List<String> removeList = executeQueue.entrySet().stream()
-                                    .filter(map -> !reportIds.contains(map.getValue().getId()))
-                                    .map(map -> map.getValue().getId()).collect(Collectors.toList());
-
-                            ApiDefinitionExecResultExample example = new ApiDefinitionExecResultExample();
-                            example.createCriteria().andIdIn(removeList);
-                            mapper.deleteByExample(example);
-                        }
-
-                        //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
-                        if (TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())) {
-                            if (!executeErrorList.isEmpty()) {
-                                Map<String, String> executeErrorMap = new HashMap<>();
-                                for (String id : executeErrorList) {
-                                    executeErrorMap.put(id, TestPlanApiExecuteStatus.FAILD.name());
-                                }
-                                TestPlanReportExecuteCatch.updateApiTestPlanExecuteInfo(request.getPlanReportId(), executeErrorMap, null, null);
-                            }
-                        }
-
-                    } catch (Exception e) {
-                        LogUtil.error(e);
-                    } finally {
-                        executorService.shutdownNow();
-                    }
-                }
-            });
-            thread.start();
-        } else {
-            Map<String, TestPlanApiCase> executeQueue = new HashMap<>();
-            //记录案例线程结果以及执行失败的案例ID
-            Map<String, String> executeThreadIdMap = new HashMap<>();
-            planApiCases.forEach(testPlanApiCase -> {
-                ApiDefinitionExecResult report = addResult(request, testPlanApiCase, APITestStatus.Running.name(), batchMapper);
-                executeQueue.put(report.getId(), testPlanApiCase);
-                executeThreadIdMap.put(testPlanApiCase.getId(), report.getId());
-                MessageCache.caseExecResourceLock.put(report.getId(), report);
-            });
-            sqlSession.flushStatements();
-            if (sqlSession != null && sqlSessionFactory != null) {
-                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
-            }
-            //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
-            if (TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())) {
-                if (!executeThreadIdMap.isEmpty()) {
-                    TestPlanReportExecuteCatch.updateTestPlanThreadInfo(request.getPlanReportId(), executeThreadIdMap, null, null);
-                }
-            }
-
-            // 开始并发执行
-            List<String> executeErrorList = new ArrayList<>();
-
-            for (String reportId : executeQueue.keySet()) {
-                TestPlanApiCase testPlanApiCase = executeQueue.get(reportId);
-                try {
-                    String debugId = request.getPlanReportId();
-                    if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) {
-                        String testId = testPlanApiCase.getId() + ":" + request.getPlanReportId() + ":" + reportId;
-                        jMeterService.runTest(testId, reportId, request.getTriggerMode(), request.getPlanReportId(), request.getConfig());
-                    } else {
-                        HashTree hashTree = generateHashTree(testPlanApiCase.getId());
-                        if (StringUtils.isEmpty(debugId)) {
-                            debugId = TriggerMode.BATCH.name();
-                        }
-                        String testId = reportId + ":" + request.getPlanReportId();
-                        jMeterService.runLocal(testId, request.getConfig(), hashTree, debugId, request.getTriggerMode());
-                    }
-                } catch (Exception e) {
-                    executeErrorList.add(testPlanApiCase.getId());
-                }
-
-            }
-
-            //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
-            if (TestPlanReportExecuteCatch.containsReport(request.getPlanReportId())) {
-                if (!executeErrorList.isEmpty()) {
-                    Map<String, String> executeErrorMap = new HashMap<>();
-                    for (String id : executeErrorList) {
-                        executeErrorMap.put(id, TestPlanApiExecuteStatus.FAILD.name());
-                    }
-                    TestPlanReportExecuteCatch.updateApiTestPlanExecuteInfo(request.getPlanReportId(), executeErrorMap, null, null);
-                }
-            }
-        }
-        return request.getId();
-    }
-
     /**
      * 测试执行
      *
      * @param request
      * @return
      */
-    public String run(BatchRunDefinitionRequest request) {
+    public List<MsExecResponseDTO> run(BatchRunDefinitionRequest request) {
         if (request.getConfig() != null) {
-            if (request.getConfig().getMode().equals(RunModeConstants.PARALLEL.toString())) {
-                // 校验并发数量
-                int count = 50;
-                BaseSystemConfigDTO dto = systemParameterService.getBaseInfo();
-                if (StringUtils.isNotEmpty(dto.getConcurrency())) {
-                    count = Integer.parseInt(dto.getConcurrency());
-                }
-                if (request.getPlanIds().size() > count) {
-                    MSException.throwException("并发数量过大，请重新选择！");
-                }
-            }
-            RunModeConfig config = request.getConfig();
+            RunModeConfigDTO config = request.getConfig();
             if (config != null) {
                 String envType = config.getEnvironmentType();
                 String envGroupId = config.getEnvironmentGroupId();
@@ -652,9 +294,9 @@ public class TestPlanApiCaseService {
                     setApiCaseEnv(request.getPlanIds(), map);
                 }
             }
-            return this.modeRun(request);
+            return testPlanApiCaseExecuteService.run(request);
         }
-        return request.getId();
+        return null;
     }
 
     public void setApiCaseEnv(List<String> planIds, Map<String, String> map) {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
index 66f7f32142..3bf79d74a7 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
@@ -3,17 +3,17 @@ package io.metersphere.track.service;
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import io.metersphere.api.service.task.NamedThreadFactory;
+import io.metersphere.api.exec.utils.NamedThreadFactory;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.LoadTestMapper;
 import io.metersphere.base.mapper.LoadTestReportMapper;
 import io.metersphere.base.mapper.TestPlanLoadCaseMapper;
 import io.metersphere.base.mapper.TestPlanMapper;
 import io.metersphere.base.mapper.ext.ExtTestPlanLoadCaseMapper;
-import io.metersphere.commons.constants.RunModeConstants;
 import io.metersphere.commons.constants.TestPlanStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
+import io.metersphere.constants.RunModeConstants;
 import io.metersphere.controller.request.OrderRequest;
 import io.metersphere.controller.request.ResetOrderRequest;
 import io.metersphere.log.vo.OperatingLogDetails;
@@ -177,7 +177,7 @@ public class TestPlanLoadCaseService {
     private void serialRun(RunBatchTestPlanRequest request) throws Exception {
         ExecutorService executorService = Executors.newFixedThreadPool(request.getRequests().size(), new NamedThreadFactory("TestPlanLoadCaseService-serial"));
         for (RunTestPlanRequest runTestPlanRequest : request.getRequests()) {
-            Future<LoadTestReportWithBLOBs> future = executorService.submit(new SerialExecTask(performanceTestService, testPlanLoadCaseMapper, loadTestReportMapper, runTestPlanRequest, request.getConfig()));
+            Future<LoadTestReportWithBLOBs> future = executorService.submit(new SerialExecTask(performanceTestService, testPlanLoadCaseMapper, loadTestReportMapper, runTestPlanRequest));
             LoadTestReportWithBLOBs report = future.get();
             // 如果开启失败结束执行，则判断返回结果状态
             if (request.getConfig().isOnSampleError()) {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
index ac9e4342eb..d98d399b27 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
@@ -12,7 +12,7 @@ import io.metersphere.api.dto.automation.TestPlanScenarioRequest;
 import io.metersphere.api.dto.definition.ApiTestCaseRequest;
 import io.metersphere.api.dto.definition.TestPlanApiCaseDTO;
 import io.metersphere.api.service.ShareInfoService;
-import io.metersphere.api.service.task.NamedThreadFactory;
+import io.metersphere.api.exec.utils.NamedThreadFactory;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
 import io.metersphere.base.mapper.ext.*;
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
index a214983c43..569b08c740 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
@@ -15,13 +15,15 @@ import io.metersphere.base.mapper.TestPlanApiScenarioMapper;
 import io.metersphere.base.mapper.TestPlanMapper;
 import io.metersphere.base.mapper.ext.ExtTestPlanScenarioCaseMapper;
 import io.metersphere.commons.constants.ApiRunMode;
-import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.constants.TestPlanTestCaseStatus;
+import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.commons.utils.ServiceUtils;
 import io.metersphere.commons.utils.TestPlanUtils;
 import io.metersphere.controller.request.ResetOrderRequest;
+import io.metersphere.dto.MsExecResponseDTO;
+import io.metersphere.dto.RunModeConfigDTO;
 import io.metersphere.log.vo.OperatingLogDetails;
 import io.metersphere.service.ProjectService;
 import io.metersphere.track.dto.*;
@@ -160,7 +162,7 @@ public class TestPlanScenarioCaseService {
         testPlanApiScenarioMapper.deleteByExample(example);
     }
 
-    public String run(RunTestPlanScenarioRequest testPlanScenarioRequest) {
+    public List<MsExecResponseDTO> run(RunTestPlanScenarioRequest testPlanScenarioRequest) {
         StringBuilder idStr = new StringBuilder();
         List<String> planCaseIdList = testPlanScenarioRequest.getPlanCaseIds();
         if (testPlanScenarioRequest.getCondition() != null && testPlanScenarioRequest.getCondition().isSelectAll()) {
@@ -173,7 +175,7 @@ public class TestPlanScenarioCaseService {
         if (CollectionUtils.isEmpty(planCaseIdList)) {
             MSException.throwException("未找到执行场景！");
         }
-        RunModeConfig config = testPlanScenarioRequest.getConfig();
+        RunModeConfigDTO config = testPlanScenarioRequest.getConfig();
         if (config != null) {
             String envType = config.getEnvironmentType();
             String envGroupId = config.getEnvironmentGroupId();
@@ -211,7 +213,7 @@ public class TestPlanScenarioCaseService {
         return apiAutomationService.run(request);
     }
 
-    public void setScenarioEnv(List<String> planScenarioIds, RunModeConfig runModeConfig) {
+    public void setScenarioEnv(List<String> planScenarioIds, RunModeConfigDTO runModeConfig) {
         SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
         TestPlanApiScenarioExample testPlanApiScenarioExample = new TestPlanApiScenarioExample();
         testPlanApiScenarioExample.createCriteria().andIdIn(planScenarioIds);
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 7f19331567..349d0ff42c 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -16,23 +16,23 @@ import io.metersphere.api.dto.automation.*;
 import io.metersphere.api.dto.definition.ApiTestCaseRequest;
 import io.metersphere.api.dto.definition.BatchRunDefinitionRequest;
 import io.metersphere.api.dto.definition.TestPlanApiCaseDTO;
-import io.metersphere.api.dto.definition.request.*;
+import io.metersphere.api.dto.definition.request.ElementUtil;
+import io.metersphere.api.dto.definition.request.MsScenario;
+import io.metersphere.api.dto.definition.request.MsTestPlan;
+import io.metersphere.api.dto.definition.request.MsThreadGroup;
 import io.metersphere.api.dto.definition.request.variable.ScenarioVariable;
 import io.metersphere.api.jmeter.JMeterService;
 import io.metersphere.api.service.ApiAutomationService;
 import io.metersphere.api.service.ApiDefinitionService;
 import io.metersphere.api.service.ApiScenarioReportService;
 import io.metersphere.api.service.ApiTestCaseService;
-import io.metersphere.api.service.task.NamedThreadFactory;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
 import io.metersphere.base.mapper.ext.*;
 import io.metersphere.commons.constants.*;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
-import io.metersphere.dto.BaseSystemConfigDTO;
-import io.metersphere.dto.IssueTemplateDao;
-import io.metersphere.dto.LogDetailDTO;
+import io.metersphere.dto.*;
 import io.metersphere.i18n.Translator;
 import io.metersphere.log.utils.ReflexObjectUtil;
 import io.metersphere.log.vo.DetailColumn;
@@ -64,8 +64,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.jorphan.collections.HashTree;
-import org.apache.jorphan.collections.ListedHashTree;
 import org.mybatis.spring.SqlSessionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -85,8 +83,6 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -197,8 +193,6 @@ public class TestPlanService {
     @Resource
     private LoadTestMapper loadTestMapper;
 
-    private final ExecutorService executorService = Executors.newFixedThreadPool(40, new NamedThreadFactory("TestPlanService"));
-
     public synchronized TestPlan addTestPlan(AddTestPlanRequest testPlan) {
         if (getTestPlanByName(testPlan.getName()).size() > 0) {
             MSException.throwException(Translator.get("plan_name_already_exists"));
@@ -951,9 +945,9 @@ public class TestPlanService {
         return extTestPlanMapper.findScheduleCreateUserById(testPlanId);
     }
 
-    public String scenarioRunModeConfig(SchedulePlanScenarioExecuteRequest planScenarioExecuteRequest) {
+    public List<MsExecResponseDTO> scenarioRunModeConfig(SchedulePlanScenarioExecuteRequest planScenarioExecuteRequest) {
         Map<String, Map<String, String>> testPlanScenarioIdMap = planScenarioExecuteRequest.getTestPlanScenarioIDMap();
-
+        List<MsExecResponseDTO> list = new LinkedList<>();
         String returnStr = null;
         for (Map.Entry<String, Map<String, String>> entry : testPlanScenarioIdMap.entrySet()) {
             Map<String, String> scenarioMap = entry.getValue();
@@ -974,57 +968,9 @@ public class TestPlanService {
             request.setProjectId(planScenarioExecuteRequest.getProjectId());
             request.setRequestOriginator("TEST_PLAN");
             request.setPlanCaseIds(new ArrayList<>(testPlanScenarioIdMap.keySet()));
-            if (request.getConfig() != null) {
-                if (request.getConfig().getMode().equals(RunModeConstants.PARALLEL.toString())) {
-                    // 校验并发数量
-                    int count = 50;
-                    BaseSystemConfigDTO dto = systemParameterService.getBaseInfo();
-                    if (StringUtils.isNotEmpty(dto.getConcurrency())) {
-                        count = Integer.parseInt(dto.getConcurrency());
-                    }
-                    if (request.getIds().size() > count) {
-                        MSException.throwException("并发数量过大，请重新选择！");
-                    }
-                    returnStr = apiAutomationService.modeRun(request);
-                } else {
-                    returnStr = apiAutomationService.modeRun(request);
-                }
-            } else {
-                returnStr = apiAutomationService.execute(request);
-            }
+            list.addAll(apiAutomationService.run(request));
         }
-        return returnStr;
-    }
-
-    /**
-     * 测试计划的定时任务--执行场景案例
-     *
-     * @param request
-     * @return
-     */
-    public String runScenarioCase(SchedulePlanScenarioExecuteRequest request) {
-        String returnId = "";
-        MsTestPlan testPlan = new MsTestPlan();
-        testPlan.setHashTree(new LinkedList<>());
-        HashTree jmeterHashTree = new ListedHashTree();
-        Map<String, Map<String, String>> testPlanScenarioIdMap = request.getTestPlanScenarioIDMap();
-
-        for (Map.Entry<String, Map<String, String>> entry : testPlanScenarioIdMap.entrySet()) {
-            Map<String, String> planScenarioIdMap = entry.getValue();
-
-            try {
-                returnId = this.generateHashTreeByScenarioList(testPlan, planScenarioIdMap, request);
-            } catch (Exception ex) {
-                MSException.throwException(ex.getMessage());
-            }
-
-            testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), new ParameterConfig());
-            String runMode = ApiRunMode.SCHEDULE_SCENARIO_PLAN.name();
-            // 调用执行方法
-            jMeterService.runLocal(request.getId(), request.getConfig(), jmeterHashTree, request.getReportId(), runMode);
-        }
-
-        return returnId;
+        return list;
     }
 
     private String generateHashTreeByScenarioList(MsTestPlan testPlan, Map<String, String> planScenarioIdMap, SchedulePlanScenarioExecuteRequest request) throws Exception {
@@ -1078,7 +1024,7 @@ public class TestPlanService {
             scenarios.add(scenario);
             // 创建场景报告
             //不同的运行模式，第二个参数入参不同
-            APIScenarioReportResult report = apiAutomationService.createScenarioReport(group.getName(),
+            APIScenarioReportResult report = apiScenarioReportService.init(group.getName(),
                     planScenarioID + ":" + request.getTestPlanReportId(),
                     item.getName(), request.getTriggerMode() == null ? ReportTriggerMode.MANUAL.name() : request.getTriggerMode(),
                     request.getExecuteType(), item.getProjectId(), request.getReportUserID(), request.getConfig(), null);
@@ -1097,15 +1043,15 @@ public class TestPlanService {
     }
 
     public String run(String testPlanID, String projectID, String userId, String triggerMode, String apiRunConfig) {
-        RunModeConfig runModeConfig = null;
+        RunModeConfigDTO runModeConfig = null;
         try {
-            runModeConfig = JSONObject.parseObject(apiRunConfig, RunModeConfig.class);
+            runModeConfig = JSONObject.parseObject(apiRunConfig, RunModeConfigDTO.class);
             runModeConfig.setOnSampleError(false);
         } catch (Exception e) {
             LogUtil.error(e);
         }
         if (runModeConfig == null) {
-            runModeConfig = new RunModeConfig();
+            runModeConfig = new RunModeConfigDTO();
             runModeConfig.setMode("serial");
             runModeConfig.setReportType("iddReport");
             runModeConfig.setEnvMap(new HashMap<>());
@@ -1121,23 +1067,6 @@ public class TestPlanService {
         Map<String, String> planScenarioIdsMap = reportInfoDTO.getPlanScenarioIdMap();
         Map<String, String> planApiCaseMap = reportInfoDTO.getApiTestCaseDataMap();
         Map<String, String> performanceIdMap = reportInfoDTO.getPerformanceIdMap();
-
-        if (runModeConfig.getMode().equals(RunModeConstants.PARALLEL.toString())) {
-            // 校验并发数量
-            int count = 50;
-            BaseSystemConfigDTO dto = systemParameterService.getBaseInfo();
-            if (StringUtils.isNotEmpty(dto.getConcurrency())) {
-                count = Integer.parseInt(dto.getConcurrency());
-            }
-            if (planApiCaseMap.size() > count) {
-                testPlanReportService.finishReport(reportInfoDTO.getTestPlanReport());
-                MSException.throwException("并发超过" + count + "，数量过大，请重新选择！");
-            }
-            if (planScenarioIdsMap.size() > count) {
-                testPlanReportService.finishReport(reportInfoDTO.getTestPlanReport());
-                MSException.throwException("并发超过" + count + "，数量过大，请重新选择！");
-            }
-        }
         extTestPlanMapper.updateActualEndTimeIsNullById(testPlanID);
         String planReportId = testPlanReport.getId();
         testPlanLog.info("ReportId[" + planReportId + "] created. TestPlanID:[" + testPlanID + "]. " + "API Run Config:【" + apiRunConfig + "】");
@@ -1218,70 +1147,72 @@ public class TestPlanService {
     }
 
     private void listenTaskExecuteStatus(String planReportId) {
-        executorService.submit(() -> {
-            try {
-                //10s 查询一次状态
-                Thread.sleep(10000);
-                while (TestPlanReportExecuteCatch.getTestPlanExecuteInfo(planReportId) != null) {
-                    testPlanReportService.countReport(planReportId);
+        // 开始串行执行
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                Thread.currentThread().setName("TestPlanListener");
+                try {
+                    //10s 查询一次状态
                     Thread.sleep(10000);
+                    while (TestPlanReportExecuteCatch.getTestPlanExecuteInfo(planReportId) != null) {
+                        testPlanReportService.countReport(planReportId);
+                        Thread.sleep(10000);
+                    }
+                } catch (InterruptedException e) {
+                    TestPlanReportExecuteCatch.remove(planReportId);
+                    LogUtil.error(e);
                 }
-            } catch (InterruptedException e) {
-                TestPlanReportExecuteCatch.remove(planReportId);
-                LogUtil.error(e);
             }
         });
+        thread.start();
     }
 
-    private void executeApiTestCase(String triggerMode, String planReportId, String userId, List<String> planCaseIds, RunModeConfig runModeConfig) {
-        executorService.submit(() -> {
-            BatchRunDefinitionRequest request = new BatchRunDefinitionRequest();
+    private void executeApiTestCase(String triggerMode, String planReportId, String userId, List<String> planCaseIds, RunModeConfigDTO runModeConfig) {
+        BatchRunDefinitionRequest request = new BatchRunDefinitionRequest();
+        if (StringUtils.equals(triggerMode, ReportTriggerMode.API.name())) {
+            request.setTriggerMode(ApiRunMode.JENKINS_API_PLAN.name());
+        } else if (StringUtils.equals(triggerMode, ReportTriggerMode.MANUAL.name())) {
+            request.setTriggerMode(ApiRunMode.MANUAL_PLAN.name());
+        } else {
+            request.setTriggerMode(ApiRunMode.SCHEDULE_API_PLAN.name());
+        }
+        request.setPlanIds(planCaseIds);
+        request.setPlanReportId(planReportId);
+        request.setConfig(runModeConfig);
+        request.setUserId(userId);
+        testPlanApiCaseService.run(request);
+    }
+
+    private void executeScenarioCase(String planReportId, String testPlanID, String projectID, RunModeConfigDTO runModeConfig, String triggerMode, String userId, Map<String, String> planScenarioIdMap) {
+        if (!planScenarioIdMap.isEmpty()) {
+            SchedulePlanScenarioExecuteRequest scenarioRequest = new SchedulePlanScenarioExecuteRequest();
+            String senarionReportID = UUID.randomUUID().toString();
+            scenarioRequest.setId(senarionReportID);
+            scenarioRequest.setReportId(senarionReportID);
+            scenarioRequest.setProjectId(projectID);
             if (StringUtils.equals(triggerMode, ReportTriggerMode.API.name())) {
-                request.setTriggerMode(ApiRunMode.JENKINS_API_PLAN.name());
+                scenarioRequest.setTriggerMode(ReportTriggerMode.API.name());
+                scenarioRequest.setRunMode(ApiRunMode.JENKINS_SCENARIO_PLAN.name());
             } else if (StringUtils.equals(triggerMode, ReportTriggerMode.MANUAL.name())) {
-                request.setTriggerMode(ApiRunMode.MANUAL_PLAN.name());
+                scenarioRequest.setTriggerMode(ReportTriggerMode.MANUAL.name());
+                scenarioRequest.setRunMode(ApiRunMode.JENKINS_SCENARIO_PLAN.name());
             } else {
-                request.setTriggerMode(ApiRunMode.SCHEDULE_API_PLAN.name());
+                scenarioRequest.setTriggerMode(ReportTriggerMode.SCHEDULE.name());
+                scenarioRequest.setRunMode(ApiRunMode.SCHEDULE_SCENARIO_PLAN.name());
             }
-            request.setPlanIds(planCaseIds);
-            request.setPlanReportId(planReportId);
-            request.setConfig(runModeConfig);
-            request.setUserId(userId);
-            testPlanApiCaseService.run(request);
-        });
-    }
+            scenarioRequest.setExecuteType(ExecuteType.Saved.name());
+            Map<String, Map<String, String>> testPlanScenarioIdMap = new HashMap<>();
+            testPlanScenarioIdMap.put(testPlanID, planScenarioIdMap);
+            scenarioRequest.setTestPlanScenarioIDMap(testPlanScenarioIdMap);
+            scenarioRequest.setReportUserID(userId);
+            scenarioRequest.setTestPlanID(testPlanID);
 
-    private void executeScenarioCase(String planReportId, String testPlanID, String projectID, RunModeConfig runModeConfig, String triggerMode, String userId, Map<String, String> planScenarioIdMap) {
-        executorService.submit(() -> {
-            if (!planScenarioIdMap.isEmpty()) {
-                SchedulePlanScenarioExecuteRequest scenarioRequest = new SchedulePlanScenarioExecuteRequest();
-                String senarionReportID = UUID.randomUUID().toString();
-                scenarioRequest.setId(senarionReportID);
-                scenarioRequest.setReportId(senarionReportID);
-                scenarioRequest.setProjectId(projectID);
-                if (StringUtils.equals(triggerMode, ReportTriggerMode.API.name())) {
-                    scenarioRequest.setTriggerMode(ReportTriggerMode.API.name());
-                    scenarioRequest.setRunMode(ApiRunMode.JENKINS_SCENARIO_PLAN.name());
-                } else if (StringUtils.equals(triggerMode, ReportTriggerMode.MANUAL.name())) {
-                    scenarioRequest.setTriggerMode(ReportTriggerMode.MANUAL.name());
-                    scenarioRequest.setRunMode(ApiRunMode.JENKINS_SCENARIO_PLAN.name());
-                } else {
-                    scenarioRequest.setTriggerMode(ReportTriggerMode.SCHEDULE.name());
-                    scenarioRequest.setRunMode(ApiRunMode.SCHEDULE_SCENARIO_PLAN.name());
-                }
-                scenarioRequest.setExecuteType(ExecuteType.Saved.name());
-                Map<String, Map<String, String>> testPlanScenarioIdMap = new HashMap<>();
-                testPlanScenarioIdMap.put(testPlanID, planScenarioIdMap);
-                scenarioRequest.setTestPlanScenarioIDMap(testPlanScenarioIdMap);
-                scenarioRequest.setReportUserID(userId);
-                scenarioRequest.setTestPlanID(testPlanID);
+            scenarioRequest.setTestPlanReportId(planReportId);
 
-                scenarioRequest.setTestPlanReportId(planReportId);
-
-                scenarioRequest.setConfig(runModeConfig);
-                this.scenarioRunModeConfig(scenarioRequest);
-            }
-        });
+            scenarioRequest.setConfig(runModeConfig);
+            this.scenarioRunModeConfig(scenarioRequest);
+        }
     }
 
     public String getLogDetails(String id) {
@@ -2003,7 +1934,7 @@ public class TestPlanService {
         String envType = testplanRunRequest.getEnvironmentType();
         Map<String, String> envMap = testplanRunRequest.getEnvMap();
         String environmentGroupId = testplanRunRequest.getEnvironmentGroupId();
-        RunModeConfig runModeConfig = new RunModeConfig();
+        RunModeConfigDTO runModeConfig = new RunModeConfigDTO();
         runModeConfig.setEnvironmentType(testplanRunRequest.getEnvironmentType());
         if (StringUtils.equals(envType, EnvironmentType.JSON.name()) && !envMap.isEmpty()) {
             runModeConfig.setEnvMap(testplanRunRequest.getEnvMap());
@@ -2027,7 +1958,7 @@ public class TestPlanService {
                 testplanRunRequest.getUserId(), testplanRunRequest.getTriggerMode(), apiRunConfig);
     }
 
-    public void setPlanCaseEnv(String planId, RunModeConfig runModeConfig) {
+    public void setPlanCaseEnv(String planId, RunModeConfigDTO runModeConfig) {
         TestPlanApiCaseExample caseExample = new TestPlanApiCaseExample();
         caseExample.createCriteria().andTestPlanIdEqualTo(planId);
         List<TestPlanApiCase> testPlanApiCases = testPlanApiCaseMapper.selectByExample(caseExample);
diff --git a/backend/src/main/java/io/metersphere/track/service/task/SerialApiExecTask.java b/backend/src/main/java/io/metersphere/track/service/task/SerialApiExecTask.java
deleted file mode 100644
index b3e8a9a0f6..0000000000
--- a/backend/src/main/java/io/metersphere/track/service/task/SerialApiExecTask.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- *
- */
-package io.metersphere.track.service.task;
-
-import io.metersphere.api.dto.RunModeDataDTO;
-import io.metersphere.api.dto.automation.RunModeConfig;
-import io.metersphere.api.jmeter.JMeterService;
-import io.metersphere.api.jmeter.MessageCache;
-import io.metersphere.base.domain.ApiDefinitionExecResult;
-import io.metersphere.base.mapper.ApiDefinitionExecResultMapper;
-import io.metersphere.commons.constants.APITestStatus;
-import io.metersphere.commons.exception.MSException;
-import io.metersphere.commons.utils.LogUtil;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.concurrent.Callable;
-
-public class SerialApiExecTask<T> implements Callable<T> {
-    private RunModeConfig config;
-    private JMeterService jMeterService;
-    private RunModeDataDTO runModeDataDTO;
-    private String runMode;
-    private ApiDefinitionExecResultMapper mapper;
-
-    public SerialApiExecTask(JMeterService jMeterService, ApiDefinitionExecResultMapper mapper, RunModeDataDTO runModeDataDTO, RunModeConfig config, String runMode) {
-        this.jMeterService = jMeterService;
-        this.config = config;
-        this.runModeDataDTO = runModeDataDTO;
-        this.runMode = runMode;
-        this.mapper = mapper;
-    }
-
-    @Override
-    public T call() {
-        try {
-            if (runModeDataDTO.getReport() != null && MessageCache.terminationOrderDeque.contains(runModeDataDTO.getReport().getId())) {
-                MessageCache.terminationOrderDeque.remove(runModeDataDTO.getReport().getId());
-                return null;
-            }
-            if (config != null && StringUtils.isNotBlank(config.getResourcePoolId())) {
-                jMeterService.runTest(runModeDataDTO.getTestId(), runModeDataDTO.getApiCaseId(), runMode, null, config);
-            } else {
-                String debugId = runModeDataDTO.getDebugReportId();
-                if(debugId == null){
-                    debugId = runModeDataDTO.getReport() != null ? runModeDataDTO.getReport().getTriggerMode() : null;
-                }
-                jMeterService.runLocal(runModeDataDTO.getApiCaseId()+":"+debugId, config, runModeDataDTO.getHashTree(), debugId, runMode);
-            }
-            // 轮询查看报告状态，最多200次，防止死循环
-            ApiDefinitionExecResult report = null;
-            int index = 1;
-            while (index < 200) {
-                Thread.sleep(3000);
-                index++;
-                 report = mapper.selectByPrimaryKey(runModeDataDTO.getApiCaseId());
-                if (report != null && !report.getStatus().equals(APITestStatus.Running.name())) {
-                    break;
-                }
-                if (runModeDataDTO.getReport() != null && MessageCache.terminationOrderDeque.contains(runModeDataDTO.getReport().getId())) {
-                    MessageCache.terminationOrderDeque.remove(runModeDataDTO.getReport().getId());
-                    break;
-                }
-            }
-            // 执行失败了，恢复报告状态
-            if (index == 200 && report != null && report.getStatus().equals(APITestStatus.Running.name())) {
-                report.setStatus(APITestStatus.Error.name());
-                mapper.updateByPrimaryKey(report);
-            }
-            return (T) report;
-        } catch (Exception ex) {
-            LogUtil.error(ex);
-            MSException.throwException(ex.getMessage());
-            return null;
-        }
-    }
-}
diff --git a/backend/src/main/java/io/metersphere/track/service/utils/SerialExecTask.java b/backend/src/main/java/io/metersphere/track/service/utils/SerialExecTask.java
index c855dd24a3..8b7ef80288 100644
--- a/backend/src/main/java/io/metersphere/track/service/utils/SerialExecTask.java
+++ b/backend/src/main/java/io/metersphere/track/service/utils/SerialExecTask.java
@@ -3,9 +3,7 @@
  */
 package io.metersphere.track.service.utils;
 
-import io.metersphere.api.dto.automation.RunModeConfig;
 import io.metersphere.base.domain.LoadTestReportWithBLOBs;
-import io.metersphere.base.domain.TestPlanLoadCase;
 import io.metersphere.base.domain.TestPlanLoadCaseWithBLOBs;
 import io.metersphere.base.mapper.LoadTestReportMapper;
 import io.metersphere.base.mapper.TestPlanLoadCaseMapper;
@@ -18,17 +16,15 @@ import java.util.concurrent.Callable;
 
 public class SerialExecTask<T> implements Callable<T> {
     private RunTestPlanRequest request;
-    private RunModeConfig config;
     private PerformanceTestService performanceTestService;
     private TestPlanLoadCaseMapper testPlanLoadCaseMapper;
     private LoadTestReportMapper loadTestReportMapper;
 
-    public SerialExecTask(PerformanceTestService performanceTestService, TestPlanLoadCaseMapper testPlanLoadCaseMapper,LoadTestReportMapper loadTestReportMapper, RunTestPlanRequest request, RunModeConfig config) {
+    public SerialExecTask(PerformanceTestService performanceTestService, TestPlanLoadCaseMapper testPlanLoadCaseMapper,LoadTestReportMapper loadTestReportMapper, RunTestPlanRequest request) {
         this.performanceTestService = performanceTestService;
         this.testPlanLoadCaseMapper = testPlanLoadCaseMapper;
         this.loadTestReportMapper = loadTestReportMapper;
         this.request = request;
-        this.config = config;
     }
 
     @Override
diff --git a/backend/src/main/java/io/metersphere/websocket/ApiReportWebSocket.java b/backend/src/main/java/io/metersphere/websocket/ApiReportWebSocket.java
index 8fc81edc28..dfb575c671 100644
--- a/backend/src/main/java/io/metersphere/websocket/ApiReportWebSocket.java
+++ b/backend/src/main/java/io/metersphere/websocket/ApiReportWebSocket.java
@@ -1,6 +1,5 @@
 package io.metersphere.websocket;
 
-import com.alibaba.nacos.client.utils.StringUtils;
 import io.metersphere.api.dto.APIReportResult;
 import io.metersphere.api.service.ApiDefinitionService;
 import io.metersphere.commons.utils.LogUtil;
@@ -91,12 +90,7 @@ public class ApiReportWebSocket {
         @Override
         public void run() {
             try {
-                APIReportResult report = null;
-                if (StringUtils.equals(runMode, "debug")) {
-                    report = apiDefinitionService.getResult(reportId, runMode);
-                } else {
-                    report = apiDefinitionService.getReportById(reportId);
-                }
+                APIReportResult report = apiDefinitionService.getReportById(reportId);
                 if (!session.isOpen()) {
                     return;
                 }
diff --git a/backend/src/main/java/io/metersphere/websocket/ScenarioReportWebSocket.java b/backend/src/main/java/io/metersphere/websocket/ScenarioReportWebSocket.java
deleted file mode 100644
index 52d9ef3ece..0000000000
--- a/backend/src/main/java/io/metersphere/websocket/ScenarioReportWebSocket.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package io.metersphere.websocket;
-
-import com.alibaba.fastjson.JSON;
-import io.metersphere.api.jmeter.MessageCache;
-import io.metersphere.api.jmeter.TestResult;
-import io.metersphere.api.service.MsResultService;
-import io.metersphere.commons.utils.LogUtil;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.websocket.*;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
-@ServerEndpoint("/api/scenario/report/get/real/{reportId}")
-@Component
-public class ScenarioReportWebSocket {
-
-    private static MsResultService resultService;
-    private static ConcurrentHashMap<Session, Timer> refreshTasks = new ConcurrentHashMap<>();
-
-    @Resource
-    public void setReportService(MsResultService resultService) {
-        ScenarioReportWebSocket.resultService = resultService;
-    }
-
-    /**
-     * 开启连接的操作
-     */
-    @OnOpen
-    public void onOpen(@PathParam("reportId") String reportId, Session session) {
-        MessageCache.reportCache.put(reportId, session);
-        Timer timer = new Timer(true);
-        ApiDebugResultTask task = new ApiDebugResultTask(session, reportId);
-        timer.schedule(task, 0, 1000);
-        refreshTasks.putIfAbsent(session, timer);
-    }
-
-    /**
-     * 连接关闭的操作
-     */
-    @OnClose
-    public void onClose(Session session) {
-        Timer timer = refreshTasks.get(session);
-        if (timer != null) {
-            timer.cancel();
-            refreshTasks.remove(session);
-        }
-        // 清理掉过程数据
-        List<String> reports = MessageCache.reportCache.entrySet().stream()
-                .filter(x -> x.getValue() == session).map(x -> x.getKey())
-                .collect(Collectors.toList());
-        if (CollectionUtils.isNotEmpty(reports)) {
-            resultService.delete(reports.get(0));
-        }
-    }
-
-    /**
-     * 给服务器发送消息告知数据库发生变化
-     */
-    @OnMessage
-    public void onMessage(@PathParam("reportId") String reportId, Session session, String message) {
-        try {
-            Timer timer = refreshTasks.get(session);
-            if (timer != null) {
-                timer.cancel();
-            }
-            Timer newTimer = new Timer(true);
-            newTimer.schedule(new ApiDebugResultTask(session, reportId), 0, 1000L);
-            refreshTasks.put(session, newTimer);
-        } catch (Exception e) {
-            LogUtil.error(e.getMessage(), e);
-        }
-    }
-
-    /**
-     * 出错的操作
-     */
-    @OnError
-    public void onError(Throwable error) {
-        System.out.println(error);
-        error.printStackTrace();
-    }
-
-    public static class ApiDebugResultTask extends TimerTask {
-        private Session session;
-        private String reportId;
-
-        ApiDebugResultTask(Session session, String reportId) {
-            this.session = session;
-            this.reportId = reportId;
-        }
-
-        @Override
-        public void run() {
-            try {
-                if (!session.isOpen()) {
-                    return;
-                }
-                TestResult report = resultService.synSampleResult(reportId);
-                if (report != null) {
-                    session.getBasicRemote().sendText(JSON.toJSONString(report));
-                    if (report.isEnd()) {
-                        session.close();
-                    }
-                }
-            } catch (Exception e) {
-                LogUtil.error(e.getMessage(), e);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/websocket/c/to/c/util/MsgDto.java b/backend/src/main/java/io/metersphere/websocket/c/to/c/util/MsgDto.java
index 1b63cdadf0..00918d2a30 100644
--- a/backend/src/main/java/io/metersphere/websocket/c/to/c/util/MsgDto.java
+++ b/backend/src/main/java/io/metersphere/websocket/c/to/c/util/MsgDto.java
@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
+ *
  */
 @AllArgsConstructor
 @NoArgsConstructor
@@ -14,5 +15,6 @@ import lombok.NoArgsConstructor;
 public class MsgDto {
     private String reportId;
     private String toReport;
+    private boolean execEnd;
     private String content;
 }
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 9dd0111eba..5055bb87bf 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 9dd0111ebafcdab7153a97ab3a3af39f5c69dac5
+Subproject commit 5055bb87bffbb60d57268a684c90edf8b27c2df8
diff --git a/backend/src/main/java/org/apache/jmeter/NewDriver.java b/backend/src/main/java/org/apache/jmeter/NewDriver.java
deleted file mode 100644
index c1c3046a9e..0000000000
--- a/backend/src/main/java/org/apache/jmeter/NewDriver.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.jmeter;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * Main class for JMeter - sets up initial classpath and the loader.
- *
- */
-public final class NewDriver {
-
-    private static final String CLASSPATH_SEPARATOR = File.pathSeparator;
-
-    private static final String OS_NAME = System.getProperty("os.name");// $NON-NLS-1$
-
-    private static final String OS_NAME_LC = OS_NAME.toLowerCase(java.util.Locale.ENGLISH);
-
-    private static final String JAVA_CLASS_PATH = "java.class.path";// $NON-NLS-1$
-
-    private static final String JMETER_LOGFILE_SYSTEM_PROPERTY = "jmeter.logfile";// $NON-NLS-1$
-
-    private static final String HEADLESS_MODE_PROPERTY = "java.awt.headless";// $NON-NLS-1$
-    /** The class loader to use for loading JMeter classes. */
-    private static final DynamicClassLoader loader;
-
-    /** The directory JMeter is installed in. */
-    private static final String JMETER_INSTALLATION_DIRECTORY;
-
-    private static final List<Exception> EXCEPTIONS_IN_INIT = new ArrayList<>();
-
-    // 将当前类加载器设置为 loader ，解决由系统类加载器加载的 JMeter 无法动态加载 jar 包问题
-    public static void setContextClassLoader() {
-        Thread.currentThread().setContextClassLoader(loader);
-    }
-
-    public static void loaderClass(String name) {
-        try {
-            loader.loadClass(name);
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    static {
-        final List<URL> jars = new LinkedList<>();
-        final String initiaClasspath = System.getProperty(JAVA_CLASS_PATH);
-
-        // Find JMeter home dir from the initial classpath
-        String tmpDir;
-
-        //只从 jmeter.home 加载
-        tmpDir = System.getProperty("jmeter.home","");// Allow override $NON-NLS-1$ $NON-NLS-2$
-        if (tmpDir.length() == 0) {
-            File userDir = new File(System.getProperty("user.dir"));// $NON-NLS-1$
-            tmpDir = userDir.getAbsoluteFile().getParent();
-        }
-
-        JMETER_INSTALLATION_DIRECTORY=tmpDir;
-
-        /*
-         * Does the system support UNC paths? If so, may need to fix them up
-         * later
-         */
-        boolean usesUNC = OS_NAME_LC.startsWith("windows");// $NON-NLS-1$
-
-        // Add standard jar locations to initial classpath
-        StringBuilder classpath = new StringBuilder();
-        File[] libDirs = new File[] { new File(JMETER_INSTALLATION_DIRECTORY + File.separator + "lib"),// $NON-NLS-1$ $NON-NLS-2$
-                new File(JMETER_INSTALLATION_DIRECTORY + File.separator + "lib" + File.separator + "ext"),// $NON-NLS-1$ $NON-NLS-2$
-                new File(JMETER_INSTALLATION_DIRECTORY + File.separator + "lib" + File.separator + "junit")};// $NON-NLS-1$ $NON-NLS-2$
-        for (File libDir : libDirs) {
-            File[] libJars = libDir.listFiles((dir, name) -> name.endsWith(".jar"));
-            if (libJars == null) {
-                new Throwable("Could not access " + libDir).printStackTrace(); // NOSONAR No logging here
-                continue;
-            }
-            Arrays.sort(libJars); // Bug 50708 Ensure predictable order of jars
-            for (File libJar : libJars) {
-                try {
-                    String s = libJar.getPath();
-
-                    // Fix path to allow the use of UNC URLs
-                    if (usesUNC) {
-                        if (s.startsWith("\\\\") && !s.startsWith("\\\\\\")) {// $NON-NLS-1$ $NON-NLS-2$
-                            s = "\\\\" + s;// $NON-NLS-1$
-                        } else if (s.startsWith("//") && !s.startsWith("///")) {// $NON-NLS-1$ $NON-NLS-2$
-                            s = "//" + s;// $NON-NLS-1$
-                        }
-                    } // usesUNC
-
-                    jars.add(new File(s).toURI().toURL());// See Java bug 4496398
-                    classpath.append(CLASSPATH_SEPARATOR);
-                    classpath.append(s);
-                } catch (MalformedURLException e) { // NOSONAR
-                    EXCEPTIONS_IN_INIT.add(new Exception("Error adding jar:"+libJar.getAbsolutePath(), e));
-                }
-            }
-        }
-
-        // ClassFinder needs the classpath
-        System.setProperty(JAVA_CLASS_PATH, initiaClasspath + classpath.toString());
-        loader = AccessController.doPrivileged(
-                (PrivilegedAction<DynamicClassLoader>) () ->
-                        new DynamicClassLoader(jars.toArray(new URL[jars.size()]), Thread.currentThread().getContextClassLoader())
-        );
-    }
-
-    /**
-     * Prevent instantiation.
-     */
-    private NewDriver() {
-    }
-
-    /**
-     * Generate an array of jar files located in a directory.
-     * Jar files located in sub directories will not be added.
-     *
-     * @param dir to search for the jar files.
-     */
-    private static File[] listJars(File dir) {
-        if (dir.isDirectory()) {
-            return dir.listFiles((f, name) -> {
-                if (name.endsWith(".jar")) {// $NON-NLS-1$
-                    File jar = new File(f, name);
-                    return jar.isFile() && jar.canRead();
-                }
-                return false;
-            });
-        }
-        return new File[0];
-    }
-
-    /**
-     * Add a URL to the loader classpath only; does not update the system classpath.
-     *
-     * @param path to be added.
-     * @throws MalformedURLException when <code>path</code> points to an invalid url
-     */
-    public static void addURL(String path) throws MalformedURLException {
-        File furl = new File(path);
-        loader.addURL(furl.toURI().toURL()); // See Java bug 4496398
-        File[] jars = listJars(furl);
-        for (File jar : jars) {
-            loader.addURL(jar.toURI().toURL()); // See Java bug 4496398
-        }
-    }
-
-    /**
-     * Add a URL to the loader classpath only; does not update the system
-     * classpath.
-     *
-     * @param url
-     *            The {@link URL} to add to the classpath
-     */
-    public static void addURL(URL url) {
-        loader.addURL(url);
-    }
-
-    /**
-     * Add a directory or jar to the loader and system classpaths.
-     *
-     * @param path
-     *            to add to the loader and system classpath
-     * @throws MalformedURLException
-     *             if <code>path</code> can not be transformed to a valid
-     *             {@link URL}
-     */
-    public static void addPath(String path) throws MalformedURLException {
-        File file = new File(path);
-        // Ensure that directory URLs end in "/"
-        if (file.isDirectory() && !path.endsWith("/")) {// $NON-NLS-1$
-            file = new File(path + "/");// $NON-NLS-1$
-        }
-        loader.addURL(file.toURI().toURL()); // See Java bug 4496398
-        StringBuilder sb = new StringBuilder(System.getProperty(JAVA_CLASS_PATH));
-        sb.append(CLASSPATH_SEPARATOR);
-        sb.append(path);
-        File[] jars = listJars(file);
-        for (File jar : jars) {
-            loader.addURL(jar.toURI().toURL()); // See Java bug 4496398
-            sb.append(CLASSPATH_SEPARATOR);
-            sb.append(jar.getPath());
-        }
-
-        // ClassFinder needs this
-        System.setProperty(JAVA_CLASS_PATH,sb.toString());
-    }
-
-    /**
-     * Get the directory where JMeter is installed. This is the absolute path
-     * name.
-     *
-     * @return the directory where JMeter is installed.
-     */
-    public static String getJMeterDir() {
-        return JMETER_INSTALLATION_DIRECTORY;
-    }
-
-    /**
-     * The main program which actually runs JMeter.
-     *
-     * @param args
-     *            the command line arguments
-     */
-    public static void main(String[] args) {
-        if(!EXCEPTIONS_IN_INIT.isEmpty()) {
-            System.err.println("Configuration error during init, see exceptions:"+exceptionsToString(EXCEPTIONS_IN_INIT)); // NOSONAR Intentional System.err use
-        } else {
-            Thread.currentThread().setContextClassLoader(loader);
-
-
-            setLoggingProperties(args);
-
-            try {
-                // Only set property if it has not been set explicitely
-                if(System.getProperty(HEADLESS_MODE_PROPERTY) == null && shouldBeHeadless(args)) {
-                    System.setProperty(HEADLESS_MODE_PROPERTY, "true");
-                }
-                Class<?> initialClass = loader.loadClass("org.apache.jmeter.JMeter");// $NON-NLS-1$
-                Object instance = initialClass.getDeclaredConstructor().newInstance();
-                Method startup = initialClass.getMethod("start", new Class[] { new String[0].getClass() });// $NON-NLS-1$
-                startup.invoke(instance, new Object[] { args });
-            } catch(Throwable e){ // NOSONAR We want to log home directory in case of exception
-                e.printStackTrace(); // NOSONAR No logger at this step
-                System.err.println("JMeter home directory was detected as: "+JMETER_INSTALLATION_DIRECTORY); // NOSONAR Intentional System.err use
-            }
-        }
-    }
-
-    /**
-     * @param exceptionsInInit List of {@link Exception}
-     * @return String
-     */
-    private static String exceptionsToString(List<Exception> exceptionsInInit) {
-        StringBuilder builder = new StringBuilder();
-        for (Exception exception : exceptionsInInit) {
-            StringWriter stringWriter = new StringWriter();
-            PrintWriter printWriter = new PrintWriter(stringWriter);
-            exception.printStackTrace(printWriter); // NOSONAR
-            builder.append(stringWriter.toString())
-                    .append("\r\n");
-        }
-        return builder.toString();
-    }
-
-    /*
-     * Set logging related system properties.
-     */
-    private static void setLoggingProperties(String[] args) {
-        String jmLogFile = getCommandLineArgument(args, 'j', "jmeterlogfile");// $NON-NLS-1$ $NON-NLS-2$
-
-        if (jmLogFile != null && !jmLogFile.isEmpty()) {
-            jmLogFile = replaceDateFormatInFileName(jmLogFile);
-            System.setProperty(JMETER_LOGFILE_SYSTEM_PROPERTY, jmLogFile);// $NON-NLS-1$
-        } else if (System.getProperty(JMETER_LOGFILE_SYSTEM_PROPERTY) == null) {// $NON-NLS-1$
-            System.setProperty(JMETER_LOGFILE_SYSTEM_PROPERTY, "jmeter.log");// $NON-NLS-1$ $NON-NLS-2$
-        }
-
-        String jmLogConf = getCommandLineArgument(args, 'i', "jmeterlogconf");// $NON-NLS-1$ $NON-NLS-2$
-        File logConfFile = null;
-
-        if (jmLogConf != null && !jmLogConf.isEmpty()) {
-            logConfFile = new File(jmLogConf);
-        } else if (System.getProperty("log4j.configurationFile") == null) {// $NON-NLS-1$
-            logConfFile = new File("log4j2.xml");// $NON-NLS-1$
-            if (!logConfFile.isFile()) {
-                logConfFile = new File(JMETER_INSTALLATION_DIRECTORY, "bin" + File.separator + "log4j2.xml");// $NON-NLS-1$ $NON-NLS-2$
-            }
-        }
-
-        if (logConfFile != null) {
-            System.setProperty("log4j.configurationFile", logConfFile.toURI().toString());// $NON-NLS-1$
-        }
-    }
-
-    private static boolean shouldBeHeadless(String[] args) {
-        for (String arg : args) {
-            if("-n".equals(arg) || "-s".equals(arg) || "-g".equals(arg)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    /*
-     * Find command line argument option value by the id and name.
-     */
-    private static String getCommandLineArgument(String[] args, int id, String name) {
-        final String shortArgName = "-" + ((char) id);// $NON-NLS-1$
-        final String longArgName = "--" + name;// $NON-NLS-1$
-
-        String value = null;
-
-        for (int i = 0; i < args.length; i++) {
-            if ((shortArgName.equals(args[i]) && i < args.length - 1)
-                    || longArgName.equals(args[i])) {
-                if (!args[i + 1].startsWith("-")) {// $NON-NLS-1$
-                    value = args[i + 1];
-                }
-                break;
-            } else if (!shortArgName.equals(args[i]) && args[i].startsWith(shortArgName)) {
-                value = args[i].substring(shortArgName.length());
-                break;
-            }
-        }
-
-        return value;
-    }
-
-    /*
-     * If the fileName contains at least one set of paired single-quotes, reformat using DateFormat
-     */
-    private static String replaceDateFormatInFileName(String fileName) {
-        try {
-            StringBuilder builder = new StringBuilder();
-
-            final Date date = new Date();
-            int fromIndex = 0;
-            int begin = fileName.indexOf('\'', fromIndex);// $NON-NLS-1$
-            int end;
-
-            String format;
-            SimpleDateFormat dateFormat;
-
-            while (begin != -1) {
-                builder.append(fileName.substring(fromIndex, begin));
-
-                fromIndex = begin + 1;
-                end = fileName.indexOf('\'', fromIndex);// $NON-NLS-1$
-                if (end == -1) {
-                    throw new IllegalArgumentException("Invalid pairs of single-quotes in the file name: " + fileName);// $NON-NLS-1$
-                }
-
-                format = fileName.substring(begin + 1, end);
-                dateFormat = new SimpleDateFormat(format);
-                builder.append(dateFormat.format(date));
-
-                fromIndex = end + 1;
-                begin = fileName.indexOf('\'', fromIndex);// $NON-NLS-1$
-            }
-
-            if (fromIndex < fileName.length() - 1) {
-                builder.append(fileName.substring(fromIndex));
-            }
-
-            return builder.toString();
-        } catch (Exception ex) {
-            System.err.println("Error replacing date format in file name:"+fileName+", error:"+ex.getMessage()); // NOSONAR
-        }
-
-        return fileName;
-    }
-}
diff --git a/backend/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java b/backend/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
deleted file mode 100644
index 3777a5f85c..0000000000
--- a/backend/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
+++ /dev/null
@@ -1,267 +0,0 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
-
-package org.apache.jmeter.assertions;
-
-import com.jayway.jsonpath.JsonPath;
-import com.jayway.jsonpath.Predicate;
-import io.metersphere.api.dto.definition.request.assertions.document.DocumentUtils;
-import net.minidev.json.JSONArray;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.testelement.AbstractTestElement;
-import org.apache.jmeter.testelement.ThreadListener;
-import org.apache.jmeter.util.JMeterUtils;
-import org.apache.oro.text.regex.Pattern;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.Serializable;
-import java.text.DecimalFormat;
-
-public class JSONPathAssertion extends AbstractTestElement implements Serializable, Assertion, ThreadListener {
-    private static final Logger log = LoggerFactory.getLogger(JSONPathAssertion.class);
-    private static final long serialVersionUID = 2L;
-    public static final String JSONPATH = "JSON_PATH";
-    public static final String EXPECTED_VALUE = "EXPECTED_VALUE";
-    public static final String JSON_VALIDATION = "JSONVALIDATION";
-    public static final String EXPECT_NULL = "EXPECT_NULL";
-    public static final String INVERT = "INVERT";
-    public static final String IS_REGEX = "ISREGEX";
-    private static ThreadLocal<DecimalFormat> decimalFormatter = ThreadLocal.withInitial(JSONPathAssertion::createDecimalFormat);
-
-    public JSONPathAssertion() {
-    }
-
-    private static DecimalFormat createDecimalFormat() {
-        DecimalFormat decimalFormatter = new DecimalFormat("#.#");
-        decimalFormatter.setMaximumFractionDigits(340);
-        decimalFormatter.setMinimumFractionDigits(1);
-        return decimalFormatter;
-    }
-
-    public String getOption() {
-        return getPropertyAsString("ASS_OPTION");
-    }
-
-    public String getElementCondition() {
-        return getPropertyAsString("ElementCondition");
-    }
-
-    public String getJsonPath() {
-        return this.getPropertyAsString("JSON_PATH");
-    }
-
-    public void setJsonPath(String jsonPath) {
-        this.setProperty("JSON_PATH", jsonPath);
-    }
-
-    public String getExpectedValue() {
-        return this.getPropertyAsString("EXPECTED_VALUE");
-    }
-
-    public void setExpectedValue(String expectedValue) {
-        this.setProperty("EXPECTED_VALUE", expectedValue);
-    }
-
-    public void setJsonValidationBool(boolean jsonValidation) {
-        this.setProperty(JSON_VALIDATION, jsonValidation);
-    }
-
-    public void setExpectNull(boolean val) {
-        this.setProperty("EXPECT_NULL", val);
-    }
-
-    public boolean isExpectNull() {
-        return this.getPropertyAsBoolean("EXPECT_NULL");
-    }
-
-    public boolean isJsonValidationBool() {
-        return this.getPropertyAsBoolean(JSON_VALIDATION);
-    }
-
-    public void setInvert(boolean invert) {
-        this.setProperty("INVERT", invert);
-    }
-
-    public boolean isInvert() {
-        return this.getPropertyAsBoolean("INVERT");
-    }
-
-    public void setIsRegex(boolean flag) {
-        this.setProperty(IS_REGEX, flag);
-    }
-
-    public boolean isUseRegex() {
-        return this.getPropertyAsBoolean(IS_REGEX, true);
-    }
-
-    private void doAssert(String jsonString) {
-        Object value = JsonPath.read(jsonString, this.getJsonPath(), new Predicate[0]);
-        if (this.isJsonValidationBool()) {
-            if (value instanceof JSONArray) {
-                if (this.arrayMatched((JSONArray) value)) {
-                    return;
-                }
-            } else if (this.isExpectNull() && value == null || this.isEquals(value)) {
-                return;
-            }
-
-            if (this.isExpectNull()) {
-                throw new IllegalStateException(String.format("Value expected to be null, but found '%s'", value));
-            } else {
-                String msg = "";
-                if (this.isUseRegex()) {
-                    msg = "Value expected to match regexp '%s', but it did not match: '%s'";
-                } else if (StringUtils.isNotEmpty(getOption()) && !this.isEquals(value)) {
-                    switch (getOption()) {
-                        case "CONTAINS":
-                            msg = "Value contains to be '%s', but found '%s'";
-                            break;
-                        case "NOT_CONTAINS":
-                            msg = "Value not contains to be '%s', but found '%s'";
-                            break;
-                        case "EQUALS":
-                            msg = "Value equals to be '%s', but found '%s'";
-                            break;
-                        case "NOT_EQUALS":
-                            msg = "Value not equals to be '%s', but found '%s'";
-                            break;
-                        case "GT":
-                            msg = "Value > '%s', but found '%s'";
-                            break;
-                        case "LT":
-                            msg = "Value < '%s', but found '%s'";
-                            break;
-                        case "DOCUMENT":
-                            msg = (StringUtils.isNotEmpty(this.getName()) ? this.getName().split("==")[1] : "") + "校验失败，实际返回：" + DocumentUtils.documentMsg(value, this.getElementCondition());
-                            break;
-                    }
-                } else {
-                    msg = "Value expected to be '%s', but found '%s'";
-                }
-                throw new IllegalStateException(String.format(msg, this.getExpectedValue(), DocumentUtils.objectToString(value, decimalFormatter)));
-            }
-        }
-    }
-
-    private boolean arrayMatched(JSONArray value) {
-        if (value.isEmpty() && "[]".equals(this.getExpectedValue())) {
-            return true;
-        } else {
-            Object[] var2 = value.toArray();
-            int var3 = var2.length;
-
-            for (int var4 = 0; var4 < var3; ++var4) {
-                Object subj = var2[var4];
-                if (subj == null && this.isExpectNull() || this.isEquals(subj)) {
-                    return true;
-                }
-            }
-
-            return this.isEquals(value);
-        }
-    }
-
-    private boolean isGt(String v1, String v2) {
-        try {
-            return Long.parseLong(v1) > Long.parseLong(v2);
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    private boolean isLt(String v1, String v2) {
-        try {
-            return Long.parseLong(v1) < Long.parseLong(v2);
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    private boolean isEquals(Object subj) {
-        String str = DocumentUtils.objectToString(subj, decimalFormatter);
-        if (this.isUseRegex()) {
-            Pattern pattern = JMeterUtils.getPatternCache().getPattern(this.getExpectedValue());
-            return JMeterUtils.getMatcher().matches(str, pattern);
-        } else {
-            if (StringUtils.isNotEmpty(getOption())) {
-                boolean refFlag = false;
-                switch (getOption()) {
-                    case "CONTAINS":
-                        refFlag = str.contains(getExpectedValue());
-                        break;
-                    case "NOT_CONTAINS":
-                        refFlag = !str.contains(getExpectedValue());
-                        break;
-                    case "EQUALS":
-                        refFlag = str.equals(getExpectedValue());
-                        break;
-                    case "NOT_EQUALS":
-                        refFlag = !str.equals(getExpectedValue());
-                        break;
-                    case "GT":
-                        refFlag = isGt(str, getExpectedValue());
-                        break;
-                    case "LT":
-                        refFlag = isLt(str, getExpectedValue());
-                        break;
-                    case "DOCUMENT":
-                        refFlag = DocumentUtils.documentChecked(subj, this.getElementCondition(), decimalFormatter);
-                        break;
-                }
-                return refFlag;
-            }
-            return str.equals(this.getExpectedValue());
-        }
-    }
-
-
-    public AssertionResult getResult(SampleResult samplerResult) {
-        AssertionResult result = new AssertionResult(this.getName());
-        String responseData = samplerResult.getResponseDataAsString();
-        if (responseData.isEmpty()) {
-            return result.setResultForNull();
-        } else {
-            result.setFailure(false);
-            result.setFailureMessage("");
-            if (!this.isInvert()) {
-                try {
-                    this.doAssert(responseData);
-                } catch (Exception var6) {
-                    log.debug("Assertion failed", var6);
-                    result.setFailure(true);
-                    result.setFailureMessage(var6.getMessage());
-                }
-            } else {
-                try {
-                    this.doAssert(responseData);
-                    result.setFailure(true);
-                    if (this.isJsonValidationBool()) {
-                        if (this.isExpectNull()) {
-                            result.setFailureMessage("Failed that JSONPath " + this.getJsonPath() + " not matches null");
-                        } else {
-                            result.setFailureMessage("Failed that JSONPath " + this.getJsonPath() + " not matches " + this.getExpectedValue());
-                        }
-                    } else {
-                        result.setFailureMessage("Failed that JSONPath not exists: " + this.getJsonPath());
-                    }
-                } catch (Exception var5) {
-                    log.debug("Assertion failed, as expected", var5);
-                }
-            }
-
-            return result;
-        }
-    }
-
-
-    public void threadStarted() {
-    }
-
-    public void threadFinished() {
-        decimalFormatter.remove();
-    }
-}
diff --git a/backend/src/main/java/org/apache/jmeter/assertions/XMLAssertion.java b/backend/src/main/java/org/apache/jmeter/assertions/XMLAssertion.java
deleted file mode 100644
index 4dc184f184..0000000000
--- a/backend/src/main/java/org/apache/jmeter/assertions/XMLAssertion.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.assertions;
-
-import com.jayway.jsonpath.JsonPath;
-import com.jayway.jsonpath.Predicate;
-import io.metersphere.api.dto.definition.request.assertions.document.DocumentUtils;
-import net.minidev.json.JSONArray;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.testelement.AbstractTestElement;
-import org.apache.jmeter.testelement.ThreadListener;
-import org.json.JSONObject;
-import org.json.XML;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.StringReader;
-import java.text.DecimalFormat;
-
-/**
- * Checks if the result is a well-formed XML content using {@link XMLReader}
- */
-public class XMLAssertion extends AbstractTestElement implements Serializable, Assertion, ThreadListener {
-    private static final Logger log = LoggerFactory.getLogger(XMLAssertion.class);
-    private static ThreadLocal<DecimalFormat> decimalFormatter = ThreadLocal.withInitial(XMLAssertion::createDecimalFormat);
-
-    private static final long serialVersionUID = 242L;
-
-    public String getXmlPath() {
-        return this.getPropertyAsString("XML_PATH");
-    }
-
-    public String getExpectedValue() {
-        return this.getPropertyAsString("EXPECTED_VALUE");
-    }
-
-    public String getCondition() {
-        return getPropertyAsString("ElementCondition");
-    }
-
-    private static DecimalFormat createDecimalFormat() {
-        DecimalFormat decimalFormatter = new DecimalFormat("#.#");
-        decimalFormatter.setMaximumFractionDigits(340);
-        decimalFormatter.setMinimumFractionDigits(1);
-        return decimalFormatter;
-    }
-
-    // one builder for all requests in a thread
-    private static final ThreadLocal<XMLReader> XML_READER = new ThreadLocal<XMLReader>() {
-        @Override
-        protected XMLReader initialValue() {
-            try {
-                XMLReader reader = SAXParserFactory.newInstance()
-                        .newSAXParser()
-                        .getXMLReader();
-                reader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
-                return reader;
-            } catch (SAXException | ParserConfigurationException e) {
-                log.error("Error initializing XMLReader in XMLAssertion", e);
-                return null;
-            }
-        }
-    };
-
-    /**
-     * Returns the result of the Assertion.
-     * Here it checks whether the Sample data is XML.
-     * If so an AssertionResult containing a FailureMessage will be returned.
-     * Otherwise the returned AssertionResult will reflect the success of the Sample.
-     */
-    @Override
-    public AssertionResult getResult(SampleResult response) {
-        // no error as default
-        AssertionResult result = new AssertionResult(getName());
-        String resultData = response.getResponseDataAsString();
-        if (resultData.length() == 0) {
-            return result.setResultForNull();
-        }
-        result.setFailure(false);
-        XMLReader builder = XML_READER.get();
-        if (builder != null) {
-            try {
-                builder.setErrorHandler(new LogErrorHandler());
-                builder.parse(new InputSource(new StringReader(resultData)));
-                try {
-                    JSONObject xmlJSONObj = XML.toJSONObject(resultData);
-                    String jsonPrettyPrintString = xmlJSONObj.toString(4);
-                    doAssert(jsonPrettyPrintString);
-                } catch (Exception e) {
-                    result.setError(true);
-                    result.setFailure(true);
-                    result.setFailureMessage(e.getMessage());
-                }
-            } catch (SAXException | IOException e) {
-                result.setError(true);
-                result.setFailure(true);
-                result.setFailureMessage(e.getMessage());
-            }
-        } else {
-            result.setError(true);
-            result.setFailureMessage("Cannot initialize XMLReader in element:" + getName() + ", check jmeter.log file");
-        }
-        return result;
-    }
-
-
-    private void doAssert(String jsonString) {
-        Object value = JsonPath.read(jsonString, this.getXmlPath(), new Predicate[0]);
-        if (value instanceof JSONArray) {
-            if (this.arrayMatched((JSONArray) value)) {
-                return;
-            }
-        }
-        if (!this.isEquals(value)) {
-            String msg = (StringUtils.isNotEmpty(this.getName()) ? this.getName().split("==")[1] : "") + "校验失败，实际返回：" + DocumentUtils.documentMsg(value, this.getCondition());
-            throw new IllegalStateException(String.format(msg, this.getExpectedValue(), DocumentUtils.objectToString(value, decimalFormatter)));
-        }
-    }
-
-
-    private boolean isEquals(Object subj) {
-        String str = DocumentUtils.objectToString(subj, decimalFormatter);
-        return DocumentUtils.documentChecked(str, this.getCondition(), decimalFormatter);
-    }
-
-    private boolean arrayMatched(JSONArray value) {
-        if (value.isEmpty() && "[]".equals(this.getExpectedValue())) {
-            return true;
-        } else {
-            Object[] var2 = value.toArray();
-            int var3 = var2.length;
-
-            for (int var4 = 0; var4 < var3; ++var4) {
-                Object subj = var2[var4];
-                if (subj == null || this.isEquals(subj)) {
-                    return true;
-                }
-            }
-
-            return this.isEquals(value);
-        }
-    }
-
-    @Override
-    public void threadStarted() {
-    }
-
-    @Override
-    public void threadFinished() {
-        XML_READER.remove();
-    }
-}
diff --git a/backend/src/main/java/org/apache/jmeter/config/CSVDataSet.java b/backend/src/main/java/org/apache/jmeter/config/CSVDataSet.java
deleted file mode 100644
index 7fd554f6c5..0000000000
--- a/backend/src/main/java/org/apache/jmeter/config/CSVDataSet.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.config;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.jmeter.engine.event.LoopIterationEvent;
-import org.apache.jmeter.engine.event.LoopIterationListener;
-import org.apache.jmeter.engine.util.NoConfigMerge;
-import org.apache.jmeter.gui.GUIMenuSortOrder;
-import org.apache.jmeter.gui.TestElementMetadata;
-import org.apache.jmeter.save.CSVSaveService;
-import org.apache.jmeter.services.FileServer;
-import org.apache.jmeter.testbeans.TestBean;
-import org.apache.jmeter.testbeans.gui.GenericTestBeanCustomizer;
-import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.apache.jmeter.testelement.property.StringProperty;
-import org.apache.jmeter.threads.JMeterContext;
-import org.apache.jmeter.threads.JMeterVariables;
-import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.util.JMeterStopThreadException;
-import org.apache.jorphan.util.JOrphanUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.io.IOException;
-import java.util.ResourceBundle;
-
-/**
- * Read lines from a file and split int variables.
- * <p>
- * The iterationStart() method is used to set up each set of values.
- * <p>
- * By default, the same file is shared between all threads
- * (and other thread groups, if they use the same file name).
- * <p>
- * The shareMode can be set to:
- * <ul>
- * <li>All threads - default, as described above</li>
- * <li>Current thread group</li>
- * <li>Current thread</li>
- * <li>Identifier - all threads sharing the same identifier</li>
- * </ul>
- * <p>
- * The class uses the FileServer alias mechanism to provide the different share modes.
- * For all threads, the file alias is set to the file name.
- * Otherwise, a suffix is appended to the filename to make it unique within the required context.
- * For current thread group, the thread group identityHashcode is used;
- * for individual threads, the thread hashcode is used as the suffix.
- * Or the user can provide their own suffix, in which case the file is shared between all
- * threads with the same suffix.
- */
-@GUIMenuSortOrder(1)
-@TestElementMetadata(labelResource = "displayName")
-public class CSVDataSet extends ConfigTestElement
-        implements TestBean, LoopIterationListener, NoConfigMerge {
-    private static final Logger log = LoggerFactory.getLogger(CSVDataSet.class);
-
-    private static final long serialVersionUID = 233L;
-
-    private static final String EOFVALUE = // value to return at EOF
-            JMeterUtils.getPropDefault("csvdataset.eofstring", "<EOF>"); //$NON-NLS-1$ //$NON-NLS-2$
-
-    private transient String filename;
-
-    private transient String fileEncoding;
-
-    private transient String variableNames;
-
-    private transient String delimiter;
-
-    private transient boolean quoted;
-
-    private transient boolean recycle = true;
-
-    private transient boolean stopThread;
-
-    private transient String[] vars;
-
-    private transient String alias;
-
-    private transient String shareMode;
-
-    private boolean firstLineIsNames = false;
-
-    private boolean ignoreFirstLine = false;
-
-    private Object readResolve() {
-        recycle = true;
-        return this;
-    }
-
-    /**
-     * Override the setProperty method in order to convert
-     * the original String shareMode property.
-     * This used the locale-dependent display value, so caused
-     * problems when the language was changed.
-     * If the "shareMode" value matches a resource value then it is converted
-     * into the resource key.
-     * To reduce the need to look up resources, we only attempt to
-     * convert values with spaces in them, as these are almost certainly
-     * not variables (and they are definitely not resource keys).
-     */
-    @Override
-    public void setProperty(JMeterProperty property) {
-        if (!(property instanceof StringProperty)) {
-            super.setProperty(property);
-            return;
-        }
-
-        final String propName = property.getName();
-        if (!"shareMode".equals(propName)) {
-            super.setProperty(property);
-            return;
-        }
-
-        final String propValue = property.getStringValue();
-        if (propValue.contains(" ")) { // variables are unlikely to contain spaces, so most likely a translation
-            try {
-                final BeanInfo beanInfo = Introspector.getBeanInfo(this.getClass());
-                final ResourceBundle rb = (ResourceBundle) beanInfo.getBeanDescriptor().getValue(GenericTestBeanCustomizer.RESOURCE_BUNDLE);
-                for (String resKey : CSVDataSetBeanInfo.getShareTags()) {
-                    if (propValue.equals(rb.getString(resKey))) {
-                        if (log.isDebugEnabled()) {
-                            log.debug("Converted {}={} to {} using Locale: {}", propName, propValue, resKey, rb.getLocale());
-                        }
-                        ((StringProperty) property).setValue(resKey); // reset the value
-                        super.setProperty(property);
-                        return;
-                    }
-                }
-                // This could perhaps be a variable name
-                log.warn("Could not translate {}={} using Locale: {}", propName, propValue, rb.getLocale());
-            } catch (IntrospectionException e) {
-                log.error("Could not find BeanInfo; cannot translate shareMode entries", e);
-            }
-        }
-        super.setProperty(property);
-    }
-
-    @Override
-    public void iterationStart(LoopIterationEvent iterEvent) {
-        FileServer server = FileServer.getFileServer();
-        final JMeterContext context = getThreadContext();
-        String delim = getDelimiter();
-        if ("\\t".equals(delim)) { // $NON-NLS-1$
-            delim = "\t";// Make it easier to enter a Tab // $NON-NLS-1$
-        } else if (delim.isEmpty()) {
-            log.debug("Empty delimiter, will use ','");
-            delim = ",";
-        }
-        //if (vars == null) {
-        initVars(server, context, delim);
-        //}
-
-        // TODO: fetch this once as per vars above?
-        JMeterVariables threadVars = context.getVariables();
-        String[] lineValues = {};
-        try {
-            if (getQuotedData()) {
-                lineValues = server.getParsedLine(alias, recycle,
-                        firstLineIsNames || ignoreFirstLine, delim.charAt(0));
-            } else {
-                String line = server.readLine(alias, recycle,
-                        firstLineIsNames || ignoreFirstLine);
-                lineValues = JOrphanUtils.split(line, delim, false);
-            }
-            for (int a = 0; a < vars.length && a < lineValues.length; a++) {
-                threadVars.put(vars[a], lineValues[a]);
-            }
-        } catch (IOException e) { // treat the same as EOF
-            log.error(e.toString());
-        }
-        if (lineValues.length == 0) {// i.e. EOF
-            if (getStopThread()) {
-                throw new JMeterStopThreadException("End of file:" + getFilename() + " detected for CSV DataSet:"
-                        + getName() + " configured with stopThread:" + getStopThread() + ", recycle:" + getRecycle());
-            }
-            for (String var : vars) {
-                threadVars.put(var, EOFVALUE);
-            }
-        }
-    }
-
-    private void initVars(FileServer server, final JMeterContext context, String delim) {
-        String fileName = getFilename().trim();
-        setAlias(context, fileName);
-        final String names = getVariableNames();
-        if (StringUtils.isEmpty(names)) {
-            String header = server.reserveFile(fileName, getFileEncoding(), alias, true);
-            try {
-                vars = CSVSaveService.csvSplitString(header, delim.charAt(0));
-                firstLineIsNames = true;
-            } catch (IOException e) {
-                throw new IllegalArgumentException("Could not split CSV header line from file:" + fileName, e);
-            }
-        } else {
-            server.reserveFile(fileName, getFileEncoding(), alias, ignoreFirstLine);
-            vars = JOrphanUtils.split(names, ","); // $NON-NLS-1$
-        }
-        trimVarNames(vars);
-    }
-
-    private void setAlias(final JMeterContext context, String alias) {
-        String mode = getShareMode();
-        int modeInt = CSVDataSetBeanInfo.getShareModeAsInt(mode);
-        switch (modeInt) {
-            case CSVDataSetBeanInfo.SHARE_ALL:
-                this.alias = alias;
-                break;
-            case CSVDataSetBeanInfo.SHARE_GROUP:
-                this.alias = alias + "@" + System.identityHashCode(context.getThreadGroup());
-                break;
-            case CSVDataSetBeanInfo.SHARE_THREAD:
-                this.alias = alias + "@" + System.identityHashCode(context.getThread());
-                break;
-            default:
-                this.alias = alias + "@" + mode; // user-specified key
-                break;
-        }
-    }
-
-    /**
-     * trim content of array varNames
-     *
-     * @param varsNames
-     */
-    private void trimVarNames(String[] varsNames) {
-        for (int i = 0; i < varsNames.length; i++) {
-            varsNames[i] = varsNames[i].trim();
-        }
-    }
-
-    /**
-     * @return Returns the filename.
-     */
-    public String getFilename() {
-        return filename;
-    }
-
-    /**
-     * @param filename The filename to set.
-     */
-    public void setFilename(String filename) {
-        this.filename = filename;
-    }
-
-    /**
-     * @return Returns the file encoding.
-     */
-    public String getFileEncoding() {
-        return fileEncoding;
-    }
-
-    /**
-     * @param fileEncoding The fileEncoding to set.
-     */
-    public void setFileEncoding(String fileEncoding) {
-        this.fileEncoding = fileEncoding;
-    }
-
-    /**
-     * @return Returns the variableNames.
-     */
-    public String getVariableNames() {
-        return variableNames;
-    }
-
-    /**
-     * @param variableNames The variableNames to set.
-     */
-    public void setVariableNames(String variableNames) {
-        this.variableNames = variableNames;
-    }
-
-    public String getDelimiter() {
-        return delimiter;
-    }
-
-    public void setDelimiter(String delimiter) {
-        this.delimiter = delimiter;
-    }
-
-    public boolean getQuotedData() {
-        return quoted;
-    }
-
-    public void setQuotedData(boolean quoted) {
-        this.quoted = quoted;
-    }
-
-    public boolean getRecycle() {
-        return recycle;
-    }
-
-    public void setRecycle(boolean recycle) {
-        this.recycle = recycle;
-    }
-
-    public boolean getStopThread() {
-        return stopThread;
-    }
-
-    public void setStopThread(boolean value) {
-        this.stopThread = value;
-    }
-
-    public String getShareMode() {
-        return shareMode;
-    }
-
-    public void setShareMode(String value) {
-        this.shareMode = value;
-    }
-
-    /**
-     * @return the ignoreFirstLine
-     */
-    public boolean isIgnoreFirstLine() {
-        return ignoreFirstLine;
-    }
-
-    /**
-     * @param ignoreFirstLine the ignoreFirstLine to set
-     */
-    public void setIgnoreFirstLine(boolean ignoreFirstLine) {
-        this.ignoreFirstLine = ignoreFirstLine;
-    }
-}
diff --git a/backend/src/main/java/org/apache/jmeter/config/KeystoreConfig.java b/backend/src/main/java/org/apache/jmeter/config/KeystoreConfig.java
deleted file mode 100644
index 16e4fcfd89..0000000000
--- a/backend/src/main/java/org/apache/jmeter/config/KeystoreConfig.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.config;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.jmeter.gui.TestElementMetadata;
-import org.apache.jmeter.testbeans.TestBean;
-import org.apache.jmeter.testelement.TestStateListener;
-import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jmeter.util.SSLManager;
-import org.apache.jorphan.util.JMeterStopTestException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Configure Keystore
- */
-@TestElementMetadata(labelResource = "displayName")
-public class KeystoreConfig extends ConfigTestElement implements TestBean, TestStateListener {
-
-    private static final long serialVersionUID = 1L;
-    private static final Logger log = LoggerFactory.getLogger(KeystoreConfig.class);
-
-    private static final String KEY_STORE_START_INDEX = "https.keyStoreStartIndex"; // $NON-NLS-1$
-    private static final String KEY_STORE_END_INDEX = "https.keyStoreEndIndex"; // $NON-NLS-1$
-
-    private String startIndex;
-    private String endIndex;
-    private String preload;
-    private String clientCertAliasVarName;
-
-    public KeystoreConfig() {
-        super();
-    }
-
-    @Override
-    public void testEnded() {
-        testEnded(null);
-    }
-
-    @Override
-    public void testEnded(String host) {
-        log.info("Destroying Keystore");
-        SSLManager.getInstance().destroyKeystore();
-    }
-
-    @Override
-    public void testStarted() {
-        testStarted(null);
-    }
-
-    @Override
-    public void testStarted(String host) {
-        String reuseSSLContext = JMeterUtils.getProperty("https.use.cached.ssl.context");
-        if (StringUtils.isEmpty(reuseSSLContext) || "true".equals(reuseSSLContext)) {
-            log.warn("https.use.cached.ssl.context property must be set to false to ensure Multiple Certificates are used");
-        }
-        int startIndexAsInt = JMeterUtils.getPropDefault(KEY_STORE_START_INDEX, 0);
-        int endIndexAsInt = JMeterUtils.getPropDefault(KEY_STORE_END_INDEX, -1);
-
-        if (!StringUtils.isEmpty(this.startIndex)) {
-            try {
-                startIndexAsInt = Integer.parseInt(this.startIndex);
-            } catch (NumberFormatException e) {
-                log.warn("Failed parsing startIndex: {}, will default to: {}, error message: {}", this.startIndex,
-                        startIndexAsInt, e, e);
-            }
-        }
-
-        if (!StringUtils.isEmpty(this.endIndex)) {
-            try {
-                endIndexAsInt = Integer.parseInt(this.endIndex);
-            } catch (NumberFormatException e) {
-                log.warn("Failed parsing endIndex: {}, will default to: {}, error message: {}", this.endIndex,
-                        endIndexAsInt, e, e);
-            }
-        }
-        if (endIndexAsInt != -1 && startIndexAsInt > endIndexAsInt) {
-            throw new JMeterStopTestException("Keystore Config error : Alias start index must be lower than Alias end index");
-        }
-        log.info(
-                "Configuring Keystore with (preload: '{}', startIndex: {}, endIndex: {}, clientCertAliasVarName: '{}')",
-                preload, startIndexAsInt, endIndexAsInt, clientCertAliasVarName);
-        // 加载认证文件
-        String path = this.getPropertyAsString("MS-KEYSTORE-FILE-PATH");
-        String password = this.getPropertyAsString("MS-KEYSTORE-FILE-PASSWORD");
-        InputStream in = null;
-        try {
-            in = new FileInputStream(new File(path));
-        } catch (IOException e) {
-            log.error(e.getMessage());
-        }
-        SSLManager.getInstance().configureKeystore(Boolean.parseBoolean(preload),
-                startIndexAsInt,
-                endIndexAsInt,
-                clientCertAliasVarName, in, password);
-    }
-
-    /**
-     * @return the endIndex
-     */
-    public String getEndIndex() {
-        return endIndex;
-    }
-
-    /**
-     * @param endIndex the endIndex to set
-     */
-    public void setEndIndex(String endIndex) {
-        this.endIndex = endIndex;
-    }
-
-    /**
-     * @return the startIndex
-     */
-    public String getStartIndex() {
-        return startIndex;
-    }
-
-    /**
-     * @param startIndex the startIndex to set
-     */
-    public void setStartIndex(String startIndex) {
-        this.startIndex = startIndex;
-    }
-
-    /**
-     * @return the preload
-     */
-    public String getPreload() {
-        return preload;
-    }
-
-    /**
-     * @param preload the preload to set
-     */
-    public void setPreload(String preload) {
-        this.preload = preload;
-    }
-
-    /**
-     * @return the clientCertAliasVarName
-     */
-    public String getClientCertAliasVarName() {
-        return clientCertAliasVarName;
-    }
-
-    /**
-     * @param clientCertAliasVarName the clientCertAliasVarName to set
-     */
-    public void setClientCertAliasVarName(String clientCertAliasVarName) {
-        this.clientCertAliasVarName = clientCertAliasVarName;
-    }
-}
diff --git a/backend/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java b/backend/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java
deleted file mode 100644
index 216387be83..0000000000
--- a/backend/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerProxy.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.protocol.http.sampler;
-
-import io.metersphere.commons.utils.LogUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.jmeter.engine.event.LoopIterationEvent;
-import org.apache.jmeter.samplers.Interruptible;
-
-import java.net.URL;
-
-/**
- * Proxy class that dispatches to the appropriate HTTP sampler.
- * <p>
- * This class is stored in the test plan, and holds all the configuration settings.
- * The actual implementation is created at run-time, and is passed a reference to this class
- * so it can get access to all the settings stored by HTTPSamplerProxy.
- */
-public final class HTTPSamplerProxy extends HTTPSamplerBase implements Interruptible {
-
-    private static final long serialVersionUID = 1L;
-
-    private transient HTTPAbstractImpl impl;
-
-    public HTTPSamplerProxy() {
-        super();
-    }
-
-    /**
-     * Convenience method used to initialise the implementation.
-     *
-     * @param impl the implementation to use.
-     */
-    public HTTPSamplerProxy(String impl) {
-        super();
-        setImplementation(impl);
-    }
-
-    protected String toExternalForm(URL u) {
-        int len = u.getProtocol().length() + 1;
-        if (u.getAuthority() != null && u.getAuthority().length() > 0)
-            len += 2 + u.getAuthority().length();
-        if (u.getPath() != null) {
-            len += u.getPath().length();
-        }
-        if (u.getQuery() != null) {
-            len += 1 + u.getQuery().length();
-        }
-        if (u.getRef() != null)
-            len += 1 + u.getRef().length();
-
-        StringBuffer result = new StringBuffer(len);
-        result.append(u.getProtocol());
-        result.append(":");
-        if (u.getAuthority() != null && u.getAuthority().length() > 0) {
-            result.append("//");
-            result.append(u.getAuthority());
-        }
-        if (StringUtils.isNotEmpty(u.getPath())) {
-            int index = 0;
-            for (int i = 0; i < u.getPath().length(); i++) {
-                char ch = u.getPath().charAt(i);
-                if (String.valueOf(ch).equals("/")) {
-                    index++;
-                } else {
-                    break;
-                }
-            }
-            result.append("/" + u.getPath().substring(index));
-        }
-        if (u.getQuery() != null) {
-            result.append('?');
-            result.append(u.getQuery());
-        }
-        if (u.getRef() != null) {
-            result.append("#");
-            result.append(u.getRef());
-        }
-        return result.toString();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected HTTPSampleResult sample(URL u, String method, boolean areFollowingRedirect, int depth) {
-        // When Retrieve Embedded resources + Concurrent Pool is used
-        // as the instance of Proxy is cloned, we end up with impl being null
-        // testIterationStart will not be executed but it's not a problem for 51380 as it's download of resources
-        // so SSL context is to be reused
-        if (impl == null) { // Not called from multiple threads, so this is OK
-            try {
-                impl = HTTPSamplerFactory.getImplementation(getImplementation(), this);
-            } catch (Exception ex) {
-                return errorResult(ex, new HTTPSampleResult());
-            }
-        }
-        try {
-            String url = toExternalForm(u);
-            if (StringUtils.isNotEmpty(url) && url.startsWith("http:/http")) {
-                url = url.substring(6);
-            }
-            u = new URL(url);
-        } catch (Exception ex) {
-            LogUtil.error(ex);
-        }
-        return impl.sample(u, method, areFollowingRedirect, depth);
-    }
-
-    // N.B. It's not possible to forward threadStarted() to the implementation class.
-    // This is because Config items are not processed until later, and HTTPDefaults may define the implementation
-
-    @Override
-    public void threadFinished() {
-        if (impl != null) {
-            impl.threadFinished(); // Forward to sampler
-        }
-    }
-
-    @Override
-    public boolean interrupt() {
-        if (impl != null) {
-            return impl.interrupt(); // Forward to sampler
-        }
-        return false;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase#testIterationStart(org.apache.jmeter.engine.event.LoopIterationEvent)
-     */
-    @Override
-    public void testIterationStart(LoopIterationEvent event) {
-        if (impl != null) {
-            impl.notifyFirstSampleAfterLoopRestart();
-        }
-    }
-}
diff --git a/backend/src/main/java/org/apache/jmeter/reporters/ResultAction.java b/backend/src/main/java/org/apache/jmeter/reporters/ResultAction.java
deleted file mode 100644
index 10e611ead9..0000000000
--- a/backend/src/main/java/org/apache/jmeter/reporters/ResultAction.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.jmeter.reporters;
-
-import org.apache.jmeter.samplers.SampleEvent;
-import org.apache.jmeter.samplers.SampleListener;
-import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.testelement.OnErrorTestElement;
-import org.apache.jmeter.threads.JMeterContext.TestLogicalAction;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.Serializable;
-
-/**
- * ResultAction - take action based on the status of the last Result
- */
-public class ResultAction extends OnErrorTestElement implements Serializable, SampleListener {
-
-    private static final long serialVersionUID = 242L;
-
-    private static final Logger log = LoggerFactory.getLogger(ResultAction.class);
-
-    /**
-     * Constructor is initially called once for each occurrence in the test plan
-     * For GUI, several more instances are created Then clear is called at start
-     * of test Called several times during test startup The name will not
-     * necessarily have been set at this point.
-     */
-    public ResultAction() {
-        super();
-    }
-
-    /**
-     * Examine the sample(s) and take appropriate action
-     *
-     * @see SampleListener#sampleOccurred(SampleEvent)
-     */
-    @Override
-    public void sampleOccurred(SampleEvent e) {
-        SampleResult s = e.getResult();
-        if (log.isDebugEnabled()) {
-            log.debug("ResultStatusHandler {} for {} OK? {}", getName(), s.getSampleLabel(), s.isSuccessful());
-        }
-        if (!s.isSuccessful()) {
-            if (isStopTestNow()) {
-                s.setStopTestNow(true);
-            } else if (isStopTest()) {
-                s.setStopTest(true);
-            } else if (isStopThread()) {
-                s.setStopThread(true);
-            } else if (isStartNextThreadLoop()) {
-                s.setTestLogicalAction(TestLogicalAction.START_NEXT_ITERATION_OF_THREAD);
-            } else if (isStartNextIterationOfCurrentLoop()) {
-                s.setTestLogicalAction(TestLogicalAction.START_NEXT_ITERATION_OF_CURRENT_LOOP);
-            } else if (isBreakCurrentLoop()) {
-                s.setTestLogicalAction(TestLogicalAction.BREAK_CURRENT_LOOP);
-            }
-        } else {
-            if (getErrorAction() == 1000) {
-                s.setTestLogicalAction(TestLogicalAction.BREAK_CURRENT_LOOP);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void sampleStarted(SampleEvent e) {
-        // not used
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void sampleStopped(SampleEvent e) {
-        // not used
-    }
-
-}
diff --git a/backend/src/main/java/org/apache/jmeter/samplers/SampleResult.java b/backend/src/main/java/org/apache/jmeter/samplers/SampleResult.java
deleted file mode 100644
index a2418f70e0..0000000000
--- a/backend/src/main/java/org/apache/jmeter/samplers/SampleResult.java
+++ /dev/null
@@ -1,1654 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.jmeter.samplers;
-
-import org.apache.jmeter.assertions.AssertionResult;
-import org.apache.jmeter.gui.Searchable;
-import org.apache.jmeter.testelement.TestPlan;
-import org.apache.jmeter.threads.JMeterContext.TestLogicalAction;
-import org.apache.jmeter.threads.JMeterContextService;
-import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.util.JOrphanUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-
-// For unit tests, @see TestSampleResult
-
-/**
- * This is a nice packaging for the various information returned from taking a
- * sample of an entry.
- */
-public class SampleResult implements Serializable, Cloneable, Searchable {
-
-    private static final long serialVersionUID = 241L;
-
-    // Needs to be accessible from Test code
-    static Logger log = LoggerFactory.getLogger(SampleResult.class);
-
-    /**
-     * The default encoding to be used if not overridden.
-     * The value is ISO-8859-1.
-     */
-    public static final String DEFAULT_HTTP_ENCODING = StandardCharsets.ISO_8859_1.name();
-
-    private static final String OK_CODE = Integer.toString(HttpURLConnection.HTTP_OK);
-    private static final String OK_MSG = "OK"; // $NON-NLS-1$
-    private static final String INVALID_CALL_SEQUENCE_MSG = "Invalid call sequence"; // $NON-NLS-1$
-
-
-    // Bug 33196 - encoding ISO-8859-1 is only suitable for Western countries
-    // However the suggested System.getProperty("file.encoding") is Cp1252 on
-    // Windows
-    // So use a new property with the original value as default
-    // needs to be accessible from test code
-    /**
-     * The default encoding to be used to decode the responseData byte array.
-     * The value is defined by the property "sampleresult.default.encoding"
-     * with a default of DEFAULT_HTTP_ENCODING if that is not defined.
-     */
-    protected static final String DEFAULT_ENCODING
-            = JMeterUtils.getPropDefault("sampleresult.default.encoding", // $NON-NLS-1$
-            DEFAULT_HTTP_ENCODING);
-
-    /**
-     * The default used by {@link #setResponseData(String, String)}
-     */
-    private static final String DEFAULT_CHARSET = Charset.defaultCharset().name();
-
-    /**
-     * Data type value ({@value}) indicating that the response data is text.
-     *
-     * @see #getDataType
-     * @see #setDataType(String)
-     */
-    public static final String TEXT = "text"; // $NON-NLS-1$
-
-    /**
-     * Data type value ({@value}) indicating that the response data is binary.
-     *
-     * @see #getDataType
-     * @see #setDataType(String)
-     */
-    public static final String BINARY = "bin"; // $NON-NLS-1$
-
-    private static final boolean DISABLE_SUBRESULTS_RENAMING = JMeterUtils.getPropDefault("subresults.disable_renaming", false);
-
-    // List of types that are known to be binary
-    private static final String[] BINARY_TYPES = {
-            "image/",       //$NON-NLS-1$
-            "audio/",       //$NON-NLS-1$
-            "video/",       //$NON-NLS-1$
-    };
-
-    // List of types that are known to be ascii, although they may appear to be binary
-    private static final String[] NON_BINARY_TYPES = {
-            "audio/x-mpegurl",  //$NON-NLS-1$ (HLS Media Manifest)
-            "audio/mpegurl",    //$NON-NLS-1$ (HLS Media Manifest)
-            "video/f4m",        //$NON-NLS-1$ (Flash Media Manifest)
-            "image/svg+xml"     //$NON-NLS-1$ (SVG is xml)
-    };
-
-
-    /**
-     * empty array which can be returned instead of null
-     */
-    private static final byte[] EMPTY_BA = new byte[0];
-
-    private static final SampleResult[] EMPTY_SR = new SampleResult[0];
-
-    private static final AssertionResult[] EMPTY_AR = new AssertionResult[0];
-
-    private static final boolean START_TIMESTAMP =
-            JMeterUtils.getPropDefault("sampleresult.timestamp.start", false);  // $NON-NLS-1$
-
-    /**
-     * Allow read-only access from test code
-     */
-    private static final boolean USE_NANO_TIME =
-            JMeterUtils.getPropDefault("sampleresult.useNanoTime", true);  // $NON-NLS-1$
-
-    /**
-     * How long between checks of nanotime; default 5000ms; set to <=0 to disable the thread
-     */
-    private static final long NANOTHREAD_SLEEP =
-            JMeterUtils.getPropDefault("sampleresult.nanoThreadSleep", 5000);  // $NON-NLS-1$
-
-    private static final String NULL_FILENAME = "NULL";
-
-    static {
-        if (START_TIMESTAMP) {
-            log.info("Note: Sample TimeStamps are START times");
-        } else {
-            log.info("Note: Sample TimeStamps are END times");
-        }
-        log.info("sampleresult.default.encoding is set to {}", DEFAULT_ENCODING);
-        log.info("sampleresult.useNanoTime={}", USE_NANO_TIME);
-        log.info("sampleresult.nanoThreadSleep={}", NANOTHREAD_SLEEP);
-
-        if (USE_NANO_TIME && NANOTHREAD_SLEEP > 0) {
-            // Make sure we start with a reasonable value
-            NanoOffset.nanoOffset = System.currentTimeMillis() - SampleResult.sampleNsClockInMs();
-            NanoOffset nanoOffset = new NanoOffset();
-            nanoOffset.setDaemon(true);
-            nanoOffset.setName("NanoOffset");
-            nanoOffset.start();
-        }
-    }
-
-    /**
-     * 定制自定义添加 =================
-     */
-    private String samplerId;
-
-    private String resourceId;
-
-    private String extVars;
-
-    public String getSamplerId() {
-        return this.samplerId;
-    }
-
-    public String getResourceId() {
-        return this.resourceId;
-    }
-
-    // 数据格式 List<id_name> 多层父级按照同级统计
-    private String scenario;
-
-    public String getScenario() {
-        return this.scenario;
-    }
-
-    public void setExtVars(String vars) {
-        this.extVars = vars;
-    }
-
-    public String getExtVars() {
-        return this.extVars;
-    }
-
-    /**
-     * 定制自定义添加 =================
-     */
-    private SampleSaveConfiguration saveConfig;
-
-    private SampleResult parent;
-
-    private byte[] responseData = EMPTY_BA;
-
-    private String responseCode = "";// Never return null
-
-    private String label = "";// Never return null
-
-    /**
-     * Filename used by ResultSaver
-     */
-    private String resultFileName = "";
-
-    /**
-     * The data used by the sampler
-     */
-    private String samplerData;
-
-    private String threadName = ""; // Never return null
-
-    private String responseMessage = "";
-
-    private String responseHeaders = ""; // Never return null
-
-    private String requestHeaders = "";
-
-    /**
-     * timeStamp == 0 means either not yet initialised or no stamp available (e.g. when loading a results file)
-     * the time stamp - can be start or end
-     */
-    private long timeStamp = 0;
-
-    private long startTime = 0;
-
-    private long endTime = 0;
-
-    private long idleTime = 0;// Allow for non-sample time
-
-    /**
-     * Start of pause (if any)
-     */
-    private long pauseTime = 0;
-
-    private List<AssertionResult> assertionResults;
-
-    private List<SampleResult> subResults;
-
-    /**
-     * The data type of the sample
-     *
-     * @see #getDataType()
-     * @see #setDataType(String)
-     * @see #TEXT
-     * @see #BINARY
-     */
-    private String dataType = ""; // Don't return null if not set
-
-    private boolean success;
-
-    /**
-     * Files that this sample has been saved in.
-     * In Non GUI mode and when best config is used, size never exceeds 1,
-     * but as a compromise set it to 2
-     */
-    private final Set<String> files = ConcurrentHashMap.newKeySet(2);
-
-    // TODO do contentType and/or dataEncoding belong in HTTPSampleResult instead?
-    private String dataEncoding;// (is this really the character set?) e.g.
-    // ISO-8895-1, UTF-8
-
-    private String contentType = ""; // e.g. text/html; charset=utf-8
-
-    /**
-     * elapsed time
-     */
-    private long elapsedTime = 0;
-
-    /**
-     * time to first response
-     */
-    private long latency = 0;
-
-    /**
-     * time to end connecting
-     */
-    private long connectTime = 0;
-
-    /**
-     * Way to signal what to do on Test
-     */
-    private TestLogicalAction testLogicalAction = TestLogicalAction.CONTINUE;
-
-    /**
-     * Should thread terminate?
-     */
-    private boolean stopThread = false;
-
-    /**
-     * Should test terminate?
-     */
-    private boolean stopTest = false;
-
-    /**
-     * Should test terminate abruptly?
-     */
-    private boolean stopTestNow = false;
-
-    private int sampleCount = 1;
-
-    private long bytes = 0; // Allows override of sample size in case sampler does not want to store all the data
-
-    private int headersSize = 0;
-
-    private long bodySize = 0;
-
-    /**
-     * Currently active threads in this thread group
-     */
-    private volatile int groupThreads = 0;
-
-    /**
-     * Currently active threads in all thread groups
-     */
-    private volatile int allThreads = 0;
-
-    private final long nanoTimeOffset;
-
-    // Allow testcode access to the settings
-    final boolean useNanoTime;
-
-    final long nanoThreadSleep;
-
-    private long sentBytes;
-
-    private URL location;
-
-    private transient boolean ignore;
-
-    private transient int subResultIndex;
-
-    /**
-     * Cache for responseData as string to avoid multiple computations
-     */
-    private transient volatile String responseDataAsString;
-
-    public SampleResult() {
-        this(USE_NANO_TIME, NANOTHREAD_SLEEP);
-    }
-
-    // Allow test code to change the default useNanoTime setting
-    SampleResult(boolean nanoTime) {
-        this(nanoTime, NANOTHREAD_SLEEP);
-    }
-
-    // Allow test code to change the default useNanoTime and nanoThreadSleep settings
-    SampleResult(boolean nanoTime, long nanoThreadSleep) {
-        this.elapsedTime = 0;
-        this.useNanoTime = nanoTime;
-        this.nanoThreadSleep = nanoThreadSleep;
-        this.nanoTimeOffset = initOffset();
-        // 增加请求ID的获取
-        Sampler sampler = JMeterContextService.getContext().getCurrentSampler();
-        if (sampler != null) {
-            this.samplerId = sampler.getPropertyAsString("MS-ID");
-            this.resourceId = sampler.getPropertyAsString("MS-RESOURCE-ID");
-            this.scenario = sampler.getPropertyAsString("MS-SCENARIO");
-        }
-
-    }
-
-    /**
-     * Copy constructor.
-     *
-     * @param res existing sample result
-     */
-    public SampleResult(SampleResult res) {
-        this();
-        allThreads = res.allThreads;//OK
-        assertionResults = res.assertionResults;
-        bytes = res.bytes;
-        headersSize = res.headersSize;
-        bodySize = res.bodySize;
-        contentType = res.contentType;//OK
-        dataEncoding = res.dataEncoding;//OK
-        dataType = res.dataType;//OK
-        endTime = res.endTime;//OK
-        // files is created automatically, and applies per instance
-        groupThreads = res.groupThreads;//OK
-        idleTime = res.idleTime;
-        label = res.label;//OK
-        latency = res.latency;
-        connectTime = res.connectTime;
-        location = res.location;//OK
-        parent = res.parent;
-        pauseTime = res.pauseTime;
-        requestHeaders = res.requestHeaders;//OK
-        responseCode = res.responseCode;//OK
-        responseData = res.responseData;//OK
-        responseDataAsString = null;
-        responseHeaders = res.responseHeaders;//OK
-        responseMessage = res.responseMessage;//OK
-
-        // Don't copy this; it is per instance resultFileName = res.resultFileName;
-
-        sampleCount = res.sampleCount;
-        samplerData = res.samplerData;
-        saveConfig = res.saveConfig;
-        sentBytes = res.sentBytes;
-        startTime = res.startTime;//OK
-        stopTest = res.stopTest;
-        stopTestNow = res.stopTestNow;
-        stopThread = res.stopThread;
-        testLogicalAction = res.testLogicalAction;
-        subResults = res.subResults;
-        success = res.success;//OK
-        threadName = res.threadName;//OK
-        elapsedTime = res.elapsedTime;
-        timeStamp = res.timeStamp;
-    }
-
-    /**
-     * Create a sample with a specific elapsed time but don't allow the times to
-     * be changed later
-     * <p>
-     * (only used by HTTPSampleResult)
-     *
-     * @param elapsed time
-     * @param atend   create the sample finishing now, else starting now
-     */
-    protected SampleResult(long elapsed, boolean atend) {
-        this();
-        long now = currentTimeInMillis();
-        if (atend) {
-            setTimes(now - elapsed, now);
-        } else {
-            setTimes(now, now + elapsed);
-        }
-    }
-
-    /**
-     * Allow users to create a sample with specific timestamp and elapsed times
-     * for cloning purposes, but don't allow the times to be changed later
-     * <p>
-     * Currently used by CSVSaveService and
-     * StatisticalSampleResult
-     *
-     * @param stamp   this may be a start time or an end time (both in
-     *                milliseconds)
-     * @param elapsed time in milliseconds
-     */
-    public SampleResult(long stamp, long elapsed) {
-        this();
-        stampAndTime(stamp, elapsed);
-    }
-
-    private long initOffset() {
-        if (useNanoTime) {
-            return nanoThreadSleep > 0 ? NanoOffset.getNanoOffset() : System.currentTimeMillis() - sampleNsClockInMs();
-        } else {
-            return Long.MIN_VALUE;
-        }
-    }
-
-    /**
-     * @param propertiesToSave The propertiesToSave to set.
-     */
-    public void setSaveConfig(SampleSaveConfiguration propertiesToSave) {
-        this.saveConfig = propertiesToSave;
-    }
-
-    public SampleSaveConfiguration getSaveConfig() {
-        return saveConfig;
-    }
-
-    public boolean isStampedAtStart() {
-        return START_TIMESTAMP;
-    }
-
-    /**
-     * Create a sample with specific start and end times for test purposes, but
-     * don't allow the times to be changed later
-     * <p>
-     * (used by StatVisualizerModel.Test)
-     *
-     * @param start start time in milliseconds since unix epoch
-     * @param end   end time in milliseconds since unix epoch
-     * @return sample with given start and end time
-     */
-    public static SampleResult createTestSample(long start, long end) {
-        SampleResult res = new SampleResult();
-        res.setStartTime(start);
-        res.setEndTime(end);
-        return res;
-    }
-
-    /**
-     * Create a sample with a specific elapsed time for test purposes, but don't
-     * allow the times to be changed later
-     *
-     * @param elapsed - desired elapsed time in milliseconds
-     * @return sample that starts 'now' and ends <code>elapsed</code> milliseconds later
-     */
-    public static SampleResult createTestSample(long elapsed) {
-        long now = System.currentTimeMillis();
-        return createTestSample(now, now + elapsed);
-    }
-
-    private static long sampleNsClockInMs() {
-        return System.nanoTime() / 1000000;
-    }
-
-    /**
-     * Helper method to get 1 ms resolution timing.
-     *
-     * @return the current time in milliseconds
-     * @throws RuntimeException when <code>useNanoTime</code> is <code>true</code> but
-     *                          <code>nanoTimeOffset</code> is not set
-     */
-    public long currentTimeInMillis() {
-        if (useNanoTime) {
-            if (nanoTimeOffset == Long.MIN_VALUE) {
-                throw new IllegalStateException("Invalid call; nanoTimeOffset has not been set");
-            }
-            return sampleNsClockInMs() + nanoTimeOffset;
-        }
-        return System.currentTimeMillis();
-    }
-
-    // Helper method to maintain timestamp relationships
-    private void stampAndTime(long stamp, long elapsed) {
-        if (START_TIMESTAMP) {
-            startTime = stamp;
-            endTime = stamp + elapsed;
-        } else {
-            startTime = stamp - elapsed;
-            endTime = stamp;
-        }
-        timeStamp = stamp;
-        elapsedTime = elapsed;
-    }
-
-    /**
-     * For use by SaveService only.
-     *
-     * @param stamp   this may be a start time or an end time (both in milliseconds)
-     * @param elapsed time in milliseconds
-     * @throws RuntimeException when <code>startTime</code> or <code>endTime</code> has been
-     *                          set already
-     */
-    public void setStampAndTime(long stamp, long elapsed) {
-        if (startTime != 0 || endTime != 0) {
-            throw new IllegalStateException("Calling setStampAndTime() after start/end times have been set");
-        }
-        stampAndTime(stamp, elapsed);
-    }
-
-    /**
-     * Set the "marked" flag to show that the result has been written to the file.
-     *
-     * @param filename the name of the file
-     * @return <code>true</code> if the result was previously marked
-     */
-    public boolean markFile(String filename) {
-        return !files.add(filename != null ? filename : NULL_FILENAME);
-    }
-
-    public String getResponseCode() {
-        return responseCode;
-    }
-
-    /**
-     * Set response code to OK, i.e. "200"
-     */
-    public void setResponseCodeOK() {
-        responseCode = OK_CODE;
-    }
-
-    public void setResponseCode(String code) {
-        responseCode = code;
-    }
-
-    public boolean isResponseCodeOK() {
-        return responseCode.equals(OK_CODE);
-    }
-
-    public String getResponseMessage() {
-        return responseMessage;
-    }
-
-    public void setResponseMessage(String msg) {
-        responseMessage = msg;
-    }
-
-    public void setResponseMessageOK() {
-        responseMessage = OK_MSG;
-    }
-
-    /**
-     * Set result statuses OK - shorthand method to set:
-     * <ul>
-     * <li>ResponseCode</li>
-     * <li>ResponseMessage</li>
-     * <li>Successful status</li>
-     * </ul>
-     */
-    public void setResponseOK() {
-        setResponseCodeOK();
-        setResponseMessageOK();
-        setSuccessful(true);
-    }
-
-    public String getThreadName() {
-        return threadName;
-    }
-
-    public void setThreadName(String threadName) {
-        this.threadName = threadName;
-    }
-
-    /**
-     * Get the sample timestamp, which may be either the start time or the end time.
-     *
-     * @return timeStamp in milliseconds
-     * @see #getStartTime()
-     * @see #getEndTime()
-     */
-    public long getTimeStamp() {
-        return timeStamp;
-    }
-
-    public String getSampleLabel() {
-        return label;
-    }
-
-    /**
-     * Get the sample label for use in summary reports etc.
-     *
-     * @param includeGroup whether to include the thread group name
-     * @return the label
-     */
-    public String getSampleLabel(boolean includeGroup) {
-        if (includeGroup) {
-            return threadName.substring(0, threadName.lastIndexOf(' ')) + ":" + label;
-        }
-        return label;
-    }
-
-    public void setSampleLabel(String label) {
-        this.label = label;
-    }
-
-    public void addAssertionResult(AssertionResult assertResult) {
-        if (assertionResults == null) {
-            assertionResults = new ArrayList<>();
-        }
-        assertionResults.add(assertResult);
-    }
-
-    /**
-     * Gets the assertion results associated with this sample.
-     *
-     * @return an array containing the assertion results for this sample.
-     * Returns empty array if there are no assertion results.
-     */
-    public AssertionResult[] getAssertionResults() {
-        if (assertionResults == null) {
-            return EMPTY_AR;
-        }
-        return assertionResults.toArray(new AssertionResult[assertionResults.size()]);
-    }
-
-    /**
-     * Add a subresult and adjust the parent byte count and end-time.
-     *
-     * @param subResult the {@link SampleResult} to be added
-     */
-    public void addSubResult(SampleResult subResult) {
-        addSubResult(subResult, isRenameSampleLabel());
-    }
-
-    /**
-     * see https://bz.apache.org/bugzilla/show_bug.cgi?id=63055
-     *
-     * @return true if TestPlan is in functional mode or property subresults.disable_renaming is true
-     */
-    public static boolean isRenameSampleLabel() {
-        return !(TestPlan.getFunctionalMode() || DISABLE_SUBRESULTS_RENAMING);
-    }
-
-    /**
-     * Add a subresult and adjust the parent byte count and end-time.
-     *
-     * @param subResult        the {@link SampleResult} to be added
-     * @param renameSubResults boolean do we rename subResults based on position
-     */
-    public void addSubResult(SampleResult subResult, boolean renameSubResults) {
-        if (subResult == null) {
-            // see https://bz.apache.org/bugzilla/show_bug.cgi?id=54778
-            return;
-        }
-        String tn = getThreadName();
-        if (tn.length() == 0) {
-            tn = Thread.currentThread().getName();
-            this.setThreadName(tn);
-        }
-        subResult.setThreadName(tn);
-
-        // Extend the time to the end of the added sample
-        setEndTime(Math.max(getEndTime(), subResult.getEndTime() + nanoTimeOffset - subResult.nanoTimeOffset)); // Bug 51855
-        // Include the byte count for the added sample
-        setBytes(getBytesAsLong() + subResult.getBytesAsLong());
-        setSentBytes(getSentBytes() + subResult.getSentBytes());
-        setHeadersSize(getHeadersSize() + subResult.getHeadersSize());
-        setBodySize(getBodySizeAsLong() + subResult.getBodySizeAsLong());
-        addRawSubResult(subResult, renameSubResults);
-    }
-
-    /**
-     * Add a subresult to the collection without updating any parent fields.
-     *
-     * @param subResult the {@link SampleResult} to be added
-     */
-    public void addRawSubResult(SampleResult subResult) {
-        storeSubResult(subResult, isRenameSampleLabel());
-    }
-
-    /**
-     * Add a subresult to the collection without updating any parent fields.
-     *
-     * @param subResult the {@link SampleResult} to be added
-     */
-    private void addRawSubResult(SampleResult subResult, boolean renameSubResults) {
-        storeSubResult(subResult, renameSubResults);
-    }
-
-    /**
-     * Add a subresult read from a results file.
-     * <p>
-     * As for {@link SampleResult#addSubResult(SampleResult)
-     * addSubResult(SampleResult)}, except that the fields don't need to be
-     * accumulated
-     *
-     * @param subResult the {@link SampleResult} to be added
-     */
-    public void storeSubResult(SampleResult subResult) {
-        storeSubResult(subResult, isRenameSampleLabel());
-    }
-
-    /**
-     * Add a subresult read from a results file.
-     * <p>
-     * As for {@link SampleResult#addSubResult(SampleResult)
-     * addSubResult(SampleResult)}, except that the fields don't need to be
-     * accumulated
-     *
-     * @param subResult        the {@link SampleResult} to be added
-     * @param renameSubResults boolean do we rename subResults based on position
-     */
-    private void storeSubResult(SampleResult subResult, boolean renameSubResults) {
-        if (subResults == null) {
-            subResults = new ArrayList<>();
-        }
-        if (renameSubResults) {
-            subResult.setSampleLabel(getSampleLabel() + "-" + subResultIndex++);
-        }
-        subResults.add(subResult);
-        subResult.setParent(this);
-    }
-
-    /**
-     * Gets the subresults associated with this sample.
-     *
-     * @return an array containing the subresults for this sample. Returns an
-     * empty array if there are no subresults.
-     */
-    public SampleResult[] getSubResults() {
-        if (subResults == null) {
-            return EMPTY_SR;
-        }
-        return subResults.toArray(new SampleResult[subResults.size()]);
-    }
-
-    /**
-     * Sets the responseData attribute of the SampleResult object.
-     * <p>
-     * If the parameter is null, then the responseData is set to an empty byte array.
-     * This ensures that getResponseData() can never be null.
-     *
-     * @param response the new responseData value
-     */
-    public void setResponseData(byte[] response) {
-        responseDataAsString = null;
-        responseData = response == null ? EMPTY_BA : response;
-    }
-
-    /**
-     * Sets the responseData attribute of the SampleResult object.
-     * Should only be called after setting the dataEncoding (if necessary)
-     *
-     * @param response the new responseData value (String)
-     * @deprecated - only intended for use from BeanShell code
-     */
-    @Deprecated
-    public void setResponseData(String response) {
-        responseDataAsString = null;
-        try {
-            responseData = response.getBytes(getDataEncodingWithDefault());
-        } catch (UnsupportedEncodingException e) {
-            log.warn("Could not convert string, using default encoding. " + e.getLocalizedMessage());
-            responseData = response.getBytes(Charset.defaultCharset()); // N.B. default charset is used deliberately here
-        }
-    }
-
-    /**
-     * Sets the encoding and responseData attributes of the SampleResult object.
-     *
-     * @param response the new responseData value (String)
-     * @param encoding the encoding to set and then use (if null, use platform default)
-     */
-    public void setResponseData(final String response, final String encoding) {
-        responseDataAsString = null;
-        String encodeUsing = encoding != null ? encoding : DEFAULT_CHARSET;
-        try {
-            responseData = response.getBytes(encodeUsing);
-            setDataEncoding(encodeUsing);
-        } catch (UnsupportedEncodingException e) {
-            log.warn("Could not convert string using '" + encodeUsing +
-                    "', using default encoding: " + DEFAULT_CHARSET, e);
-            responseData = response.getBytes(Charset.defaultCharset()); // N.B. default charset is used deliberately here
-            setDataEncoding(DEFAULT_CHARSET);
-        }
-    }
-
-    /**
-     * Gets the responseData attribute of the SampleResult object.
-     * <p>
-     * Note that some samplers may not store all the data, in which case
-     * getResponseData().length will be incorrect.
-     * <p>
-     * Instead, always use {@link #getBytes()} to obtain the sample result byte count.
-     * </p>
-     *
-     * @return the responseData value (cannot be null)
-     */
-    public byte[] getResponseData() {
-        return responseData;
-    }
-
-    /**
-     * Gets the responseData of the SampleResult object as a String
-     *
-     * @return the responseData value as a String, converted according to the encoding
-     */
-    public String getResponseDataAsString() {
-        try {
-            if (responseDataAsString == null) {
-                responseDataAsString = new String(responseData, getDataEncodingWithDefault());
-            }
-            return responseDataAsString;
-        } catch (UnsupportedEncodingException e) {
-            log.warn("Using platform default as " + getDataEncodingWithDefault() + " caused " + e);
-            return new String(responseData, Charset.defaultCharset()); // N.B. default charset is used deliberately here
-        }
-    }
-
-    public void setSamplerData(String s) {
-        samplerData = s;
-    }
-
-    public String getSamplerData() {
-        return samplerData;
-    }
-
-    /**
-     * Get the time it took this sample to occur.
-     *
-     * @return elapsed time in milliseconds
-     */
-    public long getTime() {
-        return elapsedTime;
-    }
-
-    public boolean isSuccessful() {
-        return success;
-    }
-
-    /**
-     * Sets the data type of the sample.
-     *
-     * @param dataType String containing {@link #BINARY} or {@link #TEXT}
-     * @see #BINARY
-     * @see #TEXT
-     */
-    public void setDataType(String dataType) {
-        this.dataType = dataType;
-    }
-
-    /**
-     * Returns the data type of the sample.
-     *
-     * @return String containing {@link #BINARY} or {@link #TEXT} or the empty string
-     * @see #BINARY
-     * @see #TEXT
-     */
-    public String getDataType() {
-        return dataType;
-    }
-
-    /**
-     * Extract and save the DataEncoding and DataType from the parameter provided.
-     * Does not save the full content Type.
-     *
-     * @param ct - content type (may be null)
-     * @see #setContentType(String) which should be used to save the full content-type string
-     */
-    public void setEncodingAndType(String ct) {
-        if (ct != null) {
-            // Extract charset and store as DataEncoding
-            // N.B. The meta tag:
-            // <META http-equiv="content-type" content="text/html; charset=foobar">
-            // is now processed by HTTPSampleResult#getDataEncodingWithDefault
-            final String charsetPrefix = "charset="; // $NON-NLS-1$
-            int cset = ct.toLowerCase(java.util.Locale.ENGLISH).indexOf(charsetPrefix);
-            if (cset >= 0) {
-                String charSet = ct.substring(cset + charsetPrefix.length());
-                // handle: ContentType: text/plain; charset=ISO-8859-1; format=flowed
-                int semiColon = charSet.indexOf(';');
-                if (semiColon >= 0) {
-                    charSet = charSet.substring(0, semiColon);
-                }
-                // Check for quoted string
-                if (charSet.startsWith("\"") || charSet.startsWith("\'")) { // $NON-NLS-1$
-                    setDataEncoding(charSet.substring(1, charSet.length() - 1)); // remove quotes
-                } else {
-                    setDataEncoding(charSet);
-                }
-            }
-            if (isBinaryType(ct)) {
-                setDataType(BINARY);
-            } else {
-                setDataType(TEXT);
-            }
-        }
-    }
-
-    /*
-     * Determine if content-type is known to be binary, i.e. not displayable as text.
-     *
-     * @param ct content type
-     * @return true if content-type is of type binary.
-     */
-    public static boolean isBinaryType(String ct) {
-        for (String entry : NON_BINARY_TYPES) {
-            if (ct.startsWith(entry)) {
-                return false;
-            }
-        }
-        for (String binaryType : BINARY_TYPES) {
-            if (ct.startsWith(binaryType)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Sets the successful attribute of the SampleResult object.
-     *
-     * @param success the new successful value
-     */
-    public void setSuccessful(boolean success) {
-        this.success = success;
-    }
-
-    /**
-     * Returns the display name.
-     *
-     * @return display name of this sample result
-     */
-    @Override
-    public String toString() {
-        return getSampleLabel();
-    }
-
-    /**
-     * Returns the dataEncoding or the default if no dataEncoding was provided.
-     *
-     * @return the value of the dataEncoding or DEFAULT_ENCODING
-     */
-    public String getDataEncodingWithDefault() {
-        return getDataEncodingWithDefault(DEFAULT_ENCODING);
-    }
-
-    /**
-     * Returns the dataEncoding or the default if no dataEncoding was provided.
-     *
-     * @param defaultEncoding the default to be applied
-     * @return the value of the dataEncoding or the provided default
-     */
-    protected String getDataEncodingWithDefault(String defaultEncoding) {
-        if (dataEncoding != null && dataEncoding.length() > 0) {
-            return dataEncoding;
-        }
-        return defaultEncoding;
-    }
-
-    /**
-     * Returns the dataEncoding. May be null or the empty String.
-     *
-     * @return the value of the dataEncoding
-     */
-    public String getDataEncodingNoDefault() {
-        return dataEncoding;
-    }
-
-    /**
-     * Sets the dataEncoding.
-     *
-     * @param dataEncoding the dataEncoding to set, e.g. ISO-8895-1, UTF-8
-     */
-    public void setDataEncoding(String dataEncoding) {
-        this.dataEncoding = dataEncoding;
-    }
-
-    /**
-     * @return whether to stop the test waiting for current running Sampler to end
-     */
-    public boolean isStopTest() {
-        return stopTest;
-    }
-
-    /**
-     * @return whether to stop the test now interrupting current running samplers
-     */
-    public boolean isStopTestNow() {
-        return stopTestNow;
-    }
-
-    /**
-     * @return whether to stop this thread
-     */
-    public boolean isStopThread() {
-        return stopThread;
-    }
-
-    public void setStopTest(boolean b) {
-        stopTest = b;
-    }
-
-    public void setStopTestNow(boolean b) {
-        stopTestNow = b;
-    }
-
-    public void setStopThread(boolean b) {
-        stopThread = b;
-    }
-
-    /**
-     * @return the request headers
-     */
-    public String getRequestHeaders() {
-        return requestHeaders;
-    }
-
-    /**
-     * @return the response headers
-     */
-    public String getResponseHeaders() {
-        return responseHeaders;
-    }
-
-    /**
-     * @param string -
-     *               request headers
-     */
-    public void setRequestHeaders(String string) {
-        requestHeaders = string;
-    }
-
-    /**
-     * @param string -
-     *               response headers
-     */
-    public void setResponseHeaders(String string) {
-        responseHeaders = string;
-    }
-
-    /**
-     * @return the full content type - e.g. text/html [;charset=utf-8 ]
-     */
-    public String getContentType() {
-        return contentType;
-    }
-
-    /**
-     * Get the media type from the Content Type
-     *
-     * @return the media type - e.g. text/html (without charset, if any)
-     */
-    public String getMediaType() {
-        return JOrphanUtils.trim(contentType, " ;").toLowerCase(java.util.Locale.ENGLISH);
-    }
-
-    /**
-     * Stores the content-type string, e.g. <code>text/xml; charset=utf-8</code>
-     *
-     * @param string the content-type to be set
-     * @see #setEncodingAndType(String) which can be used to extract the charset.
-     */
-    public void setContentType(String string) {
-        contentType = string;
-    }
-
-    /**
-     * @return idleTime
-     */
-    public long getIdleTime() {
-        return idleTime;
-    }
-
-    /**
-     * @return the end time
-     */
-    public long getEndTime() {
-        return endTime;
-    }
-
-    /**
-     * @return the start time
-     */
-    public long getStartTime() {
-        return startTime;
-    }
-
-    /*
-     * Helper methods N.B. setStartTime must be called before setEndTime
-     *
-     * setStartTime is used by HTTPSampleResult to clone the parent sampler and
-     * allow the original start time to be kept
-     */
-    protected final void setStartTime(long start) {
-        startTime = start;
-        if (START_TIMESTAMP) {
-            timeStamp = startTime;
-        }
-    }
-
-    public void setEndTime(long end) {
-        endTime = end;
-        if (!START_TIMESTAMP) {
-            timeStamp = endTime;
-        }
-        if (startTime == 0) {
-            log.error("setEndTime must be called after setStartTime", new Throwable(INVALID_CALL_SEQUENCE_MSG));
-        } else {
-            elapsedTime = endTime - startTime - idleTime;
-        }
-    }
-
-    /**
-     * Set idle time pause.
-     * For use by SampleResultConverter/CSVSaveService.
-     *
-     * @param idle long
-     */
-    public void setIdleTime(long idle) {
-        idleTime = idle;
-    }
-
-    private void setTimes(long start, long end) {
-        setStartTime(start);
-        setEndTime(end);
-    }
-
-    /**
-     * Record the start time of a sample
-     */
-    public void sampleStart() {
-        if (startTime == 0) {
-            setStartTime(currentTimeInMillis());
-        } else {
-            log.error("sampleStart called twice", new Throwable(INVALID_CALL_SEQUENCE_MSG));
-        }
-    }
-
-    /**
-     * Record the end time of a sample and calculate the elapsed time
-     */
-    public void sampleEnd() {
-        if (endTime == 0) {
-            setEndTime(currentTimeInMillis());
-        } else {
-            log.error("sampleEnd called twice", new Throwable(INVALID_CALL_SEQUENCE_MSG));
-        }
-    }
-
-    /**
-     * Pause a sample
-     */
-    public void samplePause() {
-        if (pauseTime != 0) {
-            log.error("samplePause called twice", new Throwable(INVALID_CALL_SEQUENCE_MSG));
-        }
-        pauseTime = currentTimeInMillis();
-    }
-
-    /**
-     * Resume a sample
-     */
-    public void sampleResume() {
-        if (pauseTime == 0) {
-            log.error("sampleResume without samplePause", new Throwable(INVALID_CALL_SEQUENCE_MSG));
-        }
-        idleTime += currentTimeInMillis() - pauseTime;
-        pauseTime = 0;
-    }
-
-    /**
-     * When a Sampler is working as a monitor
-     *
-     * @param monitor flag whether this sampler is working as a monitor
-     * @deprecated since 3.2 NOOP
-     */
-    @Deprecated
-    public void setMonitor(boolean monitor) {
-        // NOOP
-    }
-
-    /**
-     * If the sampler is a monitor, method will return true.
-     *
-     * @return true if the sampler is a monitor
-     * @deprecated since 3.2 always return false
-     */
-    @Deprecated
-    public boolean isMonitor() {
-        return false;
-    }
-
-    /**
-     * The statistical sample sender aggregates several samples to save on
-     * transmission costs.
-     *
-     * @param count number of samples represented by this instance
-     */
-    public void setSampleCount(int count) {
-        sampleCount = count;
-    }
-
-    /**
-     * return the sample count. by default, the value is 1.
-     *
-     * @return the sample count
-     */
-    public int getSampleCount() {
-        return sampleCount;
-    }
-
-    /**
-     * Returns the count of errors.
-     *
-     * @return 0 - or 1 if the sample failed
-     * <p>
-     * TODO do we need allow for nested samples?
-     */
-    public int getErrorCount() {
-        return success ? 0 : 1;
-    }
-
-    public void setErrorCount(int i) {// for reading from CSV files
-        // ignored currently
-    }
-
-    /*
-     * TODO: error counting needs to be sorted out.
-     *
-     * At present the Statistical Sampler tracks errors separately
-     * It would make sense to move the error count here, but this would
-     * mean lots of changes.
-     * It's also tricky maintaining the count - it can't just be incremented/decremented
-     * when the success flag is set as this may be done multiple times.
-     * The work-round for now is to do the work in the StatisticalSampleResult,
-     * which overrides this method.
-     * Note that some JMS samplers also create samples with > 1 sample count
-     * Also the Transaction Controller probably needs to be changed to do
-     * proper sample and error accounting.
-     * The purpose of this work-round is to allow at least minimal support for
-     * errors in remote statistical batch mode.
-     *
-     */
-
-    /**
-     * In the event the sampler does want to pass back the actual contents, we
-     * still want to calculate the throughput. The bytes are the bytes of the
-     * response data.
-     *
-     * @param length the number of bytes of the response data for this sample
-     */
-    public void setBytes(long length) {
-        bytes = length;
-    }
-
-    /**
-     * In the event the sampler does want to pass back the actual contents, we
-     * still want to calculate the throughput. The bytes are the bytes of the
-     * response data.
-     *
-     * @param length the number of bytes of the response data for this sample
-     * @deprecated use setBytes(long)
-     */
-    @Deprecated
-    public void setBytes(int length) {
-        setBytes((long) length);
-    }
-
-    /**
-     * @param sentBytesCount long sent bytes
-     */
-    public void setSentBytes(long sentBytesCount) {
-        sentBytes = sentBytesCount;
-    }
-
-    /**
-     * @return the sentBytes
-     */
-    public long getSentBytes() {
-        return sentBytes;
-    }
-
-    /**
-     * return the bytes returned by the response.
-     *
-     * @return byte count
-     * @deprecated use getBytesAsLong
-     */
-    @Deprecated
-    public int getBytes() {
-        return (int) getBytesAsLong();
-    }
-
-    /**
-     * return the bytes returned by the response.
-     *
-     * @return byte count
-     */
-    public long getBytesAsLong() {
-        long tmpSum = this.getHeadersSize() + this.getBodySizeAsLong();
-        return tmpSum == 0 ? bytes : tmpSum;
-    }
-
-    /**
-     * @return Returns the latency.
-     */
-    public long getLatency() {
-        return latency;
-    }
-
-    /**
-     * Set the time to the first response
-     */
-    public void latencyEnd() {
-        latency = currentTimeInMillis() - startTime - idleTime;
-    }
-
-    /**
-     * This is only intended for use by SampleResultConverter!
-     *
-     * @param latency The latency to set.
-     */
-    public void setLatency(long latency) {
-        this.latency = latency;
-    }
-
-    /**
-     * @return Returns the connect time.
-     */
-    public long getConnectTime() {
-        return connectTime;
-    }
-
-    /**
-     * Set the time to the end of connecting
-     */
-    public void connectEnd() {
-        connectTime = currentTimeInMillis() - startTime - idleTime;
-    }
-
-    /**
-     * This is only intended for use by SampleResultConverter!
-     *
-     * @param time The connect time to set.
-     */
-    public void setConnectTime(long time) {
-        this.connectTime = time;
-    }
-
-    /**
-     * This is only intended for use by SampleResultConverter!
-     *
-     * @param timeStamp The timeStamp to set.
-     */
-    public void setTimeStamp(long timeStamp) {
-        this.timeStamp = timeStamp;
-    }
-
-
-    public void setURL(URL location) {
-        this.location = location;
-    }
-
-    public URL getURL() {
-        return location;
-    }
-
-    /**
-     * Get a String representation of the URL (if defined).
-     *
-     * @return ExternalForm of URL, or empty string if url is null
-     */
-    public String getUrlAsString() {
-        return location == null ? "" : location.toExternalForm();
-    }
-
-    /**
-     * @return Returns the parent.
-     */
-    public SampleResult getParent() {
-        return parent;
-    }
-
-    /**
-     * @param parent The parent to set.
-     */
-    public void setParent(SampleResult parent) {
-        this.parent = parent;
-    }
-
-    public String getResultFileName() {
-        return resultFileName;
-    }
-
-    public void setResultFileName(String resultFileName) {
-        this.resultFileName = resultFileName;
-    }
-
-    public int getGroupThreads() {
-        return groupThreads;
-    }
-
-    public void setGroupThreads(int n) {
-        this.groupThreads = n;
-    }
-
-    public int getAllThreads() {
-        return allThreads;
-    }
-
-    public void setAllThreads(int n) {
-        this.allThreads = n;
-    }
-
-    // Bug 47394
-
-    /**
-     * Allow custom SampleSenders to drop unwanted assertionResults
-     */
-    public void removeAssertionResults() {
-        this.assertionResults = null;
-    }
-
-    /**
-     * Allow custom SampleSenders to drop unwanted subResults
-     */
-    public void removeSubResults() {
-        this.subResults = null;
-    }
-
-    /**
-     * Set the headers size in bytes
-     *
-     * @param size the number of bytes of the header
-     */
-    public void setHeadersSize(int size) {
-        this.headersSize = size;
-    }
-
-    /**
-     * Get the headers size in bytes
-     *
-     * @return the headers size
-     */
-    public int getHeadersSize() {
-        return headersSize;
-    }
-
-    /**
-     * @return the body size in bytes
-     * @deprecated replaced by getBodySizeAsLong()
-     */
-    @Deprecated
-    public int getBodySize() {
-        return (int) getBodySizeAsLong();
-    }
-
-    /**
-     * @return the body size in bytes
-     */
-    public long getBodySizeAsLong() {
-        return bodySize == 0 ? responseData.length : bodySize;
-    }
-
-    /**
-     * @param bodySize the body size to set
-     */
-    public void setBodySize(long bodySize) {
-        this.bodySize = bodySize;
-    }
-
-    /**
-     * @param bodySize the body size to set
-     * @deprecated use setBodySize(long)
-     */
-    @Deprecated
-    public void setBodySize(int bodySize) {
-        this.bodySize = bodySize;
-    }
-
-    private static class NanoOffset extends Thread {
-
-        private static volatile long nanoOffset;
-
-        static long getNanoOffset() {
-            return nanoOffset;
-        }
-
-        @Override
-        public void run() {
-            // Wait longer than a clock pulse (generally 10-15ms)
-            getOffset(30L); // Catch an early clock pulse to reduce slop.
-            while (true) {
-                getOffset(NANOTHREAD_SLEEP); // Can now afford to wait a bit longer between checks
-            }
-        }
-
-        private static void getOffset(long wait) {
-            try {
-                TimeUnit.MILLISECONDS.sleep(wait);
-                long clock = System.currentTimeMillis();
-                long nano = SampleResult.sampleNsClockInMs();
-                nanoOffset = clock - nano;
-            } catch (InterruptedException ignore) {
-                // ignored
-                Thread.currentThread().interrupt();
-            }
-        }
-    }
-
-    /**
-     * @return the startNextThreadLoop
-     * @deprecated use {@link SampleResult#getTestLogicalAction()}
-     */
-    @Deprecated
-    public boolean isStartNextThreadLoop() {
-        return testLogicalAction == TestLogicalAction.START_NEXT_ITERATION_OF_THREAD;
-    }
-
-    /**
-     * @param startNextThreadLoop the startNextLoop to set
-     * @deprecated use SampleResult#setTestLogicalAction(TestLogicalAction)
-     */
-    @Deprecated
-    public void setStartNextThreadLoop(boolean startNextThreadLoop) {
-        if (startNextThreadLoop) {
-            testLogicalAction = TestLogicalAction.START_NEXT_ITERATION_OF_THREAD;
-        } else {
-            testLogicalAction = TestLogicalAction.CONTINUE;
-        }
-    }
-
-    /**
-     * Clean up cached data
-     */
-    public void cleanAfterSample() {
-        this.responseDataAsString = null;
-    }
-
-    @Override
-    public Object clone() {
-        try {
-            return super.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new IllegalStateException("This should not happen");
-        }
-    }
-
-    @Override
-    public List<String> getSearchableTokens() throws Exception {
-        List<String> datasToSearch = new ArrayList<>(4);
-        datasToSearch.add(getSampleLabel());
-        datasToSearch.add(getResponseDataAsString());
-        datasToSearch.add(getRequestHeaders());
-        datasToSearch.add(getResponseHeaders());
-        return datasToSearch;
-    }
-
-    /**
-     * @return boolean true if this SampleResult should not be sent to Listeners
-     */
-    public boolean isIgnore() {
-        return ignore;
-    }
-
-    /**
-     * Call this method to tell JMeter to ignore this SampleResult by Listeners
-     */
-    public void setIgnore() {
-        this.ignore = true;
-    }
-
-    /**
-     * @return String first non null assertion failure message if assertionResults is not null, null otherwise
-     */
-    public String getFirstAssertionFailureMessage() {
-        String message = null;
-        AssertionResult[] results = getAssertionResults();
-
-        if (results != null) {
-            // Find the first non-null message
-            for (AssertionResult result : results) {
-                message = result.getFailureMessage();
-                if (message != null) {
-                    break;
-                }
-            }
-        }
-        return message;
-    }
-
-    /**
-     * @return the testLogicalAction
-     */
-    public TestLogicalAction getTestLogicalAction() {
-        return testLogicalAction;
-    }
-
-    /**
-     * @param testLogicalAction the testLogicalAction to set
-     */
-    public void setTestLogicalAction(TestLogicalAction testLogicalAction) {
-        this.testLogicalAction = testLogicalAction;
-    }
-}
diff --git a/backend/src/main/java/org/apache/jmeter/threads/JMeterThread.java b/backend/src/main/java/org/apache/jmeter/threads/JMeterThread.java
deleted file mode 100644
index 8bfc19f6d4..0000000000
--- a/backend/src/main/java/org/apache/jmeter/threads/JMeterThread.java
+++ /dev/null
@@ -1,1181 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.threads;
-
-import io.metersphere.api.jmeter.MsResultCollector;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.jmeter.assertions.Assertion;
-import org.apache.jmeter.assertions.AssertionResult;
-import org.apache.jmeter.control.Controller;
-import org.apache.jmeter.control.IteratingController;
-import org.apache.jmeter.control.TransactionSampler;
-import org.apache.jmeter.engine.StandardJMeterEngine;
-import org.apache.jmeter.engine.event.LoopIterationEvent;
-import org.apache.jmeter.engine.event.LoopIterationListener;
-import org.apache.jmeter.gui.GuiPackage;
-import org.apache.jmeter.processor.PostProcessor;
-import org.apache.jmeter.processor.PreProcessor;
-import org.apache.jmeter.samplers.*;
-import org.apache.jmeter.testbeans.TestBeanHelper;
-import org.apache.jmeter.testelement.*;
-import org.apache.jmeter.threads.JMeterContext.TestLogicalAction;
-import org.apache.jmeter.timers.Timer;
-import org.apache.jmeter.timers.TimerService;
-import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.collections.HashTree;
-import org.apache.jorphan.collections.HashTreeTraverser;
-import org.apache.jorphan.collections.ListedHashTree;
-import org.apache.jorphan.collections.SearchByClass;
-import org.apache.jorphan.util.JMeterError;
-import org.apache.jorphan.util.JMeterStopTestException;
-import org.apache.jorphan.util.JMeterStopTestNowException;
-import org.apache.jorphan.util.JMeterStopThreadException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.function.Consumer;
-
-/**
- * The JMeter interface to the sampling process, allowing JMeter to see the
- * timing, add listeners for sampling events and to stop the sampling process.
- */
-public class JMeterThread implements Runnable, Interruptible {
-    private static final Logger log = LoggerFactory.getLogger(JMeterThread.class);
-
-    public static final String PACKAGE_OBJECT = "JMeterThread.pack"; // $NON-NLS-1$
-
-    public static final String LAST_SAMPLE_OK = "JMeterThread.last_sample_ok"; // $NON-NLS-1$
-
-    private static final String TRUE = Boolean.toString(true); // i.e. "true"
-
-    /**
-     * How often to check for shutdown during ramp-up, default 1000ms
-     */
-    private static final int RAMPUP_GRANULARITY =
-            JMeterUtils.getPropDefault("jmeterthread.rampup.granularity", 1000); // $NON-NLS-1$
-
-    private static final float TIMER_FACTOR = JMeterUtils.getPropDefault("timer.factor", 1.0f);
-
-    private static final TimerService TIMER_SERVICE = TimerService.getInstance();
-
-    private static final float ONE_AS_FLOAT = 1.0f;
-
-    private static final boolean APPLY_TIMER_FACTOR = Float.compare(TIMER_FACTOR, ONE_AS_FLOAT) != 0;
-
-    private final Controller threadGroupLoopController;
-
-    private final HashTree testTree;
-
-    private final TestCompiler compiler;
-
-    private final JMeterThreadMonitor monitor;
-
-    private final JMeterVariables threadVars;
-
-    // Note: this is only used to implement TestIterationListener#testIterationStart
-    // Since this is a frequent event, it makes sense to create the list once rather than scanning each time
-    // The memory used will be released when the thread finishes
-    private final Collection<TestIterationListener> testIterationStartListeners;
-
-    private final Collection<SampleMonitor> sampleMonitors;
-
-    private final ListenerNotifier notifier;
-
-    /*
-     * The following variables are set by StandardJMeterEngine.
-     * This is done before start() is called, so the values will be published to the thread safely
-     * TODO - consider passing them to the constructor, so that they can be made final
-     * (to avoid adding lots of parameters, perhaps have a parameter wrapper object.
-     */
-    private String threadName;
-
-    private int initialDelay = 0;
-
-    private int threadNum = 0;
-
-    private long startTime = 0;
-
-    private long endTime = 0;
-
-    private final boolean isSameUserOnNextIteration;
-
-    // based on this scheduler is enabled or disabled
-    private boolean scheduler = false;
-
-    // Gives access to parent thread threadGroup
-    private AbstractThreadGroup threadGroup;
-
-    private StandardJMeterEngine engine = null; // For access to stop methods.
-
-    /*
-     * The following variables may be set/read from multiple threads.
-     */
-    private volatile boolean running; // may be set from a different thread
-
-    private volatile boolean onErrorStopTest;
-
-    private volatile boolean onErrorStopTestNow;
-
-    private volatile boolean onErrorStopThread;
-
-    private volatile boolean onErrorStartNextLoop;
-
-    private volatile Sampler currentSamplerForInterruption;
-
-    private final ReentrantLock interruptLock = new ReentrantLock(); // ensure that interrupt cannot overlap with shutdown
-
-    public JMeterThread(HashTree test, JMeterThreadMonitor monitor, ListenerNotifier note) {
-        this(test, monitor, note, false);
-    }
-
-    public JMeterThread(HashTree test, JMeterThreadMonitor monitor, ListenerNotifier note, Boolean isSameUserOnNextIteration) {
-        this.monitor = monitor;
-        threadVars = new JMeterVariables();
-        testTree = test;
-        compiler = new TestCompiler(testTree);
-        threadGroupLoopController = (Controller) testTree.getArray()[0];
-        SearchByClass<TestIterationListener> threadListenerSearcher = new SearchByClass<>(TestIterationListener.class); // TL - IS
-        test.traverse(threadListenerSearcher);
-        testIterationStartListeners = threadListenerSearcher.getSearchResults();
-        SearchByClass<SampleMonitor> sampleMonitorSearcher = new SearchByClass<>(SampleMonitor.class);
-        test.traverse(sampleMonitorSearcher);
-        sampleMonitors = sampleMonitorSearcher.getSearchResults();
-        notifier = note;
-        running = true;
-        this.isSameUserOnNextIteration = isSameUserOnNextIteration;
-    }
-
-    public void setInitialContext(JMeterContext context) {
-        threadVars.putAll(context.getVariables());
-    }
-
-    /**
-     * Enable the scheduler for this JMeterThread.
-     *
-     * @param sche flag whether the scheduler should be enabled
-     */
-    public void setScheduled(boolean sche) {
-        this.scheduler = sche;
-    }
-
-    /**
-     * Set the StartTime for this Thread.
-     *
-     * @param stime the StartTime value.
-     */
-    public void setStartTime(long stime) {
-        startTime = stime;
-    }
-
-    /**
-     * Get the start time value.
-     *
-     * @return the start time value.
-     */
-    public long getStartTime() {
-        return startTime;
-    }
-
-    /**
-     * Set the EndTime for this Thread.
-     *
-     * @param etime the EndTime value.
-     */
-    public void setEndTime(long etime) {
-        endTime = etime;
-    }
-
-    /**
-     * Get the end time value.
-     *
-     * @return the end time value.
-     */
-    public long getEndTime() {
-        return endTime;
-    }
-
-    /**
-     * Check if the scheduled time is completed.
-     */
-    private void stopSchedulerIfNeeded() {
-        long now = System.currentTimeMillis();
-        if (now >= endTime) {
-            running = false;
-            log.info("Stopping because end time detected by thread: {}", threadName);
-        }
-    }
-
-    /**
-     * Wait until the scheduled start time if necessary
-     */
-    private void startScheduler() {
-        long delay = startTime - System.currentTimeMillis();
-        delayBy(delay, "startScheduler");
-    }
-
-    public void setThreadName(String threadName) {
-        this.threadName = threadName;
-    }
-
-    @Override
-    public void run() {
-        // threadContext is not thread-safe, so keep within thread
-        JMeterContext threadContext = JMeterContextService.getContext();
-        LoopIterationListener iterationListener = null;
-        try {
-            iterationListener = initRun(threadContext);
-            while (running) {
-                Sampler sam = threadGroupLoopController.next();
-                while (running && sam != null) {
-                    processSampler(sam, null, threadContext);
-                    threadContext.cleanAfterSample();
-
-                    boolean lastSampleOk = TRUE.equals(threadContext.getVariables().get(LAST_SAMPLE_OK));
-                    // restart of the next loop
-                    // - was requested through threadContext
-                    // - or the last sample failed AND the onErrorStartNextLoop option is enabled
-                    if (threadContext.getTestLogicalAction() != TestLogicalAction.CONTINUE
-                            || (onErrorStartNextLoop && !lastSampleOk)) {
-                        if (log.isDebugEnabled() && onErrorStartNextLoop
-                                && threadContext.getTestLogicalAction() != TestLogicalAction.CONTINUE) {
-                            log.debug("Start Next Thread Loop option is on, Last sample failed, starting next thread loop");
-                        }
-                        if (onErrorStartNextLoop && !lastSampleOk) {
-                            triggerLoopLogicalActionOnParentControllers(sam, threadContext, JMeterThread::continueOnThreadLoop);
-                        } else {
-                            switch (threadContext.getTestLogicalAction()) {
-                                case BREAK_CURRENT_LOOP:
-                                    triggerLoopLogicalActionOnParentControllers(sam, threadContext, JMeterThread::breakOnCurrentLoop);
-                                    break;
-                                case START_NEXT_ITERATION_OF_THREAD:
-                                    triggerLoopLogicalActionOnParentControllers(sam, threadContext, JMeterThread::continueOnThreadLoop);
-                                    break;
-                                case START_NEXT_ITERATION_OF_CURRENT_LOOP:
-                                    triggerLoopLogicalActionOnParentControllers(sam, threadContext, JMeterThread::continueOnCurrentLoop);
-                                    break;
-                                default:
-                                    break;
-                            }
-                        }
-                        threadContext.setTestLogicalAction(TestLogicalAction.CONTINUE);
-                        sam = null;
-                        setLastSampleOk(threadContext.getVariables(), true);
-                    } else {
-                        sam = threadGroupLoopController.next();
-                    }
-                }
-
-                // It would be possible to add finally for Thread Loop here
-                if (threadGroupLoopController.isDone()) {
-                    running = false;
-                    log.info("Thread is done: {}", threadName);
-                }
-            }
-        }
-        // Might be found by controller.next()
-        catch (JMeterStopTestException e) { // NOSONAR
-            if (log.isInfoEnabled()) {
-                log.info("Stopping Test: {}", e.toString());
-            }
-            shutdownTest();
-        } catch (JMeterStopTestNowException e) { // NOSONAR
-            if (log.isInfoEnabled()) {
-                log.info("Stopping Test Now: {}", e.toString());
-            }
-            stopTestNow();
-        } catch (JMeterStopThreadException e) { // NOSONAR
-            if (log.isInfoEnabled()) {
-                log.info("Stop Thread seen for thread {}, reason: {}", getThreadName(), e.toString());
-            }
-        } catch (Exception | JMeterError e) {
-            log.error("Test failed!", e);
-        } catch (ThreadDeath e) {
-            throw e; // Must not ignore this one
-        } finally {
-            currentSamplerForInterruption = null; // prevent any further interrupts
-            interruptLock.lock();  // make sure current interrupt is finished, prevent another starting yet
-            try {
-                threadContext.clear();
-                log.info("Thread finished: {}", threadName);
-                threadFinished(iterationListener);
-                monitor.threadFinished(this); // Tell the monitor we are done
-                JMeterContextService.removeContext(); // Remove the ThreadLocal entry
-            } finally {
-                interruptLock.unlock(); // Allow any pending interrupt to complete (OK because currentSampler == null)
-            }
-        }
-    }
-
-    /**
-     * Trigger break/continue/switch to next thread Loop  depending on consumer implementation
-     *
-     * @param sampler       Sampler Base sampler
-     * @param threadContext
-     * @param consumer      Consumer that will process the tree of elements up to root node
-     */
-    private void triggerLoopLogicalActionOnParentControllers(Sampler sampler, JMeterContext threadContext,
-                                                             Consumer<FindTestElementsUpToRootTraverser> consumer) {
-        TransactionSampler transactionSampler = null;
-        if (sampler instanceof TransactionSampler) {
-            transactionSampler = (TransactionSampler) sampler;
-        }
-
-        Sampler realSampler = findRealSampler(sampler);
-        if (realSampler == null) {
-            throw new IllegalStateException(
-                    "Got null subSampler calling findRealSampler for:" +
-                            (sampler != null ? sampler.getName() : "null") + ", sampler:" + sampler);
-        }
-        // Find parent controllers of current sampler
-        FindTestElementsUpToRootTraverser pathToRootTraverser = new FindTestElementsUpToRootTraverser(realSampler);
-        testTree.traverse(pathToRootTraverser);
-
-        consumer.accept(pathToRootTraverser);
-
-        // bug 52968
-        // When using Start Next Loop option combined to TransactionController.
-        // if an error occurs in a Sample (child of TransactionController)
-        // then we still need to report the Transaction in error (and create the sample result)
-        if (transactionSampler != null) {
-            SamplePackage transactionPack = compiler.configureTransactionSampler(transactionSampler);
-            doEndTransactionSampler(transactionSampler, null, transactionPack, threadContext);
-        }
-    }
-
-    /**
-     * Executes a continue of current loop, equivalent of "continue" in algorithm.
-     * As a consequence it ends the first loop it finds on the path to root
-     *
-     * @param pathToRootTraverser {@link FindTestElementsUpToRootTraverser}
-     */
-    private static void continueOnCurrentLoop(FindTestElementsUpToRootTraverser pathToRootTraverser) {
-        List<Controller> controllersToReinit = pathToRootTraverser.getControllersToRoot();
-        for (Controller parentController : controllersToReinit) {
-            if (parentController instanceof AbstractThreadGroup) {
-                AbstractThreadGroup tg = (AbstractThreadGroup) parentController;
-                tg.startNextLoop();
-            } else if (parentController instanceof IteratingController) {
-                ((IteratingController) parentController).startNextLoop();
-                break;
-            } else {
-                parentController.triggerEndOfLoop();
-            }
-        }
-    }
-
-    /**
-     * Executes a break of current loop, equivalent of "break" in algorithm.
-     * As a consequence it ends the first loop it finds on the path to root
-     *
-     * @param pathToRootTraverser {@link FindTestElementsUpToRootTraverser}
-     */
-    private static void breakOnCurrentLoop(FindTestElementsUpToRootTraverser pathToRootTraverser) {
-        List<Controller> controllersToReinit = pathToRootTraverser.getControllersToRoot();
-        for (Controller parentController : controllersToReinit) {
-            if (parentController instanceof AbstractThreadGroup) {
-                AbstractThreadGroup tg = (AbstractThreadGroup) parentController;
-                tg.breakThreadLoop();
-            } else if (parentController instanceof IteratingController) {
-                ((IteratingController) parentController).breakLoop();
-                break;
-            } else {
-                parentController.triggerEndOfLoop();
-            }
-        }
-    }
-
-    /**
-     * Executes a restart of Thread loop, equivalent of "continue" in algorithm but on Thread Loop.
-     * As a consequence it ends all loop on the path to root
-     *
-     * @param pathToRootTraverser {@link FindTestElementsUpToRootTraverser}
-     */
-    private static void continueOnThreadLoop(FindTestElementsUpToRootTraverser pathToRootTraverser) {
-        List<Controller> controllersToReinit = pathToRootTraverser.getControllersToRoot();
-        for (Controller parentController : controllersToReinit) {
-            if (parentController instanceof AbstractThreadGroup) {
-                AbstractThreadGroup tg = (AbstractThreadGroup) parentController;
-                tg.startNextLoop();
-            } else {
-                parentController.triggerEndOfLoop();
-            }
-        }
-    }
-
-    /**
-     * Find the Real sampler (Not TransactionSampler) that really generated an error
-     * The Sampler provided is not always the "real" one, it can be a TransactionSampler,
-     * if there are some other controllers (SimpleController or other implementations) between this TransactionSampler and the real sampler,
-     * triggerEndOfLoop will not be called for those controllers leaving them in "ugly" state.
-     * the following method will try to find the sampler that really generate an error
-     *
-     * @return {@link Sampler}
-     */
-    private Sampler findRealSampler(Sampler sampler) {
-        Sampler realSampler = sampler;
-        while (realSampler instanceof TransactionSampler) {
-            realSampler = ((TransactionSampler) realSampler).getSubSampler();
-        }
-        return realSampler;
-    }
-
-    /**
-     * Process the current sampler, handling transaction samplers.
-     *
-     * @param current       sampler
-     * @param parent        sampler
-     * @param threadContext
-     * @return SampleResult if a transaction was processed
-     */
-    private SampleResult processSampler(Sampler current, Sampler parent, JMeterContext threadContext) {
-        SampleResult transactionResult = null;
-        // Check if we are running a transaction
-        TransactionSampler transactionSampler = null;
-        // Find the package for the transaction
-        SamplePackage transactionPack = null;
-        try {
-            if (current instanceof TransactionSampler) {
-                transactionSampler = (TransactionSampler) current;
-                transactionPack = compiler.configureTransactionSampler(transactionSampler);
-
-                // Check if the transaction is done
-                if (transactionSampler.isTransactionDone()) {
-                    transactionResult = doEndTransactionSampler(transactionSampler,
-                            parent,
-                            transactionPack,
-                            threadContext);
-                    // Transaction is done, we do not have a sampler to sample
-                    current = null;
-                } else {
-                    Sampler prev = current;
-                    // It is the sub sampler of the transaction that will be sampled
-                    current = transactionSampler.getSubSampler();
-                    if (current instanceof TransactionSampler) {
-                        SampleResult res = processSampler(current, prev, threadContext);// recursive call
-                        threadContext.setCurrentSampler(prev);
-                        current = null;
-                        if (res != null) {
-                            transactionSampler.addSubSamplerResult(res);
-                        }
-                    }
-                }
-            }
-
-            // Check if we have a sampler to sample
-            if (current != null) {
-                executeSamplePackage(current, transactionSampler, transactionPack, threadContext);
-            }
-
-            if (scheduler) {
-                // checks the scheduler to stop the iteration
-                stopSchedulerIfNeeded();
-            }
-
-        } catch (JMeterStopTestException e) { // NOSONAR
-            if (log.isInfoEnabled()) {
-                log.info("Stopping Test: {}", e.toString());
-            }
-            shutdownTest();
-        } catch (JMeterStopTestNowException e) { // NOSONAR
-            if (log.isInfoEnabled()) {
-                log.info("Stopping Test with interruption of current samplers: {}", e.toString());
-            }
-            stopTestNow();
-        } catch (JMeterStopThreadException e) { // NOSONAR
-            if (log.isInfoEnabled()) {
-                log.info("Stopping Thread: {}", e.toString());
-            }
-            stopThread();
-        } catch (Exception e) {
-            if (current != null) {
-                log.error("Error while processing sampler: '{}'.", current.getName(), e);
-            } else {
-                log.error("Error while processing sampler.", e);
-            }
-        }
-        if (!running
-                && transactionResult == null
-                && transactionSampler != null
-                && transactionPack != null) {
-            transactionResult = doEndTransactionSampler(transactionSampler, parent, transactionPack, threadContext);
-        }
-
-        return transactionResult;
-    }
-
-    private void fillThreadInformation(SampleResult result,
-                                       int nbActiveThreadsInThreadGroup,
-                                       int nbTotalActiveThreads) {
-        result.setGroupThreads(nbActiveThreadsInThreadGroup);
-        result.setAllThreads(nbTotalActiveThreads);
-        result.setThreadName(threadName);
-    }
-
-    /**
-     * Execute the sampler with its pre/post processors, timers, assertions
-     * Broadcast the result to the sample listeners
-     */
-    private void executeSamplePackage(Sampler current,
-                                      TransactionSampler transactionSampler,
-                                      SamplePackage transactionPack,
-                                      JMeterContext threadContext) {
-
-        threadContext.setCurrentSampler(current);
-        // Get the sampler ready to sample
-        SamplePackage pack = compiler.configureSampler(current);
-        runPreProcessors(pack.getPreProcessors());
-
-        // Hack: save the package for any transaction controllers
-        threadVars.putObject(PACKAGE_OBJECT, pack);
-
-        delay(pack.getTimers());
-        SampleResult result = null;
-        if (running) {
-            Sampler sampler = pack.getSampler();
-            // 执行前发给监听
-            List<SampleListener> sampleListeners = pack.getSampleListeners();
-            if (CollectionUtils.isNotEmpty(sampleListeners)) {
-                for (SampleListener sampleListener : sampleListeners) {
-                    try {
-                        if (sampleListener instanceof MsResultCollector) {
-                            SampleEvent event = new SampleEvent(null, current.getPropertyAsString("MS-RESOURCE-ID"), threadVars);
-                            sampleListener.sampleStarted(event);
-                            break;
-                        }
-                    } catch (RuntimeException e) {
-                        log.error("自定义提前发送监听失败.", e);
-                    }
-                }
-            }
-            //======
-            result = doSampling(threadContext, sampler);
-        }
-        // If we got any results, then perform processing on the result
-        if (result != null) {
-            if (!result.isIgnore()) {
-                int nbActiveThreadsInThreadGroup = threadGroup.getNumberOfThreads();
-                int nbTotalActiveThreads = JMeterContextService.getNumberOfThreads();
-                fillThreadInformation(result, nbActiveThreadsInThreadGroup, nbTotalActiveThreads);
-                SampleResult[] subResults = result.getSubResults();
-                if (subResults != null) {
-                    for (SampleResult subResult : subResults) {
-                        fillThreadInformation(subResult, nbActiveThreadsInThreadGroup, nbTotalActiveThreads);
-                    }
-                }
-                threadContext.setPreviousResult(result);
-                runPostProcessors(pack.getPostProcessors());
-                checkAssertions(pack.getAssertions(), result, threadContext);
-                // PostProcessors can call setIgnore, so reevaluate here
-                if (!result.isIgnore()) {
-                    // Do not send subsamples to listeners which receive the transaction sample
-                    List<SampleListener> sampleListeners = getSampleListeners(pack, transactionPack, transactionSampler);
-                    notifyListeners(sampleListeners, result);
-                }
-                compiler.done(pack);
-                // Add the result as subsample of transaction if we are in a transaction
-                if (transactionSampler != null && !result.isIgnore()) {
-                    transactionSampler.addSubSamplerResult(result);
-                }
-            } else {
-                // This call is done by checkAssertions() , as we don't call it
-                // for isIgnore, we explictely call it here
-                setLastSampleOk(threadContext.getVariables(), result.isSuccessful());
-            }
-            // Check if thread or test should be stopped
-            if (result.isStopThread() || (!result.isSuccessful() && onErrorStopThread)) {
-                stopThread();
-            }
-            if (result.isStopTest() || (!result.isSuccessful() && onErrorStopTest)) {
-                shutdownTest();
-            }
-            if (result.isStopTestNow() || (!result.isSuccessful() && onErrorStopTestNow)) {
-                stopTestNow();
-            }
-            if (result.getTestLogicalAction() != TestLogicalAction.CONTINUE) {
-                threadContext.setTestLogicalAction(result.getTestLogicalAction());
-            }
-        } else {
-            compiler.done(pack); // Finish up
-        }
-    }
-
-    /**
-     * Call sample on Sampler handling:
-     * <ul>
-     *  <li>setting up ThreadContext</li>
-     *  <li>initializing sampler if needed</li>
-     *  <li>positioning currentSamplerForInterruption for potential interruption</li>
-     *  <li>Playing SampleMonitor before and after sampling</li>
-     *  <li>resetting currentSamplerForInterruption</li>
-     * </ul>
-     *
-     * @param threadContext {@link JMeterContext}
-     * @param sampler       {@link Sampler}
-     * @return {@link SampleResult}
-     */
-    private SampleResult doSampling(JMeterContext threadContext, Sampler sampler) {
-        sampler.setThreadContext(threadContext);
-        sampler.setThreadName(threadName);
-        TestBeanHelper.prepare(sampler);
-
-        // Perform the actual sample
-        currentSamplerForInterruption = sampler;
-        if (!sampleMonitors.isEmpty()) {
-            for (SampleMonitor sampleMonitor : sampleMonitors) {
-                if (sampleMonitor instanceof TestElement) {
-                    TestBeanHelper.prepare((TestElement) sampleMonitor);
-                }
-                sampleMonitor.sampleStarting(sampler);
-            }
-        }
-        try {
-            return sampler.sample(null);
-        } finally {
-            if (!sampleMonitors.isEmpty()) {
-                for (SampleMonitor sampleMonitor : sampleMonitors) {
-                    sampleMonitor.sampleEnded(sampler);
-                }
-            }
-            currentSamplerForInterruption = null;
-        }
-    }
-
-    private SampleResult doEndTransactionSampler(
-            TransactionSampler transactionSampler, Sampler parent,
-            SamplePackage transactionPack, JMeterContext threadContext) {
-        // Get the transaction sample result
-        SampleResult transactionResult = transactionSampler.getTransactionResult();
-        fillThreadInformation(transactionResult, threadGroup.getNumberOfThreads(), JMeterContextService.getNumberOfThreads());
-
-        // Check assertions for the transaction sample
-        checkAssertions(transactionPack.getAssertions(), transactionResult, threadContext);
-        // Notify listeners with the transaction sample result
-        if (!(parent instanceof TransactionSampler)) {
-            notifyListeners(transactionPack.getSampleListeners(), transactionResult);
-        }
-        compiler.done(transactionPack);
-        return transactionResult;
-    }
-
-    /**
-     * Get the SampleListeners for the sampler. Listeners who receive transaction sample
-     * will not be in this list.
-     *
-     * @param samplePack
-     * @param transactionPack
-     * @param transactionSampler
-     * @return the listeners who should receive the sample result
-     */
-    private List<SampleListener> getSampleListeners(SamplePackage samplePack, SamplePackage transactionPack, TransactionSampler transactionSampler) {
-        List<SampleListener> sampleListeners = samplePack.getSampleListeners();
-        // Do not send subsamples to listeners which receive the transaction sample
-        if (transactionSampler != null) {
-            List<SampleListener> onlySubSamplerListeners = new ArrayList<>();
-            List<SampleListener> transListeners = transactionPack.getSampleListeners();
-            for (SampleListener listener : sampleListeners) {
-                // Check if this instance is present in transaction listener list
-                boolean found = false;
-                for (SampleListener trans : transListeners) {
-                    // Check for the same instance
-                    if (trans == listener) {
-                        found = true;
-                        break;
-                    }
-                }
-                if (!found) {
-                    onlySubSamplerListeners.add(listener);
-                }
-            }
-            sampleListeners = onlySubSamplerListeners;
-        }
-        return sampleListeners;
-    }
-
-    /**
-     * Store {@link JMeterThread#LAST_SAMPLE_OK} in JMeter Variables context
-     */
-    private void setLastSampleOk(JMeterVariables variables, boolean value) {
-        variables.put(LAST_SAMPLE_OK, Boolean.toString(value));
-    }
-
-    /**
-     * @param threadContext
-     * @return the iteration listener
-     */
-    private IterationListener initRun(JMeterContext threadContext) {
-        threadVars.putObject(JMeterVariables.VAR_IS_SAME_USER_KEY, isSameUserOnNextIteration);
-        threadContext.setVariables(threadVars);
-        threadContext.setThreadNum(getThreadNum());
-        setLastSampleOk(threadVars, true);
-        threadContext.setThread(this);
-        threadContext.setThreadGroup(threadGroup);
-        threadContext.setEngine(engine);
-        testTree.traverse(compiler);
-        if (scheduler) {
-            // set the scheduler to start
-            startScheduler();
-        }
-
-        rampUpDelay(); // TODO - how to handle thread stopped here
-        if (log.isInfoEnabled()) {
-            log.info("Thread started: {}", Thread.currentThread().getName());
-        }
-        /*
-         * Setting SamplingStarted before the controllers are initialised allows
-         * them to access the running values of functions and variables (however
-         * it does not seem to help with the listeners)
-         */
-        threadContext.setSamplingStarted(true);
-
-        threadGroupLoopController.initialize();
-        IterationListener iterationListener = new IterationListener();
-        threadGroupLoopController.addIterationListener(iterationListener);
-
-        threadStarted();
-        return iterationListener;
-    }
-
-    private void threadStarted() {
-        JMeterContextService.incrNumberOfThreads();
-        threadGroup.incrNumberOfThreads();
-        GuiPackage gp = GuiPackage.getInstance();
-        if (gp != null) {// check there is a GUI
-            gp.getMainFrame().updateCounts();
-        }
-        ThreadListenerTraverser startup = new ThreadListenerTraverser(true);
-        testTree.traverse(startup); // call ThreadListener.threadStarted()
-    }
-
-    private void threadFinished(LoopIterationListener iterationListener) {
-        ThreadListenerTraverser shut = new ThreadListenerTraverser(false);
-        testTree.traverse(shut); // call ThreadListener.threadFinished()
-        JMeterContextService.decrNumberOfThreads();
-        threadGroup.decrNumberOfThreads();
-        GuiPackage gp = GuiPackage.getInstance();
-        if (gp != null) {// check there is a GUI
-            gp.getMainFrame().updateCounts();
-        }
-        if (iterationListener != null) { // probably not possible, but check anyway
-            threadGroupLoopController.removeIterationListener(iterationListener);
-        }
-    }
-
-    // N.B. This is only called at the start and end of a thread, so there is not
-    // necessary to cache the search results, thus saving memory
-    static class ThreadListenerTraverser implements HashTreeTraverser {
-        private final boolean isStart;
-
-        ThreadListenerTraverser(boolean start) {
-            isStart = start;
-        }
-
-        @Override
-        public void addNode(Object node, HashTree subTree) {
-            if (node instanceof ThreadListener) {
-                ThreadListener tl = (ThreadListener) node;
-                if (isStart) {
-                    try {
-                        tl.threadStarted();
-                    } catch (Exception e) {
-                        log.error("Error calling threadStarted", e);
-                    }
-                } else {
-                    try {
-                        tl.threadFinished();
-                    } catch (Exception e) {
-                        log.error("Error calling threadFinished", e);
-                    }
-                }
-            }
-        }
-
-        @Override
-        public void subtractNode() {
-            // NOOP
-        }
-
-        @Override
-        public void processPath() {
-            // NOOP
-        }
-    }
-
-    public String getThreadName() {
-        return threadName;
-    }
-
-    /**
-     * Set running flag to false which will interrupt JMeterThread on next flag test.
-     * This is a clean shutdown.
-     */
-    public void stop() { // Called by StandardJMeterEngine, TestAction and AccessLogSampler
-        running = false;
-        log.info("Stopping: {}", threadName);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean interrupt() {
-        interruptLock.lock();
-        try {
-            Sampler samp = currentSamplerForInterruption; // fetch once; must be done under lock
-            if (samp instanceof Interruptible) { // (also protects against null)
-                if (log.isWarnEnabled()) {
-                    log.warn("Interrupting: {} sampler: {}", threadName, samp.getName());
-                }
-                try {
-                    boolean found = ((Interruptible) samp).interrupt();
-                    if (!found) {
-                        log.warn("No operation pending");
-                    }
-                    return found;
-                } catch (Exception e) { // NOSONAR
-                    if (log.isWarnEnabled()) {
-                        log.warn("Caught Exception interrupting sampler: {}", e.toString());
-                    }
-                }
-            } else if (samp != null) {
-                if (log.isWarnEnabled()) {
-                    log.warn("Sampler is not Interruptible: {}", samp.getName());
-                }
-            }
-        } finally {
-            interruptLock.unlock();
-        }
-        return false;
-    }
-
-    /**
-     * Clean shutdown of test, which means wait for end of current running samplers
-     */
-    private void shutdownTest() {
-        running = false;
-        log.info("Shutdown Test detected by thread: {}", threadName);
-        if (engine != null) {
-            engine.askThreadsToStop();
-        }
-    }
-
-    /**
-     * Stop test immediately by interrupting running samplers
-     */
-    private void stopTestNow() {
-        running = false;
-        log.info("Stop Test Now detected by thread: {}", threadName);
-        if (engine != null) {
-            engine.stopTest();
-        }
-    }
-
-    /**
-     * Clean Exit of current thread
-     */
-    private void stopThread() {
-        running = false;
-        log.info("Stop Thread detected by thread: {}", threadName);
-    }
-
-    private void checkAssertions(List<Assertion> assertions, SampleResult parent, JMeterContext threadContext) {
-        for (Assertion assertion : assertions) {
-            TestBeanHelper.prepare((TestElement) assertion);
-            if (assertion instanceof AbstractScopedAssertion) {
-                AbstractScopedAssertion scopedAssertion = (AbstractScopedAssertion) assertion;
-                String scope = scopedAssertion.fetchScope();
-                if (scopedAssertion.isScopeParent(scope)
-                        || scopedAssertion.isScopeAll(scope)
-                        || scopedAssertion.isScopeVariable(scope)) {
-                    processAssertion(parent, assertion);
-                }
-                if (scopedAssertion.isScopeChildren(scope)
-                        || scopedAssertion.isScopeAll(scope)) {
-                    recurseAssertionChecks(parent, assertion, 3);
-                }
-            } else {
-                processAssertion(parent, assertion);
-            }
-        }
-        setLastSampleOk(threadContext.getVariables(), parent.isSuccessful());
-    }
-
-    private void recurseAssertionChecks(SampleResult parent, Assertion assertion, int level) {
-        if (level < 0) {
-            return;
-        }
-        SampleResult[] children = parent.getSubResults();
-        boolean childError = false;
-        for (SampleResult childSampleResult : children) {
-            processAssertion(childSampleResult, assertion);
-            recurseAssertionChecks(childSampleResult, assertion, level - 1);
-            if (!childSampleResult.isSuccessful()) {
-                childError = true;
-            }
-        }
-        // If parent is OK, but child failed, add a message and flag the parent as failed
-        if (childError && parent.isSuccessful()) {
-            AssertionResult assertionResult = new AssertionResult(((AbstractTestElement) assertion).getName());
-            assertionResult.setResultForFailure("One or more sub-samples failed");
-            parent.addAssertionResult(assertionResult);
-            parent.setSuccessful(false);
-        }
-    }
-
-    private void processAssertion(SampleResult result, Assertion assertion) {
-        AssertionResult assertionResult;
-        try {
-            assertionResult = assertion.getResult(result);
-        } catch (AssertionError e) {
-            log.debug("Error processing Assertion.", e);
-            assertionResult = new AssertionResult("Assertion failed! See log file (debug level, only).");
-            assertionResult.setFailure(true);
-            assertionResult.setFailureMessage(e.toString());
-        } catch (JMeterError e) {
-            log.error("Error processing Assertion.", e);
-            assertionResult = new AssertionResult("Assertion failed! See log file.");
-            assertionResult.setError(true);
-            assertionResult.setFailureMessage(e.toString());
-        } catch (Exception e) {
-            log.error("Exception processing Assertion.", e);
-            assertionResult = new AssertionResult("Assertion failed! See log file.");
-            assertionResult.setError(true);
-            assertionResult.setFailureMessage(e.toString());
-        }
-        result.setSuccessful(result.isSuccessful() && !(assertionResult.isError() || assertionResult.isFailure()));
-        result.addAssertionResult(assertionResult);
-    }
-
-    private void runPostProcessors(List<PostProcessor> extractors) {
-        for (PostProcessor ex : extractors) {
-            TestBeanHelper.prepare((TestElement) ex);
-            ex.process();
-        }
-    }
-
-    private void runPreProcessors(List<PreProcessor> preProcessors) {
-        for (PreProcessor ex : preProcessors) {
-            if (log.isDebugEnabled()) {
-                log.debug("Running preprocessor: {}", ((AbstractTestElement) ex).getName());
-            }
-            TestBeanHelper.prepare((TestElement) ex);
-            ex.process();
-        }
-    }
-
-    /**
-     * Run all configured timers and sleep the total amount of time.
-     * <p>
-     * If the amount of time would amount to an ending after endTime, then
-     * end the current thread by setting {@code running} to {@code false} and
-     * return immediately.
-     *
-     * @param timers to be used for calculating the delay
-     */
-    private void delay(List<Timer> timers) {
-        long totalDelay = 0;
-        for (Timer timer : timers) {
-            TestBeanHelper.prepare((TestElement) timer);
-            long delay = timer.delay();
-            if (APPLY_TIMER_FACTOR && timer.isModifiable()) {
-                if (log.isDebugEnabled()) {
-                    log.debug("Applying TIMER_FACTOR:{} on timer:{} for thread:{}", TIMER_FACTOR,
-                            ((TestElement) timer).getName(), getThreadName());
-                }
-                delay = Math.round(delay * TIMER_FACTOR);
-            }
-            totalDelay += delay;
-        }
-        if (totalDelay > 0) {
-            try {
-                if (scheduler) {
-                    // We reduce pause to ensure end of test is not delayed by a sleep ending after test scheduled end
-                    // See Bug 60049
-                    totalDelay = TIMER_SERVICE.adjustDelay(totalDelay, endTime, false);
-                    if (totalDelay < 0) {
-                        log.debug("The delay would be longer than the scheduled period, so stop thread now.");
-                        running = false;
-                        return;
-                    }
-                }
-                TimeUnit.MILLISECONDS.sleep(totalDelay);
-            } catch (InterruptedException e) {
-                log.warn("The delay timer was interrupted - probably did not wait as long as intended.");
-                Thread.currentThread().interrupt();
-            }
-        }
-    }
-
-    void notifyTestListeners() {
-        threadVars.incIteration();
-        for (TestIterationListener listener : testIterationStartListeners) {
-            listener.testIterationStart(new LoopIterationEvent(threadGroupLoopController, threadVars.getIteration()));
-            if (listener instanceof TestElement) {
-                ((TestElement) listener).recoverRunningVersion();
-            }
-        }
-    }
-
-    private void notifyListeners(List<SampleListener> listeners, SampleResult result) {
-        SampleEvent event = new SampleEvent(result, threadGroup.getName(), threadVars);
-        notifier.notifyListeners(event, listeners);
-    }
-
-    /**
-     * Set rampup delay for JMeterThread Thread
-     *
-     * @param delay Rampup delay for JMeterThread
-     */
-    public void setInitialDelay(int delay) {
-        initialDelay = delay;
-    }
-
-    /**
-     * Initial delay if ramp-up period is active for this threadGroup.
-     */
-    private void rampUpDelay() {
-        delayBy(initialDelay, "RampUp");
-    }
-
-    /**
-     * Wait for delay with RAMPUP_GRANULARITY
-     *
-     * @param delay delay in ms
-     * @param type  Delay type
-     */
-    protected final void delayBy(long delay, String type) {
-        if (delay > 0) {
-            long start = System.currentTimeMillis();
-            long end = start + delay;
-            long now;
-            long pause = RAMPUP_GRANULARITY;
-            while (running && (now = System.currentTimeMillis()) < end) {
-                long togo = end - now;
-                if (togo < pause) {
-                    pause = togo;
-                }
-                try {
-                    TimeUnit.MILLISECONDS.sleep(pause); // delay between checks
-                } catch (InterruptedException e) {
-                    if (running) { // NOSONAR running may have been changed from another thread
-                        log.warn("{} delay for {} was interrupted. Waited {} milli-seconds out of {}", type, threadName,
-                                now - start, delay);
-                    }
-                    Thread.currentThread().interrupt();
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns the threadNum.
-     *
-     * @return the threadNum
-     */
-    public int getThreadNum() {
-        return threadNum;
-    }
-
-    /**
-     * Sets the threadNum.
-     *
-     * @param threadNum the threadNum to set
-     */
-    public void setThreadNum(int threadNum) {
-        this.threadNum = threadNum;
-    }
-
-    private class IterationListener implements LoopIterationListener {
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public void iterationStart(LoopIterationEvent iterEvent) {
-            notifyTestListeners();
-        }
-    }
-
-    /**
-     * Save the engine instance for access to the stop methods
-     *
-     * @param engine the engine which is used
-     */
-    public void setEngine(StandardJMeterEngine engine) {
-        this.engine = engine;
-    }
-
-    /**
-     * Should Test stop on sampler error?
-     *
-     * @param b true or false
-     */
-    public void setOnErrorStopTest(boolean b) {
-        onErrorStopTest = b;
-    }
-
-    /**
-     * Should Test stop abruptly on sampler error?
-     *
-     * @param b true or false
-     */
-    public void setOnErrorStopTestNow(boolean b) {
-        onErrorStopTestNow = b;
-    }
-
-    /**
-     * Should Thread stop on Sampler error?
-     *
-     * @param b true or false
-     */
-    public void setOnErrorStopThread(boolean b) {
-        onErrorStopThread = b;
-    }
-
-    /**
-     * Should Thread start next loop on Sampler error?
-     *
-     * @param b true or false
-     */
-    public void setOnErrorStartNextLoop(boolean b) {
-        onErrorStartNextLoop = b;
-    }
-
-    public void setThreadGroup(AbstractThreadGroup group) {
-        this.threadGroup = group;
-    }
-
-    /**
-     * @return {@link ListedHashTree}
-     */
-    public ListedHashTree getTestTree() {
-        return (ListedHashTree) testTree;
-    }
-
-    /**
-     * @return {@link ListenerNotifier}
-     */
-    public ListenerNotifier getNotifier() {
-        return notifier;
-    }
-
-}
diff --git a/backend/src/main/java/org/apache/jmeter/util/JSR223BeanInfoSupport.java b/backend/src/main/java/org/apache/jmeter/util/JSR223BeanInfoSupport.java
deleted file mode 100644
index 67568d3d13..0000000000
--- a/backend/src/main/java/org/apache/jmeter/util/JSR223BeanInfoSupport.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.jmeter.util;
-
-import org.apache.jmeter.testbeans.TestBean;
-
-import javax.script.ScriptEngineFactory;
-import javax.script.ScriptEngineManager;
-import java.util.*;
-import java.util.Map.Entry;
-
-/**
- *  解决JSR233加载 ScriptEngineFactory 空指针问题
- */
-public abstract class JSR223BeanInfoSupport extends ScriptingBeanInfoSupport {
-
-    private static final String[] LANGUAGE_TAGS;
-
-    /**
-     * Will be removed in next version following 3.2
-     * @deprecated use {@link JSR223BeanInfoSupport#getLanguageNames()}
-     */
-    @Deprecated
-    public static final String[][] LANGUAGE_NAMES; // NOSONAR Kept for backward compatibility
-
-    private static final String[][] CONSTANT_LANGUAGE_NAMES;
-
-    static {
-        Map<String, ScriptEngineFactory> nameMap = new HashMap<>();
-        ScriptEngineManager sem = new ScriptEngineManager();
-        final List<ScriptEngineFactory> engineFactories = sem.getEngineFactories();
-        for(ScriptEngineFactory fact : engineFactories){
-            List<String> names = fact.getNames();
-            for(String shortName : names) {
-                if (shortName != null) {
-                    nameMap.put(shortName.toLowerCase(Locale.ENGLISH), fact);
-                }
-            }
-        }
-        LANGUAGE_TAGS = nameMap.keySet().toArray(new String[nameMap.size()]);
-        Arrays.sort(LANGUAGE_TAGS);
-        CONSTANT_LANGUAGE_NAMES = new String[nameMap.size()][2];
-        int i = 0;
-        for(Entry<String, ScriptEngineFactory> me : nameMap.entrySet()) {
-            final String key = me.getKey();
-            CONSTANT_LANGUAGE_NAMES[i][0] = key;
-            final ScriptEngineFactory fact = me.getValue();
-            CONSTANT_LANGUAGE_NAMES[i++][1] = key +
-                    "     (" // $NON-NLS-1$
-                    + fact.getLanguageName() + " " + fact.getLanguageVersion()  // $NON-NLS-1$
-                    + " / "  // $NON-NLS-1$
-                    + fact.getEngineName() + " " + fact.getEngineVersion() // $NON-NLS-1$
-                    + ")";   // $NON-NLS-1$
-        }
-
-        LANGUAGE_NAMES = getLanguageNames(); // NOSONAR Kept for backward compatibility
-    }
-
-    private static final ResourceBundle NAME_BUNDLE = new ListResourceBundle() {
-        @Override
-        protected Object[][] getContents() {
-            return CONSTANT_LANGUAGE_NAMES;
-        }
-    };
-
-    protected JSR223BeanInfoSupport(Class<? extends TestBean> beanClass) {
-        super(beanClass, LANGUAGE_TAGS, NAME_BUNDLE);
-    }
-
-    /**
-     * @return String array of 2 columns array containing Script engine short name / Script Language details
-     */
-    public static final String[][] getLanguageNames() {
-        return CONSTANT_LANGUAGE_NAMES.clone();
-    }
-
-}
diff --git a/backend/src/main/java/org/apache/jmeter/util/JSR223TestElement.java b/backend/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
deleted file mode 100644
index e503783138..0000000000
--- a/backend/src/main/java/org/apache/jmeter/util/JSR223TestElement.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.jmeter.util;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.script.Bindings;
-import javax.script.Compilable;
-import javax.script.CompiledScript;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-
-import io.metersphere.base.domain.JarConfig;
-import io.metersphere.commons.utils.CommonBeanFactory;
-import io.metersphere.commons.utils.LogUtil;
-import io.metersphere.service.JarConfigService;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.collections.map.LRUMap;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.jmeter.NewDriver;
-import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.samplers.Sampler;
-import org.apache.jmeter.testelement.TestStateListener;
-import org.apache.jmeter.threads.JMeterContext;
-import org.apache.jmeter.threads.JMeterContextService;
-import org.apache.jmeter.threads.JMeterVariables;
-import org.apache.jorphan.util.JOrphanUtils;
-import org.codehaus.groovy.jsr223.GroovyScriptEngineImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Base class for JSR223 Test elements
- *
- *  将当前类加载器设置为 loader ，解决由系统类加载器加载的 JMeter 无法动态加载 jar 包问题
- *  同时隔离在 beanshell 中访问由系统类加载器加载的其他类
- */
-public abstract class JSR223TestElement extends ScriptingTestElement
-        implements Serializable, TestStateListener
-{
-    private static final long serialVersionUID = 232L;
-
-    private static final Logger logger = LoggerFactory.getLogger(JSR223TestElement.class);
-    /**
-     * Cache of compiled scripts
-     */
-    @SuppressWarnings("unchecked") // LRUMap does not support generics (yet)
-    private static final Map<String, CompiledScript> compiledScriptsCache =
-            Collections.synchronizedMap(
-                    new LRUMap(JMeterUtils.getPropDefault("jsr223.compiled_scripts_cache_size", 100)));
-
-    /** If not empty then script in ScriptText will be compiled and cached */
-    private String cacheKey = "";
-
-    /** md5 of the script, used as an unique key for the cache */
-    private String scriptMd5 = null;
-
-    /**
-     * Initialization On Demand Holder pattern
-     */
-    private static class LazyHolder {
-        private LazyHolder() {
-            super();
-        }
-        public static final ScriptEngineManager INSTANCE = new ScriptEngineManager();
-    }
-
-    /**
-     * @return ScriptEngineManager singleton
-     */
-    public static ScriptEngineManager getInstance() {
-        return LazyHolder.INSTANCE;
-    }
-
-    public JSR223TestElement() {
-        super();
-    }
-
-    /**
-     * @return {@link ScriptEngine} for language defaulting to groovy if language is not set
-     * @throws ScriptException when no {@link ScriptEngine} could be found
-     */
-    protected ScriptEngine getScriptEngine() throws ScriptException {
-        String lang = getScriptLanguageWithDefault();
-        ScriptEngine scriptEngine = getInstance().getEngineByName(lang);
-        if (scriptEngine == null) {
-            throw new ScriptException("Cannot find engine named: '"+lang+"', ensure you set language field in JSR223 Test Element: "+getName());
-        }
-
-        return scriptEngine;
-    }
-
-    /**
-     * @return script language or DEFAULT_SCRIPT_LANGUAGE if none is set
-     */
-    private String getScriptLanguageWithDefault() {
-        String lang = getScriptLanguage();
-        if (StringUtils.isNotEmpty(lang)) {
-            return lang;
-        }
-        return DEFAULT_SCRIPT_LANGUAGE;
-    }
-
-    /**
-     * Populate variables to be passed to scripts
-     * @param bindings Bindings
-     */
-    protected void populateBindings(Bindings bindings) {
-        final String label = getName();
-        final String fileName = getFilename();
-        final String scriptParameters = getParameters();
-        // Use actual class name for log
-        final Logger elementLogger = LoggerFactory.getLogger(getClass().getName()+"."+getName());
-        bindings.put("log", elementLogger); // $NON-NLS-1$ (this name is fixed)
-        bindings.put("Label", label); // $NON-NLS-1$ (this name is fixed)
-        bindings.put("FileName", fileName); // $NON-NLS-1$ (this name is fixed)
-        bindings.put("Parameters", scriptParameters); // $NON-NLS-1$ (this name is fixed)
-        String[] args=JOrphanUtils.split(scriptParameters, " ");//$NON-NLS-1$
-        bindings.put("args", args); // $NON-NLS-1$ (this name is fixed)
-        // Add variables for access to context and variables
-        JMeterContext jmctx = JMeterContextService.getContext();
-        bindings.put("ctx", jmctx); // $NON-NLS-1$ (this name is fixed)
-        JMeterVariables vars = jmctx.getVariables();
-        bindings.put("vars", vars); // $NON-NLS-1$ (this name is fixed)
-        Properties props = JMeterUtils.getJMeterProperties();
-        bindings.put("props", props); // $NON-NLS-1$ (this name is fixed)
-        // For use in debugging:
-        bindings.put("OUT", System.out); // NOSONAR $NON-NLS-1$ (this name is fixed)
-
-        // Most subclasses will need these:
-        Sampler sampler = jmctx.getCurrentSampler();
-        bindings.put("sampler", sampler); // $NON-NLS-1$ (this name is fixed)
-        SampleResult prev = jmctx.getPreviousResult();
-        bindings.put("prev", prev); // $NON-NLS-1$ (this name is fixed)
-    }
-
-
-    /**
-     * This method will run inline script or file script with special behaviour for file script:
-     * - If ScriptEngine implements Compilable script will be compiled and cached
-     * - If not if will be run
-     * @param scriptEngine ScriptEngine
-     * @param pBindings {@link Bindings} might be null
-     * @return Object returned by script
-     * @throws IOException when reading the script fails
-     * @throws ScriptException when compiling or evaluation of the script fails
-     */
-    protected Object processFileOrScript(ScriptEngine scriptEngine, final Bindings pBindings)
-            throws IOException, ScriptException {
-
-        this.loadGroovyJar(scriptEngine);
-
-        Bindings bindings = pBindings;
-        if (bindings == null) {
-            bindings = scriptEngine.createBindings();
-        }
-        populateBindings(bindings);
-        File scriptFile = new File(getFilename());
-        // Hack: bsh-2.0b5.jar BshScriptEngine implements Compilable but throws
-        // "java.lang.Error: unimplemented"
-        boolean supportsCompilable = scriptEngine instanceof Compilable
-                && !("bsh.engine.BshScriptEngine".equals(scriptEngine.getClass().getName())); // NOSONAR // $NON-NLS-1$
-
-        ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-        // 将当前类加载器设置为 loader ，解决由系统类加载器加载的 JMeter 无法动态加载 jar 包问题
-        // 同时隔离在 beanshell 中访问由系统类加载器加载的其他类
-        NewDriver.setContextClassLoader();
-
-        try {
-            if (!StringUtils.isEmpty(getFilename())) {
-                if (scriptFile.exists() && scriptFile.canRead()) {
-                    if (supportsCompilable) {
-                        String newCacheKey = getScriptLanguage() + "#" + // $NON-NLS-1$
-                                scriptFile.getAbsolutePath() + "#" + // $NON-NLS-1$
-                                scriptFile.lastModified();
-                        CompiledScript compiledScript = compiledScriptsCache.get(newCacheKey);
-                        if (compiledScript == null) {
-                            synchronized (compiledScriptsCache) {
-                                compiledScript = compiledScriptsCache.get(newCacheKey);
-                                if (compiledScript == null) {
-                                    // TODO Charset ?
-                                    try (BufferedReader fileReader = new BufferedReader(new FileReader(scriptFile),
-                                            (int) scriptFile.length())) {
-                                        compiledScript = ((Compilable) scriptEngine).compile(fileReader);
-                                        compiledScriptsCache.put(newCacheKey, compiledScript);
-                                    }
-                                }
-                            }
-                        }
-                        return compiledScript.eval(bindings);
-                    } else {
-                        // TODO Charset ?
-                        try (BufferedReader fileReader = new BufferedReader(new FileReader(scriptFile),
-                                (int) scriptFile.length())) {
-                            return scriptEngine.eval(fileReader, bindings);
-                        }
-                    }
-                } else {
-                    throw new ScriptException("Script file '" + scriptFile.getAbsolutePath()
-                            + "' does not exist or is unreadable for element:" + getName());
-                }
-            } else if (!StringUtils.isEmpty(getScript())) {
-                if (supportsCompilable &&
-                        !ScriptingBeanInfoSupport.FALSE_AS_STRING.equals(cacheKey)) {
-                    computeScriptMD5();
-                    CompiledScript compiledScript = compiledScriptsCache.get(this.scriptMd5);
-                    if (compiledScript == null) {
-                        synchronized (compiledScriptsCache) {
-                            compiledScript = compiledScriptsCache.get(this.scriptMd5);
-                            if (compiledScript == null) {
-                                try {
-                                    compiledScript = ((Compilable) scriptEngine).compile(getScript());
-                                    compiledScriptsCache.put(this.scriptMd5, compiledScript);
-                                } catch (IllegalArgumentException e) {
-                                    LogUtil.error(e.getMessage(), e);
-                                    return new Object();
-                                }
-                            }
-                        }
-                    }
-
-                    return compiledScript.eval(bindings);
-                } else {
-                    return scriptEngine.eval(getScript(), bindings);
-                }
-            } else {
-                throw new ScriptException("Both script file and script text are empty for element:" + getName());
-            }
-        } catch (ScriptException ex) {
-            Throwable rootCause = ex.getCause();
-            if(isStopCondition(rootCause)) {
-                throw (RuntimeException) ex.getCause();
-            } else {
-                throw ex;
-            }
-        } finally {
-            // 将当前类加载器设置回来，避免加载无法加载到系统类加载加载类
-            Thread.currentThread().setContextClassLoader(contextClassLoader);
-        }
-    }
-
-    /**
-     * groovy 使用的是自己的类加载器，
-     * 这里再执行脚本前，使用 groovy的加载器加载jar包，
-     * 解决groovy脚本无法使用jar包的问题
-     * @Auth jianxing
-     * @param scriptEngine
-     */
-    public static void loadGroovyJar(ScriptEngine scriptEngine) {
-        if (scriptEngine instanceof GroovyScriptEngineImpl) {
-            GroovyScriptEngineImpl groovyScriptEngine = (GroovyScriptEngineImpl) scriptEngine;
-
-            JarConfigService jarConfigService = CommonBeanFactory.getBean(JarConfigService.class);
-            List<JarConfig> jars = jarConfigService.list();
-
-            jars.forEach(jarConfig -> {
-                try {
-                    String path = jarConfig.getPath();
-                    File file = new File(path);
-                    if (file.isDirectory() && !path.endsWith("/")) {
-                        file = new File(path + "/");
-                    }
-                    groovyScriptEngine.getClassLoader().addURL(file.toURI().toURL());
-                } catch (Exception e) {
-                    LogUtil.error(e);
-                }
-            });
-
-        }
-    }
-
-    /**
-     * @return boolean true if element is not compilable or if compilation succeeds
-     * @throws IOException if script is missing
-     * @throws ScriptException if compilation fails
-     */
-    public boolean compile()
-            throws ScriptException, IOException {
-        String lang = getScriptLanguageWithDefault();
-        ScriptEngine scriptEngine = getInstance().getEngineByName(lang);
-        boolean supportsCompilable = scriptEngine instanceof Compilable
-                && !("bsh.engine.BshScriptEngine".equals(scriptEngine.getClass().getName())); // NOSONAR // $NON-NLS-1$
-        if(!supportsCompilable) {
-            return true;
-        }
-        if (!StringUtils.isEmpty(getScript())) {
-            try {
-                ((Compilable) scriptEngine).compile(getScript());
-                return true;
-            } catch (ScriptException e) { // NOSONAR
-                logger.error("Error compiling script for test element {}, error:{}", getName(), e.getMessage());
-                return false;
-            }
-        } else {
-            File scriptFile = new File(getFilename());
-            try (BufferedReader fileReader = new BufferedReader(new FileReader(scriptFile),
-                    (int) scriptFile.length())) {
-                try {
-                    ((Compilable) scriptEngine).compile(fileReader);
-                    return true;
-                } catch (ScriptException e) { // NOSONAR
-                    logger.error("Error compiling script for test element {}, error:{}", getName(), e.getMessage());
-                    return false;
-                }
-            }
-        }
-    }
-
-    /**
-     * compute MD5 if it is null
-     */
-    private void computeScriptMD5() {
-        // compute the md5 of the script if needed
-        if(scriptMd5 == null) {
-            scriptMd5 = DigestUtils.md5Hex(getScript());
-        }
-    }
-
-    /**
-     * @return the cacheKey
-     */
-    public String getCacheKey() {
-        return cacheKey;
-    }
-
-    /**
-     * @param cacheKey the cacheKey to set
-     */
-    public void setCacheKey(String cacheKey) {
-        this.cacheKey = cacheKey;
-    }
-
-    /**
-     * @see org.apache.jmeter.testelement.TestStateListener#testStarted()
-     */
-    @Override
-    public void testStarted() {
-        // NOOP
-    }
-
-    /**
-     * @see org.apache.jmeter.testelement.TestStateListener#testStarted(java.lang.String)
-     */
-    @Override
-    public void testStarted(String host) {
-        // NOOP
-    }
-
-    /**
-     * @see org.apache.jmeter.testelement.TestStateListener#testEnded()
-     */
-    @Override
-    public void testEnded() {
-        testEnded("");
-    }
-
-    /**
-     * @see org.apache.jmeter.testelement.TestStateListener#testEnded(java.lang.String)
-     */
-    @Override
-    public void testEnded(String host) {
-        compiledScriptsCache.clear();
-        this.scriptMd5 = null;
-    }
-
-    public String getScriptLanguage() {
-        return scriptLanguage;
-    }
-
-    public void setScriptLanguage(String s) {
-        scriptLanguage = s;
-    }
-}
diff --git a/backend/src/main/java/org/apache/jmeter/util/SSLManager.java b/backend/src/main/java/org/apache/jmeter/util/SSLManager.java
deleted file mode 100644
index d13c5c7e12..0000000000
--- a/backend/src/main/java/org/apache/jmeter/util/SSLManager.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jmeter.util;
-
-import org.apache.commons.lang3.Validate;
-import org.apache.jmeter.gui.GuiPackage;
-import org.apache.jmeter.util.keystore.JmeterKeyStore;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.security.*;
-import java.security.cert.CertificateException;
-import java.util.Locale;
-
-/**
- * The SSLManager handles the KeyStore information for JMeter. Basically, it
- * handles all the logic for loading and initializing all the JSSE parameters
- * and selecting the alias to authenticate against if it is available.
- * SSLManager will try to automatically select the client certificate for you,
- * but if it can't make a decision, it will pop open a dialog asking you for
- * more information.
- * <p>
- * TODO? - N.B. does not currently allow the selection of a client certificate.
- *
- */
-public abstract class SSLManager {
-    private static final Logger log = LoggerFactory.getLogger(SSLManager.class);
-
-    private static final String SSL_TRUST_STORE = "javax.net.ssl.trustStore";// $NON-NLS-1$
-
-    private static final String KEY_STORE_PASSWORD = "javax.net.ssl.keyStorePassword"; // $NON-NLS-1$ NOSONAR no hard coded password
-
-    public static final String JAVAX_NET_SSL_KEY_STORE = "javax.net.ssl.keyStore"; // $NON-NLS-1$
-
-    private static final String JAVAX_NET_SSL_KEY_STORE_TYPE = "javax.net.ssl.keyStoreType"; // $NON-NLS-1$
-
-    private static final String PKCS12 = "pkcs12"; // $NON-NLS-1$
-
-    /** Singleton instance of the manager */
-    private static SSLManager manager;
-
-    private static final boolean IS_SSL_SUPPORTED = true;
-
-    /** Cache the KeyStore instance */
-    private JmeterKeyStore keyStore;
-
-    /** Cache the TrustStore instance - null if no truststore name was provided */
-    private KeyStore trustStore = null;
-    // Have we yet tried to load the truststore?
-    private volatile boolean truststoreLoaded=false;
-
-    /** Have the password available */
-    protected volatile String defaultpw = System.getProperty(KEY_STORE_PASSWORD);
-
-    private int keystoreAliasStartIndex;
-
-    private int keystoreAliasEndIndex;
-
-    private String clientCertAliasVarName;
-
-    /**
-     * Resets the SSLManager so that we can create a new one with a new keystore
-     */
-    public static synchronized void reset() {
-        SSLManager.manager = null;
-    }
-
-    public abstract void setContext(HttpURLConnection conn);
-
-    /**
-     * Default implementation of setting the Provider
-     *
-     * @param provider
-     *            the provider to use
-     */
-    protected void setProvider(Provider provider) {
-        if (null != provider) {
-            Security.addProvider(provider);
-        }
-    }
-
-    protected synchronized JmeterKeyStore getKeyStore() {
-        if (null == this.keyStore) {
-            String fileName = System.getProperty(JAVAX_NET_SSL_KEY_STORE,""); // empty if not provided
-            String fileType = System.getProperty(JAVAX_NET_SSL_KEY_STORE_TYPE, // use the system property to determine the type
-                    fileName.toLowerCase(Locale.ENGLISH).endsWith(".p12") ? PKCS12 : "JKS"); // otherwise use the name
-            log.info("JmeterKeyStore Location: {} type {}", fileName, fileType);
-            try {
-                this.keyStore = JmeterKeyStore.getInstance(fileType, keystoreAliasStartIndex, keystoreAliasEndIndex, clientCertAliasVarName);
-                log.info("KeyStore created OK");
-            } catch (Exception e) {
-                this.keyStore = null;
-                throw new IllegalArgumentException("Could not create keystore: "+e.getMessage(), e);
-            }
-
-            try {
-
-                // The string 'NONE' is used for the keystore location when using PKCS11
-                // https://docs.oracle.com/javase/8/docs/technotes/guides/security/p11guide.html#JSSE
-                if ("NONE".equalsIgnoreCase(fileName)) {
-                    retryLoadKeys(null, false);
-                    log.info("Total of {} aliases loaded OK from PKCS11", keyStore.getAliasCount());
-                } else {
-                    File initStore = new File(fileName);
-                    if (fileName.length() > 0 && initStore.exists()) {
-                        retryLoadKeys(initStore, true);
-                        if (log.isInfoEnabled()) {
-                            log.info("Total of {} aliases loaded OK from keystore {}",
-                                    keyStore.getAliasCount(), fileName);
-                        }
-                    } else {
-                        log.warn("Keystore file not found, loading empty keystore");
-                        this.defaultpw = ""; // Ensure not null
-                        this.keyStore.load(null, "");
-                    }
-                }
-            } catch (Exception e) {
-                log.error("Problem loading keystore: {}", e.getMessage(), e);
-            }
-
-            if (log.isDebugEnabled()) {
-                log.debug("JmeterKeyStore type: {}", this.keyStore.getClass());
-            }
-        }
-
-        return this.keyStore;
-    }
-
-    /**
-     * Opens and initializes the KeyStore. If the password for the KeyStore is
-     * not set, this method will prompt you to enter it. Unfortunately, there is
-     * no PasswordEntryField available from JOptionPane.
-     *
-     * @return the configured {@link JmeterKeyStore}
-     */
-    protected synchronized JmeterKeyStore getKeyStore(InputStream is,String password) {
-        if (null == this.keyStore) {
-            String fileName = System.getProperty(JAVAX_NET_SSL_KEY_STORE,""); // empty if not provided
-            String fileType = System.getProperty(JAVAX_NET_SSL_KEY_STORE_TYPE, // use the system property to determine the type
-                    fileName.toLowerCase(Locale.ENGLISH).endsWith(".p12") ? PKCS12 : "JKS"); // otherwise use the name
-            log.info("JmeterKeyStore Location: {} type {}", fileName, fileType);
-            try {
-                this.keyStore = JmeterKeyStore.getInstance(fileType, keystoreAliasStartIndex, keystoreAliasEndIndex, clientCertAliasVarName);
-                log.info("KeyStore created OK");
-            } catch (Exception e) {
-                this.keyStore = null;
-                throw new IllegalArgumentException("Could not create keystore: "+e.getMessage(), e);
-            }
-
-           try {
-
-              // The string 'NONE' is used for the keystore location when using PKCS11
-              // https://docs.oracle.com/javase/8/docs/technotes/guides/security/p11guide.html#JSSE
-              if ("NONE".equalsIgnoreCase(fileName)) {
-                 retryLoadKeys(null, false);
-                 log.info("Total of {} aliases loaded OK from PKCS11", keyStore.getAliasCount());
-              } else {
-                 File initStore = new File(fileName);
-                 if (fileName.length() > 0 && initStore.exists()) {
-                     retryLoadKeys(initStore, true);
-                     if (log.isInfoEnabled()) {
-                         log.info("Total of {} aliases loaded OK from keystore {}",
-                                 keyStore.getAliasCount(), fileName);
-                     }
-                 } else {
-                    log.warn("Keystore file not found, loading empty keystore");
-                    this.defaultpw = ""; // Ensure not null
-                    this.keyStore.load(is, password);
-                 }
-              }
-           } catch (Exception e) {
-              log.error("Problem loading keystore: {}", e.getMessage(), e);
-           }
-
-           if (log.isDebugEnabled()) {
-              log.debug("JmeterKeyStore type: {}", this.keyStore.getClass());
-           }
-        }
-
-        return this.keyStore;
-    }
-
-    private void retryLoadKeys(File initStore, boolean allowEmptyPassword) throws NoSuchAlgorithmException,
-            CertificateException, IOException, KeyStoreException, UnrecoverableKeyException {
-        for (int i = 0; i < 3; i++) {
-            String password = getPassword();
-            if (!allowEmptyPassword) {
-                Validate.notNull(password, "Password for keystore must not be null");
-            }
-            try {
-                if (initStore == null) {
-                    this.keyStore.load(null, password);
-                } else {
-                    try (InputStream fis = new FileInputStream(initStore)) {
-                        this.keyStore.load(fis, password);
-                    }
-                }
-                return;
-            } catch (IOException e) {
-                log.debug("Could not load keystore. Wrong password for keystore?", e);
-            }
-            this.defaultpw = null;
-        }
-    }
-
-    /*
-     * The password can be defined as a property; this dialogue is provided to allow it
-     * to be entered at run-time.
-     */
-    private String getPassword() {
-        String password = this.defaultpw;
-        if (null == password) {
-            final GuiPackage guiInstance = GuiPackage.getInstance();
-//            if (guiInstance != null) {
-//                JPanel panel = new JPanel(new MigLayout("fillx, wrap 2", "[][fill, grow]"));
-//                JLabel passwordLabel = new JLabel("Password: ");
-//                JPasswordField pwf = new JPasswordField(64);
-//                pwf.setEchoChar('*');
-//                passwordLabel.setLabelFor(pwf);
-//                panel.add(passwordLabel);
-//                panel.add(pwf);
-//                int choice = JOptionPane.showConfirmDialog(guiInstance.getMainFrame(), panel,
-//                        JMeterUtils.getResString("ssl_pass_prompt"), JOptionPane.OK_CANCEL_OPTION,
-//                        JOptionPane.PLAIN_MESSAGE);
-//                if (choice == JOptionPane.OK_OPTION) {
-//                    char[] pwchars = pwf.getPassword();
-//                    this.defaultpw = new String(pwchars);
-//                    Arrays.fill(pwchars, '*');
-//                }
-//                System.setProperty(KEY_STORE_PASSWORD, this.defaultpw);
-//                password = this.defaultpw;
-//            }
-        } else {
-            log.warn("No password provided, and no GUI present so cannot prompt");
-        }
-        return password;
-    }
-
-    /**
-     * Opens and initializes the TrustStore.
-     *
-     * There are 3 possibilities:
-     * <ul>
-     * <li>no truststore name provided, in which case the default Java truststore
-     * should be used</li>
-     * <li>truststore name is provided, and loads OK</li>
-     * <li>truststore name is provided, but is not found or does not load OK, in
-     * which case an empty
-     * truststore is created</li>
-     * </ul>
-     * If the KeyStore object cannot be created, then this is currently treated the
-     * same as if no truststore name was provided.
-     *
-     * @return
-     *         {@code null} when Java truststore should be used.
-     *         Otherwise the truststore, which may be empty if the file could not be
-     *         loaded.
-     *
-     */
-    protected KeyStore getTrustStore() {
-        if (!truststoreLoaded) {
-
-            truststoreLoaded=true;// we've tried ...
-
-            String fileName = System.getProperty(SSL_TRUST_STORE);
-            if (fileName == null) {
-                return null;
-            }
-            log.info("TrustStore Location: {}", fileName);
-
-            try {
-                this.trustStore = KeyStore.getInstance("JKS");
-                log.info("TrustStore created OK, Type: JKS");
-            } catch (Exception e) {
-                this.trustStore = null;
-                throw new RuntimeException("Problem creating truststore: "+e.getMessage(), e);
-            }
-
-            try {
-                File initStore = new File(fileName);
-
-                if (initStore.exists()) {
-                    try (InputStream fis = new FileInputStream(initStore)) {
-                        this.trustStore.load(fis, null);
-                        log.info("Truststore loaded OK from file");
-                    }
-                } else {
-                    log.warn("Truststore file not found, loading empty truststore");
-                    this.trustStore.load(null, null);
-                }
-            } catch (Exception e) {
-                throw new RuntimeException("Can't load TrustStore: " + e.getMessage(), e);
-            }
-        }
-
-        return this.trustStore;
-    }
-
-    /**
-     * Protected Constructor to remove the possibility of directly instantiating
-     * this object. Create the SSLContext, and wrap all the X509KeyManagers with
-     * our X509KeyManager so that we can choose our alias.
-     */
-    protected SSLManager() {
-    }
-
-    /**
-     * Static accessor for the SSLManager object. The SSLManager is a singleton.
-     *
-     * @return the singleton {@link SSLManager}
-     */
-    public static synchronized SSLManager getInstance() {
-        if (null == SSLManager.manager) {
-            SSLManager.manager = new JsseSSLManager(null);
-        }
-
-        return SSLManager.manager;
-    }
-
-    /**
-     * Test whether SSL is supported or not.
-     *
-     * @return flag whether SSL is supported
-     */
-    public static boolean isSSLSupported() {
-        return SSLManager.IS_SSL_SUPPORTED;
-    }
-
-    /**
-     * Configure Keystore
-     *
-     * @param preload
-     *            flag whether the keystore should be opened within this method,
-     *            or the opening should be delayed
-     * @param startIndex
-     *            first index to consider for a key
-     * @param endIndex
-     *            last index to consider for a key
-     * @param clientCertAliasVarName
-     *            name of the default key, if empty the first key will be used
-     *            as default key
-     */
-    public synchronized void configureKeystore(boolean preload, int startIndex, int endIndex, String clientCertAliasVarName,InputStream is,String password) {
-        this.keystoreAliasStartIndex = startIndex;
-        this.keystoreAliasEndIndex = endIndex;
-        this.clientCertAliasVarName = clientCertAliasVarName;
-        if(preload) {
-            keyStore = getKeyStore(is,password);
-        }
-    }
-
-    /**
-     * Destroy Keystore
-     */
-    public synchronized void destroyKeystore() {
-        keyStore=null;
-    }
-}
diff --git a/backend/src/main/java/org/apache/jorphan/collections/HashTree.java b/backend/src/main/java/org/apache/jorphan/collections/HashTree.java
deleted file mode 100644
index 828ab5861a..0000000000
--- a/backend/src/main/java/org/apache/jorphan/collections/HashTree.java
+++ /dev/null
@@ -1,1095 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.jorphan.collections;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.*;
-
-/**
- * This class is used to create a tree structure of objects. Each element in the
- * tree is also a key to the next node down in the tree. It provides many ways
- * to add objects and branches, as well as many ways to retrieve.
- * <p>
- * HashTree implements the Map interface for convenience reasons. The main
- * difference between a Map and a HashTree is that the HashTree organizes the
- * data into a recursive tree structure, and provides the means to manipulate
- * that structure.
- * <p>
- * Of special interest is the {@link #traverse(HashTreeTraverser)} method, which
- * provides an expedient way to traverse any HashTree by implementing the
- * {@link HashTreeTraverser} interface in order to perform some operation on the
- * tree, or to extract information from the tree.
- *
- * @see HashTreeTraverser
- * @see SearchByClass
- */
-public class HashTree implements Serializable, Map<Object, HashTree>, Cloneable {
-
-    private static final long serialVersionUID = 240L;
-
-    // Used for the RuntimeException to short-circuit the traversal
-    private static final String FOUND = "found"; // $NON-NLS-1$
-
-    // N.B. The keys can be either JMeterTreeNode or TestElement
-    protected final Map<Object, HashTree> data;
-
-    /**
-     * Creates an empty new HashTree.
-     */
-    public HashTree() {
-        this(null, null);
-    }
-
-    /**
-     * Allow subclasses to provide their own Map.
-     * @param _map {@link Map} to use
-     */
-    protected HashTree(Map<Object, HashTree> _map) {
-        this(_map, null);
-    }
-
-    /**
-     * Creates a new HashTree and adds the given object as a top-level node.
-     *
-     * @param key
-     *            name of the new top-level node
-     */
-    public HashTree(Object key) {
-        this(new LinkedHashMap<Object, HashTree>(), key);
-    }
-
-    /**
-     * Uses the new HashTree if not null and adds the given object as a
-     * top-level node if not null
-     *
-     * @param _map
-     *            the map to be used. If <code>null</code> a new {@link LinkedHashMap}
-     *            will be created
-     * @param key
-     *            the object to be used as the key for the root node (may be
-     *            <code>null</code>, in which case no root node will be created)
-     */
-    private HashTree(Map<Object, HashTree> _map, Object key) {
-        if(_map != null) {
-            data = _map;
-        } else {
-            data = new LinkedHashMap<>();
-        }
-        if(key != null) {
-            data.put(key, new HashTree());
-        }
-    }
-
-    /**
-     * The Map given must also be a HashTree, otherwise an
-     * UnsupportedOperationException is thrown. If it is a HashTree, this is
-     * like calling the add(HashTree) method.
-     *
-     * @see #add(HashTree)
-     * @see Map#putAll(Map)
-     */
-    @Override
-    public void putAll(Map<?, ? extends HashTree> map) {
-        if (map instanceof HashTree) {
-            this.add((HashTree) map);
-        } else {
-            throw new UnsupportedOperationException("can only putAll other HashTree objects");
-        }
-    }
-
-    /**
-     * Exists to satisfy the Map interface.
-     *
-     * @see Map#entrySet()
-     */
-    @Override
-    public Set<Entry<Object, HashTree>> entrySet() {
-        return data.entrySet();
-    }
-
-    /**
-     * Implemented as required by the Map interface, but is not very useful
-     * here. All 'values' in a HashTree are HashTree's themselves.
-     *
-     * @param value
-     *            Object to be tested as a value.
-     * @return True if the HashTree contains the value, false otherwise.
-     * @see Map#containsValue(Object)
-     */
-    @Override
-    public boolean containsValue(Object value) {
-        return data.containsValue(value);
-    }
-
-    /**
-     * This is the same as calling HashTree.add(key,value).
-     *
-     * @param key
-     *            to use
-     * @param value
-     *            to store against key
-     * @see Map#put(Object, Object)
-     */
-    @Override
-    public HashTree put(Object key, HashTree value) {
-        HashTree previous = data.get(key);
-        add(key, value);
-        return previous;
-    }
-
-    /**
-     * Clears the HashTree of all contents.
-     *
-     * @see Map#clear()
-     */
-    @Override
-    public void clear() {
-        data.clear();
-    }
-
-    /**
-     * Returns a collection of all the sub-trees of the current tree.
-     *
-     * @see Map#values()
-     */
-    @Override
-    public Collection<HashTree> values() {
-        return data.values();
-    }
-
-    /**
-     * Adds a key as a node at the current level and then adds the given
-     * HashTree to that new node.
-     *
-     * @param key
-     *            key to create in this tree
-     * @param subTree
-     *            sub tree to add to the node created for the first argument.
-     */
-    public void add(Object key, HashTree subTree) {
-        add(key).add(subTree);
-    }
-
-    /**
-     * Adds all the nodes and branches of the given tree to this tree. Is like
-     * merging two trees. Duplicates are ignored.
-     *
-     * @param newTree the tree to be added
-     */
-    public void add(HashTree newTree) {
-        for (Object item : newTree.list()) {
-            add(item).add(newTree.getTree(item));
-        }
-    }
-
-    /**
-     * Creates a new HashTree and adds all the objects in the given collection
-     * as top-level nodes in the tree.
-     *
-     * @param keys
-     *            a collection of objects to be added to the created HashTree.
-     */
-    public HashTree(Collection<?> keys) {
-        data = new LinkedHashMap<>();
-        for (Object o : keys) {
-            data.put(o, new HashTree());
-        }
-    }
-
-    /**
-     * Creates a new HashTree and adds all the objects in the given array as
-     * top-level nodes in the tree.
-     *
-     * @param keys
-     *            array with names for the new top-level nodes
-     */
-    public HashTree(Object[] keys) {
-        data = new LinkedHashMap<>();
-        for (Object key : keys) {
-            data.put(key, new HashTree());
-        }
-    }
-
-    /**
-     * If the HashTree contains the given object as a key at the top level, then
-     * a true result is returned, otherwise false.
-     *
-     * @param o
-     *            Object to be tested as a key.
-     * @return True if the HashTree contains the key, false otherwise.
-     * @see Map#containsKey(Object)
-     */
-    @Override
-    public boolean containsKey(Object o) {
-        return data.containsKey(o);
-    }
-
-    /**
-     * If the HashTree is empty, true is returned, false otherwise.
-     *
-     * @return True if HashTree is empty, false otherwise.
-     */
-    @Override
-    public boolean isEmpty() {
-        return data.isEmpty();
-    }
-
-    /**
-     * Sets a key and it's value in the HashTree. It actually sets up a key, and
-     * then creates a node for the key and sets the value to the new node, as a
-     * key. Any previous nodes that existed under the given key are lost.
-     *
-     * @param key
-     *            key to be set up
-     * @param value
-     *            value to be set up as a key in the secondary node
-     */
-    public void set(Object key, Object value) {
-        data.put(key, createNewTree(value));
-    }
-
-    /**
-     * Sets a key into the current tree and assigns it a HashTree as its
-     * subtree. Any previous entries under the given key are removed.
-     *
-     * @param key
-     *            key to be set up
-     * @param t
-     *            HashTree that the key maps to
-     */
-    public void set(Object key, HashTree t) {
-        data.put(key, t);
-    }
-
-    /**
-     * Sets a key and its values in the HashTree. It sets up a key in the
-     * current node, and then creates a node for that key, and sets all the
-     * values in the array as keys in the new node. Any keys previously held
-     * under the given key are lost.
-     *
-     * @param key
-     *            Key to be set up
-     * @param values
-     *            Array of objects to be added as keys in the secondary node
-     */
-    public void set(Object key, Object[] values) {
-        data.put(key, createNewTree(Arrays.asList(values)));
-    }
-
-    /**
-     * Sets a key and its values in the HashTree. It sets up a key in the
-     * current node, and then creates a node for that key, and set all the
-     * values in the array as keys in the new node. Any keys previously held
-     * under the given key are removed.
-     *
-     * @param key
-     *            key to be set up
-     * @param values
-     *            Collection of objects to be added as keys in the secondary
-     *            node
-     */
-    public void set(Object key, Collection<?> values) {
-        data.put(key, createNewTree(values));
-    }
-
-    /**
-     * Sets a series of keys into the HashTree. It sets up the first object in
-     * the key array as a key in the current node, recurses into the next
-     * HashTree node through that key and adds the second object in the array.
-     * Continues recursing in this manner until the end of the first array is
-     * reached, at which point all the values of the second array are set as
-     * keys to the bottom-most node. All previous keys of that bottom-most node
-     * are removed.
-     *
-     * @param treePath
-     *            array of keys to put into HashTree
-     * @param values
-     *            array of values to be added as keys to bottom-most node
-     */
-    public void set(Object[] treePath, Object[] values) {
-        if (treePath != null && values != null) {
-            set(Arrays.asList(treePath), Arrays.asList(values));
-        }
-    }
-
-    /**
-     * Sets a series of keys into the HashTree. It sets up the first object in
-     * the key array as a key in the current node, recurses into the next
-     * HashTree node through that key and adds the second object in the array.
-     * Continues recursing in this manner until the end of the first array is
-     * reached, at which point all the values of the Collection of values are
-     * set as keys to the bottom-most node. Any keys previously held by the
-     * bottom-most node are lost.
-     *
-     * @param treePath
-     *            array of keys to put into HashTree
-     * @param values
-     *            Collection of values to be added as keys to bottom-most node
-     */
-    public void set(Object[] treePath, Collection<?> values) {
-        if (treePath != null) {
-            set(Arrays.asList(treePath), values);
-        }
-    }
-
-    /**
-     * Sets a series of keys into the HashTree. It sets up the first object in
-     * the key list as a key in the current node, recurses into the next
-     * HashTree node through that key and adds the second object in the list.
-     * Continues recursing in this manner until the end of the first list is
-     * reached, at which point all the values of the array of values are set as
-     * keys to the bottom-most node. Any previously existing keys of that bottom
-     * node are removed.
-     *
-     * @param treePath
-     *            collection of keys to put into HashTree
-     * @param values
-     *            array of values to be added as keys to bottom-most node
-     */
-    public void set(Collection<?> treePath, Object[] values) {
-        HashTree tree = addTreePath(treePath);
-        tree.set(Arrays.asList(values));
-    }
-
-    /**
-     * Sets the nodes of the current tree to be the objects of the given
-     * collection. Any nodes previously in the tree are removed.
-     *
-     * @param values
-     *            Collection of objects to set as nodes.
-     */
-    public void set(Collection<?> values) {
-        clear();
-        this.add(values);
-    }
-
-    /**
-     * Sets a series of keys into the HashTree. It sets up the first object in
-     * the key list as a key in the current node, recurses into the next
-     * HashTree node through that key and adds the second object in the list.
-     * Continues recursing in this manner until the end of the first list is
-     * reached, at which point all the values of the Collection of values are
-     * set as keys to the bottom-most node. Any previously existing keys of that
-     * bottom node are lost.
-     *
-     * @param treePath
-     *            list of keys to put into HashTree
-     * @param values
-     *            collection of values to be added as keys to bottom-most node
-     */
-    public void set(Collection<?> treePath, Collection<?> values) {
-        HashTree tree = addTreePath(treePath);
-        tree.set(values);
-    }
-
-    /**
-     * Adds an key into the HashTree at the current level. If a HashTree exists
-     * for the key already, no new tree will be added
-     *
-     * @param key
-     *            key to be added to HashTree
-     * @return newly generated tree, if no tree was found for the given key;
-     *         existing key otherwise
-     */
-    public HashTree add(Object key) {
-        if (!data.containsKey(key)) {
-            HashTree newTree = createNewTree();
-            data.put(key, newTree);
-            return newTree;
-        }
-        return getTree(key);
-    }
-
-    /**
-     * Adds all the given objects as nodes at the current level.
-     *
-     * @param keys
-     *            Array of Keys to be added to HashTree.
-     */
-    public void add(Object[] keys) {
-        for (Object key : keys) {
-            add(key);
-        }
-    }
-
-    /**
-     * Adds a bunch of keys into the HashTree at the current level.
-     *
-     * @param keys
-     *            Collection of Keys to be added to HashTree.
-     */
-    public void add(Collection<?> keys) {
-        for (Object o : keys) {
-            add(o);
-        }
-    }
-
-    /**
-     * Adds a key and it's value in the HashTree. The first argument becomes a
-     * node at the current level, and the second argument becomes a node of it.
-     *
-     * @param key
-     *            key to be added
-     * @param value
-     *            value to be added as a key in the secondary node
-     * @return HashTree for which <code>value</code> is the key
-     */
-    public HashTree add(Object key, Object value) {
-        return add(key).add(value);
-    }
-
-    /**
-     * Adds a key and it's values in the HashTree. The first argument becomes a
-     * node at the current level, and adds all the values in the array to the
-     * new node.
-     *
-     * @param key
-     *            key to be added
-     * @param values
-     *            array of objects to be added as keys in the secondary node
-     */
-    public void add(Object key, Object[] values) {
-        add(key).add(values);
-    }
-
-    /**
-     * Adds a key as a node at the current level and then adds all the objects
-     * in the second argument as nodes of the new node.
-     *
-     * @param key
-     *            key to be added
-     * @param values
-     *            Collection of objects to be added as keys in the secondary
-     *            node
-     */
-    public void add(Object key, Collection<?> values) {
-        add(key).add(values);
-    }
-
-    /**
-     * Adds a series of nodes into the HashTree using the given path. The first
-     * argument is an array that represents a path to a specific node in the
-     * tree. If the path doesn't already exist, it is created (the objects are
-     * added along the way). At the path, all the objects in the second argument
-     * are added as nodes.
-     *
-     * @param treePath
-     *            an array of objects representing a path
-     * @param values
-     *            array of values to be added as keys to bottom-most node
-     */
-    public void add(Object[] treePath, Object[] values) {
-        if (treePath != null) {
-            add(Arrays.asList(treePath), Arrays.asList(values));
-        }
-    }
-
-    /**
-     * Adds a series of nodes into the HashTree using the given path. The first
-     * argument is an array that represents a path to a specific node in the
-     * tree. If the path doesn't already exist, it is created (the objects are
-     * added along the way). At the path, all the objects in the second argument
-     * are added as nodes.
-     *
-     * @param treePath
-     *            an array of objects representing a path
-     * @param values
-     *            collection of values to be added as keys to bottom-most node
-     */
-    public void add(Object[] treePath, Collection<?> values) {
-        if (treePath != null) {
-            add(Arrays.asList(treePath), values);
-        }
-    }
-
-    public HashTree add(Object[] treePath, Object value) {
-        return add(Arrays.asList(treePath), value);
-    }
-
-    /**
-     * Adds a series of nodes into the HashTree using the given path. The first
-     * argument is a List that represents a path to a specific node in the tree.
-     * If the path doesn't already exist, it is created (the objects are added
-     * along the way). At the path, all the objects in the second argument are
-     * added as nodes.
-     *
-     * @param treePath
-     *            a list of objects representing a path
-     * @param values
-     *            array of values to be added as keys to bottom-most node
-     */
-    public void add(Collection<?> treePath, Object[] values) {
-        HashTree tree = addTreePath(treePath);
-        tree.add(Arrays.asList(values));
-    }
-
-    /**
-     * Adds a series of nodes into the HashTree using the given path. The first
-     * argument is a List that represents a path to a specific node in the tree.
-     * If the path doesn't already exist, it is created (the objects are added
-     * along the way). At the path, the object in the second argument is added
-     * as a node.
-     *
-     * @param treePath
-     *            a list of objects representing a path
-     * @param value
-     *            Object to add as a node to bottom-most node
-     * @return HashTree for which <code>value</code> is the key
-     */
-    public HashTree add(Collection<?> treePath, Object value) {
-        HashTree tree = addTreePath(treePath);
-        return tree.add(value);
-    }
-
-    /**
-     * Adds a series of nodes into the HashTree using the given path. The first
-     * argument is a SortedSet that represents a path to a specific node in the
-     * tree. If the path doesn't already exist, it is created (the objects are
-     * added along the way). At the path, all the objects in the second argument
-     * are added as nodes.
-     *
-     * @param treePath
-     *            a SortedSet of objects representing a path
-     * @param values
-     *            Collection of values to be added as keys to bottom-most node
-     */
-    public void add(Collection<?> treePath, Collection<?> values) {
-        HashTree tree = addTreePath(treePath);
-        tree.add(values);
-    }
-
-    protected HashTree addTreePath(Collection<?> treePath) {
-        HashTree tree = this;
-        for (Object temp : treePath) {
-            tree = tree.add(temp);
-        }
-        return tree;
-    }
-
-    /**
-     * Gets the HashTree mapped to the given key.
-     *
-     * @param key
-     *            Key used to find appropriate HashTree()
-     * @return the HashTree for <code>key</code>
-     */
-    public HashTree getTree(Object key) {
-        return data.get(key);
-    }
-
-    /**
-     * Returns the HashTree object associated with the given key. Same as
-     * calling {@link #getTree(Object)}.
-     *
-     * @see Map#get(Object)
-     */
-    @Override
-    public HashTree get(Object key) {
-        return getTree(key);
-    }
-
-    /**
-     * Gets the HashTree object mapped to the last key in the array by recursing
-     * through the HashTree structure one key at a time.
-     *
-     * @param treePath
-     *            array of keys.
-     * @return HashTree at the end of the recursion.
-     */
-    public HashTree getTree(Object[] treePath) {
-        if (treePath != null) {
-            return getTree(Arrays.asList(treePath));
-        }
-        return this;
-    }
-
-    /**
-     * Create a clone of this HashTree. This is not a deep clone (i.e., the
-     * contents of the tree are not cloned).
-     *
-     */
-    @Override
-    public Object clone() {
-        HashTree newTree = new HashTree();
-        cloneTree(newTree);
-        return newTree;
-    }
-
-    protected void cloneTree(HashTree newTree) {
-        for (Object key : list()) {
-            newTree.set(key, (HashTree) getTree(key).clone());
-        }
-    }
-
-    /**
-     * Creates a new tree. This method exists to allow inheriting classes to
-     * generate the appropriate types of nodes. For instance, when a node is
-     * added, it's value is a HashTree. Rather than directly calling the
-     * HashTree() constructor, the createNewTree() method is called. Inheriting
-     * classes should override these methods and create the appropriate subclass
-     * of HashTree.
-     *
-     * @return HashTree
-     */
-    protected HashTree createNewTree() {
-        return new HashTree();
-    }
-
-    /**
-     * Creates a new tree. This method exists to allow inheriting classes to
-     * generate the appropriate types of nodes. For instance, when a node is
-     * added, it's value is a HashTree. Rather than directly calling the
-     * HashTree() constructor, the createNewTree() method is called. Inheriting
-     * classes should override these methods and create the appropriate subclass
-     * of HashTree.
-     *
-     * @param key
-     *            object to use as the key for the top level
-     *
-     * @return newly created {@link HashTree}
-     */
-    protected HashTree createNewTree(Object key) {
-        return new HashTree(key);
-    }
-
-    /**
-     * Creates a new tree. This method exists to allow inheriting classes to
-     * generate the appropriate types of nodes. For instance, when a node is
-     * added, it's value is a HashTree. Rather than directly calling the
-     * HashTree() constructor, the createNewTree() method is called. Inheriting
-     * classes should override these methods and create the appropriate subclass
-     * of HashTree.
-     *
-     * @param values objects to be added to the new {@link HashTree}
-     *
-     * @return newly created {@link HashTree}
-     */
-    protected HashTree createNewTree(Collection<?> values) {
-        return new HashTree(values);
-    }
-
-    /**
-     * Gets the HashTree object mapped to the last key in the SortedSet by
-     * recursing through the HashTree structure one key at a time.
-     *
-     * @param treePath
-     *            Collection of keys
-     * @return HashTree at the end of the recursion
-     */
-    public HashTree getTree(Collection<?> treePath) {
-        return getTreePath(treePath);
-    }
-
-    /**
-     * Gets a Collection of all keys in the current HashTree node. If the
-     * HashTree represented a file system, this would be like getting a
-     * collection of all the files in the current folder.
-     *
-     * @return Set of all keys in this HashTree
-     */
-    public Collection<Object> list() {
-        return data.keySet();
-    }
-
-    /**
-     * Gets a Set of all keys in the HashTree mapped to the given key of the
-     * current HashTree object (in other words, one level down. If the HashTree
-     * represented a file system, this would like getting a list of all files in
-     * a sub-directory (of the current directory) specified by the key argument.
-     *
-     * @param key
-     *            key used to find HashTree to get list of
-     * @return Set of all keys in found HashTree.
-     */
-    public Collection<?> list(Object key) {
-        HashTree temp = data.get(key);
-        if (temp != null) {
-            return temp.list();
-        }
-        return new HashSet<>();
-    }
-
-    /**
-     * Removes the entire branch specified by the given key.
-     *
-     * @see Map#remove(Object)
-     */
-    @Override
-    public HashTree remove(Object key) {
-        return data.remove(key);
-    }
-
-    /**
-     * Recurses down into the HashTree structure using each subsequent key in the
-     * array of keys, and returns the Set of keys of the HashTree object at the
-     * end of the recursion. If the HashTree represented a file system, this
-     * would be like getting a list of all the files in a directory specified by
-     * the treePath, relative from the current directory.
-     *
-     * @param treePath
-     *            Array of keys used to recurse into HashTree structure
-     * @return Set of all keys found in end HashTree
-     */
-    public Collection<?> list(Object[] treePath) {
-        if (treePath != null) {
-            return list(Arrays.asList(treePath));
-        }
-        return list();
-    }
-
-    /**
-     * Recurses down into the HashTree structure using each subsequent key in the
-     * List of keys, and returns the Set of keys of the HashTree object at the
-     * end of the recursion. If the HashTree represented a file system, this
-     * would be like getting a list of all the files in a directory specified by
-     * the treePath, relative from the current directory.
-     *
-     * @param treePath
-     *            List of keys used to recurse into HashTree structure
-     * @return Set of all keys found in end HashTree
-     */
-    public Collection<?> list(Collection<?> treePath) {
-        HashTree tree = getTreePath(treePath);
-        if (tree != null) {
-            return tree.list();
-        }
-        return new HashSet<>();
-    }
-
-    /**
-     * Finds the given current key, and replaces it with the given new key. Any
-     * tree structure found under the original key is moved to the new key.
-     *
-     * @param currentKey name of the key to be replaced
-     * @param newKey name of the new key
-     */
-    public void replaceKey(Object currentKey, Object newKey) {
-        HashTree tree = getTree(currentKey);
-        data.remove(currentKey);
-        data.put(newKey, tree);
-    }
-
-    /**
-     * Gets an array of all keys in the current HashTree node. If the HashTree
-     * represented a file system, this would be like getting an array of all the
-     * files in the current folder.
-     *
-     * @return array of all keys in this HashTree.
-     */
-    public Object[] getArray() {
-        return data.keySet().toArray();
-    }
-
-    /**
-     * Gets an array of all keys in the HashTree mapped to the given key of the
-     * current HashTree object (in other words, one level down). If the HashTree
-     * represented a file system, this would like getting a list of all files in
-     * a sub-directory (of the current directory) specified by the key argument.
-     *
-     * @param key
-     *            key used to find HashTree to get list of
-     * @return array of all keys in found HashTree
-     */
-    public Object[] getArray(Object key) {
-        HashTree t = getTree(key);
-        if (t != null) {
-            return t.getArray();
-        }
-        return null;
-    }
-
-    /**
-     * Recurses down into the HashTree structure using each subsequent key in the
-     * array of keys, and returns an array of keys of the HashTree object at the
-     * end of the recursion. If the HashTree represented a file system, this
-     * would be like getting a list of all the files in a directory specified by
-     * the treePath, relative from the current directory.
-     *
-     * @param treePath
-     *            array of keys used to recurse into HashTree structure
-     * @return array of all keys found in end HashTree
-     */
-    public Object[] getArray(Object[] treePath) {
-        if (treePath != null) {
-            return getArray(Arrays.asList(treePath));
-        }
-        return getArray();
-    }
-
-    /**
-     * Recurses down into the HashTree structure using each subsequent key in the
-     * treePath argument, and returns an array of keys of the HashTree object at
-     * the end of the recursion. If the HashTree represented a file system, this
-     * would be like getting a list of all the files in a directory specified by
-     * the treePath, relative from the current directory.
-     *
-     * @param treePath
-     *            list of keys used to recurse into HashTree structure
-     * @return array of all keys found in end HashTree
-     */
-    public Object[] getArray(Collection<?> treePath) {
-        HashTree tree = getTreePath(treePath);
-        return (tree != null) ? tree.getArray() : null;
-    }
-
-    protected HashTree getTreePath(Collection<?> treePath) {
-        HashTree tree = this;
-        for (Object aTreePath : treePath) {
-            tree = tree.getTree(aTreePath);
-            if (tree == null) {
-                return null;
-            }
-        }
-        return tree;
-    }
-
-    /**
-     * Returns a hashcode for this HashTree.
-     *
-     * @see Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        return data.hashCode() * 7;
-    }
-
-    /**
-     * Compares all objects in the tree and verifies that the two trees contain
-     * the same objects at the same tree levels. Returns true if they do, false
-     * otherwise.
-     *
-     * @param o
-     *            Object to be compared against
-     * @see Object#equals(Object)
-     */
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof HashTree)) {
-            return false;
-        }
-        HashTree oo = (HashTree) o;
-        if (oo.size() != this.size()) {
-            return false;
-        }
-        return data.equals(oo.data);
-    }
-
-    /**
-     * Returns a Set of all the keys in the top-level of this HashTree.
-     *
-     * @see Map#keySet()
-     */
-    @Override
-    public Set<Object> keySet() {
-        return data.keySet();
-    }
-
-    /**
-     * Searches the HashTree structure for the given key. If it finds the key,
-     * it returns the HashTree mapped to the key. If it finds nothing, it
-     * returns null.
-     *
-     * @param key
-     *            Key to search for
-     * @return HashTree mapped to key, if found, otherwise <code>null</code>
-     */
-    public HashTree search(Object key) {
-        HashTree result = getTree(key);
-        if (result != null) {
-            return result;
-        }
-        TreeSearcher searcher = new TreeSearcher(key);
-        try {
-            traverse(searcher);
-        } catch (RuntimeException e) {
-            if (!e.getMessage().equals(FOUND)){
-                throw e;
-            }
-            // do nothing - means object is found
-        }
-        return searcher.getResult();
-    }
-
-    /**
-     * Method readObject.
-     *
-     * @param ois
-     *            the stream to read the objects from
-     * @throws ClassNotFoundException
-     *             when the class for the deserialization can not be found
-     * @throws IOException
-     *             when I/O error occurs
-     */
-    private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
-        ois.defaultReadObject();
-    }
-
-    private void writeObject(ObjectOutputStream oos) throws IOException {
-        oos.defaultWriteObject();
-    }
-
-    /**
-     * Returns the number of top-level entries in the HashTree.
-     *
-     * @see Map#size()
-     */
-    @Override
-    public int size() {
-        return data.size();
-    }
-
-    /**
-     * Allows any implementation of the HashTreeTraverser interface to easily
-     * traverse (depth-first) all the nodes of the HashTree. The Traverser
-     * implementation will be given notification of each node visited.
-     *
-     * @see HashTreeTraverser
-     * @param visitor
-     *            the visitor that wants to traverse the tree
-     */
-    public void traverse(HashTreeTraverser visitor) {
-        for (Object item : list()) {
-            visitor.addNode(item, getTree(item));
-            getTree(item).traverseInto(visitor);
-        }
-    }
-
-    /**
-     * The recursive method that accomplishes the tree-traversal and performs
-     * the callbacks to the HashTreeTraverser.
-     *
-     * @param visitor
-     *            the {@link HashTreeTraverser} to be notified
-     */
-    private void traverseInto(HashTreeTraverser visitor) {
-        if (list().isEmpty()) {
-            visitor.processPath();
-        } else {
-            for (Object item : list()) {
-                final HashTree treeItem = getTree(item);
-                visitor.addNode(item, treeItem);
-                treeItem.traverseInto(visitor);
-            }
-        }
-        visitor.subtractNode();
-    }
-
-    /**
-     * Generate a printable representation of the tree.
-     *
-     * @return a representation of the tree
-     */
-    @Override
-    public String toString() {
-        ConvertToString converter = new ConvertToString();
-        try {
-            traverse(converter);
-        } catch (Exception e) { // Just in case
-            converter.reportError(e);
-        }
-        return converter.toString();
-    }
-
-    private static class TreeSearcher implements HashTreeTraverser {
-
-        private final Object target;
-
-        private HashTree result;
-
-        public TreeSearcher(Object t) {
-            target = t;
-        }
-
-        public HashTree getResult() {
-            return result;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void addNode(Object node, HashTree subTree) {
-            result = subTree.getTree(target);
-            if (result != null) {
-                // short circuit traversal when found
-                throw new RuntimeException(FOUND);
-            }
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void processPath() {
-            // Not used
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void subtractNode() {
-            // Not used
-        }
-    }
-
-    private static class ConvertToString implements HashTreeTraverser {
-        private final StringBuilder string = new StringBuilder(getClass().getName() + "{");
-
-        private final StringBuilder spaces = new StringBuilder();
-
-        private int depth = 0;
-
-        @Override
-        public void addNode(Object key, HashTree subTree) {
-            depth++;
-            string.append("\n").append(getSpaces()).append(key);
-            string.append(" {");
-        }
-
-        @Override
-        public void subtractNode() {
-            string.append("\n" + getSpaces() + "}");
-            depth--;
-        }
-
-        @Override
-        public void processPath() {
-            // NOOP
-        }
-
-        @Override
-        public String toString() {
-            string.append("\n}");
-            return string.toString();
-        }
-
-        void reportError(Throwable t){
-            string.append("Error: ").append(t.toString());
-        }
-
-        private String getSpaces() {
-            if (spaces.length() < depth * 2) {
-                while (spaces.length() < depth * 2) {
-                    spaces.append("  ");
-                }
-            } else if (spaces.length() > depth * 2) {
-                spaces.setLength(depth * 2);
-            }
-            return spaces.toString();
-        }
-    }
-}
diff --git a/backend/src/main/resources/db/migration/V102__v1.16_release.sql b/backend/src/main/resources/db/migration/V102__v1.16_release.sql
index 9a49de665d..8309650833 100644
--- a/backend/src/main/resources/db/migration/V102__v1.16_release.sql
+++ b/backend/src/main/resources/db/migration/V102__v1.16_release.sql
@@ -25,4 +25,33 @@ ALTER TABLE project
     ADD api_quick varchar(50) DEFAULT NULL COMMENT 'api定义快捷调试按钮',
 
 ALTER TABLE test_case
-    ADD case_public tinyint(1) DEFAULT NULL COMMENT '是否是公共用例';
\ No newline at end of file
+    ADD case_public tinyint(1) DEFAULT NULL COMMENT '是否是公共用例';
+
+-- 执行结果优化
+alter table api_scenario_report add report_version int null;
+
+CREATE TABLE IF NOT EXISTS `api_scenario_report_result`
+(
+   `id` varchar(50) NOT NULL COMMENT 'ID',
+   `resource_id` VARCHAR(200) DEFAULT NULL COMMENT '请求资源 id',
+    `report_id` VARCHAR(50) DEFAULT NULL COMMENT '报告 id',
+     create_time bigint(13)  NULL COMMENT '创建时间',
+    `status` varchar(100) null COMMENT '结果状态',
+    `request_time` bigint(13) null COMMENT '请求时间',
+		`total_assertions` bigint(13) null COMMENT '总断言数',
+    `pass_assertions` bigint(13) null COMMENT '失败断言数',
+     content longblob  COMMENT '执行结果',
+	PRIMARY KEY (`id`),
+	KEY `index_resource_id` (`resource_id`) USING BTREE
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
+
+CREATE TABLE IF NOT EXISTS `api_scenario_report_structure`
+(
+  `id` varchar(50) NOT NULL COMMENT 'ID',
+  `report_id` VARCHAR(50) DEFAULT NULL COMMENT '请求资源 id',
+	 create_time bigint(13)  NULL COMMENT '创建时间',
+	 resource_tree longblob  DEFAULT NULL COMMENT '资源步骤结构树',
+	 console LONGTEXT DEFAULT NULL COMMENT '执行日志',
+	PRIMARY KEY (`id`),
+	KEY `index_report_id` (`report_id`) USING BTREE
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
diff --git a/backend/src/main/resources/logback.xml b/backend/src/main/resources/logback.xml
index 73a4471261..2743753829 100644
--- a/backend/src/main/resources/logback.xml
+++ b/backend/src/main/resources/logback.xml
@@ -1,210 +1,244 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="true">
-	<property resource="application.properties"/>
-	<property file="/opt/metersphere/conf/metersphere.properties"/>
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
-		</encoder>
-	</appender>
+    <property resource="application.properties"/>
+    <property file="/opt/metersphere/conf/metersphere.properties"/>
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+        </encoder>
+    </appender>
 
-	<appender name="debugAppender"
-			  class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>DEBUG</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logging.file.path}/debug.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<FileNamePattern>${logging.file.path}/history/debug.%d{yyyyMMdd}-%i.log
-			</FileNamePattern>
-			<maxHistory>30</maxHistory>
-			<TimeBasedFileNamingAndTriggeringPolicy
-					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>50MB</maxFileSize>
-			</TimeBasedFileNamingAndTriggeringPolicy>
-		</rollingPolicy>
-		<encoder>
-			<charset>UTF-8</charset>
-			<Pattern>%d [%thread] %-5level %logger{36} %line - %msg%n</Pattern>
-		</encoder>
-	</appender>
+    <appender name="debugAppender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <File>${logging.file.path}/debug.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${logging.file.path}/history/debug.%d{yyyyMMdd}-%i.log
+            </FileNamePattern>
+            <maxHistory>30</maxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>50MB</maxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <charset>UTF-8</charset>
+            <Pattern>%d [%thread] %-5level %logger{36} %line - %msg%n</Pattern>
+        </encoder>
+    </appender>
 
-	<appender name="infoAppender"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>INFO</level>
-		</filter>
-		<File>${logging.file.path}/info.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<FileNamePattern>${logging.file.path}/history/info.%d{yyyyMMdd}-%i.log
-			</FileNamePattern>
-			<maxHistory>30</maxHistory>
-			<TimeBasedFileNamingAndTriggeringPolicy
-					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>50MB</maxFileSize>
-			</TimeBasedFileNamingAndTriggeringPolicy>
-		</rollingPolicy>
-		<encoder>
-			<charset>UTF-8</charset>
-			<Pattern>%d [%thread] %-5level %logger{36} %line - %msg%n</Pattern>
-		</encoder>
-	</appender>
+    <appender name="infoAppender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <File>${logging.file.path}/info.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${logging.file.path}/history/info.%d{yyyyMMdd}-%i.log
+            </FileNamePattern>
+            <maxHistory>30</maxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>50MB</maxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <charset>UTF-8</charset>
+            <Pattern>%d [%thread] %-5level %logger{36} %line - %msg%n</Pattern>
+        </encoder>
+    </appender>
 
-	<appender name="errorAppender"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>ERROR</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
+    <appender name="errorAppender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
 
-		<File>${logging.file.path}/error.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<FileNamePattern>${logging.file.path}/history/error.%d{yyyyMMdd}-%i.log
-			</FileNamePattern>
-			<maxHistory>30</maxHistory>
-			<TimeBasedFileNamingAndTriggeringPolicy
-					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>50MB</maxFileSize>
-			</TimeBasedFileNamingAndTriggeringPolicy>
-		</rollingPolicy>
-		<encoder>
-			<charset>UTF-8</charset>
-			<Pattern>%d [%thread] %-5level %logger{36} %line - %msg%n</Pattern>
-		</encoder>
-	</appender>
+        <File>${logging.file.path}/error.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${logging.file.path}/history/error.%d{yyyyMMdd}-%i.log
+            </FileNamePattern>
+            <maxHistory>30</maxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>50MB</maxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <charset>UTF-8</charset>
+            <Pattern>%d [%thread] %-5level %logger{36} %line - %msg%n</Pattern>
+        </encoder>
+    </appender>
 
-	<appender name="warnAppender"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>WARN</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logging.file.path}/warn.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<FileNamePattern>${logging.file.path}/history/warn.%d{yyyyMMdd}-%i.log
-			</FileNamePattern>
-			<maxHistory>30</maxHistory>
-			<TimeBasedFileNamingAndTriggeringPolicy
-					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>50MB</maxFileSize>
-			</TimeBasedFileNamingAndTriggeringPolicy>
-		</rollingPolicy>
-		<encoder>
-			<charset>UTF-8</charset>
-			<Pattern>%d [%thread] %-5level %logger{36} %line - %msg%n</Pattern>
-		</encoder>
-	</appender>
+    <appender name="warnAppender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <File>${logging.file.path}/warn.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${logging.file.path}/history/warn.%d{yyyyMMdd}-%i.log
+            </FileNamePattern>
+            <maxHistory>30</maxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>50MB</maxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <charset>UTF-8</charset>
+            <Pattern>%d [%thread] %-5level %logger{36} %line - %msg%n</Pattern>
+        </encoder>
+    </appender>
 
-	<appender name="consoleAsyncAppender" class="ch.qos.logback.classic.AsyncAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>DEBUG</level>
-		</filter>
-		<queueSize>10000</queueSize>
-		<appender-ref ref="console" />
-	</appender>
+    <appender name="consoleAsyncAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>DEBUG</level>
+        </filter>
+        <queueSize>10000</queueSize>
+        <appender-ref ref="console"/>
+    </appender>
 
-	<appender name="debugAsyncAppender" class="ch.qos.logback.classic.AsyncAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>DEBUG</level>
-		</filter>
-		<queueSize>10000</queueSize>
-		<appender-ref ref="debugAppender" />
-	</appender>
+    <appender name="debugAsyncAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>DEBUG</level>
+        </filter>
+        <queueSize>10000</queueSize>
+        <appender-ref ref="debugAppender"/>
+    </appender>
 
-	<appender name="infoAsyncAppender" class="ch.qos.logback.classic.AsyncAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>INFO</level>
-		</filter>
-		<queueSize>10000</queueSize>
-		<appender-ref ref="infoAppender" />
-	</appender>
+    <appender name="infoAsyncAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <queueSize>10000</queueSize>
+        <appender-ref ref="infoAppender"/>
+    </appender>
 
-	<appender name="errorAsyncAppender" class="ch.qos.logback.classic.AsyncAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>ERROR</level>
-		</filter>
-		<queueSize>10000</queueSize>
-		<includeCallerData>true</includeCallerData>
-		<appender-ref ref="errorAppender" />
-	</appender>
+    <appender name="errorAsyncAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <queueSize>10000</queueSize>
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="errorAppender"/>
+    </appender>
 
-	<appender name="warnAsyncAppender" class="ch.qos.logback.classic.AsyncAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>WARN</level>
-		</filter>
-		<queueSize>10000</queueSize>
-		<includeCallerData>true</includeCallerData>
-		<appender-ref ref="warnAppender" />
-	</appender>
+    <appender name="warnAsyncAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <queueSize>10000</queueSize>
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="warnAppender"/>
+    </appender>
 
-	<!-- 自定义测试计划执行的日志	-->
-	<appender name="infoTestPlanAppender"
-			  class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>INFO</level>
-		</filter>
-		<File>${logging.file.path}/testPlan/info.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<FileNamePattern>${logging.file.path}/history/testPlan/info.%d{yyyyMMdd}-%i.log
-			</FileNamePattern>
-			<maxHistory>30</maxHistory>
-			<TimeBasedFileNamingAndTriggeringPolicy
-					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>50MB</maxFileSize>
-			</TimeBasedFileNamingAndTriggeringPolicy>
-		</rollingPolicy>
-		<encoder>
-			<charset>UTF-8</charset>
-			<Pattern>%d [%thread] %-5level %logger{36} %line - %msg%n</Pattern>
-		</encoder>
-	</appender>
-	<appender name="infoTestPlanAsyncAppender" class="ch.qos.logback.classic.AsyncAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>INFO</level>
-		</filter>
-		<queueSize>10000</queueSize>
-		<appender-ref ref="infoTestPlanAppender" />
-	</appender>
-	<logger name="testPlanExecuteLog" additivity="false">
-		<level value="${logger.level:INFO}"/>
-		<appender-ref ref="infoTestPlanAsyncAppender"/>
-	</logger>
+    <!-- 自定义测试计划执行的日志	-->
+    <appender name="infoTestPlanAppender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <File>${logging.file.path}/testPlan/info.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${logging.file.path}/history/testPlan/info.%d{yyyyMMdd}-%i.log
+            </FileNamePattern>
+            <maxHistory>30</maxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>50MB</maxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <charset>UTF-8</charset>
+            <Pattern>%d [%thread] %-5level %logger{36} %line - %msg%n</Pattern>
+        </encoder>
+    </appender>
+    <appender name="infoTestPlanAsyncAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <queueSize>10000</queueSize>
+        <appender-ref ref="infoTestPlanAppender"/>
+    </appender>
+    <logger name="testPlanExecuteLog" additivity="false">
+        <level value="${logger.level:INFO}"/>
+        <appender-ref ref="infoTestPlanAsyncAppender"/>
+    </logger>
 
-	<!-- 自定义JMETER输出日志 -->
+    <!-- 自定义执行过程日志 -->
+    <appender name="apiRunLogAppender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <File>${logging.file.path}/ms-jmeter-run-log.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${logging.file.path}/history/ms-jmeter-run-log.%d{yyyyMMdd}-%i.log
+            </FileNamePattern>
+            <maxHistory>30</maxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>50MB</maxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <charset>UTF-8</charset>
+            <Pattern>%d [%thread] %-5level %logger{36} %line - %msg%n</Pattern>
+        </encoder>
+    </appender>
+    <appender name="runLogAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <queueSize>10000</queueSize>
+        <appender-ref ref="apiRunLogAppender"/>
+    </appender>
+    <logger name="ms-jmeter-run-log" additivity="false">
+        <level value="${logger.level:INFO}"/>
+        <appender-ref ref="runLogAppender"/>
+    </logger>
+
+
+    <!-- 自定义JMETER输出日志 -->
     <appender name="JMETER_LOG" class="io.metersphere.api.jmeter.JmeterLoggerAppender"/>
 
-	<root level="INFO">
-		<appender-ref ref="infoAsyncAppender" />
-		<appender-ref ref="console"/>
-	</root>
+    <root level="INFO">
+        <appender-ref ref="infoAsyncAppender"/>
+        <appender-ref ref="console"/>
+    </root>
     <!--将JMETER日志单独输出的包路径-->
     <logger name="org.apache.jmeter" additivity="false" level="${logger.level:INFO}">
         <appender-ref ref="JMETER_LOG"/>
     </logger>
 
-	<logger name="io.metersphere" additivity="false">
-		<level value="${logger.level:INFO}"/>
-		<appender-ref ref="infoAsyncAppender"/>
-		<appender-ref ref="warnAsyncAppender"/>
-		<appender-ref ref="errorAsyncAppender"/>
-	</logger>
+    <logger name="io.metersphere" additivity="false">
+        <level value="${logger.level:INFO}"/>
+        <appender-ref ref="infoAsyncAppender"/>
+        <appender-ref ref="warnAsyncAppender"/>
+        <appender-ref ref="errorAsyncAppender"/>
+    </logger>
 
-	<logger name="io.metersphere.base.mapper" level="${logger.sql.level}">
-		<appender-ref ref="console"/>
-	</logger>
-<!--	<logger name="io.metersphere.xpack.mapper" level="${logger.sql.level}">-->
-<!--		<appender-ref ref="console"/>-->
-<!--	</logger>-->
+    <logger name="io.metersphere.base.mapper" level="${logger.sql.level}">
+        <appender-ref ref="console"/>
+    </logger>
+    <!--	<logger name="io.metersphere.xpack.mapper" level="${logger.sql.level}">-->
+    <!--		<appender-ref ref="console"/>-->
+    <!--	</logger>-->
 
-	<logger name="io.metersphere.Application" additivity="false" level="${logger.level:INFO}">
-		<appender-ref ref="infoAsyncAppender"/>
-	</logger>
+    <logger name="io.metersphere.Application" additivity="false" level="${logger.level:INFO}">
+        <appender-ref ref="infoAsyncAppender"/>
+    </logger>
 
-	<!--	<logger name="com.alibaba.nacos.naming.client.listener" additivity="false" level="ERROR"/>-->
-	<!--	<logger name="org.apache.dubbo" additivity="false" level="ERROR"/>-->
+    <!--	<logger name="com.alibaba.nacos.naming.client.listener" additivity="false" level="ERROR"/>-->
+    <!--	<logger name="org.apache.dubbo" additivity="false" level="ERROR"/>-->
 
 </configuration>
\ No newline at end of file
diff --git a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
index c79a39a221..85d3dbb8e9 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
@@ -9,14 +9,21 @@
             <div>
               <el-tabs v-model="activeName" @tab-click="handleClick">
                 <el-tab-pane :label="$t('api_report.total')" name="total">
-                  <ms-scenario-results :treeData="fullTreeNodes" :console="content.console" v-on:requestResult="requestResult"/>
+                  <ms-scenario-results :treeData="fullTreeNodes" :console="content.console" v-on:requestResult="requestResult" ref="resultsTree"/>
                 </el-tab-pane>
                 <el-tab-pane name="fail">
                   <template slot="label">
                     <span class="fail">{{ $t('api_report.fail') }}</span>
                   </template>
-                  <ms-scenario-results v-on:requestResult="requestResult" :console="content.console" :treeData="failsTreeNodes"/>
+                  <ms-scenario-results v-on:requestResult="requestResult" :console="content.console" :treeData="fullTreeNodes" ref="failsTree"/>
                 </el-tab-pane>
+                <el-tab-pane name="console">
+                  <template slot="label">
+                    <span class="console">{{ $t('api_test.definition.request.console') }}</span>
+                  </template>
+                  <pre>{{ content.console }}</pre>
+                </el-tab-pane>
+
               </el-tabs>
             </div>
             <ms-api-report-export v-if="reportExportVisible" id="apiTestReport" :title="report.testName"
@@ -42,6 +49,7 @@ import MsApiReportViewHeader from "./ApiReportViewHeader";
 import {RequestFactory} from "../../definition/model/ApiTestModel";
 import {windowPrint, getUUID, getCurrentProjectID} from "@/common/js/utils";
 import {getScenarioReport, getShareScenarioReport} from "@/network/api";
+import {STEP} from "@/business/components/api/automation/scenario/Setting";
 
 export default {
   name: "MsApiReport",
@@ -67,6 +75,7 @@ export default {
       reportExportVisible: false,
       requestType: undefined,
       fullTreeNodes: [],
+      stepFilter: new STEP,
     }
   },
   activated() {
@@ -100,6 +109,11 @@ export default {
     }
   },
   methods: {
+    filter(index) {
+      if (index === "1") {
+        this.$refs.failsTree.filter(index);
+      }
+    },
     init() {
       this.loading = true;
       this.report = {};
@@ -111,7 +125,10 @@ export default {
       this.isRequestResult = false;
     },
     handleClick(tab, event) {
-      this.isRequestResult = false
+      this.isRequestResult = false;
+      if (this.report && this.report.reportVersion && this.report.reportVersion > 1) {
+        this.filter(tab.index);
+      }
     },
     active() {
       this.isActive = !this.isActive;
@@ -161,10 +178,10 @@ export default {
             label: nodeArray[i],
             value: item,
           };
-          if (i !== (nodeArray.length -1)) {
+          if (i !== (nodeArray.length - 1)) {
             node.children = [];
-          }else {
-            if(item.subRequestResults && item.subRequestResults.length > 0){
+          } else {
+            if (item.subRequestResults && item.subRequestResults.length > 0) {
               let itemChildren = this.deepFormatTreeNode(item.subRequestResults);
               node.children = itemChildren;
               if (node.label.indexOf("UUID=")) {
@@ -251,11 +268,11 @@ export default {
           value: item,
           children: []
         };
-        if(item.subRequestResults && item.subRequestResults.length > 0){
+        if (item.subRequestResults && item.subRequestResults.length > 0) {
           let itemChildren = this.deepFormatTreeNode(item.subRequestResults);
           node.children = itemChildren;
         }
-            children.push(node);
+        children.push(node);
         children.forEach(itemNode => {
           returnChildren.push(itemNode);
         });
@@ -300,10 +317,24 @@ export default {
         });
       }
     },
+
     handleGetScenarioReport(data) {
       if (data) {
         this.report = data;
-        this.buildReport();
+        if (this.report.reportVersion && this.report.reportVersion > 1) {
+          if (data.content) {
+            let report = JSON.parse(data.content);
+            this.content = report;
+            this.fullTreeNodes = report.steps;
+            this.content.console = report.console;
+            this.content.error = report.error;
+            this.content.success = (report.total - report.error);
+            this.totalTime = report.totalTime;
+          }
+          this.loading = false;
+        } else {
+          this.buildReport();
+        }
       } else {
         this.$emit('invisible');
         this.$warning('报告已删除');
@@ -392,7 +423,30 @@ export default {
         this.scenarioName = requestResult.scenarioName;
       });
     },
+    formatExportApi(array, scenario) {
+      array.forEach(item => {
+        if (this.stepFilter && this.stepFilter.get("AllSamplerProxy").indexOf(item.type) !== -1) {
+          scenario.requestResults.push(item.value);
+        }
+        if (item.children && item.children.length > 0) {
+          this.formatExportApi(item.children, scenario);
+        }
+      })
+    },
     handleExport() {
+      if (this.report.reportVersion && this.report.reportVersion > 1) {
+        this.fullTreeNodes.forEach(item => {
+          if (item.type === "scenario") {
+            let scenario = {name: item.label, requestResults: []};
+            if (this.content.scenarios && this.content.scenarios.length > 0) {
+              this.content.scenarios.push(scenario);
+            } else {
+              this.content.scenarios = [scenario];
+            }
+            this.formatExportApi(item.children, scenario);
+          }
+        })
+      }
       this.reportExportVisible = true;
       let reset = this.exportReportReset;
       this.$nextTick(() => {
diff --git a/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue b/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue
index df80d07223..45821ea126 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue
@@ -2,7 +2,6 @@
   <header class="report-header">
     <el-row>
       <el-col>
-        <!--        <span v-if="!debug"><el-input size="mini" style="width: 200px" v-model="report.name"/> </span>-->
         <span v-if="!debug">
           <el-input v-if="nameIsEdit" size="mini" @blur="handleSave(report.name)" style="width: 200px" v-model="report.name"/>
           <span v-else>
@@ -98,6 +97,7 @@ export default {
 
 .export-button {
   float: right;
+  margin-right: 10px;
 }
 
 </style>
diff --git a/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue b/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
index 016affa43f..7ff97cecbf 100644
--- a/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
+++ b/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
@@ -112,7 +112,6 @@ export default {
     if (this.scenario && this.scenario.scenarioDefinition) {
       this.content.scenarioStepTotal = this.scenario.scenarioDefinition.hashTree.length;
       this.initTree();
-      this.initWebSocket();
       this.initMessageSocket();
       this.clearDebug();
     }
@@ -128,48 +127,17 @@ export default {
   methods: {
     initTree() {
       this.fullTreeNodes = [];
-      let obj = {index: 1, label: this.scenario.name, value: {responseResult: {}, unexecute: true, testing: false}, children: [], unsolicited: true};
-      this.formatContent(this.scenario.scenarioDefinition.hashTree, obj);
+      let obj = {resId: "root", index: 1, label: this.scenario.name, value: {responseResult: {}, unexecute: true, testing: false}, children: [], unsolicited: true};
+      this.formatContent(this.scenario.scenarioDefinition.hashTree, obj, "", "root");
       this.fullTreeNodes.push(obj);
     },
-    compare(){
-      return function(a,b){
+    compare() {
+      return function (a, b) {
         let v1 = a.value.sort;
         let v2 = b.value.sort;
         return v1 - v2;
       }
     },
-    setTreeValue(arr) {
-      arr.forEach(item => {
-        if (this.debugResult && this.debugResult.get(item.resId)) {
-          let arrValue = this.debugResult.get(item.resId);
-          if (arrValue.length > 1) {
-            for (let i = 0; i < arrValue.length; i++) {
-              let obj = {resId: item.resId, index: i, label: item.resId, value: arrValue[i], children: []};
-              let isAdd = true;
-              for (let h = 0; h < arr.length; h++) {
-                let node = arr [h];
-                if (node.value.name === arrValue[i].name) {
-                  isAdd = false;
-                }
-                if (node.resId === arrValue[i].resourceId && node.value.unexecute) {
-                  arr.splice(h, 1);
-                }
-              }
-              if (isAdd) {
-                arr.push(obj);
-              }
-            }
-          } else {
-            item.value = arrValue[0];
-          }
-        }
-        if (item.children && item.children.length > 0) {
-          this.setTreeValue(item.children);
-        }
-      })
-      arr.sort(this.compare());
-    },
     getType(type) {
       switch (type) {
         case "LoopController":
@@ -183,13 +151,13 @@ export default {
       }
       return type;
     },
-    formatContent(hashTree, tree, fullPath) {
+    formatContent(hashTree, tree, fullPath, pid) {
       if (hashTree) {
         hashTree.forEach(item => {
           if (item.enable) {
             item.parentIndex = fullPath ? fullPath + "_" + item.index : item.index;
             let name = item.name ? item.name : this.getType(item.type);
-            let obj = {resId: item.resourceId + "_" + item.parentIndex, index: Number(item.index), label: name, value: {name: name, responseResult: {}, unexecute: true, testing: false}, children: [], unsolicited: true};
+            let obj = {pid: pid, resId: item.resourceId + "_" + item.parentIndex, index: Number(item.index), label: name, value: {name: name, responseResult: {}, unexecute: true, testing: false}, children: [], unsolicited: true};
             tree.children.push(obj);
             if (this.stepFilter.get("AllSamplerProxy").indexOf(item.type) !== -1) {
               obj.unsolicited = false;
@@ -198,7 +166,7 @@ export default {
               this.content.scenarioTotal += 1;
             }
             if (item.hashTree && item.hashTree.length > 0 && this.stepFilter && this.stepFilter.get("AllSamplerProxy").indexOf(item.type) === -1) {
-              this.formatContent(item.hashTree, obj, item.parentIndex);
+              this.formatContent(item.hashTree, obj, item.parentIndex, obj.resId);
             }
           }
         })
@@ -242,240 +210,25 @@ export default {
       this.content.scenarioSuccess = 0;
       this.content.scenarioError = 0;
     },
-    initWebSocket() {
-      let protocol = "ws://";
-      if (window.location.protocol === 'https:') {
-        protocol = "wss://";
-      }
-      const uri = protocol + window.location.host + "/api/scenario/report/get/real/" + this.reportId;
-      this.websocket = new WebSocket(uri);
-      this.websocket.onmessage = this.onMessage;
-    },
-    onMessage(e) {
-      if (e.data) {
-        let data = JSON.parse(e.data);
-        this.formatResult(data);
-        if (data.end) {
-          this.removeReport();
-          this.getReport();
-          this.$emit('refresh', this.debugResult);
-        }
-      }
-    },
-    removeReport() {
-      let url = "/api/scenario/report/remove/real/" + this.reportId;
-      this.$get(url, response => {
-        scenario.$emit('hide', this.scenarioId);
-        this.$success(this.$t('schedule.event_success'));
-        this.websocket.close();
-        this.messageWebSocket.close();
-      });
-    },
-    getTransaction(transRequests, resMap) {
-      transRequests.forEach(subItem => {
-        if (subItem.method === 'Request') {
-          this.getTransaction(subItem.subRequestResults, resMap);
-        }
-        this.reqTotal++;
-        let key = subItem.resourceId;
-        if (resMap.get(key)) {
-          if (resMap.get(key).indexOf(subItem) === -1 && subItem.method !== 'Request') {
-            resMap.get(key).push(subItem);
-          }
-        } else {
-          resMap.set(key, [subItem]);
-        }
-        if (subItem.success) {
-          this.reqSuccess++;
-        } else {
-          this.reqError++;
-        }
-        if (subItem.startTime && Number(subItem.startTime) < this.startTime) {
-          this.startTime = subItem.startTime;
-        }
-        if (subItem.endTime && Number(subItem.endTime) > this.endTime) {
-          this.endTime = subItem.endTime;
-        }
-      })
-    },
-    formatResult(res) {
-      let resMap = new Map;
-      this.startTime = 0;
-      this.endTime = 0;
-      let requestTime = 0;
-      this.clearDebug();
-      if (res && res.scenarios) {
-        res.scenarios.forEach(item => {
-          this.content.total += item.requestResults.length;
-          this.content.passAssertions += item.passAssertions
-          this.content.totalAssertions += item.totalAssertions;
-          if (item && item.requestResults) {
-            for(let index in item.requestResults){
-              let req = item.requestResults[index];
-              req.sort = index;
-              req.responseResult.console = res.console;
-              if (req.method === 'Request' && req.subRequestResults && req.subRequestResults.length > 0) {
-                this.getTransaction(req.subRequestResults, resMap);
-              } else {
-                this.reqTotal++;
-                let key = req.resourceId;
-                if (resMap.get(key)) {
-                  if (resMap.get(key).indexOf(req) === -1) {
-                    resMap.get(key).push(req);
-                  }
-                } else {
-                  resMap.set(key, [req]);
-                }
-                if (req.success) {
-                  this.reqSuccess++;
-                } else {
-                  this.reqError++;
-                }
-                if (req.startTime && Number(req.startTime)) {
-                  this.startTime = req.startTime;
-                }
-                if (req.endTime && Number(req.endTime)) {
-                  this.endTime = req.endTime;
-                }
-                requestTime = requestTime + (this.endTime - this.startTime)
-              }
-            }
-          }
-        })
-      }
-      this.totalTime = requestTime;
-
-      this.debugResult = resMap;
-      this.setTreeValue(this.fullTreeNodes);
-      this.reload();
-    },
     reload() {
       this.loading = true;
       this.$nextTick(() => {
         this.loading = false;
       });
     },
-    getReport() {
-      let url = "/api/scenario/report/get/" + this.reportId;
-      this.$get(url, response => {
-        this.report = response.data || {};
-        if (response.data) {
-          try {
-            this.content = JSON.parse(this.report.content);
-            if (!this.content) {
-              this.content = {scenarios: []};
-            }
-          } catch (e) {
-            throw e;
-          }
-          this.getFails();
+    getFails(arrays) {
+      for (let i = 0; i < arrays.length; i++) {
+        let item = arrays [i];
+        if (this.stepFilter.get("AllSamplerProxy").indexOf(item.type) !== -1 && item.value && item.value.success) {
+          arrays.splice(i, 1);
+        }
+        if (item.children && item.children.length > 0) {
+          this.getFails(item.children);
         }
-      });
-    },
-    getFails() {
-      this.fails = [];
-      let array = [];
-      if (this.content.scenarios) {
-        this.content.scenarios.forEach((scenario) => {
-          let failScenario = Object.assign({}, scenario);
-          if (scenario.error > 0) {
-            this.fails.push(failScenario);
-            failScenario.requestResults = [];
-            scenario.requestResults.forEach((request) => {
-              if (!request.success) {
-                let failRequest = Object.assign({}, request);
-                failScenario.requestResults.push(failRequest);
-                array.push(request);
-              }
-            })
-          }
-        })
-        this.formatTree(array, this.failsTreeNodes);
-        this.recursiveSorting(this.failsTreeNodes);
-        this.exportFlag = true;
       }
-    },
-    formatTree(array, tree) {
-      array.map((item) => {
-        let key = item.name;
-        let nodeArray = key.split('^@~@^');
-        let children = tree;
-        let scenarioId = "";
-        let scenarioName = "";
-        if (item.scenario) {
-          let scenarioArr = JSON.parse(item.scenario);
-          if (scenarioArr.length > 1) {
-            let scenarioIdArr = scenarioArr[0].split("_");
-            scenarioId = scenarioIdArr[0];
-            scenarioName = scenarioIdArr[1];
-          }
-        }
-        // 循环构建子节点
-        for (let i = 0; i < nodeArray.length; i++) {
-          if (!nodeArray[i]) {
-            continue;
-          }
-          let node = {
-            label: nodeArray[i],
-            value: item,
-          };
-          if (i !== nodeArray.length) {
-            node.children = [];
-          }
-
-          if (children.length === 0) {
-            children.push(node);
-          }
-
-          let isExist = false;
-          for (let j in children) {
-            if (children[j].label === node.label) {
-
-              let idIsPath = true;
-              //判断ID是否匹配  目前发现问题的只有重复场景，而重复场景是在第二个节点开始合并的。所以这里暂时只判断第二个场景问题。
-              //如果出现了其他问题，则需要检查其他问题的数据结构。暂时采用具体问题具体分析的策略
-              if (i === nodeArray.length - 2) {
-                idIsPath = false;
-                let childId = "";
-                let childName = "";
-                if (children[j].value && children[j].value.scenario) {
-                  let scenarioArr = JSON.parse(children[j].value.scenario);
-                  if (scenarioArr.length > 1) {
-                    let childArr = scenarioArr[0].split("_");
-                    childId = childArr[0];
-                    if (childArr.length > 1) {
-                      childName = childArr[1];
-                    }
-                  }
-                }
-                if (scenarioId === "") {
-                  idIsPath = true;
-                } else if (scenarioId === childId) {
-                  idIsPath = true;
-                } else if (scenarioName !== childName) {
-                  //如果两个名字不匹配则默认通过，不匹配ID
-                  idIsPath = true;
-                }
-              }
-              if (idIsPath) {
-                if (i !== nodeArray.length - 1 && !children[j].children) {
-                  children[j].children = [];
-                }
-                children = (i === nodeArray.length - 1 ? children : children[j].children);
-                isExist = true;
-                break;
-              }
-            }
-          }
-          if (!isExist) {
-            children.push(node);
-            if (i !== nodeArray.length - 1 && !children[children.length - 1].children) {
-              children[children.length - 1].children = [];
-            }
-            children = (i === nodeArray.length - 1 ? children : children[children.length - 1].children);
-          }
-        }
-      })
+      if (arrays[0] && this.stepFilter.get("AllSamplerProxy").indexOf(arrays[0].type) !== -1 && arrays[0].value && arrays[0].value.success) {
+        arrays.splice(0, 1);
+      }
     },
     recursiveSorting(arr) {
       for (let i in arr) {
@@ -511,13 +264,55 @@ export default {
       }
       const uri = protocol + window.location.host + "/ws/" + this.reportId;
       this.messageWebSocket = new WebSocket(uri);
-      this.messageWebSocket.onmessage = this.onMessage2;
+      this.messageWebSocket.onmessage = this.onMessage;
+    },
+    getReport() {
+      let url = "/api/scenario/report/get/" + this.reportId;
+      this.$get(url, response => {
+        this.report = response.data || {};
+        if (response.data) {
+          this.content = JSON.parse(response.data.content);
+          if (!this.content) {
+            this.content = {scenarios: []};
+          }
+          this.content.error = this.content.error;
+          this.content.success = (this.content.total - this.content.error);
+          this.totalTime = this.content.totalTime;
+          this.failsTreeNodes = JSON.parse(JSON.stringify(this.fullTreeNodes));
+          this.getFails(this.failsTreeNodes);
+          this.reload();
+        }
+      });
     },
-
     runningNodeChild(arr, resourceId) {
       arr.forEach(item => {
         if (resourceId === item.resId) {
           item.value.testing = true;
+        } else if (resourceId && resourceId.startsWith("result_")) {
+          let data = JSON.parse(resourceId.substring(7));
+          if (data.method === 'Request' && data.subRequestResults && data.subRequestResults.length > 0) {
+            data.subRequestResults.forEach(subItem => {
+              if (item.resId === subItem.resourceId) {
+                item.value = subItem;
+                item.testing = false;
+                item.debug = true;
+              }
+            })
+          } else if (item.resId === data.resourceId) {
+            if (item.value && item.value.id && !item.mark) {
+              let newItem = JSON.parse(JSON.stringify(item));
+              newItem.value = data;
+              newItem.mark = true;
+              newItem.testing = false;
+              newItem.index = item.index + 1;
+              newItem.debug = true;
+              arr.push(newItem);
+            } else {
+              item.value = data;
+              item.testing = false;
+              item.debug = true;
+            }
+          }
         }
         if (item.children && item.children.length > 0) {
           this.runningNodeChild(item.children, resourceId);
@@ -529,6 +324,21 @@ export default {
         this.fullTreeNodes.forEach(item => {
           if (resourceId === item.resId) {
             item.value.testing = true;
+          } else if (resourceId && resourceId.startsWith("result_")) {
+            let data = JSON.parse(resourceId.substring(7));
+            if (data.method === 'Request' && data.subRequestResults && data.subRequestResults.length > 0) {
+              data.subRequestResults.forEach(subItem => {
+                if (item.resId === subItem.resourceId) {
+                  item.value = subItem;
+                  item.testing = false;
+                  item.debug = true;
+                }
+              })
+            } else if (item.resId === data.resourceId) {
+              item.value = data;
+              item.testing = false;
+              item.debug = true;
+            }
           }
           if (item.children && item.children.length > 0) {
             this.runningNodeChild(item.children, resourceId);
@@ -536,10 +346,16 @@ export default {
         })
       }
     },
-    onMessage2(e) {
+    onMessage(e) {
       if (e.data) {
         this.runningEvaluation(e.data);
       }
+      if (e.data && e.data.indexOf("断开连接") !== -1) {
+        this.getReport();
+        this.messageWebSocket.close();
+        scenario.$emit('hide', this.scenarioId);
+        this.$emit('refresh', this.debugResult);
+      }
     },
   },
   computed: {
diff --git a/frontend/src/business/components/api/automation/report/components/RequestResult.vue b/frontend/src/business/components/api/automation/report/components/RequestResult.vue
index f6cf376c5c..a713e60b6c 100644
--- a/frontend/src/business/components/api/automation/report/components/RequestResult.vue
+++ b/frontend/src/business/components/api/automation/report/components/RequestResult.vue
@@ -1,7 +1,7 @@
 <template>
-  <el-card class="ms-cards">
+  <el-card class="ms-cards" v-if="request && request.responseResult">
     <div class="request-result">
-      <div @click="active">
+      <div @click="active" >
         <el-row :gutter="10" type="flex" align="middle" class="info">
           <el-col :span="10" v-if="indexNumber!=undefined">
             <el-tooltip :content="getName(request.name)" placement="top">
diff --git a/frontend/src/business/components/api/automation/report/components/ResponseText.vue b/frontend/src/business/components/api/automation/report/components/ResponseText.vue
index 4326cddbfb..7fd119c8fb 100644
--- a/frontend/src/business/components/api/automation/report/components/ResponseText.vue
+++ b/frontend/src/business/components/api/automation/report/components/ResponseText.vue
@@ -11,10 +11,6 @@
           <pre>{{ response.headers }}</pre>
         </el-tab-pane>
 
-        <el-tab-pane :label="$t('api_test.definition.request.console')" name="console" class="pane">
-          <pre>{{ console ? console : response.console }}</pre>
-        </el-tab-pane>
-
         <el-tab-pane :label="$t('api_report.assertions')" name="assertions" class="pane assertions">
           <ms-assertion-results :assertions="response.assertions"/>
         </el-tab-pane>
diff --git a/frontend/src/business/components/api/automation/report/components/ScenarioResult.vue b/frontend/src/business/components/api/automation/report/components/ScenarioResult.vue
index d863631336..199f54012c 100644
--- a/frontend/src/business/components/api/automation/report/components/ScenarioResult.vue
+++ b/frontend/src/business/components/api/automation/report/components/ScenarioResult.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="scenario-result">
-    <div v-if="(node.children && node.children.length >0) || node.unsolicited">
+    <div v-if="(node.children && node.children.length >0) || node.unsolicited || this.stepFilter.get('AllSamplerProxy').indexOf(node.type) === -1">
       <el-card class="ms-card">
         <div class="el-step__icon is-text ms-api-col">
           <div class="el-step__icon-inner"> {{ node.index }}</div>
@@ -18,6 +18,7 @@
 
 <script>
 import MsRequestResult from "./RequestResult";
+import {STEP} from "@/business/components/api/automation/scenario/Setting";
 
 export default {
   name: "MsScenarioResult",
@@ -31,6 +32,7 @@ export default {
   data() {
     return {
       isActive: false,
+      stepFilter: new STEP,
     }
   },
   methods: {
diff --git a/frontend/src/business/components/api/automation/report/components/ScenarioResults.vue b/frontend/src/business/components/api/automation/report/components/ScenarioResults.vue
index f85744555e..87f953a53a 100644
--- a/frontend/src/business/components/api/automation/report/components/ScenarioResults.vue
+++ b/frontend/src/business/components/api/automation/report/components/ScenarioResults.vue
@@ -3,6 +3,7 @@
     <el-tree :data="treeData"
              :expand-on-click-node="false"
              :default-expand-all="defaultExpand"
+             :filter-node-method="filterNode"
              highlight-current
              class="ms-tree ms-report-tree" ref="resultsTree">
           <span slot-scope="{ node, data}" style="width: 99%" @click="nodeClick(node)">
@@ -33,6 +34,24 @@ export default {
     }
   },
   methods: {
+    filterNode(value, data) {
+      if (!data.value && data.children && data.children.length > 0) {
+        return true;
+      }
+      if (!data.value && !data.children && data.children.length === 0) {
+        return false;
+      }
+      if (!value) return true;
+      if (data.value) {
+        return data.value.error > 0;
+      }
+      return false;
+    },
+    filter(val) {
+      this.$nextTick(() => {
+        this.$refs.resultsTree.filter(val);
+      });
+    },
     requestResult(requestResult) {
       this.$emit("requestResult", requestResult);
     },
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index aaa02a0228..26518e0f15 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -697,57 +697,6 @@ export default {
         })
       }
     },
-    initWebSocket() {
-      let protocol = "ws://";
-      if (window.location.protocol === 'https:') {
-        protocol = "wss://";
-      }
-      const uri = protocol + window.location.host + "/api/scenario/report/get/real/" + this.reportId;
-      this.websocket = new WebSocket(uri);
-      this.websocket.onmessage = this.onMessage;
-    },
-    onMessage(e) {
-      if (e.data) {
-        let data = JSON.parse(e.data);
-        this.formatResult(data);
-        this.message = getUUID();
-        if (data.end) {
-          this.removeReport();
-          this.runScenario = undefined;
-          this.debugLoading = false;
-          this.message = "stop";
-          this.stopDebug = "stop";
-        }
-      }
-    },
-    getTransaction(transRequests, startTime, endTime, resMap) {
-      transRequests.forEach(subItem => {
-        if (subItem.method === 'Request') {
-          this.getTransaction(subItem.subRequestResults, startTime, endTime, resMap);
-        }
-        this.reqTotal++;
-        let key = subItem.resourceId;
-        if (resMap.get(key)) {
-          if (resMap.get(key).indexOf(subItem) === -1) {
-            resMap.get(key).push(subItem);
-          }
-        } else {
-          resMap.set(key, [subItem]);
-        }
-        if (subItem.success) {
-          this.reqSuccess++;
-        } else {
-          this.reqError++;
-        }
-        if (subItem.startTime && Number(subItem.startTime) < startTime) {
-          startTime = subItem.startTime;
-        }
-        if (subItem.endTime && Number(subItem.endTime) > endTime) {
-          endTime = subItem.endTime;
-        }
-      })
-    },
-
     initMessageSocket() {
       let protocol = "ws://";
       if (window.location.protocol === 'https:') {
@@ -755,7 +704,7 @@ export default {
       }
       const uri = protocol + window.location.host + "/ws/" + this.reportId;
       this.messageWebSocket = new WebSocket(uri);
-      this.messageWebSocket.onmessage = this.onMessage2;
+      this.messageWebSocket.onmessage = this.onDebugMessage;
     },
     runningEditParent(node) {
       if (node) {
@@ -765,89 +714,87 @@ export default {
         }
       }
     },
-    runningNodeChild(arr, resourceId) {
+    runningNodeChild(arr, resultData) {
       arr.forEach(item => {
-        if (item.data && item.data.resourceId + "_" + item.data.parentIndex === resourceId) {
+        if (resultData && resultData.startsWith("result_")) {
+          let data = JSON.parse(resultData.substring(7));
+          if (data.method === 'Request' && data.subRequestResults && data.subRequestResults.length > 0) {
+            data.subRequestResults.forEach(subItem => {
+              if (item.data && item.data.resourceId + "_" + item.data.parentIndex === subItem.resourceId) {
+                item.data.requestResult.push(subItem);
+                // 更新父节点状态
+                this.resultEvaluation(subItem.resourceId, subItem.success);
+                item.data.testing = false;
+                item.data.debug = true;
+              }
+            })
+          } else if (item.data && item.data.resourceId + "_" + item.data.parentIndex === data.resourceId) {
+            item.data.requestResult.push(data);
+            // 更新父节点状态
+            this.resultEvaluation(data.resourceId, data.success);
+            item.data.testing = false;
+            item.data.debug = true;
+          }
+        } else if (item.data && item.data.resourceId + "_" + item.data.parentIndex === resultData) {
           item.data.testing = true;
           this.runningEditParent(item.parent);
         }
         if (item.childNodes && item.childNodes.length > 0) {
-          this.runningNodeChild(item.childNodes, resourceId);
+          this.runningNodeChild(item.childNodes, resultData);
         }
       })
     },
-    runningEvaluation(resourceId) {
+    runningEvaluation(resultData) {
       if (this.$refs.stepTree && this.$refs.stepTree.root) {
         this.$refs.stepTree.root.childNodes.forEach(item => {
-          if (item.data && item.data.resourceId + "_" + item.data.parentIndex === resourceId) {
+          if (item.data && item.data.resourceId + "_" + item.data.parentIndex === resultData) {
             item.data.testing = true;
+          } else if (resultData && resultData.startsWith("result_")) {
+            let data = JSON.parse(resultData.substring(7));
+            if (data.method === 'Request' && data.subRequestResults && data.subRequestResults.length > 0) {
+              data.subRequestResults.forEach(subItem => {
+                if (item.data && item.data.resourceId + "_" + item.data.parentIndex === subItem.resourceId) {
+                  item.data.requestResult.push(subItem);
+                  // 更新父节点状态
+                  this.resultEvaluation(subItem.resourceId, subItem.success);
+                  item.data.testing = false;
+                  item.data.debug = true;
+                }
+              })
+            } else if (item.data && item.data.resourceId + "_" + item.data.parentIndex === data.resourceId) {
+              item.data.requestResult.push(data);
+              // 更新父节点状态
+              this.resultEvaluation(data.resourceId, data.success);
+              item.data.testing = false;
+              item.data.debug = true;
+            }
           }
           if (item.childNodes && item.childNodes.length > 0) {
-            this.runningNodeChild(item.childNodes, resourceId);
+            this.runningNodeChild(item.childNodes, resultData);
           }
         })
       }
     },
-    onMessage2(e) {
+    onDebugMessage(e) {
+      if (e.data && e.data.startsWith("result_")) {
+        let data = JSON.parse(e.data.substring(7));
+        this.reqTotal += 1;
+        this.reqTotalTime += (data.endTime - data.startTime);
+        if (data.error === 0) {
+          this.reqSuccess += 1;
+        } else {
+          this.reqError += 1;
+        }
+      }
       this.runningEvaluation(e.data);
       this.message = getUUID();
-    },
-
-    formatResult(res) {
-      let resMap = new Map;
-      let startTime = 99991611737506593;
-      let endTime = 0;
-      this.clearDebug();
-      if (res && res.scenarios) {
-        res.scenarios.forEach(item => {
-          if (item && item.requestResults) {
-            item.requestResults.forEach(req => {
-              req.responseResult.console = res.console;
-              if (req.method === 'Request' && req.subRequestResults && req.subRequestResults.length > 0) {
-                this.getTransaction(req.subRequestResults, startTime, endTime, resMap);
-              } else {
-                this.reqTotal++;
-                let key = req.resourceId;
-                if (resMap.get(key)) {
-                  if (resMap.get(key).indexOf(req) === -1) {
-                    resMap.get(key).push(req);
-                  }
-                } else {
-                  resMap.set(key, [req]);
-                }
-                if (req.success) {
-                  this.reqSuccess++;
-                } else {
-                  this.reqError++;
-                }
-                if (req.startTime && Number(req.startTime) < startTime) {
-                  startTime = req.startTime;
-                }
-                if (req.endTime && Number(req.endTime) > endTime) {
-                  endTime = req.endTime;
-                }
-              }
-            })
-          }
-        })
+      if (e.data && e.data.indexOf("断开连接") !== -1) {
+        this.runScenario = undefined;
+        this.debugLoading = false;
+        this.message = "stop";
+        this.stopDebug = "stop";
+        this.reload();
       }
-      if (startTime < endTime) {
-        this.reqTotalTime = endTime - startTime + 100;
-      }
-      this.debugResult = resMap;
-      if (this.runScenario && this.runScenario.hashTree) {
-        this.sort(this.runScenario.hashTree);
-      } else {
-        this.sort();
-      }
-      this.reloadDebug = getUUID();
-    },
-    removeReport() {
-      let url = "/api/scenario/report/remove/real/" + this.reportId;
-      this.$get(url, response => {
-        this.messageWebSocket.close();
-        this.websocket.close();
-      });
     },
     handleCommand() {
       this.debug = false;
@@ -1036,13 +983,6 @@ export default {
         }
         // 添加debug结果
         stepArray[i].parentIndex = fullPath ? fullPath + "_" + stepArray[i].index : stepArray[i].index;
-        let key = stepArray[i].resourceId + "_" + stepArray[i].parentIndex;
-        if (this.debugResult && this.debugResult.get(key)) {
-          stepArray[i].requestResult = this.debugResult.get(key);
-          stepArray[i].result = null;
-          stepArray[i].debug = this.debug;
-          this.resultEvaluation(key, stepArray[i].requestResult[0].success);
-        }
         if (stepArray[i].hashTree && stepArray[i].hashTree.length > 0) {
           this.stepSize += stepArray[i].hashTree.length;
           this.sort(stepArray[i].hashTree, stepArray[i].projectId, stepArray[i].parentIndex);
@@ -1509,7 +1449,6 @@ export default {
         this.debugVisible = true;
         this.loading = false;
       } else {
-        this.initWebSocket();
         this.initMessageSocket();
       }
     },
diff --git a/frontend/src/business/components/api/definition/components/Run.vue b/frontend/src/business/components/api/definition/components/Run.vue
index 5126ca51f8..c221265768 100644
--- a/frontend/src/business/components/api/definition/components/Run.vue
+++ b/frontend/src/business/components/api/definition/components/Run.vue
@@ -23,7 +23,7 @@ export default {
     return {
       result: {},
       loading: false,
-      runId: "",
+      requestResult: {},
       reqNumber: 0,
       websocket: {}
     }
@@ -47,17 +47,38 @@ export default {
         protocol = "wss://";
       }
       let runMode = this.debug ? "debug" : "run";
-      const uri = protocol + window.location.host + "/api/definition/run/report/" + this.runId + "/" + runMode;
+      const uri = protocol + window.location.host + "/api/definition/run/report/" + this.requestResult.reportId + "/" + runMode;
       this.websocket = new WebSocket(uri);
-      this.websocket.onmessage = this.onMessage;
+      this.websocket.onmessage = this.onRunMessage;
     },
-    onMessage(e) {
+    onRunMessage(e) {
       if (e.data) {
         let data = JSON.parse(e.data);
         this.websocket.close();
         this.$emit('runRefresh', data);
       }
     },
+    debugSocket() {
+      let protocol = "ws://";
+      if (window.location.protocol === 'https:') {
+        protocol = "wss://";
+      }
+      const uri = protocol + window.location.host + "/ws/" + this.reportId;
+      this.websocket = new WebSocket(uri);
+      this.websocket.onmessage = this.onDebugMessage;
+    },
+    onDebugMessage(e) {
+      if (e.data && e.data.startsWith("result_")) {
+        try {
+          let data = e.data.substring(7);
+          this.websocket.close();
+          this.$emit('runRefresh', JSON.parse(data));
+        } catch (e) {
+          this.websocket.close();
+          this.$emit('runRefresh', "");
+        }
+      }
+    },
     sort(stepArray) {
       if (stepArray) {
         for (let i in stepArray) {
@@ -117,8 +138,12 @@ export default {
         url = "/api/definition/run";
       }
       this.$fileUpload(url, null, bodyFiles, reqObj, response => {
-        this.runId = response.data;
-        this.initWebSocket();
+        this.requestResult = response.data;
+        if (this.debug) {
+          this.debugSocket();
+        } else {
+          this.initWebSocket();
+        }
         this.$emit('autoCheckStatus');  //   执行结束后，自动更新计划状态
       }, error => {
         this.$emit('errorRefresh', {});
diff --git a/frontend/src/business/components/api/definition/components/body/ApiBody.vue b/frontend/src/business/components/api/definition/components/body/ApiBody.vue
index 994975b50f..54a3817a65 100644
--- a/frontend/src/business/components/api/definition/components/body/ApiBody.vue
+++ b/frontend/src/business/components/api/definition/components/body/ApiBody.vue
@@ -130,7 +130,7 @@ export default {
   },
 
   watch: {
-    'body.typeChange'(){
+    'body.typeChange'() {
       this.reloadCodeEdit();
     },
     'body.raw'() {
@@ -139,8 +139,8 @@ export default {
           const MsConvert = new Convert();
           let data = MsConvert.format(JSON.parse(this.body.raw));
           if (this.body.jsonSchema) {
-            this.body.jsonSchema = this.deepAssign(this.body.jsonSchema, data);
-          }else{
+            this.body.jsonSchema = this.deepAssign(data);
+          } else {
             this.body.jsonSchema = data;
           }
         } catch (ex) {
@@ -294,8 +294,8 @@ export default {
         let keyValues = [];
         params.forEach(item => {
           let line = [];
-          line[0] = item.substring(0,item.indexOf(":"));
-          line[1] = item.substring(item.indexOf(":")+1,item.length);
+          line[0] = item.substring(0, item.indexOf(":"));
+          line[1] = item.substring(item.indexOf(":") + 1, item.length);
           let required = false;
           keyValues.unshift(new KeyValue({
             name: line[0],
diff --git a/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue
index 60815af8bf..ec29898997 100644
--- a/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue
+++ b/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue
@@ -154,7 +154,9 @@ export default {
       this.responseData = data;
       this.loading = false;
       this.isStop = false;
-      this.$refs.debugResult.reload();
+      if (this.$refs.debugResult) {
+        this.$refs.debugResult.reload();
+      }
     },
     saveAsApi() {
       let obj = {request: this.request};
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index 6d05542d39..01f5c4b1d7 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -553,7 +553,11 @@ export default {
       this.$post('/api/testcase/batch/run', obj, () => {
         this.condition.ids = [];
         this.$refs.batchRun.close();
-        this.$store.state.currentApiCase.case = true;
+        if (this.$store.state.currentApiCase) {
+          this.$store.state.currentApiCase.case = true;
+        } else {
+          this.$store.state.currentApiCase = {case: true};
+        }
         this.search();
       });
     },
diff --git a/frontend/src/business/components/project/menu/function/FunctionRun.vue b/frontend/src/business/components/project/menu/function/FunctionRun.vue
index db9f87dd7d..8cd05b3202 100644
--- a/frontend/src/business/components/project/menu/function/FunctionRun.vue
+++ b/frontend/src/business/components/project/menu/function/FunctionRun.vue
@@ -23,7 +23,7 @@ export default {
     return {
       result: {},
       loading: false,
-      runId: "",
+      requestResult: "",
       reqNumber: 0,
       websocket: {}
     }
@@ -46,7 +46,7 @@ export default {
       if (window.location.protocol === 'https:') {
         protocol = "wss://";
       }
-      const uri = protocol + window.location.host + "/api/definition/run/report/" + this.runId + "/debug";
+      const uri = protocol + window.location.host + "/api/definition/run/report/" + this.requestResult.reportId + "/debug";
       this.websocket = new WebSocket(uri);
       this.websocket.onmessage = this.onMessage;
     },
@@ -93,7 +93,7 @@ export default {
       let url = "/custom/func/run";
       reqObj.reportId = this.reportId;
       this.$post(url, reqObj, res => {
-        this.runId = res.data;
+        this.requestResult = res.data;
         this.initWebSocket();
       }, () => {
         this.$emit('errorRefresh', {});
diff --git a/frontend/src/business/components/task/TaskCenter.vue b/frontend/src/business/components/task/TaskCenter.vue
index 9780d3fa69..046d8358b9 100644
--- a/frontend/src/business/components/task/TaskCenter.vue
+++ b/frontend/src/business/components/task/TaskCenter.vue
@@ -37,7 +37,7 @@
         <!-- 接口用例结果 -->
         <ms-request-result-tail :response="response" ref="debugResult" v-if="reportType === 'API'"/>
 
-        <ms-api-report-detail :reportId="reportId" v-if="reportType === 'SCENARIO'"/>
+        <ms-api-report-detail :showCancelButton="false" :reportId="reportId" v-if="reportType === 'SCENARIO'"/>
 
         <performance-report-view :perReportId="reportId" v-if="reportType === 'PERFORMANCE'"/>
       </el-card>

From 5517d5c43744f8f5df684f938aa80315b6c545b9 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 16 Dec 2021 10:24:11 +0800
Subject: [PATCH 133/256] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BC=98=E5=8C=96=E8=B6=85=E6=97=B6=E9=98=9F?=
 =?UTF-8?q?=E5=88=97=EF=BC=8C=E8=B6=85=E6=97=B6=E6=8A=A5=E5=91=8A=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=8A=B6=E6=80=81=20timeout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exec/api/TestPlanApiExecuteService.java   | 17 +++++++-----
 .../metersphere/api/exec/queue/ExecTask.java  |  6 +++--
 .../exec/queue/PoolExecBlockingQueueUtil.java | 26 +++++++------------
 .../exec/queue/SerialBlockingQueueUtil.java   | 25 +++++++-----------
 .../scenario/ApiScenarioSerialService.java    | 13 +++++++---
 .../api/jmeter/APISingleResultListener.java   |  3 ---
 .../api/jmeter/MsKafkaListener.java           |  5 +++-
 .../api/service/ApiScenarioReportService.java |  8 ++----
 .../api/service/TestResultService.java        |  6 +++++
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 10 files changed, 54 insertions(+), 57 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java b/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java
index 11b42099f8..c9227087cb 100644
--- a/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java
+++ b/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java
@@ -21,10 +21,7 @@ import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
 import io.metersphere.api.jmeter.JMeterService;
 import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.api.service.RemakeReportService;
-import io.metersphere.base.domain.ApiDefinitionExecResult;
-import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
-import io.metersphere.base.domain.TestPlanApiCase;
-import io.metersphere.base.domain.TestPlanApiCaseExample;
+import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiDefinitionExecResultMapper;
 import io.metersphere.base.mapper.ApiTestCaseMapper;
 import io.metersphere.base.mapper.TestPlanApiCaseMapper;
@@ -159,17 +156,23 @@ public class TestPlanApiExecuteService {
                                 remakeReportService.remake(runRequest);
                                 continue;
                             }
-                            // 初始化等待队列
-                            SerialBlockingQueueUtil.init(runRequest.getReportId(), 1);
                             LoggerUtil.info("TestPlan Serial run 【 " + runRequest.getReportId() + "】start");
                             // 开始执行
                             jMeterService.run(runRequest);
 
                             Object reportObj = SerialBlockingQueueUtil.take(runRequest.getReportId());
+                            if (reportObj == null) {
+                                LoggerUtil.info("TestPlan Serial run-进入超时补偿处理：【 " + runRequest.getReportId() + " 】");
+                                ApiDefinitionExecResult apiDefinitionExecResult = apiDefinitionExecResultMapper.selectByPrimaryKey(runRequest.getReportId());
+                                if (apiDefinitionExecResult != null) {
+                                    apiDefinitionExecResult.setStatus("timeout");
+                                    apiDefinitionExecResultMapper.updateByPrimaryKey(apiDefinitionExecResult);
+                                }
+                            }
                             LoggerUtil.info("TestPlan Serial run 【 " + runRequest.getReportId() + "】end");
                             // 如果开启失败结束执行，则判断返回结果状态
                             if (request.getConfig().isOnSampleError()) {
-                                if (reportObj != null) {
+                                if (reportObj != null && reportObj instanceof ApiDefinitionExecResult) {
                                     ApiDefinitionExecResult result = (ApiDefinitionExecResult) reportObj;
                                     if (result == null || !result.getStatus().equals("Success")) {
                                         break;
diff --git a/backend/src/main/java/io/metersphere/api/exec/queue/ExecTask.java b/backend/src/main/java/io/metersphere/api/exec/queue/ExecTask.java
index 1d8ede4912..5947234c15 100644
--- a/backend/src/main/java/io/metersphere/api/exec/queue/ExecTask.java
+++ b/backend/src/main/java/io/metersphere/api/exec/queue/ExecTask.java
@@ -18,11 +18,13 @@ public class ExecTask implements Runnable {
 
     @Override
     public void run() {
-        PoolExecBlockingQueueUtil.init(request.getReportId(), 1);
         LoggerUtil.info("开始执行报告ID：【 " + request.getReportId() + " 】,资源ID【 " + request.getTestId() + " 】");
         JMeterService jMeterService = CommonBeanFactory.getBean(JMeterService.class);
         jMeterService.addQueue(request);
-        PoolExecBlockingQueueUtil.take(request.getReportId());
+        Object res = PoolExecBlockingQueueUtil.take(request.getReportId());
+        if (res == null) {
+            LoggerUtil.info("执行报告：【 " + request.getReportId() + " 】,资源ID【 " + request.getTestId() + " 】执行超时");
+        }
         LoggerUtil.info("任务：【 " + request.getReportId() + " 】执行完成");
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/exec/queue/PoolExecBlockingQueueUtil.java b/backend/src/main/java/io/metersphere/api/exec/queue/PoolExecBlockingQueueUtil.java
index 6e6bd4042b..1b8f30dcef 100644
--- a/backend/src/main/java/io/metersphere/api/exec/queue/PoolExecBlockingQueueUtil.java
+++ b/backend/src/main/java/io/metersphere/api/exec/queue/PoolExecBlockingQueueUtil.java
@@ -13,21 +13,16 @@ public class PoolExecBlockingQueueUtil {
     // 系统级队列控制整体并发数量
     public static Map<String, BlockingQueue<Object>> queue = new ConcurrentHashMap<>();
 
-    public static void init(String key, int queueSize) {
-        BlockingQueue<Object> blockingQueue = new ArrayBlockingQueue<>(queueSize);
-        queue.put(key, blockingQueue);
-    }
+    private static final String END_SIGN = "RUN-END";
+    private static final int QUEUE_SIZE = 1;
 
     public static void offer(String key) {
         if (StringUtils.isNotEmpty(key) && queue.containsKey(key)) {
             try {
-                if (!queue.get(key).offer("end")) {
-                    queue.get(key).add("end");
-                }
+                queue.get(key).offer(END_SIGN);
             } catch (Exception e) {
                 LogUtil.error(e);
             } finally {
-                queue.get(key).offer("end");
                 queue.remove(key);
             }
         }
@@ -35,23 +30,20 @@ public class PoolExecBlockingQueueUtil {
 
     public static Object take(String key) {
         try {
-            if (StringUtils.isNotEmpty(key) && queue.containsKey(key)) {
-                return queue.get(key).poll(5, TimeUnit.MINUTES);
+            if (StringUtils.isNotEmpty(key) && !queue.containsKey(key)) {
+                BlockingQueue<Object> blockingQueue = new ArrayBlockingQueue<>(QUEUE_SIZE);
+                queue.put(key, blockingQueue);
+                return blockingQueue.poll(5, TimeUnit.MINUTES);
             }
         } catch (Exception e) {
-            LogUtil.error("获取队列失败：" + e.getMessage());
-            return null;
-        } finally {
-            if (StringUtils.isNotEmpty(key)) {
-                queue.remove(key);
-            }
+            LogUtil.error("初始化队列失败：" + e.getMessage());
         }
         return null;
     }
 
     public static void remove(String key) {
         if (StringUtils.isNotEmpty(key) && queue.containsKey(key)) {
-            queue.get(key).add("end");
+            queue.get(key).offer(END_SIGN);
             queue.remove(key);
         }
     }
diff --git a/backend/src/main/java/io/metersphere/api/exec/queue/SerialBlockingQueueUtil.java b/backend/src/main/java/io/metersphere/api/exec/queue/SerialBlockingQueueUtil.java
index fb4ee17532..51ab0e1262 100644
--- a/backend/src/main/java/io/metersphere/api/exec/queue/SerialBlockingQueueUtil.java
+++ b/backend/src/main/java/io/metersphere/api/exec/queue/SerialBlockingQueueUtil.java
@@ -14,46 +14,39 @@ import java.util.concurrent.TimeUnit;
 public class SerialBlockingQueueUtil {
     // 只作用与串行任务
     public static Map<String, BlockingQueue<Object>> queue = new ConcurrentHashMap<>();
+    public static final String END_SIGN = "RUN-END";
+    private static final int QUEUE_SIZE = 1;
 
-    public static void init(String key, int queueSize) {
-        BlockingQueue<Object> blockingQueue = new ArrayBlockingQueue<>(queueSize);
-        queue.put(key, blockingQueue);
-    }
 
     public static void offer(ResultDTO dto, Object report) {
         String key = dto != null && StringUtils.equals(dto.getReportType(), RunModeConstants.SET_REPORT.toString()) ? dto.getReportId() + "_" + dto.getTestId() : dto.getReportId();
         if (StringUtils.isNotEmpty(key) && queue.containsKey(key)) {
             try {
-                if (!queue.get(key).offer(report)) {
-                    queue.get(key).add(report);
-                }
+                queue.get(key).offer(report);
             } catch (Exception e) {
                 LogUtil.error(e);
             } finally {
-                queue.get(key).offer(report);
+                queue.remove(key);
             }
         }
     }
 
     public static Object take(String key) {
         try {
-            if (StringUtils.isNotEmpty(key) && queue.containsKey(key)) {
-                return queue.get(key).poll(3, TimeUnit.MINUTES);
+            if (StringUtils.isNotEmpty(key) && !queue.containsKey(key)) {
+                BlockingQueue<Object> blockingQueue = new ArrayBlockingQueue<>(QUEUE_SIZE);
+                queue.put(key, blockingQueue);
+                return blockingQueue.poll(3, TimeUnit.MINUTES);
             }
         } catch (Exception e) {
             LogUtil.error("获取队列失败：" + e.getMessage());
-            return null;
-        } finally {
-            if (StringUtils.isNotEmpty(key)) {
-                queue.remove(key);
-            }
         }
         return null;
     }
 
     public static void remove(String key) {
         if (StringUtils.isNotEmpty(key) && queue.containsKey(key)) {
-            queue.get(key).add(null);
+            queue.get(key).offer(END_SIGN);
             queue.remove(key);
         }
     }
diff --git a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java
index 2b3995a7e3..dc34e5b59f 100644
--- a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java
+++ b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java
@@ -88,9 +88,6 @@ public class ApiScenarioSerialService {
                                 hashTreeUtil.setEnvParamsMapToHashTree(hashTree, executeEnvParams);
                                 executeQueue.get(key).setHashTree(hashTree);
                             }
-
-                            SerialBlockingQueueUtil.init(queueReportId, 1);
-
                             String reportId = StringUtils.isNotEmpty(serialReportId) ? serialReportId : key;
                             JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(executeQueue.get(key).getTestId(), reportId, request.getRunMode(), executeQueue.get(key).getHashTree());
                             if (request.getConfig() != null) {
@@ -104,10 +101,18 @@ public class ApiScenarioSerialService {
                             jMeterService.run(runRequest);
 
                             Object reportObj = SerialBlockingQueueUtil.take(queueReportId);
+                            if (reportObj == null) {
+                                LoggerUtil.info("Scenario run-进入超时补偿处理：【 " + queueReportId + " 】");
+                                ApiScenarioReport scenarioReport = apiScenarioReportMapper.selectByPrimaryKey(reportId);
+                                if (scenarioReport != null) {
+                                    scenarioReport.setStatus("Timeout");
+                                    apiScenarioReportMapper.updateByPrimaryKey(scenarioReport);
+                                }
+                            }
                             LoggerUtil.info("Scenario run-执行完成：【 " + queueReportId + " 】");
                             // 如果开启失败结束执行，则判断返回结果状态
                             if (request.getConfig().isOnSampleError()) {
-                                if (reportObj != null) {
+                                if (reportObj != null && reportObj instanceof ApiScenarioReport) {
                                     ApiScenarioReport scenarioReport = (ApiScenarioReport) reportObj;
                                     if (!scenarioReport.getStatus().equals("Success")) {
                                         break;
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java b/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java
index cfcd08e22f..232d12c673 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java
@@ -2,7 +2,6 @@ package io.metersphere.api.jmeter;
 
 
 import io.metersphere.api.exec.queue.PoolExecBlockingQueueUtil;
-import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.service.MsResultService;
 import io.metersphere.api.service.TestResultService;
 import io.metersphere.commons.utils.CommonBeanFactory;
@@ -26,8 +25,6 @@ public class APISingleResultListener extends MsExecListener {
     public void testEnded(ResultDTO dto, Map<String, Object> kafkaConfig) {
         try {
             LoggerUtil.info("进入TEST-END处理报告【" + dto.getReportId() + " 】整体执行完成；" + dto.getRunMode());
-            // 串行队列
-            SerialBlockingQueueUtil.offer(dto, "testEnd");
             // 全局并发队列
             PoolExecBlockingQueueUtil.offer(dto.getReportId());
             dto.setConsole(CommonBeanFactory.getBean(MsResultService.class).getJmeterLogger(dto.getReportId()));
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java b/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java
index 5e4ec20d6f..3c292c0665 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java
@@ -10,6 +10,7 @@ import io.metersphere.api.service.TestResultService;
 import io.metersphere.config.KafkaConfig;
 import io.metersphere.dto.ResultDTO;
 import io.metersphere.utils.LoggerUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.kafka.annotation.KafkaListener;
@@ -29,7 +30,9 @@ public class MsKafkaListener {
             LoggerUtil.info("报告 【 " + testResult.getReportId() + " 】资源 " + testResult.getTestId() + " 整体执行完成");
             testResultService.testEnded(testResult);
             // 串行队列
-            SerialBlockingQueueUtil.offer(testResult, "testEnd");
+            if (CollectionUtils.isEmpty(testResult.getRequestResults())) {
+                SerialBlockingQueueUtil.offer(testResult, SerialBlockingQueueUtil.END_SIGN);
+            }
             // 全局并发队列
             PoolExecBlockingQueueUtil.offer(testResult.getReportId());
         } else {
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
index 1cb6c15ca8..b2b1260239 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
@@ -117,6 +117,8 @@ public class ApiScenarioReportService {
                 scenarioReport = updateScenario(requestResults, dto);
             }
         }
+        // 串行队列
+        SerialBlockingQueueUtil.offer(dto, scenarioReport != null ? scenarioReport : SerialBlockingQueueUtil.END_SIGN);
         return scenarioReport;
     }
 
@@ -269,8 +271,6 @@ public class ApiScenarioReportService {
             }
         }
         ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), errorSize > 0 ? "Error" : "Success", dto.getRunMode());
-        // 串行队列
-        SerialBlockingQueueUtil.offer(dto, report);
         return report;
     }
 
@@ -329,8 +329,6 @@ public class ApiScenarioReportService {
                     apiScenarioMapper.updateByPrimaryKey(scenario);
                 }
             }
-            // 串行队列
-            SerialBlockingQueueUtil.offer(dto, report);
             testPlanLog.info("TestPlanReportId" + JSONArray.toJSONString(testPlanReportIdList) + " EXECUTE OVER. SCENARIO STATUS : " + JSONObject.toJSONString(scenarioAndErrorMap));
             for (String item : testPlanReportIdList) {
                 TestPlanReportExecuteCatch.updateApiTestPlanExecuteInfo(item, null, scenarioAndErrorMap, null);
@@ -385,8 +383,6 @@ public class ApiScenarioReportService {
         if (scenario != null && report != null) {
             sendNotice(scenario, report);
         }
-        // 串行队列
-        SerialBlockingQueueUtil.offer(dto, report);
         return report;
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/service/TestResultService.java b/backend/src/main/java/io/metersphere/api/service/TestResultService.java
index 92d978cb72..d0237d1868 100644
--- a/backend/src/main/java/io/metersphere/api/service/TestResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/TestResultService.java
@@ -1,6 +1,7 @@
 package io.metersphere.api.service;
 
 import io.metersphere.api.dto.automation.ApiTestReportVariable;
+import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.jmeter.ExecutedHandleSingleton;
 import io.metersphere.base.domain.*;
 import io.metersphere.commons.constants.ApiRunMode;
@@ -106,6 +107,11 @@ public class TestResultService {
                     }
                 }
             }
+        } else {
+            // 串行队列
+            if (dto != null && org.apache.commons.collections.CollectionUtils.isEmpty(dto.getRequestResults())) {
+                SerialBlockingQueueUtil.offer(dto, SerialBlockingQueueUtil.END_SIGN);
+            }
         }
     }
 
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 5055bb87bf..dae3bfa801 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 5055bb87bffbb60d57268a684c90edf8b27c2df8
+Subproject commit dae3bfa8015fefe44c0c7a7517a43a5da93e6950

From 118a12f07d0352bbc8c8052dc912baf2c38b2d9c Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Thu, 16 Dec 2021 09:44:50 +0800
Subject: [PATCH 134/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DSQL=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=B9=B6=E4=BC=98=E5=8C=96=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V102__v1.16_release.sql      | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V102__v1.16_release.sql b/backend/src/main/resources/db/migration/V102__v1.16_release.sql
index 8309650833..ebeeb44921 100644
--- a/backend/src/main/resources/db/migration/V102__v1.16_release.sql
+++ b/backend/src/main/resources/db/migration/V102__v1.16_release.sql
@@ -22,7 +22,7 @@ WHERE `type` = 'data';
 ALTER TABLE project
     ADD case_public tinyint(1) DEFAULT NULL COMMENT '是否开启用例公共库';
 ALTER TABLE project
-    ADD api_quick varchar(50) DEFAULT NULL COMMENT 'api定义快捷调试按钮',
+    ADD api_quick varchar(50) DEFAULT NULL COMMENT 'api定义快捷调试按钮';
 
 ALTER TABLE test_case
     ADD case_public tinyint(1) DEFAULT NULL COMMENT '是否是公共用例';
@@ -32,26 +32,26 @@ alter table api_scenario_report add report_version int null;
 
 CREATE TABLE IF NOT EXISTS `api_scenario_report_result`
 (
-   `id` varchar(50) NOT NULL COMMENT 'ID',
-   `resource_id` VARCHAR(200) DEFAULT NULL COMMENT '请求资源 id',
+    `id` varchar(50) NOT NULL COMMENT 'ID',
+    `resource_id` VARCHAR(200) DEFAULT NULL COMMENT '请求资源 id',
     `report_id` VARCHAR(50) DEFAULT NULL COMMENT '报告 id',
-     create_time bigint(13)  NULL COMMENT '创建时间',
+    `create_time` bigint(13)  NULL COMMENT '创建时间',
     `status` varchar(100) null COMMENT '结果状态',
     `request_time` bigint(13) null COMMENT '请求时间',
-		`total_assertions` bigint(13) null COMMENT '总断言数',
+	`total_assertions` bigint(13) null COMMENT '总断言数',
     `pass_assertions` bigint(13) null COMMENT '失败断言数',
-     content longblob  COMMENT '执行结果',
-	PRIMARY KEY (`id`),
-	KEY `index_resource_id` (`resource_id`) USING BTREE
+    `content` longblob  COMMENT '执行结果',
+    PRIMARY KEY (`id`),
+    KEY `index_resource_id` (`resource_id`) USING BTREE
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
 
 CREATE TABLE IF NOT EXISTS `api_scenario_report_structure`
 (
-  `id` varchar(50) NOT NULL COMMENT 'ID',
-  `report_id` VARCHAR(50) DEFAULT NULL COMMENT '请求资源 id',
-	 create_time bigint(13)  NULL COMMENT '创建时间',
-	 resource_tree longblob  DEFAULT NULL COMMENT '资源步骤结构树',
-	 console LONGTEXT DEFAULT NULL COMMENT '执行日志',
-	PRIMARY KEY (`id`),
-	KEY `index_report_id` (`report_id`) USING BTREE
+    `id` varchar(50) NOT NULL COMMENT 'ID',
+    `report_id` VARCHAR(50) DEFAULT NULL COMMENT '请求资源 id',
+    `create_time` bigint(13)  NULL COMMENT '创建时间',
+    `resource_tree` longblob  DEFAULT NULL COMMENT '资源步骤结构树',
+    `console` LONGTEXT DEFAULT NULL COMMENT '执行日志',
+    PRIMARY KEY (`id`),
+    KEY `index_report_id` (`report_id`) USING BTREE
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;

From e53e5904502ce9b2451793e8a3e42f949462f5ab Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Thu, 16 Dec 2021 11:38:52 +0800
Subject: [PATCH 135/256] =?UTF-8?q?build:=20=E6=9E=84=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6jar=E5=88=B0resources=E9=87=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index bdb14b6932..b4ca7e3692 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -423,7 +423,7 @@
                         <artifactItem>
                             <groupId>org.apache.jmeter</groupId>
                             <artifactId>ApacheJMeter_functions</artifactId>
-                            <version>${jmeter.version}</version>
+                            <version>5.4.1</version>
                             <type>jar</type>
                             <overWrite>true</overWrite>
                             <outputDirectory>src/main/resources/jmeter/lib/ext</outputDirectory>
@@ -432,7 +432,7 @@
                         <artifactItem>
                             <groupId>io.metersphere</groupId>
                             <artifactId>metersphere-jmeter-functions</artifactId>
-                            <version>${metersphere-jmeter-functions.version}</version>
+                            <version>1.4</version>
                             <type>jar</type>
                             <overWrite>true</overWrite>
                             <outputDirectory>src/main/resources/jmeter/lib/ext</outputDirectory>

From 876bf31c94ac9e13ac01dafc9ac4c20eac97588d Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 16 Dec 2021 13:37:57 +0800
Subject: [PATCH 136/256] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/jmeter/APIBackendListenerHandler.java |  2 +-
 .../api/jmeter/APISingleResultListener.java   |  8 +++-----
 .../api/jmeter/MsDebugListener.java           |  2 +-
 .../api/jmeter/MsKafkaListener.java           |  5 +----
 .../ApiDefinitionExecResultService.java       |  8 ++++++--
 .../ApiScenarioReportResultService.java       | 20 +++++++------------
 .../report/components/RequestResultTail.vue   |  4 +++-
 7 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerHandler.java b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerHandler.java
index 40e04d596d..9d8b3af94a 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerHandler.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerHandler.java
@@ -20,7 +20,7 @@ public class APIBackendListenerHandler {
 
         // 无结果返回直接结束队列
         if (dto == null || CollectionUtils.isEmpty(dto.getRequestResults())) {
-            SerialBlockingQueueUtil.offer(dto, "testEnd");
+            SerialBlockingQueueUtil.offer(dto, SerialBlockingQueueUtil.END_SIGN);
         }
         dto.setConsole(resultService.getJmeterLogger(dto.getReportId()));
         // 存储结果
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java b/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java
index 232d12c673..9500579835 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java
@@ -14,10 +14,8 @@ import java.util.Map;
 public class APISingleResultListener extends MsExecListener {
     @Override
     public void handleTeardownTest(ResultDTO dto, Map<String, Object> kafkaConfig) {
-        LoggerUtil.info("开始处理单条执行结果报告【" + dto.getReportId() + " 】,资源【 " + dto.getTestId() + " 】");
-
+        LoggerUtil.info("处理单条执行结果报告【" + dto.getReportId() + " 】,资源【 " + dto.getTestId() + " 】");
         dto.setConsole(CommonBeanFactory.getBean(MsResultService.class).getJmeterLogger(dto.getReportId()));
-        // 存储结果
         CommonBeanFactory.getBean(TestResultService.class).saveResults(dto);
     }
 
@@ -28,10 +26,10 @@ public class APISingleResultListener extends MsExecListener {
             // 全局并发队列
             PoolExecBlockingQueueUtil.offer(dto.getReportId());
             dto.setConsole(CommonBeanFactory.getBean(MsResultService.class).getJmeterLogger(dto.getReportId()));
+            // 整体执行结束更新资源状态
+            CommonBeanFactory.getBean(TestResultService.class).testEnded(dto);
         } catch (Exception e) {
             LoggerUtil.error(e);
         }
-        // 存储结果
-        CommonBeanFactory.getBean(TestResultService.class).testEnded(dto);
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java b/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java
index f0cc1ba69e..07a3f863db 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java
@@ -105,7 +105,7 @@ public class MsDebugListener extends AbstractListenerElement implements SampleLi
         result.setResponseCode(TEST_END);
         ResultDTO dto = new ResultDTO();
         dto.setReportId(this.getName());
-        SerialBlockingQueueUtil.offer(dto, "testEnd");
+        SerialBlockingQueueUtil.offer(dto, SerialBlockingQueueUtil.END_SIGN);
         try {
             if (client != null) {
                 client.close();
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java b/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java
index 3c292c0665..405c67fa97 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java
@@ -10,7 +10,6 @@ import io.metersphere.api.service.TestResultService;
 import io.metersphere.config.KafkaConfig;
 import io.metersphere.dto.ResultDTO;
 import io.metersphere.utils.LoggerUtil;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.kafka.annotation.KafkaListener;
@@ -30,9 +29,7 @@ public class MsKafkaListener {
             LoggerUtil.info("报告 【 " + testResult.getReportId() + " 】资源 " + testResult.getTestId() + " 整体执行完成");
             testResultService.testEnded(testResult);
             // 串行队列
-            if (CollectionUtils.isEmpty(testResult.getRequestResults())) {
-                SerialBlockingQueueUtil.offer(testResult, SerialBlockingQueueUtil.END_SIGN);
-            }
+            SerialBlockingQueueUtil.offer(testResult, SerialBlockingQueueUtil.END_SIGN);
             // 全局并发队列
             PoolExecBlockingQueueUtil.offer(testResult.getReportId());
         } else {
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index 008bb81bca..b001c6b83d 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -76,10 +76,14 @@ public class ApiDefinitionExecResultService {
         LoggerUtil.info("接收到API/CASE执行结果【 " + requestResults.size() + " 】");
 
         for (RequestResult item : requestResults) {
+            item.setEndTime(System.currentTimeMillis());
+            if (item.getResponseResult() != null) {
+                item.getResponseResult().setResponseTime((item.getEndTime() - item.getStartTime()));
+            }
             if (!StringUtils.startsWithAny(item.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
                 ApiDefinitionExecResult result = this.save(item, dto.getReportId(), dto.getConsole(), count, dto.getRunMode(), dto.getTestId(), isFirst);
                 // 串行队列
-                SerialBlockingQueueUtil.offer(dto, "testEnd");
+                SerialBlockingQueueUtil.offer(dto, result != null ? result : SerialBlockingQueueUtil.END_SIGN);
                 if (result != null) {
                     // 发送通知
                     sendNotice(result);
@@ -220,7 +224,7 @@ public class ApiDefinitionExecResultService {
                 caseReportMap.put(dto.getTestId(), saveResult.getId());
                 isFirst = false;
                 // 串行队列
-                SerialBlockingQueueUtil.offer(dto, "testEnd");
+                SerialBlockingQueueUtil.offer(dto, SerialBlockingQueueUtil.END_SIGN);
             }
         }
         updateTestCaseStates(dto.getTestId());
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
index 8ce4b70198..7bbdd1d1b7 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
@@ -7,10 +7,6 @@ import io.metersphere.dto.RequestResult;
 import io.metersphere.utils.LoggerUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.session.ExecutorType;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,32 +19,30 @@ import java.util.UUID;
 @Transactional(rollbackFor = Exception.class)
 public class ApiScenarioReportResultService {
     @Resource
-    private SqlSessionFactory sqlSessionFactory;
+    private ApiScenarioReportResultMapper apiScenarioReportResultMapper;
 
     public void save(String reportId, List<RequestResult> queue) {
-        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
-        ApiScenarioReportResultMapper batchMapper = sqlSession.getMapper(ApiScenarioReportResultMapper.class);
         queue.forEach(item -> {
             // 事物控制器出来的结果特殊处理
             if (StringUtils.isNotEmpty(item.getName()) && item.getName().startsWith("Transaction=") && CollectionUtils.isEmpty(item.getSubRequestResults())) {
                 LoggerUtil.debug("合并事物请求暂不入库");
             } else if (StringUtils.isNotEmpty(item.getName()) && item.getName().startsWith("Transaction=") && CollectionUtils.isNotEmpty(item.getSubRequestResults())) {
                 item.getSubRequestResults().forEach(subItem -> {
-                    batchMapper.insert(this.newApiScenarioReportResult(reportId, subItem));
+                    apiScenarioReportResultMapper.insert(this.newApiScenarioReportResult(reportId, subItem));
                 });
             } else {
-                batchMapper.insert(this.newApiScenarioReportResult(reportId, item));
+                apiScenarioReportResultMapper.insert(this.newApiScenarioReportResult(reportId, item));
             }
         });
-        sqlSession.flushStatements();
-        if (sqlSession != null) {
-            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
-        }
     }
 
     private ApiScenarioReportResult newApiScenarioReportResult(String reportId, RequestResult result) {
         ApiScenarioReportResult report = new ApiScenarioReportResult();
         report.setId(UUID.randomUUID().toString());
+        result.setEndTime(System.currentTimeMillis());
+        if (result.getResponseResult() != null) {
+            result.getResponseResult().setResponseTime((result.getEndTime() - result.getStartTime()));
+        }
         String resourceId = result.getResourceId();
         if (StringUtils.isNotEmpty(resourceId) && resourceId.contains("_")) {
             resourceId = StringUtils.substringBefore(result.getResourceId(), "_");
diff --git a/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue b/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue
index b243b87bc0..d3e0a07bb0 100644
--- a/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue
+++ b/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue
@@ -13,7 +13,9 @@
           </el-tooltip>
         </el-col>
         <el-col :span="8">
-          <div class="url"> {{ $t('api_report.start_time') }}：{{ request.startTime | timestampFormatDate(true) }}
+          <div class="url">
+            {{ $t('api_report.start_time') }}：{{ request.startTime | timestampFormatDate(true) }}
+            {{ $t('report.test_end_time') }}：{{ request.endTime | timestampFormatDate(true) }}
           </div>
         </el-col>
       </el-row>

From 554eac82ffaf35d512c34cad7e73cbfaccc5bf2e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 16 Dec 2021 14:35:06 +0800
Subject: [PATCH 137/256] =?UTF-8?q?refactor(=E9=A1=B9=E7=9B=AE=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE):=20i18n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008892 --user=lyh 【国际化】-Project Setting-Tab 页格式完全不一致。仅需要首字母大写
https://www.tapd.cn/55049933/s/1081542
---
 frontend/src/i18n/en-US.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 6cbcd95e99..1fa6252158 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -218,7 +218,7 @@ export default {
       after_finish: 'Execution after completion',
       current_case: 'Current case',
     },
-    project_setting: "Project Setting",
+    project_setting: "Project Settings",
     table: {
       select_tip: "Item {0} data is selected"
     },
@@ -677,17 +677,17 @@ export default {
       stop_test: "Terminate the test",
       report_handle: "Message processing"
     },
-    info: 'INFO',
+    info: 'Info',
     member: 'Member',
-    env: 'ENVIRONMENT',
-    file_manage: 'FILE',
-    log: 'LOG',
-    version_manage: 'VERSION',
-    app_manage: 'APPLICATION',
+    env: 'Environment',
+    file_manage: 'File',
+    log: 'Log',
+    version_manage: 'Version',
+    app_manage: 'App Management',
     desc: 'Project Description',
     manage_people: 'Project Manager',
     creator: 'Creator',
-    create_time: 'CreateTime',
+    create_time: 'Created',
     member_desc: 'Project member management',
     env_desc: 'Project operating environment',
     file_desc: 'Jar package and resource file management',

From 2fd6dc131654117a3f55f428a1590f6a7411d304 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Thu, 16 Dec 2021 14:51:37 +0800
Subject: [PATCH 138/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dslf4j=20jar?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/backend/pom.xml b/backend/pom.xml
index b4ca7e3692..7cbb182edd 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -265,6 +265,12 @@
             <groupId>io.metersphere</groupId>
             <artifactId>metersphere-plugin-core</artifactId>
             <version>1.0.1</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>log4j-slf4j-impl</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--随机数据生成API-->
         <dependency>

From b4f2854b0e1aa198e0758586025f1b7f6a741f25 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 16 Dec 2021 15:26:36 +0800
Subject: [PATCH 139/256] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E5=AE=9A=E6=97=B6=E6=A3=80=E6=9F=A5=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5=E5=91=8A=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TestPlanReportListenerScheduled.java      | 36 +++++++++++++++++++
 .../metersphere/api/jmeter/MessageCache.java  | 14 +++++---
 .../track/service/TestPlanService.java        | 28 ++-------------
 3 files changed, 48 insertions(+), 30 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/schedule/TestPlanReportListenerScheduled.java

diff --git a/backend/src/main/java/io/metersphere/api/exec/schedule/TestPlanReportListenerScheduled.java b/backend/src/main/java/io/metersphere/api/exec/schedule/TestPlanReportListenerScheduled.java
new file mode 100644
index 0000000000..1ef1848da6
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/schedule/TestPlanReportListenerScheduled.java
@@ -0,0 +1,36 @@
+package io.metersphere.api.exec.schedule;
+
+import io.metersphere.api.cache.TestPlanReportExecuteCatch;
+import io.metersphere.api.jmeter.MessageCache;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.track.service.TestPlanReportService;
+import io.metersphere.utils.LoggerUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+public class TestPlanReportListenerScheduled {
+    /**
+     * 定时调用监听检查报告状态
+     */
+    @Scheduled(cron = "*/9 * * * * ?")
+    public void testPlanScheduled() {
+        //判断缓冲队列是否存在记录
+        if (CollectionUtils.isNotEmpty(MessageCache.jobReportCache)) {
+            for (int i = 0; i < MessageCache.jobReportCache.size(); i++) {
+                this.listener(MessageCache.jobReportCache.get(i));
+            }
+        }
+    }
+
+    private void listener(String planReportId) {
+        LoggerUtil.info("检查测试计划执行报告：【" + planReportId + "】");
+        if (TestPlanReportExecuteCatch.getTestPlanExecuteInfo(planReportId) != null) {
+            CommonBeanFactory.getBean(TestPlanReportService.class).countReport(planReportId);
+        } else {
+            MessageCache.jobReportCache.remove(planReportId);
+            LoggerUtil.info("测试计划执行报告：【" + planReportId + "】执行完成，剩余队列：" + MessageCache.jobReportCache.size());
+        }
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java b/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java
index 41dd0fb2db..2c3ec1a09c 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java
@@ -4,16 +4,20 @@ import io.metersphere.base.domain.ApiDefinitionExecResult;
 
 import javax.websocket.Session;
 import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class MessageCache {
-    public static Map<String, ReportCounter> concurrencyCounter = new HashMap<>();
-
-    public static ConcurrentHashMap<String, Session> reportCache = new ConcurrentHashMap<>();
+    public final static Map<String, ReportCounter> concurrencyCounter = new HashMap<>();
 
+    public final static ConcurrentHashMap<String, Session> reportCache = new ConcurrentHashMap<>();
     // 用例并发锁
-    public static ConcurrentHashMap<String, ApiDefinitionExecResult> caseExecResourceLock = new ConcurrentHashMap<>();
+    public final static ConcurrentHashMap<String, ApiDefinitionExecResult> caseExecResourceLock = new ConcurrentHashMap<>();
 
-    public static Map<String, Long> jmeterLogTask = new HashMap<>();
+    public final static Map<String, Long> jmeterLogTask = new HashMap<>();
+
+    // 定时任务报告
+    public final static List<String> jobReportCache = new LinkedList<>();
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 349d0ff42c..01c62a9203 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -22,6 +22,7 @@ import io.metersphere.api.dto.definition.request.MsTestPlan;
 import io.metersphere.api.dto.definition.request.MsThreadGroup;
 import io.metersphere.api.dto.definition.request.variable.ScenarioVariable;
 import io.metersphere.api.jmeter.JMeterService;
+import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.api.service.ApiAutomationService;
 import io.metersphere.api.service.ApiDefinitionService;
 import io.metersphere.api.service.ApiScenarioReportService;
@@ -59,6 +60,7 @@ import io.metersphere.track.request.testplan.LoadCaseRequest;
 import io.metersphere.track.request.testplan.TestplanRunRequest;
 import io.metersphere.track.request.testplancase.QueryTestPlanCaseRequest;
 import org.apache.commons.beanutils.BeanMap;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
@@ -71,7 +73,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
@@ -1071,8 +1072,7 @@ public class TestPlanService {
         String planReportId = testPlanReport.getId();
         testPlanLog.info("ReportId[" + planReportId + "] created. TestPlanID:[" + testPlanID + "]. " + "API Run Config:【" + apiRunConfig + "】");
         //开启测试计划执行状态的监听
-        this.listenTaskExecuteStatus(planReportId);
-
+        MessageCache.jobReportCache.add(planReportId);
         //不同任务的执行ID
         Map<String, String> executePerformanceIdMap = new HashMap<>();
         Map<String, String> executeApiCaseIdMap = new HashMap<>();
@@ -1146,28 +1146,6 @@ public class TestPlanService {
         return testPlanReport.getId();
     }
 
-    private void listenTaskExecuteStatus(String planReportId) {
-        // 开始串行执行
-        Thread thread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                Thread.currentThread().setName("TestPlanListener");
-                try {
-                    //10s 查询一次状态
-                    Thread.sleep(10000);
-                    while (TestPlanReportExecuteCatch.getTestPlanExecuteInfo(planReportId) != null) {
-                        testPlanReportService.countReport(planReportId);
-                        Thread.sleep(10000);
-                    }
-                } catch (InterruptedException e) {
-                    TestPlanReportExecuteCatch.remove(planReportId);
-                    LogUtil.error(e);
-                }
-            }
-        });
-        thread.start();
-    }
-
     private void executeApiTestCase(String triggerMode, String planReportId, String userId, List<String> planCaseIds, RunModeConfigDTO runModeConfig) {
         BatchRunDefinitionRequest request = new BatchRunDefinitionRequest();
         if (StringUtils.equals(triggerMode, ReportTriggerMode.API.name())) {

From b47dcfaa43178c0ff3d1bab88d0d29213c9c3943 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 16 Dec 2021 15:47:49 +0800
Subject: [PATCH 140/256] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE):=20=E9=80=9A=E8=BF=87=E9=A1=B9=E7=9B=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=87=E6=8D=A2=E9=A1=B9=E7=9B=AE=E6=97=B6=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E8=8F=9C=E5=8D=95=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008905 --user=lyh 【系统设置】新建项目后不显示项目等测试菜单
https://www.tapd.cn/55049933/s/1081730
---
 .../settings/workspace/MsProject.vue          | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue
index 69ef6e7bc5..008a5fa5e4 100644
--- a/frontend/src/business/components/settings/workspace/MsProject.vue
+++ b/frontend/src/business/components/settings/workspace/MsProject.vue
@@ -191,7 +191,6 @@ import {
   getCurrentUser,
   getCurrentUserId,
   getCurrentWorkspaceId,
-  listenGoBack,
   removeGoBackListener
 } from "@/common/js/utils";
 import MsContainer from "../../common/components/MsContainer";
@@ -254,8 +253,6 @@ export default {
         description: [
           {max: 250, message: this.$t('commons.input_limit', [0, 250]), trigger: 'blur'}
         ],
-        // caseTemplateId: [{required: true}],
-        // issueTemplateId: [{required: true}],
       },
       screenHeight: 'calc(100vh - 195px)',
       dialogCondition: {},
@@ -288,9 +285,6 @@ export default {
     this.list();
   },
   computed: {
-    currentUser: () => {
-      return getCurrentUser();
-    },
     projectId() {
       return getCurrentProjectID();
     },
@@ -306,19 +300,20 @@ export default {
         name: '',
         projectId: row.id
       };
-      this.wsId = row.id;
       this.result = this.$post("/user/project/member/list", param, res => {
-        let data = res.data;
-        this.memberLineData = data;
-        let arr = this.memberLineData.filter(item => item.id == getCurrentUserId());
+        this.memberLineData = res.data;
+        let arr = this.memberLineData.filter(item => item.id === getCurrentUserId());
         if (arr.length > 0) {
           window.sessionStorage.setItem(PROJECT_ID, row.id);
-          this.$router.push('/track/home');
+          this.$router.push('/track/home').then(() => {
+            if (!getCurrentUser().lastProjectId) {
+              window.location.reload();
+            }
+          });
         } else {
-          this.$message(this.$t("commons.project_permission"));
+          this.$warning(this.$t("commons.project_permission"));
         }
       });
-
     },
     getMaintainerOptions() {
       this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
@@ -420,7 +415,6 @@ export default {
         name: '',
         projectId: row.id
       };
-      this.wsId = row.id;
       let path = "/user/project/member/list";
       this.result = this.$post(this.buildPagePath(path), param, res => {
         let data = res.data;

From c34be4c8eb521d32068e4227590ca11a159ea4b8 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 16 Dec 2021 16:53:23 +0800
Subject: [PATCH 141/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BA=E6=8F=90=E4=BA=A4=E5=90=8E=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E6=A1=86=E4=B8=8D=E4=BC=9A=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008916 --user=lyh 【测试跟踪】用例评审，评论提交后评论框不会清空
https://www.tapd.cn/55049933/s/1081803
---
 .../components/track/review/commom/ReviewComment.vue      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/track/review/commom/ReviewComment.vue b/frontend/src/business/components/track/review/commom/ReviewComment.vue
index 262faa1146..462aab8309 100644
--- a/frontend/src/business/components/track/review/commom/ReviewComment.vue
+++ b/frontend/src/business/components/track/review/commom/ReviewComment.vue
@@ -17,7 +17,7 @@
     <div>
       <div class="editors_div_style">
         <div id="editorsDiv" >
-          <ms-mark-down-text prop="description" :data="from" :toolbars="toolbars"/>
+          <ms-mark-down-text prop="description" :data="form" :toolbars="toolbars"/>
         </div>
       </div>
 
@@ -33,7 +33,6 @@
 <script>
 import ReviewCommentItem from "./ReviewCommentItem";
 import FormRichTextItem from "@/business/components/track/case/components/FormRichTextItem";
-import {uploadMarkDownImg} from "@/network/image";
 import MsMarkDownText from "@/business/components/track/case/components/MsMarkDownText";
 
 export default {
@@ -48,7 +47,7 @@ export default {
   data() {
     return {
       result: {},
-      from: {
+      form: {
         description: ''
       },
       loadCommenItem:true,
@@ -103,7 +102,7 @@ export default {
     sendComment() {
       let comment = {};
       comment.caseId = this.caseId;
-      comment.description = this.from.description;
+      comment.description = this.form.description;
       comment.reviewId = this.reviewId;
       comment.status = this.reviewStatus;
       if (!comment.description) {
@@ -112,6 +111,7 @@ export default {
       }
       this.result = this.$post('/test/case/comment/save', comment, () => {
         this.$success(this.$t('test_track.comment.send_success'));
+        this.form.description = "";
         this.refresh();
         if(this.$refs.md){
           this.$refs.md.toolbar_left_click('trash');

From ef0acc965a5347edb192516419c67bc10ecea73f Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 16 Dec 2021 17:11:24 +0800
Subject: [PATCH 142/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=B8=8D=E9=80=9A=E8=BF=87=E6=B2=A1=E6=9C=89=E5=8F=8D?=
 =?UTF-8?q?=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008914 --user=lyh 【测试跟踪】用例评审，不填写评论，点击不通过，没有反应，console有报错
https://www.tapd.cn/55049933/s/1081817
---
 .../components/track/case/components/MsMarkDownText.vue     | 6 ++++++
 .../components/track/review/commom/ReviewComment.vue        | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/track/case/components/MsMarkDownText.vue b/frontend/src/business/components/track/case/components/MsMarkDownText.vue
index 30a56ccab3..3a66dc0011 100644
--- a/frontend/src/business/components/track/case/components/MsMarkDownText.vue
+++ b/frontend/src/business/components/track/case/components/MsMarkDownText.vue
@@ -131,6 +131,12 @@ export default {
     },
     getContent() {
       return this.$refs.md.d_render;
+    },
+    getTextareaDom() {
+      return this.$refs.md.getTextareaDom();
+    },
+    toolbar_left_click(param) {
+      this.$refs.md.toolbar_left_click(param);
     }
   }
 }
diff --git a/frontend/src/business/components/track/review/commom/ReviewComment.vue b/frontend/src/business/components/track/review/commom/ReviewComment.vue
index 462aab8309..0ad3fc4a1f 100644
--- a/frontend/src/business/components/track/review/commom/ReviewComment.vue
+++ b/frontend/src/business/components/track/review/commom/ReviewComment.vue
@@ -17,7 +17,7 @@
     <div>
       <div class="editors_div_style">
         <div id="editorsDiv" >
-          <ms-mark-down-text prop="description" :data="form" :toolbars="toolbars"/>
+          <ms-mark-down-text prop="description" :data="form" :toolbars="toolbars" ref="md"/>
         </div>
       </div>
 

From 647fa1a2d60e18fa1d6cf89ae985cce12eea7c8a Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Thu, 16 Dec 2021 14:05:54 +0800
Subject: [PATCH 143/256] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86):=20=E5=BA=94=E7=94=A8=E8=AE=BE=E7=BD=AE=E4=B8=AD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89url?=
 =?UTF-8?q?=E5=8F=AF=E9=87=8D=E5=A4=8D=E4=B8=8D=E7=94=9F=E6=95=88=EF=BC=8C?=
 =?UTF-8?q?=20=E5=8F=91=E7=8E=B0=E5=8E=9F=E6=9D=A5=E7=9A=84=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B9=E7=9B=AE=E4=B8=AD=E8=AE=BE=E7=BD=AE=E6=98=AF?=
 =?UTF-8?q?=E6=9C=AA=E5=BC=80=E5=A7=8B=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008902 --user=王孝刚 【项目管理】-应用设置-修改接口定义url可重复不生效， 发现原来的编辑项目中设置是未开始状态
https://www.tapd.cn/55049933/s/1081527
---
 .../components/project/menu/appmanage/AppManage.vue       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/project/menu/appmanage/AppManage.vue b/frontend/src/business/components/project/menu/appmanage/AppManage.vue
index a2053d772d..8b9d485c1c 100644
--- a/frontend/src/business/components/project/menu/appmanage/AppManage.vue
+++ b/frontend/src/business/components/project/menu/appmanage/AppManage.vue
@@ -23,8 +23,8 @@
                           </el-form-item>
                           <el-divider v-if="this.isXpack"></el-divider>
                           <el-form-item :label-width="labelWidth" :label="$t('project.test_case_custom_id_info')"
-                                        prop="repeatable">
-                            <el-switch v-model="form.repeatable" style="margin-top:20px"></el-switch>
+                                        prop="customNum">
+                            <el-switch v-model="form.customNum" style="margin-top:20px"></el-switch>
                           </el-form-item>
                         </el-form>
                       </fieldset>
@@ -42,8 +42,8 @@
                       <fieldset>
                         <el-form :model="form" ref="form" label-position="left" label-width="200px" size="small">
                           <el-form-item :label-width="labelWidth" :label="$t('project.repeatable_info')"
-                                        prop="customNum">
-                            <el-switch v-model="form.customNum" style="margin-top:20px"></el-switch>
+                                        prop="repeatable">
+                            <el-switch v-model="form.repeatable" style="margin-top:20px"></el-switch>
                           </el-form-item>
                           <el-divider></el-divider>
                           <el-form-item :label-width="labelWidth" :label="$t('project.scenario_custom_id_info')"

From e56ac02942b05e064b97a80d80d0c9082ea047ee Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Thu, 16 Dec 2021 14:44:56 +0800
Subject: [PATCH 144/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E5=85=AC=E5=85=B1=E7=94=A8=E4=BE=8B=E5=BA=93?=
 =?UTF-8?q?=E4=B8=AD=E6=89=B9=E9=87=8F=E9=80=89=E6=8B=A9=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=BA=93=E5=A4=8D=E5=88=B6=E5=88=B0=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=A4=B1=E8=B4=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008901 --user=王孝刚 【公共用例库】-批量选择公共用例库复制到模块失败。
https://www.tapd.cn/55049933/s/1081614
---
 .../java/io/metersphere/track/service/TestCaseService.java   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index ce22ab817a..8ff73d57f1 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -1339,11 +1339,8 @@ public class TestCaseService {
             batchCopy.setId(UUID.randomUUID().toString());
             batchCopy.setCreateTime(System.currentTimeMillis());
             batchCopy.setUpdateTime(System.currentTimeMillis());
-            checkTestCustomNum(batchCopy);
             batchCopy.setNum(getNextNum(SessionUtils.getCurrentProjectId()));
-            if (StringUtils.isBlank(batchCopy.getCustomNum())) {
-                batchCopy.setCustomNum(batchCopy.getNum().toString());
-            }
+            batchCopy.setCustomNum(batchCopy.getNum().toString());
             batchCopy.setCreateUser(SessionUtils.getUserId());
             batchCopy.setMaintainer(SessionUtils.getUserId());
             batchCopy.setReviewStatus(TestCaseReviewStatus.Prepare.name());

From 3b53f6a697b586458b19db050e392a01558b5f8a Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Thu, 16 Dec 2021 15:13:18 +0800
Subject: [PATCH 145/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E5=85=AC=E5=85=B1=E7=94=A8=E4=BE=8B=E5=BA=93?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BF=AE=E6=94=B9=E7=94=A8=E4=BE=8B=E8=B4=A3?=
 =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E5=90=8E=EF=BC=8C=E6=96=B0=E7=9A=84=E8=B4=A3?=
 =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E4=BB=8D=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=92=8C=E5=88=A0=E9=99=A4=E8=AF=A5=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008907 --user=王孝刚 【公共用例库】-选择修改用例责任人后，新的责任人仍不可编辑和删除该用例
https://www.tapd.cn/55049933/s/1081648
---
 .../components/track/case/components/TestCaseList.vue        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 76e8dc8e24..28b56863a3 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -758,7 +758,10 @@ export default {
 
     },
     isPublic(testCase) {
-      if (testCase.maintainer !== getCurrentUserId() || testCase.createUser !== getCurrentUserId()) {
+      if (testCase.maintainer && testCase.maintainer !== getCurrentUserId()) {
+        return true;
+      }
+      if (testCase.createUser && testCase.createUser !== getCurrentUserId()) {
         return true;
       } else {
         return false;

From 22094ed429271ec254ce6a1e9ada7d4b23b3291a Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Thu, 16 Dec 2021 18:05:40 +0800
Subject: [PATCH 146/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E5=90=8E=E5=8F=B0=E5=A4=B1=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/i18n.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/i18n/i18n.js b/frontend/src/i18n/i18n.js
index db8aa23e32..16d9ee5db2 100644
--- a/frontend/src/i18n/i18n.js
+++ b/frontend/src/i18n/i18n.js
@@ -35,7 +35,7 @@ const loadedLanguages = ['en_US', 'zh_CN', 'zh_TW'];
 
 function setI18nLanguage(lang) {
   i18n.locale = lang;
-  axios.defaults.headers.common['Accept-Language'] = lang;
+  axios.defaults.headers.common['Accept-Language'] = lang.replace("_", "-");
   document.querySelector('html').setAttribute('lang', lang);
   return lang;
 }

From 9b94963669d3a32cae473758bdbacb8570c5a47e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 16 Dec 2021 19:12:33 +0800
Subject: [PATCH 147/256] refactor: i18n
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008911 --user=lyh 【国际化】测试跟踪 模块，未进行国际化的问题汇总
https://www.tapd.cn/55049933/s/1081982
---
 .../components/track/plan/common/PlanRunModeWithEnv.vue     | 2 +-
 .../plan/view/comonents/api/TestCaseScenarioRelevance.vue   | 6 +++---
 frontend/src/i18n/en-US.js                                  | 2 ++
 frontend/src/i18n/zh-CN.js                                  | 2 ++
 frontend/src/i18n/zh-TW.js                                  | 2 ++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/track/plan/common/PlanRunModeWithEnv.vue b/frontend/src/business/components/track/plan/common/PlanRunModeWithEnv.vue
index b1f1ff11e4..eb7616e5e1 100644
--- a/frontend/src/business/components/track/plan/common/PlanRunModeWithEnv.vue
+++ b/frontend/src/business/components/track/plan/common/PlanRunModeWithEnv.vue
@@ -32,7 +32,7 @@
         </el-col>
         <el-col :span="18">
           <div>
-            <el-checkbox v-model="runConfig.onSampleError">失败停止</el-checkbox>
+            <el-checkbox v-model="runConfig.onSampleError">{{ $t("api_test.fail_to_stop") }}</el-checkbox>
           </div>
           <div v-if="testType === 'API'" style="padding-top: 10px">
             <el-checkbox v-model="runConfig.runWithinResourcePool" style="padding-right: 10px;">
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue
index 8e85faffb4..7fa9730250 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue
@@ -111,14 +111,14 @@
         let envType = this.$refs.apiScenarioList.environmentType;
         let envGroupId = this.$refs.apiScenarioList.envGroupId;
         if (!map || map.size < 1) {
-          this.$warning("请选择用例！");
+          this.$warning(this.$t("api_test.please_select_case"));
           return false;
         }
         if (envType === ENV_TYPE.JSON && (!envMap || envMap.size < 1)) {
-          this.$warning("请选择环境！");
+          this.$warning(this.$t("api_test.environment.select_environment"));
           return false;
         } else if (envType === ENV_TYPE.GROUP && !envGroupId) {
-          this.$warning("请选择环境！");
+          this.$warning(this.$t("api_test.environment.select_environment"));
           return false;
         }
         param.planId = this.planId;
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 1fa6252158..dd299b8110 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -994,6 +994,8 @@ export default {
     export_config: "Export",
     enable_validate_tip: "No request available",
     copy: "Copy Test",
+    please_select_case: "Please select case",
+    fail_to_stop: "Fail to stop",
     jar_config: {
       title: "Upload jar package",
       jar_file: "Jar package",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 5b52182836..7b18c3ab50 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1002,6 +1002,8 @@ export default {
     export_config: "导出",
     enable_validate_tip: "没有可用请求",
     copy: "复制测试",
+    please_select_case: "请选择用例",
+    fail_to_stop: "失败停止",
     batch_add_parameter: "格式：参数名:参数值 <br/> 如：Accept-Encoding:utf-8",
     jar_config: {
       title: "上传jar包",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index fa74d8fa24..227c154643 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -999,6 +999,8 @@ export default {
     export_config: "導出",
     enable_validate_tip: "沒有可用請求",
     copy: "復製測試",
+    please_select_case: "請選擇用例",
+    fail_to_stop: "失敗停止",
     batch_add_parameter: "格式：參數名:參數值 <br/> 如：Accept-Encoding:utf-8",
     jar_config: {
       title: "上傳jar包",

From e3fa37a6f1b01af167ca094e09a99f6b36e46ddc Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 16 Dec 2021 20:22:14 +0800
Subject: [PATCH 148/256] =?UTF-8?q?fix:=20jira=E8=8E=B7=E5=8F=96=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/constants/CustomFieldType.java    | 21 ++++++++
 .../commons/utils/LicenseUtils.java           | 18 +++++++
 .../track/issue/AbstractIssuePlatform.java    | 40 +++++++++++++--
 .../metersphere/track/issue/JiraPlatform.java |  1 +
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 .../components/project/menu/EditProject.vue   |  4 +-
 .../track/case/components/IssueRelateList.vue | 15 ++----
 .../case/components/TestCaseEditOtherInfo.vue |  5 +-
 .../case/components/TestCaseIssueRelate.vue   | 51 +++++++++----------
 .../track/issue/IssueEditDetail.vue           | 26 +++-------
 .../components/track/issue/IssueList.vue      | 25 ++-------
 frontend/src/business/components/xpack        |  2 +-
 frontend/src/common/js/tableUtils.js          |  3 ++
 frontend/src/network/Issue.js                 | 36 +++++++++++--
 14 files changed, 161 insertions(+), 88 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/commons/constants/CustomFieldType.java
 create mode 100644 backend/src/main/java/io/metersphere/commons/utils/LicenseUtils.java

diff --git a/backend/src/main/java/io/metersphere/commons/constants/CustomFieldType.java b/backend/src/main/java/io/metersphere/commons/constants/CustomFieldType.java
new file mode 100644
index 0000000000..080c65e286
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/commons/constants/CustomFieldType.java
@@ -0,0 +1,21 @@
+package io.metersphere.commons.constants;
+
+public enum CustomFieldType {
+    INPUT("input"),TEXTAREA("textarea"),
+    SELECT("select"),MULTIPLE_SELECT("multipleSelect"),
+    RADIO("radio"),CHECKBOX("checkbox"),
+    MEMBER("member"), MULTIPLE_MEMBER("multipleMember"),
+    DATE("date"),DATETIME("datetime"),
+    INT("int"),FLOAT("float"),
+    MULTIPLE_INPUT("multipleInput"),RICH_TEXT("richText");
+
+    String value;
+
+    CustomFieldType(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/commons/utils/LicenseUtils.java b/backend/src/main/java/io/metersphere/commons/utils/LicenseUtils.java
new file mode 100644
index 0000000000..834d77600e
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/commons/utils/LicenseUtils.java
@@ -0,0 +1,18 @@
+package io.metersphere.commons.utils;
+
+import java.lang.reflect.Method;
+
+public class LicenseUtils {
+    public static boolean valid() {
+        try {
+            Class<?> aClass = Class.forName("io.metersphere.xpack.license.util.LicenseCache");
+            Method get = aClass.getMethod("valid");
+            System.out.println("====");
+            return (boolean) get.invoke(null);
+        } catch (Exception e) {
+            LogUtil.error(e);
+            e.printStackTrace();
+            return false;
+        }
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
index 299e29b64d..4a3c9a2c65 100644
--- a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
@@ -7,6 +7,7 @@ import io.metersphere.base.mapper.IssuesMapper;
 import io.metersphere.base.mapper.ProjectMapper;
 import io.metersphere.base.mapper.TestCaseIssuesMapper;
 import io.metersphere.base.mapper.ext.ExtIssuesMapper;
+import io.metersphere.commons.constants.CustomFieldType;
 import io.metersphere.commons.constants.IssuesStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
@@ -64,6 +65,7 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
     protected String workspaceId;
     protected String userId;
     protected String defaultCustomFields;
+    protected boolean isThirdPartTemplate;
 
 
     public String getKey() {
@@ -366,13 +368,31 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
 
     protected String syncIssueCustomField(String customFieldsStr, JSONObject issue) {
         List<CustomFieldItemDTO> customFields = CustomFieldService.getCustomFields(customFieldsStr);
+        Set<String> names = issue.keySet();
         customFields.forEach(item -> {
             String fieldName = item.getCustomData();
             Object value = issue.get(fieldName);
             if (value != null) {
-                if (value instanceof JSONObject) {
-                    if (!fieldName.equals("assignee") && !fieldName.equals("reporter")) { // 获取不到账号名
-                        item.setValue(((JSONObject)value).getString("id"));
+               if (value instanceof JSONObject) {
+                   JSONObject valObj = ((JSONObject) value);
+                   String accountId = valObj.getString("accountId");
+                   JSONObject child = valObj.getJSONObject("child");
+                   if (child != null) {// 级联框
+                       List<Object> values = new ArrayList<>();
+                       if (StringUtils.isNotBlank(valObj.getString("id")))  {
+                           values.add(valObj.getString("id"));
+                       }
+                       if (StringUtils.isNotBlank(child.getString("id")))  {
+                           values.add(child.getString("id"));
+                       }
+                       item.setValue(values);
+                   } else if (StringUtils.isNotBlank(accountId)) {
+                       // 用户选择框
+                       if (isThirdPartTemplate) {
+                           item.setValue(accountId);
+                       }
+                    } else {
+                       item.setValue(valObj.getString("id"));
                     }
                 } else if (value instanceof JSONArray) {
                     List<Object> values = new ArrayList<>();
@@ -387,6 +407,12 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
                 } else {
                     item.setValue(value);
                 }
+            } else if (names.contains(fieldName)) {
+                if (item.getType().equals(CustomFieldType.CHECKBOX.getValue())) {
+                    item.setValue(new ArrayList<>());
+                } else {
+                    item.setValue(null);
+                }
             }
         });
         return JSONObject.toJSONString(customFields);
@@ -463,4 +489,12 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
         issue.setCreator(SessionUtils.getUserId());
         issue.setNum(nextNum);
     }
+
+    public boolean isThirdPartTemplate() {
+        Project project = projectService.getProjectById(projectId);
+        if (project.getThirdPartTemplate() != null && project.getThirdPartTemplate() && LicenseUtils.valid()) {
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
index c7cb031edb..72256d1b08 100644
--- a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
@@ -294,6 +294,7 @@ public class JiraPlatform extends AbstractIssuePlatform {
 
     @Override
     public void syncIssues(Project project, List<IssuesDao> issues) {
+        isThirdPartTemplate = isThirdPartTemplate();
         issues.forEach(item -> {
             try {
                 IssuesWithBLOBs issuesWithBLOBs = issuesMapper.selectByPrimaryKey(item.getId());
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index dae3bfa801..23fd955ff2 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit dae3bfa8015fefe44c0c7a7517a43a5da93e6950
+Subproject commit 23fd955ff25ccf19f115c9d37a970e0caba6986d
diff --git a/frontend/src/business/components/project/menu/EditProject.vue b/frontend/src/business/components/project/menu/EditProject.vue
index c80110a96f..00bfaa8b8c 100644
--- a/frontend/src/business/components/project/menu/EditProject.vue
+++ b/frontend/src/business/components/project/menu/EditProject.vue
@@ -18,7 +18,7 @@
           <template-select :data="form" scene="API_CASE" prop="caseTemplateId" ref="caseTemplate"/>
         </el-form-item>
 
-        <el-form-item v-if="xpackEable" :label-width="labelWidth" :label="$t('使用第三方平台模板')" prop="scenarioCustomNum">
+        <el-form-item v-if="xpackEable && form.platform === 'Jira'" :label-width="labelWidth" :label="$t('使用第三方平台模板')" prop="scenarioCustomNum">
           <el-switch v-model="form.thirdPartTemplate"></el-switch>
         </el-form-item>
 
@@ -231,7 +231,7 @@ export default {
       if (platforms.indexOf(platform) === -1) {
         for (let i = 0; i < this.platformOptions.length; i++) {
           if (this.platformOptions[i].value === platform) {
-            this.platformOptions.splice(1, i);
+            this.platformOptions.splice(i, 1);
             break;
           }
         }
diff --git a/frontend/src/business/components/track/case/components/IssueRelateList.vue b/frontend/src/business/components/track/case/components/IssueRelateList.vue
index cbd0918781..c61c1e8b92 100644
--- a/frontend/src/business/components/track/case/components/IssueRelateList.vue
+++ b/frontend/src/business/components/track/case/components/IssueRelateList.vue
@@ -66,14 +66,12 @@
 import MsEditDialog from "@/business/components/common/components/MsEditDialog";
 import MsTable from "@/business/components/common/components/table/MsTable";
 import MsTableColumn from "@/business/components/common/components/table/MsTableColumn";
-import {getRelateIssues, testCaseIssueRelate} from "@/network/Issue";
+import {getRelateIssues, isThirdPartEnable, testCaseIssueRelate} from "@/network/Issue";
 import IssueDescriptionTableItem from "@/business/components/track/issue/IssueDescriptionTableItem";
 import {ISSUE_STATUS_MAP} from "@/common/js/table-constants";
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import {getPageInfo} from "@/common/js/tableUtils";
 import {getCurrentProjectID} from "@/common/js/utils";
-import {getIssueTemplate} from "../../../../../network/custom-field-template";
-import {LOCAL} from "@/common/js/constants";
 export default {
   name: "IssueRelateList",
   components: {MsTablePagination, IssueDescriptionTableItem, MsTableColumn, MsTable, MsEditDialog},
@@ -94,14 +92,9 @@ export default {
   },
   props: ['caseId'],
   created() {
-    getIssueTemplate()
-      .then((template) => {
-        if (template.platform === LOCAL) {
-          this.isThirdPart = false;
-        } else {
-          this.isThirdPart = true;
-        }
-      });
+    isThirdPartEnable((data) => {
+      this.isThirdPart = data;
+    });
   },
   methods: {
     open() {
diff --git a/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue b/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
index fa61269529..fda4596f81 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
@@ -27,6 +27,7 @@
 
     <el-tab-pane :label="$t('test_track.case.relate_issue')" name="bug">
       <test-case-issue-relate
+        v-if="tabActiveName === 'bug'"
         :plan-id="planId"
         :read-only="readOnly && !(isTestPlan)"
         :case-id="caseId" ref="issue"/>
@@ -118,7 +119,9 @@ export default {
       if (this.tabActiveName === 'demand') {
         this.getDemandOptions();
       } else if (this.tabActiveName === 'bug') {
-        this.$refs.issue.getIssues();
+        if (this.$refs.issue) {
+          this.$refs.issue.getIssues();
+        }
       } else if (this.tabActiveName === 'relationship') {
         this.$refs.relationship.open();
       } else if (this.tabActiveName === 'attachment') {
diff --git a/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue b/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
index 2dbf8e7671..577dee6829 100644
--- a/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
@@ -97,8 +97,7 @@ import MsTableColumn from "@/business/components/common/components/table/MsTable
 import IssueDescriptionTableItem from "@/business/components/track/issue/IssueDescriptionTableItem";
 import {ISSUE_STATUS_MAP} from "@/common/js/table-constants";
 import IssueRelateList from "@/business/components/track/case/components/IssueRelateList";
-import {deleteIssueRelate, getIssuesByCaseId} from "@/network/Issue";
-import {getIssueTemplate} from "@/network/custom-field-template";
+import {deleteIssueRelate, getIssuePartTemplateWithProject, getIssuesByCaseId} from "@/network/Issue";
 import {getCustomFieldValue, getTableHeaderWithCustomFields} from "@/common/js/tableUtils";
 import {LOCAL} from "@/common/js/constants";
 export default {
@@ -132,34 +131,34 @@ export default {
     },
   },
   created() {
-    getIssueTemplate()
-      .then((template) => {
-        this.issueTemplate = template;
-        if (this.issueTemplate.platform === LOCAL) {
-          this.isThirdPart = false;
-        } else {
-          this.isThirdPart = true;
-        }
-        if (template) {
-          let customFields = template.customFields;
-          for (let fields of customFields) {
-            if (fields.name === '状态') {
-              this.status = fields.options;
-              break;
-            }
+    getIssuePartTemplateWithProject((template, project) => {
+      this.currentProject = project;
+      this.issueTemplate = template;
+      if (this.issueTemplate.platform === LOCAL) {
+        this.isThirdPart = false;
+      } else {
+        this.isThirdPart = true;
+      }
+      if (template) {
+        let customFields = template.customFields;
+        for (let fields of customFields) {
+          if (fields.name === '状态') {
+            this.status = fields.options;
+            break;
           }
         }
-        this.fields = getTableHeaderWithCustomFields('ISSUE_LIST', this.issueTemplate.customFields);
-        if (!this.isThirdPart) {
-          for (let i = 0; i < this.fields.length; i++) {
-            if (this.fields[i].id === 'platformStatus') {
-              this.fields.splice(i, 1);
-              break;
-            }
+      }
+      this.fields = getTableHeaderWithCustomFields('ISSUE_LIST', this.issueTemplate.customFields);
+      if (!this.isThirdPart) {
+        for (let i = 0; i < this.fields.length; i++) {
+          if (this.fields[i].id === 'platformStatus') {
+            this.fields.splice(i, 1);
+            break;
           }
         }
-        this.$refs.table.reloadTable();
-      });
+      }
+      this.$refs.table.reloadTable();
+    });
   },
   methods: {
     statusChange(param) {
diff --git a/frontend/src/business/components/track/issue/IssueEditDetail.vue b/frontend/src/business/components/track/issue/IssueEditDetail.vue
index c3df76ca3e..d21f2d931a 100644
--- a/frontend/src/business/components/track/issue/IssueEditDetail.vue
+++ b/frontend/src/business/components/track/issue/IssueEditDetail.vue
@@ -3,7 +3,7 @@
     <el-scrollbar>
       <el-form :model="form" :rules="rules" label-position="right" label-width="80px" ref="form">
 
-        <el-form-item v-if="!enableThirdPartTemplate" :label="$t('commons.title')" prop="title">
+        <el-form-item :label="$t('commons.title')" prop="title">
           <el-input v-model="form.title" autocomplete="off" class="top-input-class"></el-input>
           <el-tooltip :content="$t('commons.follow')" placement="bottom"  effect="dark" v-if="!showFollow">
             <i class="el-icon-star-off" style="color: #783987; font-size: 25px; margin-left: 15px;cursor: pointer;position: relative;top: 5px" @click="saveFollow" />
@@ -81,12 +81,8 @@ import {
   getCurrentUser,
   getCurrentUserId,
   getCurrentWorkspaceId,
-  hasLicense
 } from "@/common/js/utils";
-import {getIssueTemplate} from "@/network/custom-field-template";
-import {getIssueThirdPartTemplate} from "@/network/Issue";
-import {getCurrentProject} from "@/network/project";
-import {JIRA} from "@/common/js/constants";
+import {enableThirdPartTemplate, getIssuePartTemplateWithProject} from "@/network/Issue";
 import CustomFiledFormItem from "@/business/components/common/components/form/CustomFiledFormItem";
 
 export default {
@@ -154,26 +150,16 @@ export default {
       return getCurrentProjectID();
     },
     enableThirdPartTemplate() {
-      return hasLicense() && this.currentProject && this.currentProject.thirdPartTemplate && this.currentProject.platform === JIRA;
+      return enableThirdPartTemplate(this.currentProject);
     },
   },
   methods: {
     open(data) {
       this.result.loading = true;
       this.$nextTick(() => {
-        getCurrentProject((responseData) => {
-          this.currentProject = responseData;
-          if (hasLicense() && this.currentProject && this.currentProject.thirdPartTemplate && this.currentProject.platform === JIRA) {
-            getIssueThirdPartTemplate()
-              .then((template) => {
-                this.init(template, data);
-              });
-          } else {
-            getIssueTemplate()
-              .then((template) => {
-                this.init(template, data);
-              });
-          }
+        getIssuePartTemplateWithProject((template, project) => {
+          this.currentProject = project;
+          this.init(template, data);
         });
       });
 
diff --git a/frontend/src/business/components/track/issue/IssueList.vue b/frontend/src/business/components/track/issue/IssueList.vue
index a16425c551..e93ef64bb1 100644
--- a/frontend/src/business/components/track/issue/IssueList.vue
+++ b/frontend/src/business/components/track/issue/IssueList.vue
@@ -168,7 +168,7 @@ import {
 import MsTableHeader from "@/business/components/common/components/MsTableHeader";
 import IssueDescriptionTableItem from "@/business/components/track/issue/IssueDescriptionTableItem";
 import IssueEdit from "@/business/components/track/issue/IssueEdit";
-import {getIssues, getIssueThirdPartTemplate, syncIssues} from "@/network/Issue";
+import {getIssuePartTemplateWithProject, getIssues, syncIssues} from "@/network/Issue";
 import {
   getCustomFieldValue,
   getCustomTableWidth,
@@ -176,11 +176,9 @@ import {
 } from "@/common/js/tableUtils";
 import MsContainer from "@/business/components/common/components/MsContainer";
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
-import {getCurrentProjectID, getCurrentWorkspaceId, hasLicense} from "@/common/js/utils";
-import {getIssueTemplate} from "@/network/custom-field-template";
+import {getCurrentProjectID, getCurrentWorkspaceId} from "@/common/js/utils";
 import {getProjectMember} from "@/network/user";
-import {JIRA, LOCAL} from "@/common/js/constants";
-import {getCurrentProject} from "@/network/project";
+import {LOCAL} from "@/common/js/constants";
 
 export default {
   name: "IssueList",
@@ -218,7 +216,6 @@ export default {
       members: [],
       isThirdPart: false,
       creatorFilters: [],
-      currentProject: null
     };
   },
   watch: {
@@ -232,20 +229,8 @@ export default {
     getProjectMember((data) => {
       this.members = data;
     });
-
-    getCurrentProject((responseData) => {
-      this.currentProject = responseData;
-      if (hasLicense() && this.currentProject.thirdPartTemplate && this.currentProject.platform === JIRA) {
-        getIssueThirdPartTemplate()
-          .then((template) => {
-            this.initFields(template);
-          });
-      } else {
-        getIssueTemplate()
-          .then((template) => {
-            this.initFields(template);
-          });
-      }
+    getIssuePartTemplateWithProject((template) => {
+      this.initFields(template);
     });
     this.getIssues();
   },
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 992bf5c0bc..f806258070 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 992bf5c0bc50e23ced47cdb1aa87e3061c3a6a5d
+Subproject commit f806258070e9ca2cda08e48aa47952d31eb2a60a
diff --git a/frontend/src/common/js/tableUtils.js b/frontend/src/common/js/tableUtils.js
index ec1be24498..effd955378 100644
--- a/frontend/src/common/js/tableUtils.js
+++ b/frontend/src/common/js/tableUtils.js
@@ -3,6 +3,7 @@ import {CUSTOM_TABLE_HEADER} from "@/common/js/default-table-header";
 import {updateCustomFieldTemplate} from "@/network/custom-field-template";
 import i18n from "@/i18n/i18n";
 import Sortable from 'sortablejs'
+import {timestampFormatDate} from "@/common/js/filter";
 
 export function _handleSelectAll(component, selection, tableData, selectRows, condition) {
   if (selection.length > 0) {
@@ -492,6 +493,8 @@ export function getCustomFieldValue(row, field, members) {
             }
             return values;
           }
+        } else if (field.type === 'datetime') {
+          return timestampFormatDate(item.value);
         }
         return item.value;
       }
diff --git a/frontend/src/network/Issue.js b/frontend/src/network/Issue.js
index 60c58f8645..f355b231b7 100644
--- a/frontend/src/network/Issue.js
+++ b/frontend/src/network/Issue.js
@@ -2,6 +2,9 @@ import {post, get} from "@/common/js/ajax";
 import {getPageDate} from "@/common/js/tableUtils";
 import {getCurrentProjectID, hasLicense} from "@/common/js/utils";
 import {baseGet, basePost} from "@/network/base-network";
+import {getCurrentProject} from "@/network/project";
+import {JIRA, LOCAL} from "@/common/js/constants";
+import {getIssueTemplate} from "@/network/custom-field-template";
 
 export function buildIssues(page) {
   let data = page.data;
@@ -10,9 +13,6 @@ export function buildIssues(page) {
       if (data[i].customFields) {
         data[i].customFields = JSON.parse(data[i].customFields);
       }
-      // if (data[i].platform !== 'Local') {
-      //   page.result = buildPlatformIssue(data[i]);
-      // }
     }
   }
 }
@@ -108,3 +108,33 @@ export function getIssueThirdPartTemplate() {
     })
   });
 }
+
+export function getIssuePartTemplateWithProject(callback) {
+  getCurrentProject((project) => {
+    let currentProject = project;
+    if (enableThirdPartTemplate(currentProject)) {
+      getIssueThirdPartTemplate()
+        .then((template) => {
+          if (callback)
+              callback(template, currentProject);
+        });
+    } else {
+      getIssueTemplate()
+        .then((template) => {
+          if (callback)
+            callback(template, currentProject);
+        });
+    }
+  });
+}
+
+export function enableThirdPartTemplate(currentProject) {
+  return hasLicense() && currentProject && currentProject.thirdPartTemplate && currentProject.platform === JIRA;
+}
+
+export function isThirdPartEnable(callback) {
+  getCurrentProject((project) => {
+    if (callback)
+      callback(project.platform !== LOCAL);
+  });
+}

From 4a8afa9449fae1894d96c860a321f280cd5c19d1 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 16 Dec 2021 21:25:42 +0800
Subject: [PATCH 149/256] =?UTF-8?q?fix:=20=E7=BC=BA=E9=99=B7=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=85=B3=E6=B3=A8=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/track/issue/IssueEditDetail.vue         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/track/issue/IssueEditDetail.vue b/frontend/src/business/components/track/issue/IssueEditDetail.vue
index d21f2d931a..da05bf870e 100644
--- a/frontend/src/business/components/track/issue/IssueEditDetail.vue
+++ b/frontend/src/business/components/track/issue/IssueEditDetail.vue
@@ -3,7 +3,7 @@
     <el-scrollbar>
       <el-form :model="form" :rules="rules" label-position="right" label-width="80px" ref="form">
 
-        <el-form-item :label="$t('commons.title')" prop="title">
+        <el-form-item v-if="!enableThirdPartTemplate" :label="$t('commons.title')" prop="title">
           <el-input v-model="form.title" autocomplete="off" class="top-input-class"></el-input>
           <el-tooltip :content="$t('commons.follow')" placement="bottom"  effect="dark" v-if="!showFollow">
             <i class="el-icon-star-off" style="color: #783987; font-size: 25px; margin-left: 15px;cursor: pointer;position: relative;top: 5px" @click="saveFollow" />
@@ -12,6 +12,14 @@
             <i class="el-icon-star-on" style="color: #783987; font-size: 28px; margin-left: 15px; cursor: pointer;position: relative;top: 5px" @click="saveFollow" />
           </el-tooltip>
         </el-form-item>
+        <div v-else style="text-align: right; margin-bottom: 5px">
+          <el-tooltip :content="$t('commons.follow')" placement="bottom"  effect="dark" v-if="!showFollow">
+            <i class="el-icon-star-off" style="color: #783987; font-size: 25px; margin-left: 15px;cursor: pointer;position: relative;top: 5px" @click="saveFollow" />
+          </el-tooltip>
+          <el-tooltip :content="$t('commons.cancel')" placement="bottom"  effect="dark" v-if="showFollow" >
+            <i class="el-icon-star-on" style="color: #783987; font-size: 28px; margin-left: 15px; cursor: pointer;position: relative;top: 5px" @click="saveFollow" />
+          </el-tooltip>
+        </div>
 
         <!-- 自定义字段 -->
         <el-form :model="customFieldForm" :rules="customFieldRules" ref="customFieldForm" class="case-form">

From 0497a7b5537463ad7eb97987cb1c08d2bdfdc7a0 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 16 Dec 2021 21:43:03 +0800
Subject: [PATCH 150/256] =?UTF-8?q?refactor:=20jira=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E7=9A=84=E5=AD=97=E6=AE=B5=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/commons/utils/LicenseUtils.java  | 2 --
 backend/src/main/java/io/metersphere/xpack                    | 2 +-
 .../src/business/components/track/issue/IssueEditDetail.vue   | 4 +++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/commons/utils/LicenseUtils.java b/backend/src/main/java/io/metersphere/commons/utils/LicenseUtils.java
index 834d77600e..42f45c8110 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/LicenseUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/LicenseUtils.java
@@ -7,11 +7,9 @@ public class LicenseUtils {
         try {
             Class<?> aClass = Class.forName("io.metersphere.xpack.license.util.LicenseCache");
             Method get = aClass.getMethod("valid");
-            System.out.println("====");
             return (boolean) get.invoke(null);
         } catch (Exception e) {
             LogUtil.error(e);
-            e.printStackTrace();
             return false;
         }
     }
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 23fd955ff2..2165b7cc0b 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 23fd955ff25ccf19f115c9d37a970e0caba6986d
+Subproject commit 2165b7cc0b0358b0b792bc06ff25570dbb230a5c
diff --git a/frontend/src/business/components/track/issue/IssueEditDetail.vue b/frontend/src/business/components/track/issue/IssueEditDetail.vue
index da05bf870e..b5230a460e 100644
--- a/frontend/src/business/components/track/issue/IssueEditDetail.vue
+++ b/frontend/src/business/components/track/issue/IssueEditDetail.vue
@@ -109,7 +109,9 @@ export default {
   data() {
     return {
       issueId:'',
-      result: {},
+      result: {
+        loading: false
+      },
       relateFields: [],
       showFollow:false,
       formLabelWidth: "150px",

From 2cc93e2d8fa5a94b5ca2b34c45d3e1a62a66f340 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Thu, 16 Dec 2021 18:15:42 +0800
Subject: [PATCH 151/256] =?UTF-8?q?fix(=E5=9B=BD=E9=99=85=E5=8C=96):=20?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008887 --user=郭雨琦 【ID1008887】【国际化】-MyWorkStation-未翻译为英文
---
 .../automation/scenario/ApiScenarioList.vue   | 11 ++++---
 .../track/case/components/TestCaseList.vue    |  6 ++--
 .../comonents/api/TestPlanApiScenarioList.vue |  9 ++---
 frontend/src/business/components/xpack        |  2 +-
 frontend/src/common/js/table-constants.js     | 33 +++++++++++++++----
 frontend/src/i18n/en-US.js                    | 19 ++++++++---
 frontend/src/i18n/zh-CN.js                    | 10 ++++--
 frontend/src/i18n/zh-TW.js                    | 10 ++++--
 8 files changed, 73 insertions(+), 27 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index b0c58dee3a..ef81d9a6c7 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -83,7 +83,7 @@
             sortable
             :field="item"
             :fields-width="fieldsWidth"
-            :filters="LEVEL_FILTERS"
+            :filters="apiscenariofilters.LEVEL_FILTERS"
             min-width="130px"
             :label="$t('api_test.automation.case_level')">
             <template v-slot:default="scope">
@@ -96,7 +96,7 @@
                            sortable
                            :field="item"
                            :fields-width="fieldsWidth"
-                           :filters="STATUS_FILTERS"
+                           :filters="apiscenariofilters.STATUS_FILTERS"
                            min-width="120px">
             <template v-slot:default="scope">
               <plan-status-table-item :value="scope.row.status"/>
@@ -191,7 +191,7 @@
                            min-width="80px"/>
           <ms-table-column prop="lastResult"
                            :label="$t('api_test.automation.last_result')"
-                           :filters="RESULT_FILTERS"
+                           :filters="apiscenariofilters.RESULT_FILTERS"
                            :field="item"
                            :fields-width="fieldsWidth"
                            sortable
@@ -500,7 +500,6 @@ export default {
           permissions: ['PROJECT_API_SCENARIO:READ+CREATE_PERFORMANCE_BATCH']
         },
       ],
-      ...API_SCENARIO_FILTERS,
       typeArr: [
         {id: 'level', name: this.$t('test_track.case.priority')},
         {id: 'status', name: this.$t('test_track.plan.plan_status')},
@@ -531,10 +530,12 @@ export default {
       },
       graphData: {},
       environmentType: "",
-      envGroupId: ""
+      envGroupId: "",
+      apiscenariofilters:{},
     };
   },
   created() {
+    this.apiscenariofilters = API_SCENARIO_FILTERS();
     scenario.$on('hide', id => {
       this.hideStopBtn(id);
     });
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 28b56863a3..767a610989 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -325,9 +325,9 @@ export default {
         {text: this.$t('test_track.review.un_pass'), value: 'UnPass'},
       ],
       statusFilters: [
-        {text: '未开始', value: 'Prepare'},
-        {text: '进行中', value: 'Underway'},
-        {text: '已完成', value: 'Completed'},
+        {text: this.$t('test_track.case.status_prepare'), value: 'Prepare'},
+        {text: this.$t('test_track.case.status_running'), value: 'Underway'},
+        {text: this.$t('test_track.case.status_finished'), value: 'Completed'},
       ],
       batchButtons: [],
       simpleButtons: [
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
index 2bf2fe9b1b..24557a1c5c 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
@@ -45,7 +45,7 @@
                            prop="level" :label="$t('api_test.automation.case_level')" min-width="120px"
                            column-key="level"
                            sortable
-                           :filters="LEVEL_FILTERS">
+                           :filters="apiscenariofilters.LEVEL_FILTERS">
             <template v-slot:default="scope">
               <priority-table-item :value="scope.row.level" ref="level"/>
             </template>
@@ -133,7 +133,7 @@
           <ms-table-column :field="item"
                            :fields-width="fieldsWidth"
                            prop="lastResult" min-width="100px"
-                           :filters="RESULT_FILTERS"
+                           :filters="apiscenariofilters.RESULT_FILTERS"
                            :label="$t('api_test.automation.last_result')">
             <template v-slot:default="{row}">
               <el-link type="success" @click="showReport(row)" v-if="row.lastResult === 'Success'">
@@ -251,7 +251,6 @@ export default {
       infoDb: false,
       runVisible: false,
       runData: [],
-      ...API_SCENARIO_FILTERS,
       enableOrderDrag: true,
       operators: [
         {
@@ -284,7 +283,8 @@ export default {
       valueArr: {
         projectEnv: []
       },
-      planCaseIds: []
+      planCaseIds: [],
+      apiscenariofilters:{},
     }
   },
   computed: {
@@ -296,6 +296,7 @@ export default {
     }
   },
   created() {
+    this.apiscenariofilters = API_SCENARIO_FILTERS();
     this.search();
 
   },
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index f806258070..f78e985bb2 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit f806258070e9ca2cda08e48aa47952d31eb2a60a
+Subproject commit f78e985bb2ccb3dfbe719e4dd02868a2399ee952
diff --git a/frontend/src/common/js/table-constants.js b/frontend/src/common/js/table-constants.js
index b3811d456c..bf2fda1e5a 100644
--- a/frontend/src/common/js/table-constants.js
+++ b/frontend/src/common/js/table-constants.js
@@ -83,25 +83,46 @@ export const ISSUE_STATUS_MAP = {
   'created':'新建'
 }
 
-export const API_SCENARIO_FILTERS = {
-  LEVEL_FILTERS: [
+export function API_SCENARIO_FILTERS () {
+  return {
+    STATUS_FILTERS: [
+      {text: i18n.t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
+      {text: i18n.t('test_track.plan.plan_status_running'), value: 'Underway'},
+      {text: i18n.t('test_track.plan.plan_status_completed'), value: 'Completed'},
+      {text: i18n.t('test_track.plan.plan_status_trash'), value: 'Trash'},
+    ],
+    LEVEL_FILTERS: [
+      {text: 'P0', value: 'P0'},
+      {text: 'P1', value: 'P1'},
+      {text: 'P2', value: 'P2'},
+      {text: 'P3', value: 'P3'}
+    ],
+    RESULT_FILTERS: [
+      {text: i18n.t('api_test.automation.fail'), value: 'Fail'},
+      {text: i18n.t('api_test.automation.success'), value: 'Success'}
+    ]
+  };
+  /*LEVEL_FILTERS: [
     {text: 'P0', value: 'P0'},
     {text: 'P1', value: 'P1'},
     {text: 'P2', value: 'P2'},
     {text: 'P3', value: 'P3'}
-  ],
+  ];
   RESULT_FILTERS: [
     {text: i18n.t('api_test.automation.fail'), value: 'Fail'},
     {text: i18n.t('api_test.automation.success'), value: 'Success'}
-  ],
-  STATUS_FILTERS: [
+  ];*/
+
+  /*STATUS_FILTERS: [
     {text: i18n.t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
     {text: i18n.t('test_track.plan.plan_status_running'), value: 'Underway'},
     {text: i18n.t('test_track.plan.plan_status_completed'), value: 'Completed'},
     {text: i18n.t('test_track.plan.plan_status_trash'), value: 'Trash'},
-  ],
+  ],*/
 }
 
+
+
 export const USER_GROUP_SCOPE = {
   'SYSTEM': 'group.system',
   'WORKSPACE': 'group.workspace',
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index dd299b8110..b2291daa46 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -360,7 +360,7 @@ export default {
     system_project: "Project",
     user_unit: "",
     workspace_unit: "",
-    dash_board:'Dash board',
+    dash_board:'DashBoard',
     all_project:'All Project',
     to_be_completed:'To be completed',
     pending_upgrade:'Pending upgrade',
@@ -1169,7 +1169,8 @@ export default {
           all: "All",
           none: "None"
         },
-      }
+      },
+      case_reduction_error_text:"Please restore first"
     },
     automation: {
       open_expansion: "One-click expansion",
@@ -1301,7 +1302,10 @@ export default {
       share_cookie: 'share cookie',
       module_id:'Scenario Module ID',
       level: 'Level',
-      version:"Scenario Version"
+      version:"Scenario Version",
+      warning_context:"It is not currently supported to add all scenarios to the test plan in batches!",
+      jmx_file_set:"Scenario JMX file set",
+      error_report_jmx:"Failed to export JMX file",
     },
     request: {
       debug: "Debug",
@@ -1775,7 +1779,9 @@ export default {
       unlink: 'Unlink',
       project_name: "Project",
       status: 'Review Status',
-      status_prepare: 'Not reviewed',
+      status_prepare: 'Not started',
+      status_running: 'In progress',
+      status_finished: 'Completed',
       status_pass: 'Pass',
       status_un_pass: 'UnPass',
       cancel_relevance_project: "Disassociating the project will also cancel the associated test cases under the project",
@@ -2043,6 +2049,11 @@ export default {
       title_description_required: "Title and description are required",
       close_success: "Closed successfully",
       preview: "Preview",
+      status_new: 'new',
+      status_resolved: 'resolved',
+      status_closed: 'closed',
+      status_active:'active',
+      status_delete:'delete',
       please_choose_current_owner: "Please choose current owner",
       tapd_current_owner: "Tapd Current Owner",
       zentao_bug_build: "Zentao Impact version",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 7b18c3ab50..ebd1e5c150 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1177,7 +1177,8 @@ export default {
           all: "全部",
           none: "无"
         },
-      }
+      },
+      case_reduction_error_text:"请先恢复"
     },
     automation: {
       open_expansion: "一键展开",
@@ -1308,7 +1309,10 @@ export default {
       share_cookie: '共享cookie',
       module_id:'场景模块ID',
       level: '级别',
-      version:"场景版本"
+      version:"场景版本",
+      warning_context:"暂不支持批量添加所有场景到测试计划!",
+      jmx_file_set:"场景JMX文件集",
+      error_report_jmx:"导出JMX文件失败",
     },
     request: {
       debug: "调试",
@@ -2058,6 +2062,8 @@ export default {
       status_new: '新建',
       status_resolved: '已解决',
       status_closed: '已关闭',
+      status_active:'激活',
+      status_delete:'删除',
       please_choose_current_owner: "请选择处理人",
       tapd_current_owner: "Tapd 处理人",
       zentao_bug_build: "禅道 影响版本",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 227c154643..4bad0772b8 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1174,7 +1174,8 @@ export default {
           all: "全部",
           none: "無"
         },
-      }
+      },
+      case_reduction_error_text:"請先恢復"
     },
     automation: {
       open_expansion: "一鍵展開",
@@ -1306,7 +1307,10 @@ export default {
       share_cookie: '共享cookie',
       module_id:'場景模塊ID',
       level: '級別',
-      version:"場景版本"
+      version:"場景版本",
+      warning_context:"暫不支持批量添加所有場景到測試計劃!",
+      jmx_file_set:"場景JMX文件集",
+      error_report_jmx:"導出JMX文件失敗",
     },
     request: {
       debug: "調試",
@@ -2055,6 +2059,8 @@ export default {
       status_new: '新建',
       status_resolved: '已解決',
       status_closed: '已關閉',
+      status_active:'激活',
+      status_delete:'删除',
       please_choose_current_owner: "請選擇處理人",
       tapd_current_owner: "Tapd 處理人",
       zentao_bug_build: "禪道 影響版本",

From fb994aba17b2322b4f89a3cee6fd3843a5a79201 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Thu, 16 Dec 2021 19:41:59 +0800
Subject: [PATCH 152/256] =?UTF-8?q?perf(=E4=BB=BB=E5=8A=A1=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83):=20=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1004211 --user=郭雨琦 【ID1004211】4.任务中心页面优化
---
 .../src/business/components/task/TaskCenter.vue     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/task/TaskCenter.vue b/frontend/src/business/components/task/TaskCenter.vue
index 046d8358b9..aca580ebe4 100644
--- a/frontend/src/business/components/task/TaskCenter.vue
+++ b/frontend/src/business/components/task/TaskCenter.vue
@@ -468,7 +468,8 @@ export default {
   border-bottom: 1px solid #E6E6E6;
   background-color: #FFF;
   margin-bottom: 10px;
-  padding: 10px;
+  padding-top: 6px;
+  padding-bottom: 6px;
 }
 
 .ms-card-task >>> .el-card__body {
@@ -520,10 +521,18 @@ export default {
 }
 
 /deep/ .el-badge__content {
-  border-radius: 10px;
+ /* border-radius: 10px;*/
   height: 10px;
   line-height: 10px;
 }
+/deep/ .el-card{
+  /* border-radius: 10px;*/
+  background: #FFF;
+  border: 0px;
+  box-shadow: 0 0 0 rgb(0,0,0,0) !important;
+}
+
+
 
 .item {
   margin-right: 10px;

From f85ebf3d4a5ae8b3fd9ccc0c2e92b6d3168b4a5d Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Thu, 16 Dec 2021 18:34:32 +0800
Subject: [PATCH 153/256] =?UTF-8?q?fix:=20=E9=92=89=E9=92=89=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1=EF=BC=8C=E9=A3=9E=E4=B9=A6?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E9=80=9A=E7=9F=A5=E6=97=B6=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?[=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5]=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/notice/sender/impl/DingNoticeSender.java     | 2 +-
 .../io/metersphere/notice/sender/impl/LarkNoticeSender.java     | 2 +-
 .../io/metersphere/notice/sender/impl/WeComNoticeSender.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/notice/sender/impl/DingNoticeSender.java b/backend/src/main/java/io/metersphere/notice/sender/impl/DingNoticeSender.java
index e3217a824e..d346c8f9d0 100644
--- a/backend/src/main/java/io/metersphere/notice/sender/impl/DingNoticeSender.java
+++ b/backend/src/main/java/io/metersphere/notice/sender/impl/DingNoticeSender.java
@@ -26,7 +26,7 @@ public class DingNoticeSender extends AbstractNoticeSender {
         OapiRobotSendRequest request = new OapiRobotSendRequest();
         request.setMsgtype("text");
         OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text();
-        text.setContent(context);
+        text.setContent("消息通知: \n" + context);
         request.setText(text);
         if (CollectionUtils.isNotEmpty(receivers)) {
             OapiRobotSendRequest.At at = new OapiRobotSendRequest.At();
diff --git a/backend/src/main/java/io/metersphere/notice/sender/impl/LarkNoticeSender.java b/backend/src/main/java/io/metersphere/notice/sender/impl/LarkNoticeSender.java
index 651c0d4dcb..1f377b78f9 100644
--- a/backend/src/main/java/io/metersphere/notice/sender/impl/LarkNoticeSender.java
+++ b/backend/src/main/java/io/metersphere/notice/sender/impl/LarkNoticeSender.java
@@ -30,7 +30,7 @@ public class LarkNoticeSender extends AbstractNoticeSender {
 
         LogUtil.info("飞书收件人: {}", userIds);
         context += StringUtils.join(collect, " ");
-        LarkClient.send(messageDetail.getWebhook(), context);
+        LarkClient.send(messageDetail.getWebhook(), "消息通知: \n" + context);
     }
 
     @Override
diff --git a/backend/src/main/java/io/metersphere/notice/sender/impl/WeComNoticeSender.java b/backend/src/main/java/io/metersphere/notice/sender/impl/WeComNoticeSender.java
index e0ad2011ed..52f5c583c3 100644
--- a/backend/src/main/java/io/metersphere/notice/sender/impl/WeComNoticeSender.java
+++ b/backend/src/main/java/io/metersphere/notice/sender/impl/WeComNoticeSender.java
@@ -22,7 +22,7 @@ public class WeComNoticeSender extends AbstractNoticeSender {
     public void sendWechatRobot(MessageDetail messageDetail, NoticeModel noticeModel, String context) {
         List<Receiver> receivers = noticeModel.getReceivers();
 
-        TextMessage message = new TextMessage(context);
+        TextMessage message = new TextMessage("消息通知: \n" + context);
         if (CollectionUtils.isNotEmpty(receivers)) {
             List<String> userIds = receivers.stream()
                     .map(Receiver::getUserId)

From cf388a9e56249ac42dd3ae563d8ebc52fde502fc Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Thu, 16 Dec 2021 19:24:00 +0800
Subject: [PATCH 154/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E7=9A=84?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8C=A4=E5=9C=A8=E4=B8=80=E8=B5=B7=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008917 --user=王孝刚 【测试跟踪】测试计划，关联接口用例的按钮挤在一起了
https://www.tapd.cn/55049933/s/1082007
---
 .../common/components/MsDialogHeader.vue          |  1 +
 .../view/comonents/base/TestCaseRelevanceBase.vue | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsDialogHeader.vue b/frontend/src/business/components/common/components/MsDialogHeader.vue
index 73f586233f..c7026a38c2 100644
--- a/frontend/src/business/components/common/components/MsDialogHeader.vue
+++ b/frontend/src/business/components/common/components/MsDialogHeader.vue
@@ -53,6 +53,7 @@ export default {
   border: none;
   outline: 0;
   cursor: pointer;
+  display: inline-block
 }
 
 </style>
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
index eb53f9a9c3..818007f145 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
@@ -7,8 +7,11 @@
         <slot name="headerBtn"></slot>
       </div>
       <div v-else>
-        <div style="margin-bottom: 5px" v-if="flag">
-          <el-checkbox v-model="checked">{{ $t('test_track.sync_add_api_load') }}</el-checkbox>
+        <div style="margin-bottom: 5px; display:inline-block" v-if="flag">
+          <el-checkbox v-model="checked" class="el-checkbox__label">{{
+              $t('test_track.sync_add_api_load')
+            }}
+          </el-checkbox>
         </div>
         <ms-dialog-header @cancel="close" v-loading="isSaving" @confirm="save"/>
       </div>
@@ -145,4 +148,12 @@ import SelectMenu from "../../../../common/SelectMenu";
 </script>
 
 <style scoped>
+
+.el-checkbox__label {
+  display: inline-block;
+  padding-left: 10px;
+  line-height: 19px;
+  font-size: 14px;
+  padding-right: 10px;
+}
 </style>

From 8eb3679994f18481866b9b0af3fc6c31fb5fdc99 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Thu, 16 Dec 2021 19:16:24 +0800
Subject: [PATCH 155/256] =?UTF-8?q?fix:=20=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=9B=BD=E9=99=85=E5=8C=96=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008929 --user=刘瑞斌 【国际化】-消息通知-通知信息未翻译
https://www.tapd.cn/55049933/s/1082095
---
 .../src/business/components/notice/util.js    | 109 +--------
 frontend/src/i18n/en-US.js                    |  38 ++++
 frontend/src/i18n/zh-CN.js                    | 214 +++++++++++-------
 frontend/src/i18n/zh-TW.js                    |  38 ++++
 4 files changed, 212 insertions(+), 187 deletions(-)

diff --git a/frontend/src/business/components/notice/util.js b/frontend/src/business/components/notice/util.js
index 5294edcb08..2a795fd746 100644
--- a/frontend/src/business/components/notice/util.js
+++ b/frontend/src/business/components/notice/util.js
@@ -1,41 +1,7 @@
+import i18n from "@/i18n/i18n";
+
 export function getOperation(operation) {
-  switch (operation) {
-    case "CREATE":
-      operation = "创建了";
-      break;
-    case "UPDATE":
-      operation = "更新了";
-      break;
-    case "DELETE":
-      operation = "删除了";
-      break;
-    case "COMMENT":
-      operation = "评论了";
-      break;
-    case "COMPLETE":
-      operation = "完成了";
-      break;
-    case "CLOSE_SCHEDULE":
-      operation = "关闭了定时任务";
-      break;
-    case "CASE_CREATE":
-      operation = "创建了接口用例";
-      break;
-    case "CASE_UPDATE":
-      operation = "更新了接口用例";
-      break;
-    case "CASE_DELETE":
-      operation = "删除了接口用例";
-      break;
-    case "EXECUTE_SUCCESSFUL":
-    case "EXECUTE_FAILED":
-    case "EXECUTE_COMPLETED":
-      operation = "执行";
-      break;
-    default:
-      break;
-  }
-  return operation;
+  return i18n.t('notice.operation.' + operation);
 }
 
 export function getResource(d) {
@@ -46,73 +12,18 @@ export function getResource(d) {
       return "";
   }
 
-  let resourceType = "";
+  let resourceType = i18n.t('notice.resource.' + d.resourceType);
+  if (!d.operation.startsWith('EXECUTE_')) {
+    return resourceType;
+  }
   switch (d.resourceType) {
     case "JENKINS_TASK" :
-      resourceType = "Jenkins";
-      if (d.operation === 'EXECUTE_SUCCESSFUL') {
-        resourceType = "Jenkins 成功";
-      }
-      if (d.operation === 'EXECUTE_FAILED') {
-        resourceType = "Jenkins 失败";
-      }
-      if (d.operation === 'EXECUTE_COMPLETED') {
-        resourceType = "Jenkins 完成";
-      }
-      break;
-    case "TEST_PLAN_TASK" :
-      resourceType = "测试计划";
-      break;
-    case "REVIEW_TASK" :
-      resourceType = "测试评审";
-      break;
-    case "DEFECT_TASK" :
-      resourceType = "缺陷";
-      break;
-    case "SWAGGER_TASK" :
-      resourceType = "Swagger";
-      break;
+    case "PERFORMANCE_TEST_TASK" :
     case "API_AUTOMATION_TASK" :
-      resourceType = "接口自动化";
-      if (d.operation === 'EXECUTE_SUCCESSFUL') {
-        resourceType = "接口自动化成功";
-      }
-      if (d.operation === 'EXECUTE_FAILED') {
-        resourceType = "接口自动化失败";
-      }
+      resourceType += i18n.t('notice.result.' + d.operation);
       break;
     case "API_DEFINITION_TASK" :
-      resourceType = "接口定义";
-      if (d.operation === 'EXECUTE_SUCCESSFUL') {
-        resourceType = "接口用例成功";
-      }
-      if (d.operation === 'EXECUTE_FAILED') {
-        resourceType = "接口用例失败";
-      }
-      break;
-    case "API_HOME_TASK" :
-      resourceType = "接口测试首页";
-      break;
-    case "API_REPORT_TASK" :
-      resourceType = "接口测试报告";
-      break;
-    case "PERFORMANCE_REPORT_TASK" :
-      resourceType = "性能测试报告";
-      break;
-    case "PERFORMANCE_TEST_TASK" :
-      resourceType = "性能测试";
-      if (d.operation === 'EXECUTE_COMPLETED') {
-        resourceType = "性能测试完成";
-      }
-      break;
-    case "TRACK_TEST_CASE_TASK" :
-      resourceType = "测试用例";
-      break;
-    case "TRACK_HOME_TASK" :
-      resourceType = "测试跟踪首页";
-      break;
-    case "TRACK_REPORT_TASK" :
-      resourceType = "测试跟踪报告";
+      resourceType = i18n.t('notice.result.api_case') + i18n.t('notice.result.' + d.operation);
       break;
     default:
       break;
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index b2291daa46..10fb263805 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -2348,5 +2348,43 @@ export default {
     mail_subject: "Subject ",
     mail_addressee: "To ",
     mail_duplicate: "Cc ",
+  },
+  notice: {
+    operation: {
+      'CREATE': ' Created',
+      'UPDATE': ' Updated',
+      'DELETE': ' Delete',
+      'COMMENT': ' Commented',
+      'COMPLETE': ' Completed',
+      'CLOSE_SCHEDULE': ' Close Scheduled task',
+      'CASE_CREATE': ' Created API Case',
+      'CASE_UPDATE': ' Updated API Case',
+      'CASE_DELETE': ' Delete API Case',
+      'EXECUTE_SUCCESSFUL': ' Execute',
+      'EXECUTE_FAILED': ' Execute',
+      'EXECUTE_COMPLETED': ' Execute',
+    },
+    resource: {
+      'JENKINS_TASK': ' Jenkins',
+      'TEST_PLAN_TASK': ' TestPlan',
+      'REVIEW_TASK': ' Review',
+      'DEFECT_TASK': ' Defect',
+      'SWAGGER_TASK': ' Swagger',
+      'API_AUTOMATION_TASK': ' API Automation',
+      'API_DEFINITION_TASK': ' API',
+      'API_HOME_TASK': ' API HomePage',
+      'API_REPORT_TASK': ' API Report',
+      'PERFORMANCE_TEST_TASK': ' Performance Test',
+      'PERFORMANCE_REPORT_TASK': ' Performance Report',
+      'TRACK_TEST_CASE_TASK': ' TestCase',
+      'TRACK_HOME_TASK': ' Tracking HomePage',
+      'TRACK_REPORT_TASK': ' Tracking Report',
+    },
+    result: {
+      'EXECUTE_SUCCESSFUL': ' Success',
+      'EXECUTE_FAILED': ' Failed',
+      'EXECUTE_COMPLETED': ' Completed',
+    },
+    api_case: 'API Case'
   }
 };
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index ebd1e5c150..c426b24137 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -70,11 +70,11 @@ export default {
     input_password: '请输入密码',
     test: '测试',
     create_time: '创建时间',
-    update_user_id:'更新人ID',
+    update_user_id: '更新人ID',
     update_time: '更新时间',
     delete_time: '删除时间',
     delete_user: '删除人',
-    delete_user_id:'删除人ID',
+    delete_user_id: '删除人ID',
     add: '添加',
     preview: '预览',
     member: '成员',
@@ -201,8 +201,8 @@ export default {
     run_success: "执行成功",
     run_completed: "执行完成",
     run_fail: "执行失败",
-    follow_success:"关注成功",
-    cancel_follow_success:"取消关注成功",
+    follow_success: "关注成功",
+    cancel_follow_success: "取消关注成功",
     type: "类型",
     relationship: {
       name: '依赖关系',
@@ -361,19 +361,19 @@ export default {
     system_project: "项目",
     user_unit: "人",
     workspace_unit: "个",
-    dash_board:'仪表盘',
-    all_project:'全部项目',
-    to_be_completed:'待完成',
-    pending_upgrade:'待更新',
-    information:'信息',
-    nick_name:'昵称',
-    resourceId:'资源ID',
-    level:'级别',
-    num:'数量',
-    original_state:'原始状态',
-    custom_num:'自定义编号',
-    version:'版本',
-    is_new:"是否新建"
+    dash_board: '仪表盘',
+    all_project: '全部项目',
+    to_be_completed: '待完成',
+    pending_upgrade: '待更新',
+    information: '信息',
+    nick_name: '昵称',
+    resourceId: '资源ID',
+    level: '级别',
+    num: '数量',
+    original_state: '原始状态',
+    custom_num: '自定义编号',
+    version: '版本',
+    is_new: "是否新建"
   },
   license: {
     title: '授权管理',
@@ -391,25 +391,25 @@ export default {
     invalid: '无效',
     expired: '已过期',
   },
-  workstation:{
+  workstation: {
     dash_board: '我的仪表盘',
     upcoming: '我的待办',
     focus: '我的关注',
     creation: '我创建的',
-    creation_case:'我创建的用例',
-    creation_issue:'我创建的缺陷',
-    creation_case_tip:'暂时还没有创建用例，马上创建',
-    creation_issue_tip:'暂时还没有创建缺陷，马上创建',
-    table_name:{
-      track_case:'功能用例',
-      track_plan:'测试计划',
-      track_review:'用例评审',
-      track_issue:'缺陷管理',
-      api_definition:'接口定义',
-      api_automation:'接口自动化',
-      api_case:'接口用例',
-      performance:'性能测试',
-      scenario_case:'场景用例'
+    creation_case: '我创建的用例',
+    creation_issue: '我创建的缺陷',
+    creation_case_tip: '暂时还没有创建用例，马上创建',
+    creation_issue_tip: '暂时还没有创建缺陷，马上创建',
+    table_name: {
+      track_case: '功能用例',
+      track_plan: '测试计划',
+      track_review: '用例评审',
+      track_issue: '缺陷管理',
+      api_definition: '接口定义',
+      api_automation: '接口自动化',
+      api_case: '接口用例',
+      performance: '性能测试',
+      scenario_case: '场景用例'
     }
   },
   display: {
@@ -471,7 +471,7 @@ export default {
     option_value_check: '请填写完整选项值',
   },
   workspace: {
-    id:'工作空间ID',
+    id: '工作空间ID',
     create: '创建工作空间',
     update: '修改工作空间',
     delete: '删除工作空间',
@@ -593,10 +593,10 @@ export default {
       zentao_request: '请求方式',
       input_zentao_request: '请输入Zentao请求方式',
       input_zentao_url: '请输入Zentao地址，例：http://xx.xx.xx.xx/zentao/',
-      zentao_info:'禅道信息',
-      zentao_account:'禅道账户',
-      zentao_password:'禅道密码',
-      zentao_prompt_information:'该信息为通过禅道提交缺陷的的用户名、密码，若未填写，则使用工作空间中配置的默认信息',
+      zentao_info: '禅道信息',
+      zentao_account: '禅道账户',
+      zentao_password: '禅道密码',
+      zentao_prompt_information: '该信息为通过禅道提交缺陷的的用户名、密码，若未填写，则使用工作空间中配置的默认信息',
       use_tip: '使用指引：',
       use_tip_tapd: 'Tapd Basic Auth 账号信息在"公司管理-安全与集成-开放平台"中查询',
       use_tip_jira: 'Jira software server 认证信息为 账号密码，Jira software cloud 认证信息为 账号+令牌(账户设置-安全-创建API令牌)',
@@ -623,11 +623,11 @@ export default {
       input_azure_url: '请输入 Azure Devops 地址',
       input_azure_organization_id: '请输入 Azure 组织ID',
       use_tip_azure: 'Azure Devops 地址+令牌(账户设置-个人访问令牌-创建令牌)',
-      jira_prompt_information:'该信息为通过Jira提交缺陷的用户认证信息，若未填写，则使用工作空间中配置的默认信息'
+      jira_prompt_information: '该信息为通过Jira提交缺陷的用户认证信息，若未填写，则使用工作空间中配置的默认信息'
     }
   },
   project: {
-    id:'项目ID',
+    id: '项目ID',
     recent: '最近的项目',
     create: '创建项目',
     edit: '编辑项目',
@@ -730,7 +730,7 @@ export default {
     no_such_user: '无此用户信息, 请输入正确的用户 ID 或者 用户邮箱！',
   },
   user: {
-    id:'用户ID',
+    id: '用户ID',
     create: '创建用户',
     modify: '修改用户',
     input_name: '请输入用户姓名',
@@ -800,7 +800,7 @@ export default {
     add: '添加角色',
   },
   report: {
-    id:'报告ID',
+    id: '报告ID',
     api_test_report: '接口测试报告',
     load_test_report: '性能测试报告',
     test_plan_report: '测试计划报告',
@@ -847,12 +847,12 @@ export default {
     delete_batch_confirm: '确认批量删除报告',
     response_time: '响应时间(s)',
     max_users: '并发数',
-    file_id:'文件ID',
-    avg_response_time:'平均响应时间',
-    tps:'每秒传输的事物处理个数'
+    file_id: '文件ID',
+    avg_response_time: '平均响应时间',
+    tps: '每秒传输的事物处理个数'
   },
   load_test: {
-    id:'测试ID',
+    id: '测试ID',
     concurrency_thread_group: '并发读取组',
     thread_group: '线程组',
     completed_test_report: '已完成测试报告',
@@ -975,7 +975,7 @@ export default {
       LatencyChart: '延迟',
       BytesThroughputChart: '字节数',
       Network: '网络',
-      url:'路径'
+      url: '路径'
     },
     project_file_update_type_error: '更新的文件类型必须一致',
   },
@@ -1028,7 +1028,7 @@ export default {
         update_time: "更新时间"
       },
       expect_detail: "期望详情",
-      request_condition:"请求触发条件",
+      request_condition: "请求触发条件",
       base_info: "基本信息",
       req_param: "请求参数",
       rsp_param: "响应内容",
@@ -1058,7 +1058,7 @@ export default {
       create_tip: "注: 详细的接口信息可以在编辑页面填写",
       api_import: "接口导入",
       check_select: "请勾选接口",
-      api_project:"所属项目",
+      api_project: "所属项目",
       select_comp: {
         no_data: "无数据",
         add_data: "去添加"
@@ -1178,7 +1178,7 @@ export default {
           none: "无"
         },
       },
-      case_reduction_error_text:"请先恢复"
+      case_reduction_error_text: "请先恢复"
     },
     automation: {
       open_expansion: "一键展开",
@@ -1216,7 +1216,7 @@ export default {
       update_time: "最后更新时间",
       step: "步骤数",
       last_result: "最后结果",
-      last_result_id:'最后结果ID',
+      last_result_id: '最后结果ID',
       passing_rate: "通过率",
       success: "通过",
       fail: "失败",
@@ -1240,9 +1240,9 @@ export default {
         select_table: "选择可见数据",
         select_all: "选择全部数据",
         check_case: "请勾选场景用例",
-        api_none:"原始API不存在",
-        case_none:"原始CASE不存在",
-        num_none:"原始场景不存在"
+        api_none: "原始API不存在",
+        case_none: "原始CASE不存在",
+        num_none: "原始场景不存在"
       },
       report_name_info: '请输入报告名称',
       save_case_info: '请先保存用例',
@@ -1259,7 +1259,7 @@ export default {
       generate_report: "生成报告",
     },
     environment: {
-      id:'环境ID',
+      id: '环境ID',
       create: '创建环境',
       name: "环境名称",
       socket: "环境域名",
@@ -1283,7 +1283,7 @@ export default {
       response_timeout: "响应超时",
     },
     scenario: {
-      id:"场景ID",
+      id: "场景ID",
       scenario: "场景",
       dubbo: "Dubbo配置",
       config: "场景配置",
@@ -1307,12 +1307,12 @@ export default {
       clone: "复制",
       cant_reference: '历史测试文件，重新保存后才可被引用',
       share_cookie: '共享cookie',
-      module_id:'场景模块ID',
+      module_id: '场景模块ID',
       level: '级别',
-      version:"场景版本",
-      warning_context:"暂不支持批量添加所有场景到测试计划!",
-      jmx_file_set:"场景JMX文件集",
-      error_report_jmx:"导出JMX文件失败",
+      version: "场景版本",
+      warning_context: "暂不支持批量添加所有场景到测试计划!",
+      jmx_file_set: "场景JMX文件集",
+      error_report_jmx: "导出JMX文件失败",
     },
     request: {
       debug: "调试",
@@ -1705,9 +1705,9 @@ export default {
     performance_test_case: "性能测试用例",
     scenario_test_case: "场景测试用例",
     report_statistics: "报告统计",
-    sort:'种类',
-    other_test_name:'其他测试名称',
-    automatic_status_update:"自动状态更新",
+    sort: '种类',
+    other_test_name: '其他测试名称',
+    automatic_status_update: "自动状态更新",
     case: {
       list: "列表",
       minder: "脑图",
@@ -1794,10 +1794,10 @@ export default {
       upload_tip: "只能上传jpg、jpeg、png、docx、doc、pdf、xlsx、txt文件",
       attachment: "附件",
       upload_time: "上传时间",
-      total:"用例总数",
-      node_id:"节点ID",
-      node_path:"节点路径",
-      match_rule:"测试用例匹配规则",
+      total: "用例总数",
+      node_id: "节点ID",
+      node_path: "节点路径",
+      match_rule: "测试用例匹配规则",
       import: {
         import: "导入用例",
         case_import: "导入测试用例",
@@ -1829,12 +1829,12 @@ export default {
         export_tip: "请切换成接口列表勾选用例导出！"
       },
       case_desc: "用例描述",
-      passing_rate:'用例通过率'
+      passing_rate: '用例通过率'
 
     },
     plan: {
       test_plan: "测试计划",
-      test_plan_id:'测试计划Id',
+      test_plan_id: '测试计划Id',
       create_plan: "创建测试计划",
       edit_plan: "编辑测试计划",
       plan_name: "计划名称",
@@ -1871,10 +1871,10 @@ export default {
       api_case: "接口测试用例",
       scenario_case: "场景测试用例",
       execute_result: "执行结果",
-      execute_time:'执行时间',
-      is_api_case_executing:"是否执行接口用例",
-      is_scenario_executing:'是否执行场景',
-      is_performance_executing:'是否执行性能',
+      execute_time: '执行时间',
+      is_api_case_executing: "是否执行接口用例",
+      is_scenario_executing: '是否执行场景',
+      is_performance_executing: '是否执行性能',
       test_plan_test_case_count: "功能用例数",
       test_plan_api_case_count: "接口用例数",
       test_plan_api_scenario_count: "场景用例数",
@@ -1891,11 +1891,11 @@ export default {
         report_not_found: "报告不存在",
       }
     },
-    demand:{
-      id:'需求ID',
-      name:'需求名称'
+    demand: {
+      id: '需求ID',
+      name: '需求名称'
     },
-    step_model:'步骤模型',
+    step_model: '步骤模型',
     review: {
       test_review: "用例评审",
       create_review: "创建用例评审",
@@ -1943,7 +1943,7 @@ export default {
       execute_result: "评审结果",
     },
     module: {
-      id:'模块ID',
+      id: '模块ID',
       search: "搜索模块",
       rename: "重命名",
       add_submodule: "添加子模块",
@@ -1986,7 +1986,7 @@ export default {
       relevance_test_case: "关联测试用例",
       cancel_all_relevance: "取消全部关联",
       executor: "执行人",
-      executor_match_rule:"执行者匹配规则",
+      executor_match_rule: "执行者匹配规则",
       execute_result: "执行结果",
       pass: "通过",
       not_pass: "不通过",
@@ -2011,7 +2011,7 @@ export default {
       submit_issues: "提缺陷",
       operate_step: "操作步骤",
       edit_component: "编辑组件",
-      component:"组件",
+      component: "组件",
       base_info: "基础信息",
       mock_info: "Mock服务",
       test_result: "测试结果",
@@ -2051,7 +2051,7 @@ export default {
       title: "缺陷标题",
       description: "缺陷描述",
       status: "缺陷状态",
-      issue_project:"所属项目",
+      issue_project: "所属项目",
       platform: "平台",
       operate: "操作",
       close: "关闭缺陷",
@@ -2062,8 +2062,8 @@ export default {
       status_new: '新建',
       status_resolved: '已解决',
       status_closed: '已关闭',
-      status_active:'激活',
-      status_delete:'删除',
+      status_active: '激活',
+      status_delete: '删除',
       please_choose_current_owner: "请选择处理人",
       tapd_current_owner: "Tapd 处理人",
       zentao_bug_build: "禅道 影响版本",
@@ -2087,11 +2087,11 @@ export default {
         automation: "自动触发",
       },
     },
-    reporter:'报告人',
-    lastmodify:'最后更改'
+    reporter: '报告人',
+    lastmodify: '最后更改'
   },
   test_resource_pool: {
-    id:"测试资源池ID",
+    id: "测试资源池ID",
     type: '类型',
     enable_disable: '启用/禁用',
     search_by_name: '根据名称搜索',
@@ -2180,7 +2180,7 @@ export default {
     not_set: "未设置",
     test_name: '测试名称',
     running_rule: '运行规则',
-    job:'任务',
+    job: '任务',
     job_status: '任务状态',
     running_task: '运行中的任务',
     next_execution_time: "下次执行时间",
@@ -2314,7 +2314,7 @@ export default {
   },
   module: {
     title: '模块管理',
-    path:'模块路径'
+    path: '模块路径'
   },
   table: {
     header_display_field: '表头显示字段',
@@ -2357,5 +2357,43 @@ export default {
     mail_subject: "邮件主题",
     mail_addressee: "收件人",
     mail_duplicate: "抄送人",
+  },
+  notice: {
+    operation: {
+      'CREATE': '创建了',
+      'UPDATE': '更新了',
+      'DELETE': '删除了',
+      'COMMENT': '评论了',
+      'COMPLETE': '完成了',
+      'CLOSE_SCHEDULE': '关闭了定时任务',
+      'CASE_CREATE': '创建了接口用例',
+      'CASE_UPDATE': '更新了接口用例',
+      'CASE_DELETE': '删除了接口用例',
+      'EXECUTE_SUCCESSFUL': '执行',
+      'EXECUTE_FAILED': '执行',
+      'EXECUTE_COMPLETED': '执行',
+    },
+    resource: {
+      'JENKINS_TASK': 'Jenkins',
+      'TEST_PLAN_TASK': '测试计划',
+      'REVIEW_TASK': '测试评审',
+      'DEFECT_TASK': '缺陷',
+      'SWAGGER_TASK': 'Swagger',
+      'API_AUTOMATION_TASK': '接口自动化',
+      'API_DEFINITION_TASK': '接口定义',
+      'API_HOME_TASK': '接口测试首页',
+      'API_REPORT_TASK': '接口测试报告',
+      'PERFORMANCE_TEST_TASK': '性能测试',
+      'PERFORMANCE_REPORT_TASK': '性能测试报告',
+      'TRACK_TEST_CASE_TASK': '测试用例',
+      'TRACK_HOME_TASK': '测试跟踪首页',
+      'TRACK_REPORT_TASK': '测试跟踪报告',
+    },
+    result: {
+      'EXECUTE_SUCCESSFUL': '成功',
+      'EXECUTE_FAILED': '失败',
+      'EXECUTE_COMPLETED': '完成',
+    },
+    api_case: '接口用例'
   }
 };
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 4bad0772b8..42ce3cf839 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -2354,5 +2354,43 @@ export default {
     mail_subject: "郵件主題",
     mail_addressee: "收件人",
     mail_duplicate: "抄送人",
+  },
+  notice: {
+    operation: {
+      'CREATE': '創建了',
+      'UPDATE': '更新了',
+      'DELETE': '刪除了',
+      'COMMENT': '評論了',
+      'COMPLETE': '完成了',
+      'CLOSE_SCHEDULE': '關閉了定時任務',
+      'CASE_CREATE': '創建了接口用例',
+      'CASE_UPDATE': '更新了接口用例',
+      'CASE_DELETE': '刪除了接口用例',
+      'EXECUTE_SUCCESSFUL': '執行',
+      'EXECUTE_FAILED': '執行',
+      'EXECUTE_COMPLETED': '執行',
+    },
+    resource: {
+      'JENKINS_TASK': 'Jenkins',
+      'TEST_PLAN_TASK': '測試計劃',
+      'REVIEW_TASK': '測試評審',
+      'DEFECT_TASK': '缺陷',
+      'SWAGGER_TASK': 'Swagger',
+      'API_AUTOMATION_TASK': '接口自動化',
+      'API_DEFINITION_TASK': '接口定義',
+      'API_HOME_TASK': '接口測試首頁',
+      'API_REPORT_TASK': '接口測試報告',
+      'PERFORMANCE_TEST_TASK': '性能測試',
+      'PERFORMANCE_REPORT_TASK': '性能測試報告',
+      'TRACK_TEST_CASE_TASK': '測試用例',
+      'TRACK_HOME_TASK': '測試跟踪首頁',
+      'TRACK_REPORT_TASK': '測試跟踪報告',
+    },
+    result: {
+      'EXECUTE_SUCCESSFUL': '成功',
+      'EXECUTE_FAILED': '失敗',
+      'EXECUTE_COMPLETED': '完成',
+    },
+    api_case: '接口用例'
   }
 };

From 0afd7eb5e6bde76dab7e7162111c0e9261861c13 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Fri, 17 Dec 2021 11:06:23 +0800
Subject: [PATCH 156/256] =?UTF-8?q?fix:=20=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=9B=BD=E9=99=85=E5=8C=96=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008929 --user=刘瑞斌 【国际化】-消息通知-通知信息未翻译
https://www.tapd.cn/55049933/s/1082095
---
 .../workspace/components/api/ApiHomeNotification.vue         | 2 +-
 .../workspace/components/track/TestPlanTaskNotification.vue  | 2 +-
 .../workspace/components/track/TestReviewNotification.vue    | 2 +-
 .../workspace/components/track/TrackHomeNotification.vue     | 2 +-
 frontend/src/i18n/en-US.js                                   | 5 ++++-
 frontend/src/i18n/zh-CN.js                                   | 2 ++
 frontend/src/i18n/zh-TW.js                                   | 2 ++
 7 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue
index a77e453c91..ff3ab4b143 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue
@@ -171,7 +171,7 @@ export default {
         isReadOnly: false,
       }],
       eventOptions: [
-        {value: 'CLOSE_SCHEDULE', label: '关闭定时任务'},
+        {value: 'CLOSE_SCHEDULE', label: this.$t('commons.close_schedule')},
       ],
       variables: [
         {
diff --git a/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue
index 66c7b515c7..ca7dc649c7 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue
@@ -175,7 +175,7 @@ export default {
         {value: 'CREATE', label: this.$t('commons.create')},
         {value: 'UPDATE', label: this.$t('commons.update')},
         {value: 'DELETE', label: this.$t('commons.delete')},
-        {value: 'COMPLETE', label: '执行完成'},
+        {value: 'COMPLETE', label: this.$t('commons.run_completed')},
         // {value: 'SUCCESS_ONE_BY_ONE', label: '逐条成功（接口）'},
         // {value: 'FAIL_ONE_BY_ONE', label: '逐条失败（接口）'},
       ],
diff --git a/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue
index f482b3ead4..f3da1a4377 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue
@@ -175,7 +175,7 @@ export default {
         {value: 'UPDATE', label: this.$t('commons.update')},
         {value: 'DELETE', label: this.$t('commons.delete')},
         {value: 'COMMENT', label: this.$t('commons.comment')},
-        {value: 'COMPLETE', label: '评审完成'}
+        {value: 'COMPLETE', label:this.$t('commons.review_complete')}
       ],
       variables: [
         {
diff --git a/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue
index 649afd272d..fda958175d 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue
@@ -171,7 +171,7 @@ export default {
         isReadOnly: false,
       }],
       eventOptions: [
-        {value: 'CLOSE_SCHEDULE', label: '关闭定时任务'},
+        {value: 'CLOSE_SCHEDULE', label: this.$t('commons.close_schedule')},
       ],
       variables: [
         {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 10fb263805..9e36eb6569 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -27,7 +27,9 @@ export default {
     please_fill_in_the_template: 'Please fill in the template',
     cut_back_old_version: 'Cut back to old version',
     cut_back_new_version: 'Switch back to new version',
-    comment: 'comment',
+    comment: 'Comment',
+    close_schedule: 'Close Schedule',
+    review_complete: 'Review Completed',
     examples: 'examples',
     help_documentation: 'Help documentation',
     confirm_delete: 'Whether to delete',
@@ -554,6 +556,7 @@ export default {
       select_events: 'Select event',
       select_receiving_method: 'Select receiving method',
       mail: 'mail',
+      in_site: 'InSite',
       nail_robot: 'Nail robot',
       enterprise_wechat_robot: 'Enterprise wechat robot',
       lark: "Flying Book Robot",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index c426b24137..b8d25b1ba5 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -28,6 +28,8 @@ export default {
     cut_back_old_version: '切回旧版',
     cut_back_new_version: '切回新版',
     comment: '评论',
+    close_schedule: '关闭定时任务',
+    review_complete: '评审完成',
     examples: '示例',
     help_documentation: '帮助文档',
     api_help_documentation: 'API文档',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 42ce3cf839..0de7b3276a 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -28,6 +28,8 @@ export default {
     cut_back_old_version: '切回舊版',
     cut_back_new_version: '切回新版',
     comment: '評論',
+    close_schedule: '關閉定時任務',
+    review_complete: '評審完成',
     examples: '示例',
     help_documentation: '幫助文檔',
     api_help_documentation: 'API文檔',

From 466b0e39cd5bddd3ea97adb029556ff8e767c359 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 17 Dec 2021 11:10:45 +0800
Subject: [PATCH 157/256] =?UTF-8?q?fix(=E4=BF=AE=E6=94=B9sql=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{V102__v1.16_release.sql => V103__v1.16_release.sql}          | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename backend/src/main/resources/db/migration/{V102__v1.16_release.sql => V103__v1.16_release.sql} (100%)

diff --git a/backend/src/main/resources/db/migration/V102__v1.16_release.sql b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
similarity index 100%
rename from backend/src/main/resources/db/migration/V102__v1.16_release.sql
rename to backend/src/main/resources/db/migration/V103__v1.16_release.sql

From d5566fc4fe3b4e606b98e3c0bb68d3d28dea868c Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 17 Dec 2021 11:05:56 +0800
Subject: [PATCH 158/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E4=B8=ADcase?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=E5=AF=BC=E8=87=B4=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V102__v1.15.5_release.sql          |  2 ++
 .../api/definition/components/case/ApiCaseItem.vue  | 13 +++++++++----
 frontend/src/i18n/en-US.js                          |  1 +
 frontend/src/i18n/zh-CN.js                          |  1 +
 frontend/src/i18n/zh-TW.js                          |  1 +
 5 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 backend/src/main/resources/db/migration/V102__v1.15.5_release.sql

diff --git a/backend/src/main/resources/db/migration/V102__v1.15.5_release.sql b/backend/src/main/resources/db/migration/V102__v1.15.5_release.sql
new file mode 100644
index 0000000000..748ca1c6cb
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V102__v1.15.5_release.sql
@@ -0,0 +1,2 @@
+ALTER TABLE api_definition_exec_result
+    MODIFY COLUMN name VARCHAR (255);
\ No newline at end of file
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index d7fd938142..2fbd303ee3 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -6,7 +6,8 @@
           <span @click.stop>
             <i class="icon el-icon-arrow-right" :class="{'is-active': apiCase.active}" @click="active(apiCase)"/>
             <el-input v-if="!apiCase.id || isShowInput" size="small" v-model="apiCase.name" :name="index" :key="index"
-                      class="ms-api-header-select" style="width: 180px" :readonly="!hasPermission('PROJECT_API_DEFINITION:READ+EDIT_CASE')"
+                      class="ms-api-header-select" style="width: 180px"
+                      :readonly="!hasPermission('PROJECT_API_DEFINITION:READ+EDIT_CASE')"
                       @blur="saveTestCase(apiCase,true)" :placeholder="$t('commons.input_name')" ref="nameEdit"/>
             <span v-else>
               <el-tooltip :content="apiCase.id ? apiCase.name : ''" placement="top">
@@ -408,9 +409,6 @@ export default {
     saveCase(row, hideAlert) {
       let tmp = JSON.parse(JSON.stringify(row));
       this.isShowInput = false;
-      if (this.validate(tmp)) {
-        return;
-      }
       tmp.request.body = row.request.body;
       let bodyFiles = this.getBodyUploadFiles(tmp);
       tmp.projectId = getCurrentProjectID();
@@ -466,6 +464,9 @@ export default {
       });
     },
     saveTestCase(row, hideAlert) {
+      if (this.validate(row)) {
+        return;
+      }
       if (this.compare.indexOf(row.id) === -1) {
         this.compare.push(row.id);
         if (this.api.saved) {
@@ -500,6 +501,10 @@ export default {
         this.$warning(this.$t('api_test.input_name'));
         return true;
       }
+      if (row.name.length > 100) {
+        this.$warning(this.$t('api_test.input_name_length'));
+        return true;
+      }
     },
     showExecResult(item) {
       item.active = true;
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 9e36eb6569..965ccc18f6 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -985,6 +985,7 @@ export default {
     invert_select: "Invert select",
     select_or_invert: "Select all/Invert select",
     input_name: "Please enter the test name",
+    input_name_length: "The length of the test name cannot exceed 100",
     select_project: "Please select project",
     variable_name: "Variable name",
     variable: "Variable",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index b8d25b1ba5..bb29d58789 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -992,6 +992,7 @@ export default {
     invert_select: "反选",
     select_or_invert: "全选/反选",
     input_name: "请输入测试名称",
+    input_name_length: "测试名称长度不能超过100",
     select_project: "请选择项目",
     variable_name: "变量名",
     variable: "变量",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 0de7b3276a..55c6f11e4f 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -989,6 +989,7 @@ export default {
     invert_select: "反選",
     select_or_invert: "全選/反選",
     input_name: "請輸入測試名稱",
+    input_name_length: "測試名稱長度不能超過100",
     select_project: "請選擇項目",
     variable_name: "變量名",
     variable: "變量",

From 55acafcd07faa51f46d27b4d833685e212f1a3e1 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Fri, 17 Dec 2021 11:43:32 +0800
Subject: [PATCH 159/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD=E6=B5=8B=E8=AF=95=E9=A1=B5=E9=9D=A2=E4=B8=8A=E7=9A=84?=
 =?UTF-8?q?i18n=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008938 --user=刘瑞斌 【国际化】-性能测试-未翻译汇总
https://www.tapd.cn/55049933/s/1082113
---
 .../performance/test/components/BatchAddMonitor.vue    |  2 +-
 .../performance/test/components/EditMonitor.vue        | 10 +++++-----
 frontend/src/business/components/xpack                 |  2 +-
 frontend/src/i18n/en-US.js                             |  9 ++++++---
 frontend/src/i18n/zh-CN.js                             |  3 +++
 frontend/src/i18n/zh-TW.js                             |  3 +++
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/frontend/src/business/components/performance/test/components/BatchAddMonitor.vue b/frontend/src/business/components/performance/test/components/BatchAddMonitor.vue
index 4d520ad32a..5c135ebbd2 100644
--- a/frontend/src/business/components/performance/test/components/BatchAddMonitor.vue
+++ b/frontend/src/business/components/performance/test/components/BatchAddMonitor.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :close-on-click-modal="false"
-    title="添加监控"
+    :title="$t('load_test.add_monitor')"
     :visible.sync="dialogVisible"
     width="70%"
     @closed="closeFunc"
diff --git a/frontend/src/business/components/performance/test/components/EditMonitor.vue b/frontend/src/business/components/performance/test/components/EditMonitor.vue
index a9e39f5461..9cb7caee5c 100644
--- a/frontend/src/business/components/performance/test/components/EditMonitor.vue
+++ b/frontend/src/business/components/performance/test/components/EditMonitor.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :close-on-click-modal="false"
-    title="添加监控"
+    :title="$t('load_test.add_monitor')"
     :visible.sync="dialogVisible"
     width="70%"
     @closed="closeFunc"
@@ -10,11 +10,11 @@
     v-loading="result.loading"
   >
     <div style="height: 50vh;overflow-y: auto;">
-      <el-form :model="form" label-position="right" label-width="80px" size="small" :rules="rule" ref="monitorForm">
+      <el-form :model="form" label-position="right" label-width="100px" size="small" :rules="rule" ref="monitorForm">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"/>
         </el-form-item>
-        <h4 style="margin-left: 80px;">监控配置</h4>
+        <h4 style="margin-left: 80px;">{{ $t('load_test.monitor_host') }}</h4>
         <el-row>
           <el-col :span="12">
             <el-form-item label="IP" prop="ip">
@@ -27,10 +27,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="描述" prop="description">
+        <el-form-item :label="$t('commons.description')" prop="description">
           <el-input v-model="form.description" autocomplete="off"/>
         </el-form-item>
-        <h4 style="margin-left: 80px;">监控项</h4>
+        <h4 style="margin-left: 80px;">{{ $t('load_test.monitor_item') }}</h4>
         <el-row>
           <el-col :span="20" :offset="2">
             <monitor-key-value key-placeholder="Label" value-placeholder="promQL" :items="monitorList"
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index f78e985bb2..f806258070 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit f78e985bb2ccb3dfbe719e4dd02868a2399ee952
+Subproject commit f806258070e9ca2cda08e48aa47952d31eb2a60a
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 965ccc18f6..da1d9bcc8c 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -916,9 +916,9 @@ export default {
     param_is_duplicate: 'Parameter name is duplicate',
     domain_ip_is_empty: 'Domain and IP cannot be empty',
     param_name_value_is_empty: 'Parameters cannot be empty',
-    connect_timeout: 'Timeout to establish a connection',
-    response_timeout: 'Timeout to response',
-    custom_http_code: 'Custom HTTP response success status code',
+    connect_timeout: 'Connect timeout',
+    response_timeout: 'Response timeout',
+    custom_http_code: 'Custom response code',
     separated_by_commas: 'Separated by commas',
     serialize_threadgroups: 'ThreadGroup Sequentially',
     autostop_threadgroups: 'Auto stop',
@@ -973,6 +973,9 @@ export default {
       Network: 'Network',
       url:'URL'
     },
+    add_monitor: 'Add Monitor',
+    monitor_item: 'Monitor',
+    monitor_host: 'Target host',
   },
   api_test: {
     is_continue: "Is continue",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index bb29d58789..731bdbc0bd 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -980,6 +980,9 @@ export default {
       url: '路径'
     },
     project_file_update_type_error: '更新的文件类型必须一致',
+    add_monitor: '添加监控',
+    monitor_item: '监控项',
+    monitor_host: '监控配置',
   },
   api_test: {
     is_continue: "是否继续",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 55c6f11e4f..624e47f8a5 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -977,6 +977,9 @@ export default {
       url:'路徑',
     },
     project_file_update_type_error: '更新的文件類型必須一致',
+    add_monitor: '添加監控',
+    monitor_item: '監控項',
+    monitor_host: '監控配置',
   },
   api_test: {
     is_continue: "是否繼續",

From bcac804f742403e6477484ce33a28273a4e967fb Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Fri, 17 Dec 2021 13:41:51 +0800
Subject: [PATCH 160/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD=E6=B5=8B=E8=AF=95=E9=A1=B5=E9=9D=A2=E4=B8=8A=E7=9A=84?=
 =?UTF-8?q?i18n=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008938 --user=刘瑞斌 【国际化】-性能测试-未翻译汇总
https://www.tapd.cn/55049933/s/1082113
---
 frontend/src/i18n/en-US.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index da1d9bcc8c..33b14cac39 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -282,7 +282,7 @@ export default {
         current_user: "Current user"
       }
     },
-    monitor: "monitor",
+    monitor: "Monitor",
     all_label: {
       case: "all",
       review: "all"
@@ -867,7 +867,7 @@ export default {
     select_project: 'Please select project',
     save_and_run: 'Save and execute',
     basic_config: 'Scene Configuration',
-    pressure_config: 'Pressure configuration',
+    pressure_config: 'Pressure Configuration',
     advanced_config: 'Advanced Configuration',
     runtime_config: 'Runtime Configuration',
     is_running: 'Test is running! ',

From bd1107db059345a1bfa74beb2fd40e2bd8ce593b Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Thu, 16 Dec 2021 13:48:14 +0800
Subject: [PATCH 161/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008891 --user=王孝刚 【国际化】-API-Api Definition 未翻译为英文
https://www.tapd.cn/55049933/s/1081505
---
 .../components/auth/ApiAuthConfig.vue         |  2 +-
 .../definition/components/list/ApiList.vue    |  2 +-
 .../mock/Components/MockScriptNavMenu.vue     |  2 +-
 .../components/module/ApiModule.vue           | 32 +++++++++----------
 .../project/menu/function/ScriptNavMenu.vue   |  2 +-
 frontend/src/i18n/en-US.js                    | 11 +++++--
 frontend/src/i18n/zh-CN.js                    |  5 +++
 frontend/src/i18n/zh-TW.js                    |  5 +++
 8 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue b/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue
index 2accb865a6..bf1a9e70a8 100644
--- a/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue
+++ b/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue
@@ -78,7 +78,7 @@ export default {
   data() {
     return {
       options: [{name: "No Auth"}, {name: "Basic Auth"}],
-      encryptOptions: [{id: false, name: "不加密"}],
+      encryptOptions: [{id: false, name: this.$t('commons.encrypted')}],
       activeName: "verified",
       rule: {},
       authConfig: {},
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index 25fe038a85..85c1a46d00 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -289,7 +289,7 @@ export default {
           permissions: ['PROJECT_API_DEFINITION:READ+EDIT_API']
         },
         {
-          name: this.$t('生成依赖关系'),
+          name: this.$t('test_track.case.generate_dependencies'),
           isXPack: true,
           handleClick: this.generateGraph,
           permissions: ['PROJECT_API_DEFINITION:READ+EDIT_API']
diff --git a/frontend/src/business/components/api/definition/components/mock/Components/MockScriptNavMenu.vue b/frontend/src/business/components/api/definition/components/mock/Components/MockScriptNavMenu.vue
index e8dba183a4..6336ab0f00 100644
--- a/frontend/src/business/components/api/definition/components/mock/Components/MockScriptNavMenu.vue
+++ b/frontend/src/business/components/api/definition/components/mock/Components/MockScriptNavMenu.vue
@@ -151,7 +151,7 @@ export default {
         if (this.language !== 'beanshell' && this.language !== 'groovy') {
           if (obj.title === this.$t('api_test.request.processor.code_add_report_length') ||
             obj.title === this.$t('api_test.request.processor.code_hide_report_length')) {
-            this.$warning("无对应的 "+ this.language +" 代码模版！");
+            this.$warning(this.$t('commons.no_corresponding') + " " + this.language + " " + this.$t('commons.code_template') + "！");
             return;
           }
         }
diff --git a/frontend/src/business/components/api/definition/components/module/ApiModule.vue b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
index 3402362cc7..1cb36aa8ec 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModule.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
@@ -4,22 +4,22 @@
     <slot name="header"></slot>
 
     <ms-node-tree
-      :is-display="getIsRelevance"
-      v-loading="result.loading"
-      :tree-nodes="data"
-      :type="isReadOnly ? 'view' : 'edit'"
-      :allLabel="$t('全部接口')"
-      :default-label="'未规划接口'"
-      @add="add"
-      @edit="edit"
-      @drag="drag"
-      @remove="remove"
-      @refresh="list"
-      @filter="filter"
-      :delete-permission="['PROJECT_API_DEFINITION:READ+DELETE_API']"
-      :add-permission="['PROJECT_API_DEFINITION:READ+CREATE_API']"
-      :update-permission="['PROJECT_API_DEFINITION:READ+EDIT_API']"
-      @nodeSelectEvent="nodeChange"
+        :is-display="getIsRelevance"
+        v-loading="result.loading"
+        :tree-nodes="data"
+        :type="isReadOnly ? 'view' : 'edit'"
+        :allLabel="$t('api_test.definition.api_all')"
+        :default-label="$t('api_test.definition.unplanned_api')"
+        @add="add"
+        @edit="edit"
+        @drag="drag"
+        @remove="remove"
+        @refresh="list"
+        @filter="filter"
+        :delete-permission="['PROJECT_API_DEFINITION:READ+DELETE_API']"
+        :add-permission="['PROJECT_API_DEFINITION:READ+CREATE_API']"
+        :update-permission="['PROJECT_API_DEFINITION:READ+EDIT_API']"
+        @nodeSelectEvent="nodeChange"
       ref="nodeTree">
 
       <template v-slot:header>
diff --git a/frontend/src/business/components/project/menu/function/ScriptNavMenu.vue b/frontend/src/business/components/project/menu/function/ScriptNavMenu.vue
index 4b0a813701..4b825836c6 100644
--- a/frontend/src/business/components/project/menu/function/ScriptNavMenu.vue
+++ b/frontend/src/business/components/project/menu/function/ScriptNavMenu.vue
@@ -158,7 +158,7 @@ export default {
         if (this.language !== 'beanshell' && this.language !== 'groovy') {
           if (obj.title === this.$t('api_test.request.processor.code_add_report_length') ||
             obj.title === this.$t('api_test.request.processor.code_hide_report_length')) {
-            this.$warning("无对应的 "+ this.language +" 代码模版！");
+            this.$warning(this.$t('commons.no_corresponding') + " " + this.language + " " + this.$t('commons.code_template') + "！");
             return;
           }
         }
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 33b14cac39..f671b241e4 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -182,6 +182,9 @@ export default {
     node_name_tip: "The name cannot contain'\\'",
     more_operator: "More operator",
     mock: "Mock settings",
+    encrypted: "Not encrypted",
+    no_corresponding: "No corresponding",
+    code_template: "code template",
     api_case: "Api Case",
     scenario_case: "Scenario Case",
     task_center: "Task center",
@@ -1037,6 +1040,8 @@ export default {
     },
     definition: {
       api_quick_button: 'Api definition shortcut add button',
+      api_all: 'All interfaces',
+      unplanned_api: 'Unplanned interface',
       id: 'Api Definition ID',
       api_title: "Api test",
       case_title: "Test Case",
@@ -1099,8 +1104,8 @@ export default {
         encryption: "encryption",
         req_param: "Request parameter",
         res_param: "Response content",
-        batch_delete: "Batch deletion",
-        delete_confirm: "Confirm deletion",
+        batch_delete: "Batch delete",
+        delete_confirm: "Confirm delete",
         batch_to_performance_confirm: "Confirm Batch Create Performance Test",
         batch_copy_confirm: "Confirm batch copy",
         batch_copy_end: "Batch Copy Over",
@@ -1355,6 +1360,7 @@ export default {
       connect_timeout: "Connect Timeout",
       response_timeout: "Response Timeout",
       follow_redirects: "Follow Redirects",
+      cert_alias: "Certificate alias",
       do_multipart_post: "Use multipart/form-data for POST",
       body_upload_limit_size: "The file size does not exceed 500 MB",
       condition: "condition",
@@ -1365,6 +1371,7 @@ export default {
         text: "Text",
         regex: "Regex",
         response_time: "Response Time",
+        jsr223: "Script",
         select_type: "Choose type",
         select_subject: "Subject",
         select_condition: "Condition",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 731bdbc0bd..8ab0288f4a 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -183,6 +183,9 @@ export default {
     node_name_tip: "名称不能包含'\\'",
     more_operator: "更多操作",
     mock: "Mock 设置",
+    encrypted: "不加密",
+    no_corresponding: "无对应的",
+    code_template: "代码模版",
     api_case: "接口用例",
     scenario_case: "场景用例",
     task_center: "任务中心",
@@ -1046,6 +1049,8 @@ export default {
     definition: {
       api_quick_button: '接口定义快捷添加按钮',
       id: '接口定义ID',
+      api_all: '全部接口',
+      unplanned_api: '未规划接口',
       api_title: "接口列表",
       case_title: "用例列表",
       doc_title: "文档",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 624e47f8a5..565b6eb2a2 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -183,6 +183,9 @@ export default {
     node_name_tip: "名稱不能包含'\\'",
     more_operator: "更多操作",
     mock: "Mock 設置",
+    encrypted: "不加密",
+    no_corresponding: "無對應的",
+    code_template: "代码模版",
     api_case: "接口用例",
     scenario_case: "場景用例",
     task_center: "任務中心",
@@ -1042,6 +1045,8 @@ export default {
     },
     definition: {
       api_quick_button: '接口定義快捷添加按鈕',
+      api_all: '全部接口',
+      unplanned_api: '未規劃接口',
       id: '接口定義ID',
       api_title: "接口列表",
       case_title: "用例列表",

From 046b5a7dba79f07dcdcdfd4c5acc3ebcfb1a563f Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Fri, 17 Dec 2021 14:04:54 +0800
Subject: [PATCH 162/256] =?UTF-8?q?fix:=20=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=9B=BD=E9=99=85=E5=8C=96=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008929 --user=刘瑞斌 【国际化】-消息通知-通知信息未翻译
https://www.tapd.cn/55049933/s/1082095
---
 frontend/src/i18n/en-US.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index f671b241e4..834142b364 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -558,11 +558,11 @@ export default {
       robot_template: 'Robot template',
       select_events: 'Select event',
       select_receiving_method: 'Select receiving method',
-      mail: 'mail',
+      mail: 'Email',
       in_site: 'InSite',
       nail_robot: 'Nail robot',
       enterprise_wechat_robot: 'Enterprise wechat robot',
-      lark: "Flying Book Robot",
+      lark: "Lark Robot",
       notes: '1. Nail and create a custom robot in the enterprise group, and then copy the webhook address on our platform;<br/>' +
         '2. Robots are selected as swarm robots, and "custom keyword" is selected for security verification: "task notification";<br/>' +
         '3. When selecting the receiver, it must be the person included in the group you created. The mobile phone number of the receiver is required and it is the mobile phone number used by the nailing enterprise',

From 910c4d21c6ea7bd0bf11a3574b817b9d1461bcc5 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 17 Dec 2021 14:28:27 +0800
Subject: [PATCH 163/256] refactor: i18n
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008890 --user=lyh 【国际化】-Settiing-ENV manament-未翻译为英文
https://www.tapd.cn/55049933/s/1082212
---
 .../environment/EnvironmentGlobalScript.vue   | 32 +++++++++----------
 .../environment/EnvironmentHttpConfig.vue     | 10 +++---
 .../components/environment/SSLFileUpload.vue  |  4 +--
 .../test/components/request/tcp/TcpConfig.vue |  2 +-
 frontend/src/i18n/en-US.js                    | 19 ++++++++++-
 frontend/src/i18n/zh-CN.js                    | 17 ++++++++++
 frontend/src/i18n/zh-TW.js                    | 17 ++++++++++
 7 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/environment/EnvironmentGlobalScript.vue b/frontend/src/business/components/api/test/components/environment/EnvironmentGlobalScript.vue
index acffe005b1..a37bd1fd59 100644
--- a/frontend/src/business/components/api/test/components/environment/EnvironmentGlobalScript.vue
+++ b/frontend/src/business/components/api/test/components/environment/EnvironmentGlobalScript.vue
@@ -4,14 +4,14 @@
       <el-collapse-item name="1">
         <template slot="title">
           <span class="span-style">{{title}}</span>
-          <el-tooltip class="item" effect="dark" content="每一个API步骤后执行一次 如加解密" placement="right">
+          <el-tooltip class="item" effect="dark" :content="$t('api_test.script.tip_1')" placement="right">
             <i class="el-icon-info"/>
           </el-tooltip>
 
           <div class="header-right" style="margin: 5px 5px 5px 50px" @click.stop>
-            <span class="span-style">过滤请求类型</span>
+            <span class="span-style">{{$t('api_test.script.filter_request_type')}}</span>
             <el-select multiple v-model="filterRequestArray" style="margin : 0px 10px 0px 10px; width: 214px "
-                       size="small" placeholder="请选择">
+                       size="small" :placeholder="$t('commons.please_select')">
               <el-option
                 v-for="item in requestArray"
                 :key="item.value"
@@ -19,8 +19,8 @@
                 :value="item.value">
               </el-option>
             </el-select>
-            <span class="span-style" style="margin-right: 10px">脚本执行顺序</span>
-            <el-select v-model="isExecAfterPrivateScript" size="small" placeholder="请选择">
+            <span class="span-style" style="margin-right: 10px">{{$t('api_test.script.execution_order')}}</span>
+            <el-select v-model="isExecAfterPrivateScript" size="small" :placeholder="$t('commons.please_select')">
               <el-option
                   v-for="item in scriptExecSort"
                   :key="item.value"
@@ -39,13 +39,13 @@
       <el-collapse-item name="2">
         <template slot="title">
           {{ stepTitle }}
-          <el-tooltip class="item" effect="dark" content="全部API流程结束后执行一次 如token获取，场景初始化" placement="right">
+          <el-tooltip class="item" effect="dark" :content="$t('api_test.script.tip_2')" placement="right">
             <i class="el-icon-info"/>
           </el-tooltip>
           <div class="header-right" style="margin: 5px 5px 5px 50px;" @click.stop>
-            <el-switch v-model="isConnScenario" active-text="关联场景结果" style="font-size: 13px;font-weight: 300"
+            <el-switch v-model="isConnScenario" :active-text="$t('api_test.script.associated_scene_results')" style="font-size: 13px;font-weight: 300"
                        @click.stop/>
-            <el-tooltip class="item" effect="dark" content="脚本步骤会统计到场景执行结果中，执行报错时会影响场景的最终执行结果" placement="right">
+            <el-tooltip class="item" effect="dark" :content="$t('api_test.script.tip_3')" placement="right">
               <i class="el-icon-info"/>
             </el-tooltip>
           </div>
@@ -81,11 +81,11 @@ export default {
   data() {
     return {
       title: "",
-      preTitle: "单个请求步骤前执行",
-      postTitle: "单个请求步骤后执行",
+      preTitle: this.$t('api_test.script.execute_before_step'),
+      postTitle: this.$t('api_test.script.execute_post_step'),
       stepTitle: "",
-      preStepTitle: "所有请求步骤前执行",
-      postStepTitle: "所有请求步骤后执行",
+      preStepTitle: this.$t('api_test.script.execute_before_all_steps'),
+      postStepTitle: this.$t('api_test.script.execute_post_all_steps'),
       result: {},
       activeNames: [],
       isConnScenario: false,
@@ -98,12 +98,12 @@ export default {
       ],
       scriptExecSort: [],
       scriptPreExecSort: [
-        {value: true, label: "步骤内前置脚本后"},
-        {value: false, label: "步骤内前置脚本前"},
+        {value: true, label: this.$t('api_test.script.after_the_pre_script_step')},
+        {value: false, label: this.$t('api_test.script.before_the_pre_script_step')},
       ],
       scriptPostExecSort: [
-        {value: true, label: "步骤内后置脚本后"},
-        {value: false, label: "步骤内后置脚本前"},
+        {value: true, label: this.$t('api_test.script.after_the_post_script_step')},
+        {value: false, label: this.$t('api_test.script.before_the_post_script_step')},
       ],
     }
   },
diff --git a/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue b/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
index 8d6f1fdb6f..c6877c03da 100644
--- a/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
+++ b/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
@@ -4,7 +4,7 @@
     <div class="ms-border">
       <el-form-item prop="socket">
         <el-row type="flex" justify="space-between">
-          <el-col :span="16">
+          <el-col :span="14">
             <span class="ms-env-span" style="line-height: 30px;">{{ $t('api_test.environment.socket') }}</span>
             <el-input v-model="condition.socket" style="width: 85%" :placeholder="$t('api_test.request.url_description')" clearable size="small">
               <template slot="prepend">
@@ -15,9 +15,9 @@
               </template>
             </el-input>
           </el-col>
-          <el-col :span="8">
-            <span style="margin-right: 12px;">描述</span>
-            <el-input v-model="condition.description" maxlength="200" :show-word-limit="true" size="small" style="width: 85%;"/>
+          <el-col :span="10">
+            <span style="margin-right: 12px; line-height: 30px;">{{ $t('commons.description') }}</span>
+            <el-input v-model="condition.description" maxlength="200" :show-word-limit="true" size="small" style="width: 70%;"/>
           </el-col>
         </el-row>
       </el-form-item>
@@ -75,7 +75,7 @@
             <span>{{ row.time | timestampFormatDate }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="'描述'">
+        <el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="$t('commons.description')">
           <template v-slot:default="{row}">
             {{ row.description }}
           </template>
diff --git a/frontend/src/business/components/api/test/components/environment/SSLFileUpload.vue b/frontend/src/business/components/api/test/components/environment/SSLFileUpload.vue
index 4c97a86b44..c56034591c 100644
--- a/frontend/src/business/components/api/test/components/environment/SSLFileUpload.vue
+++ b/frontend/src/business/components/api/test/components/environment/SSLFileUpload.vue
@@ -4,7 +4,7 @@
     :visible.sync="dialogVisible"
     append-to-body
     destroy-on-close
-    width="500px"
+    width="550px"
     :before-close="handleClose">
     <el-form :model="currentConfig" label-width="100px" v-loading="result.loading" ref="form">
       <el-row>
@@ -25,7 +25,7 @@
             ref="fileUpload">
             <i class="el-icon-upload"></i>
             <div class="el-upload__text" v-html="$t('load_test.upload_tips')"></div>
-            <div class="el-upload__tip" slot="tip">{{$t('api_test.api_import.file_size_limit')}}，支持p12,jks,pfx格式</div>
+            <div class="el-upload__tip" slot="tip">{{$t('api_test.api_import.file_size_limit')}}，{{ $t('api_test.api_import.support_format') }}</div>
           </el-upload>
         </el-form-item>
         <el-col>
diff --git a/frontend/src/business/components/api/test/components/request/tcp/TcpConfig.vue b/frontend/src/business/components/api/test/components/request/tcp/TcpConfig.vue
index dd845ac011..6d768d5677 100644
--- a/frontend/src/business/components/api/test/components/request/tcp/TcpConfig.vue
+++ b/frontend/src/business/components/api/test/components/request/tcp/TcpConfig.vue
@@ -49,7 +49,7 @@
 
     <el-row :gutter="10">
       <el-col :span="24">
-        <el-form-item :label="'描述'" prop="description">
+        <el-form-item :label="$t('commons.description')" prop="description">
           <el-input v-model="config.description" maxlength="200" :show-word-limit="true" size="small"/>
         </el-form-item>
       </el-col>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 834142b364..41b7f66f9f 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -171,7 +171,7 @@ export default {
     millisecond: 'ms',
     please_upload: 'Please upload file',
     please_fill_path: 'Please fill in the path',
-    reference_documentation: "Reference documentation",
+    reference_documentation: "Documentation",
     already_exists: 'The name already exists',
     modifier: 'Modifier',
     validate: "Validate",
@@ -1482,6 +1482,7 @@ export default {
       tip: "Instructions",
       export_tip: "Export Tip",
       ms_tip: "Support for MeterSphere JSON format",
+      support_format: "Support p12, jks, pfx format",
       ms_export_tip: "Export jSON-formatted files via MeterSphere website or browser plug-ins",
       har_export_tip: "Export HAR files by browser dev-tool",
       esb_export_tip: "Can not export esb files now",
@@ -1631,6 +1632,22 @@ export default {
           close_title: "Do you want to close this scheduled task？",
         }
       }
+    },
+    script: {
+      tip_1: "Execute once after each API step, such as encryption and decryption",
+      tip_2: "Execute once after all API process ends, such as token acquisition and scene initialization",
+      tip_3: "Script steps will be counted in the execution result of the scene, and the final execution result of the scene will be affected when an execution error is reported",
+      filter_request_type: "Filter request type",
+      execution_order: "Script execution order",
+      associated_scene_results: "Associated scene results",
+      execute_before_step: "Execute before a single request step",
+      execute_post_step: "Execute after a single request step",
+      execute_before_all_steps: "Execute before all requested steps",
+      execute_post_all_steps: "Execute after all requested steps",
+      after_the_pre_script_step: "After the pre-script in the step",
+      before_the_pre_script_step: "Before pre-script in step",
+      after_the_post_script_step: "After the script is placed in the step",
+      before_the_post_script_step: "Post-in-step before script",
     }
   },
   api_report: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 8ab0288f4a..6c0894049e 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1487,6 +1487,7 @@ export default {
       title: "接口测试导入",
       data_format: "数据格式",
       file_size_limit: "文件大小不超过 50 M",
+      support_format: "支持p12,jks,pfx格式",
       tip: "说明",
       export_tip: "导出方法",
       ms_tip: "支持 MeterSphere json 格式",
@@ -1639,6 +1640,22 @@ export default {
           close_title: "要关闭这条定时任务吗？",
         }
       }
+    },
+    script: {
+      tip_1: "每一个API步骤后执行一次 如加解密",
+      tip_2: "全部API流程结束后执行一次 如token获取，场景初始化",
+      tip_3: "脚本步骤会统计到场景执行结果中，执行报错时会影响场景的最终执行结果",
+      filter_request_type: "过滤请求类型",
+      execution_order: "脚本执行顺序",
+      associated_scene_results: "关联场景结果",
+      execute_before_step: "单个请求步骤前执行",
+      execute_post_step: "单个请求步骤后执行",
+      execute_before_all_steps: "所有请求步骤前执行",
+      execute_post_all_steps: "所有请求步骤后执行",
+      after_the_pre_script_step: "步骤内前置脚本后",
+      before_the_pre_script_step: "步骤内前置脚本前",
+      after_the_post_script_step: "步骤内后置脚本后",
+      before_the_post_script_step: "步骤内后置脚本前",
     }
   },
   api_report: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 565b6eb2a2..93746dc9e1 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1488,6 +1488,7 @@ export default {
       tip: "說明",
       export_tip: "導出方法",
       ms_tip: "支持 MeterSphere json 格式",
+      support_format: "支持p12,jks,pfx格式",
       ms_export_tip: "通過 MeterSphere 接口測試頁面或者瀏覽器插件導出 json 格式文件",
       har_export_tip: "通過 瀏覽器的開發者工具 導出 HAR 格式文件",
       esb_export_tip: "暫時不支持ESB文件的導出",
@@ -1637,6 +1638,22 @@ export default {
           close_title: "要關閉這條定時任務嗎？",
         }
       }
+    },
+    script: {
+      tip_1: "每一個API步驟後執行一次 如加解密",
+      tip_2: "全部API流程結束後執行一次 如token獲取，場景初始化",
+      tip_3: "腳本步驟會統計到場景執行結果中，執行報錯時會影響場景的最終執行結果",
+      filter_request_type: "過濾請求類型",
+      execution_order: "腳本執行順序",
+      associated_scene_results: "關聯場景結果",
+      execute_before_step: "單個請求步驟前執行",
+      execute_post_step: "單個請求步驟後執行",
+      execute_before_all_steps: "所有請求步驟前執行",
+      execute_post_all_steps: "所有請求步驟後執行",
+      after_the_pre_script_step: "步驟內前置腳本後",
+      before_the_pre_script_step: "步驟內前置腳本前",
+      after_the_post_script_step: "步驟內後置腳本後",
+      before_the_post_script_step: "步驟內後置腳本前",
     }
   },
   api_report: {

From eac9557c9568535c9e9deda018c984781f041268 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Fri, 17 Dec 2021 14:27:40 +0800
Subject: [PATCH 164/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E9=80=9A=E7=9F=A5=E8=AF=84=E8=AE=BA=E5=90=8E=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=8F=91=E9=80=81=E9=80=9A=E7=9F=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008936 --user=刘瑞斌 【消息通知】-设置用例评审的“评论”
邮件和站内信通知，用例评审中评论一条用例后都未收到消息通知 https://www.tapd.cn/55049933/s/1082213
---
 .../controller/TestCaseReviewController.java     | 16 ++++++++++++++++
 .../track/review/commom/ReviewComment.vue        |  2 +-
 .../track/review/view/TestCaseReviewView.vue     |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java
index 55b2e48348..dba9901a49 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java
@@ -3,6 +3,7 @@ package io.metersphere.track.controller;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.metersphere.base.domain.Project;
+import io.metersphere.base.domain.TestCaseComment;
 import io.metersphere.base.domain.TestCaseReview;
 import io.metersphere.base.domain.User;
 import io.metersphere.commons.constants.NoticeConstants;
@@ -17,7 +18,9 @@ import io.metersphere.service.CheckPermissionService;
 import io.metersphere.track.dto.TestCaseReviewDTO;
 import io.metersphere.track.dto.TestReviewDTOWithMetric;
 import io.metersphere.track.request.testreview.*;
+import io.metersphere.track.service.TestCaseCommentService;
 import io.metersphere.track.service.TestCaseReviewService;
+import io.metersphere.track.service.TestCaseService;
 import io.metersphere.track.service.TestReviewProjectService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
@@ -37,6 +40,8 @@ public class TestCaseReviewController {
     TestReviewProjectService testReviewProjectService;
     @Resource
     CheckPermissionService checkPermissionService;
+    @Resource
+    private TestCaseCommentService testCaseCommentService;
 
     @PostMapping("/list/{goPage}/{pageSize}")
     public Pager<List<TestCaseReviewDTO>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryCaseReviewRequest request) {
@@ -143,4 +148,15 @@ public class TestCaseReviewController {
     public void editTestFollows(@RequestBody SaveTestCaseReviewRequest testCaseReview) {
         testCaseReviewService.editCaseRevieweFollow(testCaseReview);
     }
+
+    @PostMapping("/comment/save")
+    @RequiresPermissions(PermissionConstants.PROJECT_TRACK_REVIEW_READ_COMMENT)
+    @MsAuditLog(module = "track_test_case_review", type = OperLogConstants.CREATE, content = "#msClass.getLogDetails(#request.id)", msClass = TestCaseCommentService.class)
+    @SendNotice(taskType = NoticeConstants.TaskType.REVIEW_TASK, target = "#targetClass.getTestCase(#request.caseId)", targetClass = TestCaseService.class,
+            event = NoticeConstants.Event.COMMENT, mailTemplate = "track/TestCaseComment", subject = "测试评审通知")
+    public TestCaseComment saveComment(@RequestBody SaveCommentRequest request) {
+        request.setId(UUID.randomUUID().toString());
+        return testCaseCommentService.saveComment(request);
+    }
+
 }
diff --git a/frontend/src/business/components/track/review/commom/ReviewComment.vue b/frontend/src/business/components/track/review/commom/ReviewComment.vue
index 0ad3fc4a1f..fe4bc86196 100644
--- a/frontend/src/business/components/track/review/commom/ReviewComment.vue
+++ b/frontend/src/business/components/track/review/commom/ReviewComment.vue
@@ -109,7 +109,7 @@ export default {
         this.$warning(this.$t('test_track.comment.description_is_null'));
         return;
       }
-      this.result = this.$post('/test/case/comment/save', comment, () => {
+      this.result = this.$post('/test/case/review/comment/save', comment, () => {
         this.$success(this.$t('test_track.comment.send_success'));
         this.form.description = "";
         this.refresh();
diff --git a/frontend/src/business/components/track/review/view/TestCaseReviewView.vue b/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
index f89aba2c3a..f6c5c0e64d 100644
--- a/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
+++ b/frontend/src/business/components/track/review/view/TestCaseReviewView.vue
@@ -182,7 +182,7 @@ export default {
 }
 
 /deep/ .ms-aside-container {
-  height: calc(100vh - 80px - 53px);
+  height: calc(100vh - 80px - 53px) !important;
   margin-top: 1px;
 }
 

From cf6c247ca882cf65071c8148f77afe6226782721 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 17 Dec 2021 14:50:54 +0800
Subject: [PATCH 165/256] =?UTF-8?q?fix:=20=E6=89=B9=E9=87=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=94=A8=E4=BE=8B=E7=9A=84=E8=B4=A3=E4=BB=BB=E4=BA=BA?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=20--bug=3D1008903=20--user=3D=E9=99=88?=
 =?UTF-8?q?=E5=BB=BA=E6=98=9F=20=E3=80=90=E5=8A=9F=E8=83=BD=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E3=80=91-=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E7=9A=84=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=20https://www.tapd.cn/55049933/s/1082080?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/service/TestCaseService.java        |  4 +-
 .../db/migration/V103__v1.16_release.sql      | 11 +--
 .../track/case/components/TestCaseList.vue    |  2 +-
 .../track/common/minder/minderUtils.js        |  2 +-
 frontend/src/i18n/en-US.js                    |  1 +
 frontend/src/i18n/zh-CN.js                    |  1 +
 frontend/src/i18n/zh-TW.js                    | 84 ++++++++++---------
 7 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 8ff73d57f1..1dbe290177 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -1280,7 +1280,7 @@ public class TestCaseService {
             List<TestCaseWithBLOBs> testCases = extTestCaseMapper.getCustomFieldsByIds(ids);
             testCases.forEach((testCase) -> {
                 String customFields = testCase.getCustomFields();
-                List<TestCaseBatchRequest.CustomFiledRequest> fields = null;
+                List<TestCaseBatchRequest.CustomFiledRequest> fields;
                 if (StringUtils.isBlank(customFields)) {
                     fields = new ArrayList<>();
                 } else {
@@ -1289,7 +1289,7 @@ public class TestCaseService {
 
                 boolean hasField = false;
                 for (TestCaseBatchRequest.CustomFiledRequest field : fields) {
-                    if (StringUtils.equals(request.getCustomTemplateFieldId(), field.getId())) {
+                    if (StringUtils.equals(request.getCustomField().getName(), field.getName())) {
                         field.setValue(request.getCustomField().getValue());
                         hasField = true;
                         break;
diff --git a/backend/src/main/resources/db/migration/V103__v1.16_release.sql b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
index ebeeb44921..dc1ee90a9b 100644
--- a/backend/src/main/resources/db/migration/V103__v1.16_release.sql
+++ b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
@@ -9,14 +9,9 @@ ALTER TABLE project
     ADD third_part_template tinyint(1) DEFAULT 0 NULL COMMENT '是否使用第三方平台缺陷模板';
 
 -- 处理历史数据
-UPDATE issue_template
-SET platform = 'Local'
-WHERE platform = 'metersphere';
-UPDATE project p JOIN issue_template it
-on p.issue_template_id = it.id SET p.platform = it.platform;
-UPDATE custom_field
-SET `type` = 'date'
-WHERE `type` = 'data';
+UPDATE issue_template SET platform = 'Local' WHERE platform = 'metersphere';
+UPDATE project p JOIN issue_template it on p.issue_template_id = it.id SET p.platform = it.platform;
+UPDATE custom_field SET `type` = 'date' WHERE `type` = 'data';
 
 -- 公共用例库
 ALTER TABLE project
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 767a610989..4cce3f83d9 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -228,7 +228,7 @@ import MsTableOperatorButton from "../../../common/components/MsTableOperatorBut
 import MsTableButton from "../../../common/components/MsTableButton";
 import {TEST_CASE_CONFIGS} from "../../../common/components/search/search-components";
 import BatchEdit from "./BatchEdit";
-import {PROJECT_NAME, TEST_CASE_LIST} from "@/common/js/constants";
+import {TEST_CASE_LIST} from "@/common/js/constants";
 import StatusTableItem from "@/business/components/track/common/tableItems/planview/StatusTableItem";
 import TestCaseDetail from "./TestCaseDetail";
 import ReviewStatus from "@/business/components/track/case/components/ReviewStatus";
diff --git a/frontend/src/business/components/track/common/minder/minderUtils.js b/frontend/src/business/components/track/common/minder/minderUtils.js
index e71ab0b544..bdff9ad3cd 100644
--- a/frontend/src/business/components/track/common/minder/minderUtils.js
+++ b/frontend/src/business/components/track/common/minder/minderUtils.js
@@ -545,7 +545,7 @@ export function handleMinderIssueDelete(commandName, isPlan) {
         }
       });
       Promise.all(promises).then(() => {
-        success('取消缺陷关联成功');
+        success(i18n.t('test_track.case.minder_create_tip'));
       });
       return isAllIssue;
     }
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 41b7f66f9f..287fad2836 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1744,6 +1744,7 @@ export default {
       text_describe_tip: "For simple test scenarios, there are no clear test steps",
       change_type: "Change Type",
       minder_create_tip: "failed, unable to create its parent module in minder",
+      minder_issue_delete_tip: "Successfully cancel the defect association",
       check_select: "Please check the case",
       export_all_cases: 'Are you sure you want to export all use cases?',
       input_test_case: 'Please enter the associated case name',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 6c0894049e..02e4c10778 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1747,6 +1747,7 @@ export default {
       text_describe_tip: "使用于简单的测试场景，没有明确的测试步骤",
       change_type: "更改类型",
       minder_create_tip: "失败, 无法在脑图创建其父模块",
+      minder_issue_delete_tip: "取消缺陷关联成功",
       check_select: "请勾选用例",
       export_all_cases: '确定要导出全部用例吗?',
       input_test_case: '请输入关联用例名称',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 93746dc9e1..7dca5279fe 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -76,7 +76,7 @@ export default {
     update_time: '更新時間',
     delete_time: '刪除時間',
     delete_user: '刪除人',
-    delete_user_id:'删除人ID',
+    delete_user_id:'刪除人ID',
     add: '添加',
     preview: '預覽',
     member: '成員',
@@ -86,7 +86,7 @@ export default {
     group: '用戶組',
     personal_info: '個人信息',
     api_keys: 'API Keys',
-    third_account: '第三方平台賬號',
+    third_account: '第三方平臺賬號',
     quota: '配額管理',
     status: '狀態',
     show_all: '顯示全部',
@@ -103,12 +103,12 @@ export default {
     enable_settings: '啟用設置',
     view_settings: '顯示設置',
     functional: '功能測試',
+    my_workstation: '我的工作臺',
     input_content: '請輸入內容',
-    my_workstation: '我的工作台',
     create: '新建',
     edit: '編輯',
     copy: '復製',
-    follow: '關注',
+    follow: '關註',
     refresh: '刷新',
     remark: '備註',
     delete: '刪除',
@@ -206,8 +206,8 @@ export default {
     run_success: "執行成功",
     run_completed: "執行完成",
     run_fail: "執行失敗",
-    follow_success:"關注成功",
-    cancel_follow_success: "取消關注成功",
+    follow_success:"關註成功",
+    cancel_follow_success:"取消關註成功",
     type: "類型",
     relationship: {
       name: '依賴關系',
@@ -224,10 +224,10 @@ export default {
       current_case: '本用例',
     },
     generate_test_data: "生成測試數據",
+    project_setting: '項目設置',
     table: {
       select_tip: "已選中 {0} 條數據"
     },
-    project_setting: '項目設置',
     selector: {
       required: "必填",
       not_required: "非必填",
@@ -366,13 +366,14 @@ export default {
     system_project: "項目",
     user_unit: "人",
     workspace_unit: "個",
-    dash_board:'儀錶盤',
+    dash_board:'儀表盤',
     all_project:'全部項目',
     to_be_completed:'待完成',
     pending_upgrade:'待更新',
     information:'信息',
-    nick_name:'暱稱',
+    nick_name:'昵稱',
     resourceId:'資源ID',
+    level:'級別',
     num:'數量',
     original_state:'原始狀態',
     custom_num:'自定義編號',
@@ -396,14 +397,14 @@ export default {
     expired: '已過期',
   },
   workstation:{
-    dash_board: '我的儀錶盤',
+    dash_board: '我的儀表盤',
     upcoming: '我的待辦',
-    focus: '我的關注',
+    focus: '我的關註',
     creation: '我創建的',
     creation_case:'我創建的用例',
     creation_issue:'我創建的缺陷',
-    creation_case_tip: '暫時還沒有創建用例，马上創建',
-    creation_issue_tip:'暫時還沒有創建缺陷，马上創建',
+    creation_case_tip:'暫時還沒有創建用例，馬上創建',
+    creation_issue_tip:'暫時還沒有創建缺陷，馬上創建',
     table_name:{
       track_case:'功能用例',
       track_plan:'測試計劃',
@@ -512,20 +513,20 @@ export default {
     env_group: {
       name: "環境組",
       create: "創建環境組",
-      not_intact: "項目與環境對應關係不完整！",
+      not_intact: "項目與環境對應關系不完整！",
       cascader_tip: "若環境組中已經包含此次將要加入的項目，則該項目環境將被覆蓋",
       search_tip: "請輸入名稱搜索環境組",
-      fast_create_tip: "請輸入名稱搜索環境組",
+      fast_create_tip: "請輸入環境組名稱快速創建",
       quickly_add: "快速添加",
       select: "請選擇環境組",
       name_not_null: "環境組名不能為空",
       delete: "刪除環境組",
       please_select_project: "請選擇項目",
       please_select_env: "請選擇環境",
-      view_details: "請選擇環境",
+      view_details: "查看域名詳情",
       domain_list: "域名列表",
       batch_add_to_ws: "批量添加到環境組",
-      choice_conflict: "環境選擇衝突，一個項目選擇一個對應環境！",
+      choice_conflict: "環境選擇沖突，一個項目選擇一個對應環境！",
       env_list: "環境列表",
       confirm: "確 定",
       please_select_env_for_current_scenario: "請為當前場景選擇一個運行環境！",
@@ -598,7 +599,7 @@ export default {
       input_zentao_request: '請輸入Zentao請求方式',
       input_zentao_url: '請輸入Zentao地址，例：http://xx.xx.xx.xx/zentao/',
       zentao_info:'禪道信息',
-      zentao_account:'禪道賬號',
+      zentao_account:'禪道賬戶',
       zentao_password:'禪道密碼',
       zentao_prompt_information:'該信息為通過禪道提交缺陷的的用戶名、密碼，若未填寫，則使用工作空間中配置的默認信息',
       use_tip: '使用指引：',
@@ -637,7 +638,6 @@ export default {
     edit: '編輯項目',
     delete: '刪除項目',
     delete_confirm: '確定要刪除這個項目嗎?',
-    group_permission: '用戶組與許可權',
     delete_tip: '刪除該項目，會刪除該項目下所有測試資源，確定要刪除嗎?',
     file_delete_tip: '刪除該項目的文件: {0}？',
     search_by_name: '根據名稱搜索',
@@ -655,10 +655,12 @@ export default {
     azureDevops_info: 'AzureDevops 信息',
     azureDevops_tip: '該信息為通過Azure Devops提交缺陷的用戶令牌信息，若未填寫，則使用工作空間中配置的默認信息',
     manager: '項目管理',
+    group_permission: '用戶組與權限',
+    global: '全局',
     no_data: '無數據',
     select: '選擇項目',
     repeatable: '接口定義URL可重復',
-    repeatable_info: '接口定義URL可重復 \n 啟用後介面定義重複性校驗將不校驗URL',
+    repeatable_info: '接口定義URL可重復 \n 啟用後接口定義重復性校驗將不校驗URL',
     case_public: '公共用例庫',
     public_info: '啟動公共用例庫 \n 可以使用公共用例庫數據，也可以自行添加用例至公共用例庫',
     upload_file_again: '重新上傳',
@@ -698,10 +700,10 @@ export default {
     creator: '創建人',
     create_time: '創建時間',
     member_desc: '添加項目成員以及項目成員管理',
+    group_desc: '添加用戶組與權限以及全局配置',
     env_desc: '項目運行環境以及全局配置',
     file_desc: 'jar包以及資源文件管理',
     log_desc: '項目全部操作過程',
-    group_desc: '添加用戶組與許可權以及全局配置',
     code_segment_desc: '自定義代碼片段',
     test_case_custom_id: '測試用例自定義ID',
     test_case_custom_id_info: '測試用例自定義ID \n 用例ID默認為系統自增ID',
@@ -733,7 +735,7 @@ export default {
     no_such_user: '無此用戶信息, 請輸入正確的用戶 ID 或者 用戶郵箱！',
   },
   user: {
-    id:"用户ID",
+    id:'用戶ID',
     create: '創建用戶',
     modify: '修改用戶',
     input_name: '請輸入用戶姓名',
@@ -753,8 +755,8 @@ export default {
       add_user_role_batch: '批量添加角色',
     },
     select_project: '請選擇項目',
-    select_group: '請選擇用戶組',
     select_workspace: '請選擇工作空間',
+    select_group: '請選擇用戶組',
     add_user_group_batch: '批量添加用戶組',
     add_project_batch: '批量添加到項目',
     add_workspace_batch: "批量添加到工作空間",
@@ -790,7 +792,7 @@ export default {
     permission: '權限',
     please_select_group: '請選擇用戶組',
     global: '全局',
-    ws_admin_global: '工作空間管理員才可以創建全域用戶組'
+    ws_admin_global: '工作空間管理員才可以創建全局用戶組'
   },
   role: {
     please_choose_role: '請選擇角色',
@@ -900,6 +902,7 @@ export default {
     resource_strategy: '分配策略',
     run_mode: '執行方式',
     input_rps_limit: '請輸入限製',
+    ramp_up_time: '預熱時間',
     ramp_up_time_within: '在',
     ramp_up_time_minutes: '秒內，分',
     ramp_up_time_seconds: '秒內增加並發用戶',
@@ -977,7 +980,7 @@ export default {
       LatencyChart: '延遲',
       BytesThroughputChart: '字節數',
       Network: '網絡',
-      url:'路徑',
+      url:'路徑'
     },
     project_file_update_type_error: '更新的文件類型必須一致',
     add_monitor: '添加監控',
@@ -1224,7 +1227,7 @@ export default {
       update_time: "最後更新時間",
       step: "步驟數",
       last_result: "最後結果",
-      last_result_id:'最後结果ID',
+      last_result_id:'最後結果ID',
       passing_rate: "通過率",
       success: "通過",
       fail: "失敗",
@@ -1285,7 +1288,6 @@ export default {
       common_config: "通用配置",
       http_config: "HTTP配置",
       database_config: "數據庫配置",
-      tips: "Tips: 執行多條SQL語句需配寘allowMultiQueries=true",
       tcp_config: "TCP配置",
       import: "導入環境",
       request_timeout: "鏈接超時",
@@ -1733,11 +1735,6 @@ export default {
     report_statistics: "報告統計",
     sort:'種類',
     other_test_name:'其他測試名稱',
-    demand:{
-      id:'需求ID',
-      name:'需求名稱'
-    },
-    step_model:'步驟模型',
     automatic_status_update:"自動狀態更新",
     case: {
       list: "列表",
@@ -1750,6 +1747,7 @@ export default {
       text_describe_tip: "使用於簡單的測試場景，沒有明確的測試步驟",
       change_type: "更改類型",
       minder_create_tip: "失敗, 無法在腦圖創建其父模塊",
+      minder_issue_delete_tip: "取消缺陷關聯成功",
       check_select: "請勾選用例",
       export_all_cases: '確定要導出全部用例嗎?',
       input_test_case: '請輸入關聯用例名稱',
@@ -1807,11 +1805,11 @@ export default {
       please_select_attr_value: '請選擇屬性對應的值',
       batch_edit_case: '批量編輯',
       batch_move_case: '批量移動',
-      batch_copy: '批量複製',
-      generate_dependencies: '生成依賴關係',
-      batch_add_public: '批量添加到公共用例庫',
-      public_warning: '未開啟公共用例庫配寘',
       batch_delete_case: '批量刪除',
+      batch_copy: '批量復製',
+      batch_add_public: '批量添加到公共用例庫',
+      public_warning: '未開啟公共庫用例配置',
+      generate_dependencies: '生成依賴關系',
       batch_unlink: '批量取消關聯',
       unlink: '取消關聯',
       project_name: '所屬項目',
@@ -1825,7 +1823,7 @@ export default {
       upload_tip: "只能上傳jpg、jpeg、png、docx、doc、pdf、xlsx、txt文件",
       attachment: "附件",
       upload_time: "上傳時間",
-      total: "用例總數",
+      total:"用例總數",
       node_id:"節點ID",
       node_path:"節點路徑",
       match_rule:"測試用例匹配規則",
@@ -1861,6 +1859,7 @@ export default {
       },
       case_desc: "用例描述",
       passing_rate:'用例通過率'
+
     },
     plan: {
       test_plan: "測試計劃",
@@ -1902,9 +1901,9 @@ export default {
       scenario_case: "場景測試用例",
       execute_result: "執行結果",
       execute_time:'執行時間',
-      is_api_case_executing:"是否执行接口用例",
-      is_scenario_executing:'是否执行场景',
-      is_performance_executing:'是否执行性能',
+      is_api_case_executing:"是否執行接口用例",
+      is_scenario_executing:'是否執行場景',
+      is_performance_executing:'是否執行性能',
       test_plan_test_case_count: "功能用例數",
       test_plan_api_case_count: "接口用例數",
       test_plan_api_scenario_count: "場景用例數",
@@ -1921,6 +1920,11 @@ export default {
         report_not_found: "報告不存在",
       }
     },
+    demand:{
+      id:'需求ID',
+      name:'需求名稱'
+    },
+    step_model:'步驟模型',
     review: {
       test_review: "用例評審",
       create_review: "創建用例評審",

From 5f700a5b44701c2a1a7f2ed73eaf8ec3ea57a31b Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 17 Dec 2021 15:23:29 +0800
Subject: [PATCH 166/256] refactor: i18n
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008900 --user=lyh 【国际化】系统设置 模块，国际化后排版问题汇总
https://www.tapd.cn/55049933/s/1082229
---
 .../components/auth/ApiAuthConfig.vue         |  2 +-
 .../components/settings/system/EditUser.vue   | 31 ++++++++++---------
 .../environment/EditEnvironmentGroup.vue      |  2 +-
 frontend/src/business/components/xpack        |  2 +-
 frontend/src/i18n/zh-CN.js                    |  2 +-
 frontend/src/i18n/zh-TW.js                    |  2 +-
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue b/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue
index bf1a9e70a8..e6dbec11b4 100644
--- a/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue
+++ b/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue
@@ -3,7 +3,7 @@
     <!-- 认证-->
     <el-tab-pane :label="$t('api_test.definition.request.verified')" name="verified">
 
-      <el-form :model="authConfig" :rules="rule" ref="authConfig" label-position="right" label-width="80px">
+      <el-form :model="authConfig" :rules="rule" ref="authConfig" label-position="right">
         <el-form-item :label="$t('api_test.definition.request.verification_method')" prop="verification">
           <el-select v-model="authConfig.verification" @change="change"
                      :placeholder="$t('api_test.definition.request.verification_method')" filterable size="small">
diff --git a/frontend/src/business/components/settings/system/EditUser.vue b/frontend/src/business/components/settings/system/EditUser.vue
index cf79972a2e..04196f2d30 100644
--- a/frontend/src/business/components/settings/system/EditUser.vue
+++ b/frontend/src/business/components/settings/system/EditUser.vue
@@ -3,11 +3,11 @@
              :visible.sync="createVisible" width="40%"
              @closed="handleClose" class="edit-user-dialog"
              :destroy-on-close="true">
-    <div v-loading="result.loading" >
+    <div v-loading="result.loading">
       <el-form :model="form" label-width="120px" size="small" :rules="rule" ref="createUserForm">
         <el-form-item label="ID" prop="id">
           <el-input v-model="form.id" autocomplete="off" :placeholder="$t('user.input_id_placeholder')"
-                    :disabled="type === 'Edit'" class="form-input" />
+                    :disabled="type === 'Edit'" class="form-input"/>
         </el-form-item>
         <el-form-item :label="$t('commons.username')" prop="name">
           <el-input v-model="form.name" autocomplete="off" :placeholder="$t('user.input_name')" class="form-input"/>
@@ -25,9 +25,9 @@
         <div v-for="(group, index) in form.groups" :key="index">
           <el-form-item :label="getLabel(index)"
                         :prop="'groups.' + index + '.type'"
-                        :rules="{required: true, message: '请选择用户组', trigger: 'change'}"
+                        :rules="{required: true, message: $t('user.select_group'), trigger: 'change'}"
           >
-            <el-select filterable v-model="group.type" placeholder="请选择用户组" :disabled="!!group.type"
+            <el-select filterable v-model="group.type" :placeholder="$t('user.select_group')" :disabled="!!group.type"
                        class="edit-user-select" @change="getResource(group.type, index)">
               <el-option
                 v-for="item in activeGroup(group)"
@@ -42,12 +42,12 @@
             </el-button>
           </el-form-item>
           <div v-if="groupType(group.type) === ws">
-            <el-form-item :label="$t('workspace.select')"
+            <el-form-item :label="$t('commons.workspace')"
                           :prop="'groups.' + index + '.ids'"
                           :rules="{required: true, message: $t('workspace.select'), trigger: 'change'}"
             >
               <el-select filterable v-model="group.ids" :placeholder="$t('workspace.select')" multiple
-                         class="edit-user-select" >
+                         class="edit-user-select">
                 <el-option
                   v-for="item in group.workspaces"
                   :key="item.id"
@@ -58,12 +58,12 @@
             </el-form-item>
           </div>
           <div v-if="groupType(group.type) === project">
-            <el-form-item label="选择项目"
+            <el-form-item :label="$t('commons.project')"
                           :prop="'groups.' + index + '.ids'"
-                          :rules="{required: true, message: '请选择项目', trigger: 'change'}"
+                          :rules="{required: true, message: $t('user.select_project'), trigger: 'change'}"
             >
-              <el-select filterable v-model="group.ids" placeholder="请选择项目" multiple
-                         class="edit-user-select" >
+              <el-select filterable v-model="group.ids" :placeholder="$t('user.select_project')" multiple
+                         class="edit-user-select">
                 <el-option
                   v-for="item in group.projects"
                   :key="item.id"
@@ -77,7 +77,7 @@
 
         <el-form-item>
           <template>
-            <el-button type="success"  class="form-input" @click="addGroup('createUserForm')" :disabled="btnAddRole">
+            <el-button type="success" class="form-input" @click="addGroup('createUserForm')" :disabled="btnAddRole">
               {{ $t('group.add') }}
             </el-button>
           </template>
@@ -292,9 +292,9 @@ export default {
         default:
       }
     },
-    getLabel(index){
-      let a  = index+1;
-      return "用户组"+a;
+    getLabel(index) {
+      let a = index + 1;
+      return this.$t('commons.group') + a;
     }
   }
 }
@@ -309,9 +309,10 @@ export default {
 /*.edit-user-dialog >>> .el-dialog__footer {
   padding-top: 0;
 }*/
-.form-input{
+.form-input {
   width: 80%;
 }
+
 .edit-user-select {
   width: 80%;
 }
diff --git a/frontend/src/business/components/settings/workspace/environment/EditEnvironmentGroup.vue b/frontend/src/business/components/settings/workspace/environment/EditEnvironmentGroup.vue
index 18ab2bba31..60186267ff 100644
--- a/frontend/src/business/components/settings/workspace/environment/EditEnvironmentGroup.vue
+++ b/frontend/src/business/components/settings/workspace/environment/EditEnvironmentGroup.vue
@@ -2,7 +2,7 @@
   <div v-loading="result.loading">
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="createVisible" destroy-on-close
                @close="handleClose">
-      <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="60px" size="small">
+      <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="90px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off" show-word-limit maxlength="50"></el-input>
         </el-form-item>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index f806258070..938171fa50 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit f806258070e9ca2cda08e48aa47952d31eb2a60a
+Subproject commit 938171fa506d5b3d8fff9857cb21a83c8e31063e
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 02e4c10778..b3447038b6 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -2261,7 +2261,7 @@ export default {
     performance: "性能测试数量",
     resource_pool: "可用测试资源池",
     max_threads: "最大并发数",
-    duration: "压测时长（秒）",
+    duration: "压测时长(秒)",
     use_default: "使用默认配额",
     yes: "是",
     no: "否",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 7dca5279fe..dfe34fb5e9 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -2261,7 +2261,7 @@ export default {
     performance: "性能測試數量",
     resource_pool: "可用測試資源池",
     max_threads: "最大並發數",
-    duration: "壓測時長（秒）",
+    duration: "壓測時長(秒)",
     use_default: "使用默認配額",
     yes: "是",
     no: "否",

From cac0150c9d6b446966497030dbfb5216e7330597 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 17 Dec 2021 15:38:31 +0800
Subject: [PATCH 167/256] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E8=84=9A=E6=9C=AC=E4=B8=8B=E8=BD=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApiJmeterFileController.java   |   2 +-
 .../assertions/document/DocumentUtils.java    | 132 -----------
 .../exec/queue/ExecThreadPoolExecutor.java    |  11 +
 .../TestPlanReportListenerScheduled.java      |   5 +-
 .../io/metersphere/api/jmeter/FixedTask.java  |  10 +-
 .../ApiDefinitionExecResultService.java       |  54 ++---
 .../api/service/ApiJmeterFileService.java     |   2 +-
 .../automation/report/SysnApiReportDetail.vue |   6 +
 .../api/automation/scenario/Setting.js        |  90 ++++----
 .../components/case/ApiCaseHeader.vue         | 217 +++++++++---------
 10 files changed, 208 insertions(+), 321 deletions(-)
 delete mode 100644 backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/DocumentUtils.java

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiJmeterFileController.java b/backend/src/main/java/io/metersphere/api/controller/ApiJmeterFileController.java
index 3ac47493ef..c6ee61370a 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiJmeterFileController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiJmeterFileController.java
@@ -51,7 +51,7 @@ public class ApiJmeterFileController {
         byte[] bytes = apiJmeterFileService.downloadJmeterFiles(runMode, testId, reportId);
         return ResponseEntity.ok()
                 .contentType(MediaType.parseMediaType("application/octet-stream"))
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + testId + ".zip\"")
+                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + reportId + "_" + testId + ".zip\"")
                 .body(bytes);
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/DocumentUtils.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/DocumentUtils.java
deleted file mode 100644
index 73c792063c..0000000000
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/document/DocumentUtils.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package io.metersphere.api.dto.definition.request.assertions.document;
-
-import com.alibaba.fastjson.JSON;
-import com.google.gson.Gson;
-import io.metersphere.vo.Condition;
-import io.metersphere.vo.ElementCondition;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.jmeter.util.JMeterUtils;
-import org.apache.oro.text.regex.Pattern;
-
-import java.text.DecimalFormat;
-import java.util.List;
-import java.util.Map;
-
-public class DocumentUtils {
-
-    public static boolean documentChecked(Object subj, String condition, ThreadLocal<DecimalFormat> decimalFormatter) {
-        if (StringUtils.isNotEmpty(condition)) {
-            ElementCondition elementCondition = JSON.parseObject(condition, ElementCondition.class);
-            boolean isTrue = true;
-            if (CollectionUtils.isNotEmpty(elementCondition.getConditions())) {
-                for (Condition item : elementCondition.getConditions()) {
-                    String expectedValue = item.getValue() != null ? item.getValue().toString() : "";
-                    String resValue = objectToString(subj, decimalFormatter);
-                    switch (item.getKey()) {
-                        case "value_eq":
-                            isTrue = StringUtils.equals(resValue, expectedValue);
-                            break;
-                        case "value_not_eq":
-                            isTrue = !StringUtils.equals(resValue, expectedValue);
-                            break;
-                        case "value_in":
-                            isTrue = StringUtils.contains(resValue, expectedValue);
-                            break;
-                        case "length_eq":
-                            isTrue = getLength(subj, decimalFormatter) == numberOf(item.getValue());
-                            break;
-                        case "length_not_eq":
-                            isTrue = getLength(subj, decimalFormatter) != numberOf(item.getValue());
-                            break;
-                        case "length_gt":
-                            isTrue = getLength(subj, decimalFormatter) > numberOf(item.getValue());
-                            break;
-                        case "length_lt":
-                            isTrue = getLength(subj, decimalFormatter) < numberOf(item.getValue());
-                            break;
-                        case "regular":
-                            Pattern pattern = JMeterUtils.getPatternCache().getPattern(expectedValue);
-                            isTrue = JMeterUtils.getMatcher().matches(resValue, pattern);
-                            break;
-                    }
-                    if (!isTrue) {
-                        break;
-                    }
-                }
-            }
-            return isTrue;
-        }
-        return true;
-    }
-
-    public static String objectToString(Object subj, ThreadLocal<DecimalFormat> decimalFormatter) {
-        String str;
-        if (subj == null) {
-            str = "null";
-        } else if (subj instanceof Map) {
-            str = new Gson().toJson(subj);
-        } else if (!(subj instanceof Double) && !(subj instanceof Float)) {
-            str = subj.toString();
-        } else {
-            str = ((DecimalFormat) decimalFormatter.get()).format(subj);
-        }
-        return str;
-    }
-
-
-    private static int getLength(Object value) {
-        if (value != null) {
-            if (value instanceof List) {
-                return ((List) value).size();
-            }
-            return value.toString().length();
-        }
-        return 0;
-    }
-
-    private static int getLength(Object value, ThreadLocal<DecimalFormat> decimalFormatter) {
-        if (value != null) {
-            if (value instanceof Map) {
-                return ((Map) value).size();
-            } else if (value instanceof List) {
-                return ((List) value).size();
-            } else if (!(value instanceof Double) && !(value instanceof Float)) {
-                return value.toString().length();
-            } else {
-                return ((DecimalFormat) decimalFormatter.get()).format(value).length();
-            }
-        }
-        return 0;
-    }
-
-    private static long numberOf(Object value) {
-        if (value != null) {
-            try {
-                return Long.parseLong(value.toString());
-            } catch (Exception e) {
-                return 0;
-            }
-        }
-        return 0;
-    }
-
-    public static String documentMsg(Object resValue, String condition) {
-        String msg = "";
-        if (StringUtils.isNotEmpty(condition)) {
-            ElementCondition elementCondition = JSON.parseObject(condition, ElementCondition.class);
-            if (CollectionUtils.isNotEmpty(elementCondition.getConditions())) {
-                for (Condition item : elementCondition.getConditions()) {
-                    if (StringUtils.equalsAny(item.getKey(), "value_eq", "value_not_eq", "value_in")) {
-                        msg = resValue != null ? resValue.toString() : "";
-                    } else if (StringUtils.equalsAny(item.getKey(), "length_eq", "length_not_eq", "length_gt", "length_lt")) {
-                        msg = "长度是：" + getLength(resValue) + "";
-                    } else {
-                        msg = resValue != null ? resValue.toString() : "";
-                    }
-                }
-            }
-        }
-        return msg;
-    }
-}
diff --git a/backend/src/main/java/io/metersphere/api/exec/queue/ExecThreadPoolExecutor.java b/backend/src/main/java/io/metersphere/api/exec/queue/ExecThreadPoolExecutor.java
index 3451d2aa0b..89f51426e3 100644
--- a/backend/src/main/java/io/metersphere/api/exec/queue/ExecThreadPoolExecutor.java
+++ b/backend/src/main/java/io/metersphere/api/exec/queue/ExecThreadPoolExecutor.java
@@ -150,6 +150,17 @@ public class ExecThreadPoolExecutor {
         return workerQueue.stream().filter(task -> StringUtils.equals(((ExecTask) task).getRequest().getReportId(), reportId)).count() > 0;
     }
 
+    public boolean checkPlanReport(String planReportId) {
+        // 检查缓冲区
+        Queue<JmeterRunRequestDTO> bufferQueue = msRejectedExecutionHandler.getBufferQueue();
+        if (CollectionUtils.isNotEmpty(bufferQueue)) {
+            return bufferQueue.stream().filter(task -> StringUtils.equals(task.getTestPlanReportId(), planReportId)).count() > 0;
+        }
+        // 检查等待队列
+        BlockingQueue workerQueue = threadPool.getQueue();
+        return workerQueue.stream().filter(task -> StringUtils.equals(((ExecTask) task).getRequest().getTestPlanReportId(), planReportId)).count() > 0;
+    }
+
     public String getWorkerQueue() {
         StringBuffer buffer = new StringBuffer();
         BlockingQueue workerQueue = threadPool.getQueue();
diff --git a/backend/src/main/java/io/metersphere/api/exec/schedule/TestPlanReportListenerScheduled.java b/backend/src/main/java/io/metersphere/api/exec/schedule/TestPlanReportListenerScheduled.java
index 1ef1848da6..25d2e1946b 100644
--- a/backend/src/main/java/io/metersphere/api/exec/schedule/TestPlanReportListenerScheduled.java
+++ b/backend/src/main/java/io/metersphere/api/exec/schedule/TestPlanReportListenerScheduled.java
@@ -1,6 +1,7 @@
 package io.metersphere.api.exec.schedule;
 
 import io.metersphere.api.cache.TestPlanReportExecuteCatch;
+import io.metersphere.api.exec.queue.ExecThreadPoolExecutor;
 import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.track.service.TestPlanReportService;
@@ -27,7 +28,9 @@ public class TestPlanReportListenerScheduled {
     private void listener(String planReportId) {
         LoggerUtil.info("检查测试计划执行报告：【" + planReportId + "】");
         if (TestPlanReportExecuteCatch.getTestPlanExecuteInfo(planReportId) != null) {
-            CommonBeanFactory.getBean(TestPlanReportService.class).countReport(planReportId);
+            if (!CommonBeanFactory.getBean(ExecThreadPoolExecutor.class).checkPlanReport(planReportId)) {
+                CommonBeanFactory.getBean(TestPlanReportService.class).countReport(planReportId);
+            }
         } else {
             MessageCache.jobReportCache.remove(planReportId);
             LoggerUtil.info("测试计划执行报告：【" + planReportId + "】执行完成，剩余队列：" + MessageCache.jobReportCache.size());
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java b/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java
index e5b2a1f0a7..17add78c05 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java
@@ -3,7 +3,7 @@ package io.metersphere.api.jmeter;
 import com.alibaba.fastjson.JSON;
 import io.metersphere.api.service.ApiScenarioReportService;
 import io.metersphere.commons.utils.CommonBeanFactory;
-import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.utils.LoggerUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -29,10 +29,10 @@ public class FixedTask {
         if (MessageCache.concurrencyCounter != null && MessageCache.concurrencyCounter.size() > 0) {
             for (String key : MessageCache.concurrencyCounter.keySet()) {
                 ReportCounter counter = MessageCache.concurrencyCounter.get(key);
-                LogUtil.info("集成报告：【" + key + "】总执行场景：【" + counter.getTestIds().size() + "】已经执行完成场景：【" + counter.getCompletedIds().size() + "】");
+                LoggerUtil.info("集成报告：【" + key + "】总执行场景：【" + counter.getTestIds().size() + "】已经执行完成场景：【" + counter.getCompletedIds().size() + "】");
                 List<String> filterList = counter.getTestIds().stream().filter(t -> !counter.getCompletedIds().contains(t)).collect(Collectors.toList());
 
-                LogUtil.debug("剩余要执行的报告" + JSON.toJSONString(filterList));
+                LoggerUtil.debug("剩余要执行的报告" + JSON.toJSONString(filterList));
                 // 合并
                 if (counter.getCompletedIds().size() >= counter.getTestIds().size()) {
                     scenarioReportService.margeReport(key);
@@ -51,14 +51,14 @@ public class FixedTask {
                             // 资源池中已经没有执行的请求了
                             int runningCount = scenarioReportService.get(key, counter);
                             if (runningCount == 0) {
-                                LogUtil.error("发生未知异常，进行资源合并，请检查资源池是否正常运行");
+                                LoggerUtil.error("发生未知异常，进行资源合并，请检查资源池是否正常运行");
                                 scenarioReportService.margeReport(key);
                                 guardTask.remove(key);
                                 MessageCache.concurrencyCounter.remove(key);
                             }
                         }
                     } catch (Exception ex) {
-                        LogUtil.error(ex.getMessage());
+                        LoggerUtil.error(ex.getMessage());
                     }
                 }
             }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index b001c6b83d..4c2a33202f 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -195,36 +195,38 @@ public class ApiDefinitionExecResultService {
         Map<String, String> caseReportMap = new HashMap<>();
         boolean isFirst = true;
         int countExpectProcessResultCount = 0;
-        for (RequestResult resultItem : requestResults) {
-            if (!StringUtils.startsWithAny(resultItem.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
-                countExpectProcessResultCount++;
+        if (CollectionUtils.isNotEmpty(requestResults)) {
+            for (RequestResult resultItem : requestResults) {
+                if (!StringUtils.startsWithAny(resultItem.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
+                    countExpectProcessResultCount++;
+                }
             }
-        }
-        LoggerUtil.info("接收到定时任务执行结果【 " + requestResults.size() + " 】");
+            LoggerUtil.info("接收到定时任务执行结果【 " + requestResults.size() + " 】");
 
-        for (RequestResult item : requestResults) {
-            if (!StringUtils.startsWithAny(item.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
-                ApiDefinitionExecResult saveResult = this.save(item, dto.getReportId(), dto.getConsole(), countExpectProcessResultCount, dto.getRunMode(), dto.getTestId(), isFirst);
-                String status = item.isSuccess() ? "success" : "error";
-                if (StringUtils.equalsAny(dto.getRunMode(), ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name())) {
-                    TestPlanApiCase apiCase = testPlanApiCaseService.getById(dto.getTestId());
-                    if (apiCase != null) {
-                        apiCase.setStatus(status);
-                        apiCase.setUpdateTime(System.currentTimeMillis());
-                        testPlanApiCaseService.updateByPrimaryKeySelective(apiCase);
+            for (RequestResult item : requestResults) {
+                if (!StringUtils.startsWithAny(item.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
+                    ApiDefinitionExecResult saveResult = this.save(item, dto.getReportId(), dto.getConsole(), countExpectProcessResultCount, dto.getRunMode(), dto.getTestId(), isFirst);
+                    String status = item.isSuccess() ? "success" : "error";
+                    if (StringUtils.equalsAny(dto.getRunMode(), ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name())) {
+                        TestPlanApiCase apiCase = testPlanApiCaseService.getById(dto.getTestId());
+                        if (apiCase != null) {
+                            apiCase.setStatus(status);
+                            apiCase.setUpdateTime(System.currentTimeMillis());
+                            testPlanApiCaseService.updateByPrimaryKeySelective(apiCase);
+                        }
+                    } else {
+                        testPlanApiCaseService.setExecResult(dto.getTestId(), status, item.getStartTime());
+                        testCaseReviewApiCaseService.setExecResult(dto.getTestId(), status, item.getStartTime());
                     }
-                } else {
-                    testPlanApiCaseService.setExecResult(dto.getTestId(), status, item.getStartTime());
-                    testCaseReviewApiCaseService.setExecResult(dto.getTestId(), status, item.getStartTime());
+                    if (StringUtils.isNotEmpty(dto.getTestId())) {
+                        apiIdResultMap.put(dto.getTestId(), item.isSuccess() ? TestPlanApiExecuteStatus.SUCCESS.name() : TestPlanApiExecuteStatus.FAILD.name());
+                    }
+                    //更新报告ID
+                    caseReportMap.put(dto.getTestId(), saveResult.getId());
+                    isFirst = false;
+                    // 串行队列
+                    SerialBlockingQueueUtil.offer(dto, SerialBlockingQueueUtil.END_SIGN);
                 }
-                if (StringUtils.isNotEmpty(dto.getTestId())) {
-                    apiIdResultMap.put(dto.getTestId(), item.isSuccess() ? TestPlanApiExecuteStatus.SUCCESS.name() : TestPlanApiExecuteStatus.FAILD.name());
-                }
-                //更新报告ID
-                caseReportMap.put(dto.getTestId(), saveResult.getId());
-                isFirst = false;
-                // 串行队列
-                SerialBlockingQueueUtil.offer(dto, SerialBlockingQueueUtil.END_SIGN);
             }
         }
         updateTestCaseStates(dto.getTestId());
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java b/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java
index 6dfd3ce48f..e030a0bea8 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java
@@ -98,7 +98,7 @@ public class ApiJmeterFileService {
             }
             hashTree = GenerateHashTreeUtil.generateHashTree(scenario, reportId, planEnvMap);
         }
-        return zipFilesToByteArray(remoteTestId, hashTree);
+        return zipFilesToByteArray((reportId + "_" + remoteTestId), hashTree);
     }
 
     public byte[] downloadJmeterJar() {
diff --git a/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue b/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
index 7ff97cecbf..0cbdb50478 100644
--- a/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
+++ b/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
@@ -39,6 +39,12 @@
                     v-on:requestResult="requestResult"
                   />
                 </el-tab-pane>
+                <el-tab-pane name="console">
+                  <template slot="label">
+                    <span class="console">{{ $t('api_test.definition.request.console') }}</span>
+                  </template>
+                  <pre>{{ content.console }}</pre>
+                </el-tab-pane>
               </el-tabs>
             </div>
             <ms-api-report-export
diff --git a/frontend/src/business/components/api/automation/scenario/Setting.js b/frontend/src/business/components/api/automation/scenario/Setting.js
index cc391bd659..5de8a57b7f 100644
--- a/frontend/src/business/components/api/automation/scenario/Setting.js
+++ b/frontend/src/business/components/api/automation/scenario/Setting.js
@@ -23,65 +23,65 @@ export function STEP() {
     ['CustomizeReq', getDefaultSamplerMenu()],
     ['MaxSamplerProxy', getDefaultSamplerMenu()],
     ['GenericController', getAll()],
-    ['AllSamplerProxy', ["HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "Sampler", "AbstractSampler","JSR223Processor"]],
-    ['DEFINITION', ["HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler"]],
-    ['AllCanExecType', ["HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "JSR223Processor", "AbstractSampler"]]]);
+    ['AllSamplerProxy', ['HTTPSamplerProxy', 'DubboSampler', 'JDBCSampler', 'TCPSampler', 'Sampler', 'AbstractSampler', 'JSR223Processor']],
+    ['DEFINITION', ['HTTPSamplerProxy', 'DubboSampler', 'JDBCSampler', 'TCPSampler']],
+    ['AllCanExecType', ['HTTPSamplerProxy', 'DubboSampler', 'JDBCSampler', 'TCPSampler', 'JSR223Processor', 'AbstractSampler']]]);
   return map
 }
 
 export const ELEMENT_TYPE = {
-  scenario: "scenario",
-  HTTPSamplerProxy: "HTTPSamplerProxy",
-  OT_IMPORT: "OT_IMPORT",
-  IfController: "IfController",
-  TransactionController: "TransactionController",
-  ConstantTimer: "ConstantTimer",
-  JSR223Processor: "JSR223Processor",
-  JSR223PreProcessor: "JSR223PreProcessor",
-  JSR223PostProcessor: "JSR223PostProcessor",
-  JDBCPostProcessor: "JDBCPostProcessor",
-  JDBCPreProcessor: "JDBCPreProcessor",
-  Assertions: "Assertions",
-  Extract: "Extract",
-  CustomizeReq: "CustomizeReq",
-  LoopController: "LoopController",
-  Plugin: "Plugin"
+  scenario: 'scenario',
+  HTTPSamplerProxy: 'HTTPSamplerProxy',
+  OT_IMPORT: 'OT_IMPORT',
+  IfController: 'IfController',
+  TransactionController: 'TransactionController',
+  ConstantTimer: 'ConstantTimer',
+  JSR223Processor: 'JSR223Processor',
+  JSR223PreProcessor: 'JSR223PreProcessor',
+  JSR223PostProcessor: 'JSR223PostProcessor',
+  JDBCPostProcessor: 'JDBCPostProcessor',
+  JDBCPreProcessor: 'JDBCPreProcessor',
+  Assertions: 'Assertions',
+  Extract: 'Extract',
+  CustomizeReq: 'CustomizeReq',
+  LoopController: 'LoopController',
+  Plugin: 'Plugin'
 }
 
 export const TYPE_TO_C = new Map([
-  ['scenario', "io.metersphere.api.dto.definition.request.MsScenario"],
-  ['HTTPSamplerProxy', "io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy"],
-  ['DubboSampler', "io.metersphere.api.dto.definition.request.sampler.MsDubboSampler"],
-  ['JDBCSampler', "io.metersphere.api.dto.definition.request.sampler.MsJDBCSampler"],
-  ['TCPSampler', "io.metersphere.api.dto.definition.request.sampler.MsTCPSampler"],
-  ['IfController', "io.metersphere.api.dto.definition.request.controller.MsIfController"],
-  ['TransactionController', "io.metersphere.api.dto.definition.request.controller.MsTransactionController"],
-  ['LoopController', "io.metersphere.api.dto.definition.request.controller.MsLoopController"],
-  ['ConstantTimer', "io.metersphere.api.dto.definition.request.timer.MsConstantTimer"],
-  ['JSR223Processor', "io.metersphere.api.dto.definition.request.processors.MsJSR223Processor"],
-  ['JSR223PreProcessor', "io.metersphere.api.dto.definition.request.processors.pre.MsJSR223PreProcessor"],
-  ['JSR223PostProcessor', "io.metersphere.api.dto.definition.request.processors.post.MsJSR223PostProcessor"],
-  ['JDBCPreProcessor', "io.metersphere.api.dto.definition.request.processors.pre.MsJDBCPreProcessor"],
-  ['JDBCPostProcessor', "io.metersphere.api.dto.definition.request.processors.post.MsJDBCPostProcessor"],
-  ['Assertions', "io.metersphere.api.dto.definition.request.assertions.MsAssertions"],
-  ['Extract', "io.metersphere.api.dto.definition.request.extract.MsExtract"],
-  ['JmeterElement', "io.metersphere.api.dto.definition.request.unknown.MsJmeterElement"],
-  ['TestPlan', "io.metersphere.api.dto.definition.request.MsTestPlan"],
-  ['ThreadGroup', "io.metersphere.api.dto.definition.request.MsThreadGroup"],
-  ['DNSCacheManager', "io.metersphere.api.dto.definition.request.dns.MsDNSCacheManager"],
-  ['DebugSampler', "io.metersphere.api.dto.definition.request.sampler.MsDebugSampler"],
-  ['AuthManager', "io.metersphere.api.dto.definition.request.auth.MsAuthManager"]
+  ['scenario', 'io.metersphere.api.dto.definition.request.MsScenario'],
+  ['HTTPSamplerProxy', 'io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy'],
+  ['DubboSampler', 'io.metersphere.api.dto.definition.request.sampler.MsDubboSampler'],
+  ['JDBCSampler', 'io.metersphere.api.dto.definition.request.sampler.MsJDBCSampler'],
+  ['TCPSampler', 'io.metersphere.api.dto.definition.request.sampler.MsTCPSampler'],
+  ['IfController', 'io.metersphere.api.dto.definition.request.controller.MsIfController'],
+  ['TransactionController', 'io.metersphere.api.dto.definition.request.controller.MsTransactionController'],
+  ['LoopController', 'io.metersphere.api.dto.definition.request.controller.MsLoopController'],
+  ['ConstantTimer', 'io.metersphere.api.dto.definition.request.timer.MsConstantTimer'],
+  ['JSR223Processor', 'io.metersphere.api.dto.definition.request.processors.MsJSR223Processor'],
+  ['JSR223PreProcessor', 'io.metersphere.api.dto.definition.request.processors.pre.MsJSR223PreProcessor'],
+  ['JSR223PostProcessor', 'io.metersphere.api.dto.definition.request.processors.post.MsJSR223PostProcessor'],
+  ['JDBCPreProcessor', 'io.metersphere.api.dto.definition.request.processors.pre.MsJDBCPreProcessor'],
+  ['JDBCPostProcessor', 'io.metersphere.api.dto.definition.request.processors.post.MsJDBCPostProcessor'],
+  ['Assertions', 'io.metersphere.api.dto.definition.request.assertions.MsAssertions'],
+  ['Extract', 'io.metersphere.api.dto.definition.request.extract.MsExtract'],
+  ['JmeterElement', 'io.metersphere.api.dto.definition.request.unknown.MsJmeterElement'],
+  ['TestPlan', 'io.metersphere.api.dto.definition.request.MsTestPlan'],
+  ['ThreadGroup', 'io.metersphere.api.dto.definition.request.MsThreadGroup'],
+  ['DNSCacheManager', 'io.metersphere.api.dto.definition.request.dns.MsDNSCacheManager'],
+  ['DebugSampler', 'io.metersphere.api.dto.definition.request.sampler.MsDebugSampler'],
+  ['AuthManager', 'io.metersphere.api.dto.definition.request.auth.MsAuthManager']
 ])
 
 export const PLUGIN_ELEMENTS = new Map([
   ['menu_post_processors', ['HtmlExtractor', 'JMESPathExtractor', 'JSONPostProcessor', 'RegexExtractor', 'BoundaryExtractor', 'JSR223PostProcessor', 'Separator', 'JDBCPostProcessor', 'XPath2Extractor', 'XPathExtractor', 'ResultAction', 'DebugPostProcessor', 'BeanShellPostProcessor']],
-  ['menu_assertions', ["Assertions", "Extract", 'Assertion', 'JSONPathAssertion', 'SizeAssertion', 'JSR223Assertion', 'XPath2Assertion', 'Separator', 'HTMLAssertion', 'JMESPathAssertion', 'MD5HexAssertion', 'SMIMEAssertion', 'XMLSchemaAssertion', 'XMLAssertion', 'XPathAssertion', 'DurationAssertion', 'CompareAssertion', 'BeanShellAssertion']],
+  ['menu_assertions', ['Assertions', 'Extract', 'Assertion', 'JSONPathAssertion', 'SizeAssertion', 'JSR223Assertion', 'XPath2Assertion', 'Separator', 'HTMLAssertion', 'JMESPathAssertion', 'MD5HexAssertion', 'SMIMEAssertion', 'XMLSchemaAssertion', 'XMLAssertion', 'XPathAssertion', 'DurationAssertion', 'CompareAssertion', 'BeanShellAssertion']],
   ['menu_listener', ['AbstractVisualizer', 'AbstractListener', 'ViewResultsFullVisualizer', 'SummaryReport', 'StatVisualizer', 'BackendListener', 'Separator', 'JSR223Listener', 'ResultSaver', 'RespTimeGraphVisualizer', 'GraphVisualizer', 'AssertionVisualizer', 'ComparisonVisualizer', 'StatGraphVisualizer', 'Summariser', 'TableVisualizer', 'SimpleDataWriter', 'MailerVisualizer', 'BeanShellListener']],
   ['menu_pre_processors', ['AbstractPostProcessor', 'JSR223PreProcessor', 'UserParameters', 'Separator', 'AnchorModifier', 'URLRewritingModifier', 'JDBCPreProcessor', 'SampleTimeout', 'RegExUserParameters', 'BeanShellPreProcessor']],
-  ['menu_logic_controller', ['GenericController', "IfController", "LoopController", 'IfControllerPanel', 'TransactionController', 'LoopControlPanel', 'WhileController', 'Separator', 'ForeachControlPanel', 'IncludeController', 'RunTime', 'CriticalSectionController', 'InterleaveControl', 'OnceOnlyController', 'RecordController', 'LogicController', 'RandomControl', 'RandomOrderController', 'ThroughputController', 'SwitchController', 'ModuleController']],
+  ['menu_logic_controller', ['GenericController', 'scenario', 'IfController', 'LoopController', 'IfControllerPanel', 'TransactionController', 'LoopControlPanel', 'WhileController', 'Separator', 'ForeachControlPanel', 'IncludeController', 'RunTime', 'CriticalSectionController', 'InterleaveControl', 'OnceOnlyController', 'RecordController', 'LogicController', 'RandomControl', 'RandomOrderController', 'ThroughputController', 'SwitchController', 'ModuleController']],
   ['menu_fragments', ['TestFragmentController']],
   ['menu_non_test_elements', ['ProxyControl', 'HttpMirrorControl', 'GenerateTree', 'PropertyControl']],
-  ['menu_generative_controller', ["HTTPSamplerProxy", "JSR223Processor", "DubboSampler", "JDBCSampler", "TCPSampler", "Sampler", 'AbstractSampler', 'CustomizeReq', 'HttpTestSample', 'TestAction', 'DebugSampler', 'JSR223Sampler', 'Separator', 'AjpSampler', 'AccessLogSampler', 'BeanShellSampler', 'BoltSampler', 'FtpTestSampler', 'GraphQLHTTPSampler', 'JDBCSampler', 'JMSPublisher', 'JMSSampler', 'JMSSubscriber', 'JUnitTestSampler', 'JavaTestSampler', 'LdapExtTestSampler', 'LdapTestSampler', 'SystemSampler', 'SmtpSampler', 'TCPSampler', 'MailReaderSampler']],
+  ['menu_generative_controller', ['HTTPSamplerProxy', 'JSR223Processor', 'DubboSampler', 'JDBCSampler', 'TCPSampler', 'Sampler', 'AbstractSampler', 'CustomizeReq', 'HttpTestSample', 'TestAction', 'DebugSampler', 'JSR223Sampler', 'Separator', 'AjpSampler', 'AccessLogSampler', 'BeanShellSampler', 'BoltSampler', 'FtpTestSampler', 'GraphQLHTTPSampler', 'JDBCSampler', 'JMSPublisher', 'JMSSampler', 'JMSSubscriber', 'JUnitTestSampler', 'JavaTestSampler', 'LdapExtTestSampler', 'LdapTestSampler', 'SystemSampler', 'SmtpSampler', 'TCPSampler', 'MailReaderSampler']],
   ['menu_threads', ['SetupThreadGroup', 'PostThreadGroup', 'ThreadGroup']],
   ['menu_timer', ['ConstantTimer', 'UniformRandomTimer', 'PreciseThroughputTimer', 'ConstantThroughputTimer', 'Separator', 'JSR223Timer', 'SyncTimer', 'PoissonRandomTimer', 'GaussianRandomTimer', 'BeanShellTimer']],
   ['menu_config_element', ['CSVDataSet', 'HeaderPanel', 'CookiePanel', 'CacheManager', 'HttpDefaults', 'Separator', 'BoltConnectionElement', 'DNSCachePanel', 'FtpConfig', 'AuthPanel', 'DataSourceElement', 'JavaConfig', 'LdapExtConfig', 'LdapConfig', 'TCPConfig', 'KeystoreConfig', 'ArgumentsPanel', 'LoginConfig', 'SimpleConfig', 'CounterConfig', 'RandomVariableConfig']],
@@ -102,7 +102,7 @@ export function init() {
   let allArray = [];
   allArray = allArray.concat(PLUGIN_ELEMENTS.get('menu_generative_controller'));
   allArray = allArray.concat(PLUGIN_ELEMENTS.get('menu_logic_controller'));
-  allArray = allArray.concat(["scenario", "ConstantTimer", "JSR223Processor"]);
+  allArray = allArray.concat(['scenario', 'ConstantTimer', 'JSR223Processor']);
   return allArray;
 }
 
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue
index 54de3f1c40..af4932d3c4 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue
@@ -2,27 +2,23 @@
   <el-header style="width: 100% ;padding: 0px">
     <el-card>
       <el-row>
-        <el-col :span="api.protocol==='HTTP'? 7:9">
-          <el-tooltip :content="api.name">
-            <span class="ms-col-name"> {{api.name}}</span>
-          </el-tooltip>
-        </el-col>
-        <el-col :span="api.protocol==='HTTP'? 6:8">
+        <el-col :span="1">
           <el-tag size="mini" :style="{'background-color': getColor(true, api.method), border: getColor(true, api.method)}" class="api-el-tag">
-            {{ api.method}}
+            {{ api.method }}
           </el-tag>
         </el-col>
-        <el-col :span="api.protocol==='HTTP'? 4:0">
-          <div class="variable-combine" style="margin-left: 10px">{{api.path ===null ? " " : api.path}}</div>
+        <el-col :span="9">
+          <div class="variable-combine"> {{ api.name }}</div>
+        </el-col>
+        <el-col :span="9">
+          <div class="variable-combine" style="margin-left: 10px">{{ api.path === null ? " " : api.path }}</div>
         </el-col>
         <el-col :span="5">
-          <div>
-            <ms-environment-select
-              :project-id="projectId"
-              :is-read-only="isReadOnly"
-              :useEnvironment='useEnvironment'
-              @setEnvironment="setEnvironment" ref="environmentSelect"/>
-          </div>
+          <ms-environment-select
+            :project-id="projectId"
+            :is-read-only="isReadOnly"
+            :useEnvironment='useEnvironment'
+            @setEnvironment="setEnvironment" ref="environmentSelect"/>
         </el-col>
       </el-row>
     </el-card>
@@ -31,112 +27,113 @@
 
 <script>
 
-  import ApiEnvironmentConfig from "../../../test/components/ApiEnvironmentConfig";
-  import MsTag from "../../../../common/components/MsTag";
-  import MsEnvironmentSelect from "./MsEnvironmentSelect";
-  import {API_METHOD_COLOUR} from "../../model/JsonData";
-  export default {
-    name: "ApiCaseHeader",
-    components: {MsEnvironmentSelect, MsTag, ApiEnvironmentConfig},
-    data() {
-      return {
-        methodColorMap: new Map(API_METHOD_COLOUR),
-      }
-    },
-    props: {
-      api: Object,
-      projectId: String,
-      priorities: Array,
-      isReadOnly: Boolean,
-      useEnvironment: String,
-      isCaseEdit: Boolean,
-      condition: {
-        type: Object,
-        default() {
-          return {}
-        },
-      }
-    },
-    created() {
-    },
-    methods: {
-      refreshEnvironment(){
-        this.$refs.environmentSelect.refreshEnvironment();
-      },
-      setEnvironment(data) {
-        if(data){
-          this.$emit('setEnvironment', data.id);
-        }
-      },
-      open() {
-        this.$refs.searchBar.open();
-      },
-      addCase() {
-        this.$emit('addCase');
-        this.refreshEnvironment();
-      },
-      getColor(enable, method) {
-        if (enable) {
-          return this.methodColorMap.get(method);
-        }
+import ApiEnvironmentConfig from "../../../test/components/ApiEnvironmentConfig";
+import MsTag from "../../../../common/components/MsTag";
+import MsEnvironmentSelect from "./MsEnvironmentSelect";
+import {API_METHOD_COLOUR} from "../../model/JsonData";
+
+export default {
+  name: "ApiCaseHeader",
+  components: {MsEnvironmentSelect, MsTag, ApiEnvironmentConfig},
+  data() {
+    return {
+      methodColorMap: new Map(API_METHOD_COLOUR),
+    }
+  },
+  props: {
+    api: Object,
+    projectId: String,
+    priorities: Array,
+    isReadOnly: Boolean,
+    useEnvironment: String,
+    isCaseEdit: Boolean,
+    condition: {
+      type: Object,
+      default() {
+        return {}
       },
     }
+  },
+  created() {
+  },
+  methods: {
+    refreshEnvironment() {
+      this.$refs.environmentSelect.refreshEnvironment();
+    },
+    setEnvironment(data) {
+      if (data) {
+        this.$emit('setEnvironment', data.id);
+      }
+    },
+    open() {
+      this.$refs.searchBar.open();
+    },
+    addCase() {
+      this.$emit('addCase');
+      this.refreshEnvironment();
+    },
+    getColor(enable, method) {
+      if (enable) {
+        return this.methodColorMap.get(method);
+      }
+    },
   }
+}
 </script>
 
 <style scoped>
 
-  .el-card-btn {
-    float: right;
-    top: 20px;
-    right: 0px;
-    padding: 0;
-    background: 0 0;
-    border: none;
-    outline: 0;
-    cursor: pointer;
-    font-size: 18px;
-    margin-left: 30px;
-  }
+.el-card-btn {
+  float: right;
+  top: 20px;
+  right: 0px;
+  padding: 0;
+  background: 0 0;
+  border: none;
+  outline: 0;
+  cursor: pointer;
+  font-size: 18px;
+  margin-left: 30px;
+}
 
-  .variable-combine {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    font-size: 10px;
-  }
+.variable-combine {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: 10px;
+}
 
-  .el-col {
-    height: 32px;
-    line-height: 32px;
-  }
+.el-col {
+  height: 32px;
+  line-height: 32px;
+}
 
-  .ms-api-header-select {
-    margin-left: 20px;
-    min-width: 100px;
-  }
+.ms-api-header-select {
+  margin-left: 20px;
+  min-width: 100px;
+}
 
-  .el-col {
-    height: 32px;
-    line-height: 32px;
-  }
+.el-col {
+  height: 32px;
+  line-height: 32px;
+}
 
-  .api-el-tag {
-    color: white;
-  }
+.api-el-tag {
+  color: white;
+}
 
-  .select-all {
-    margin-right: 10px;
-  }
+.select-all {
+  margin-right: 10px;
+}
 
-  .ms-col-name {
-    display: inline-block;
-    margin: 0 5px;
-    overflow-x: hidden;
-    padding-bottom: 0;
-    text-overflow: ellipsis;
-    vertical-align: middle;
-    white-space: nowrap;
-    width: 100px;
-  }
+.ms-col-name {
+  display: inline-block;
+  margin: 0 5px;
+  overflow-x: hidden;
+  padding-bottom: 0;
+  text-overflow: ellipsis;
+  vertical-align: middle;
+  white-space: nowrap;
+  width: 100px;
+}
 </style>

From b18cec18e1a1bbe25f3cf4a13307ddff82ea291d Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 17 Dec 2021 15:45:04 +0800
Subject: [PATCH 168/256] =?UTF-8?q?fix(=E4=BB=BB=E5=8A=A1=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83):=20=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008937 --user=王孝刚 【国际化】-任务中心-未翻译问题汇总
https://www.tapd.cn/55049933/s/1082364
---
 .../java/io/metersphere/api/service/MockConfigService.java | 4 ++--
 backend/src/main/resources/i18n/messages_en_US.properties  | 3 ++-
 backend/src/main/resources/i18n/messages_zh_CN.properties  | 2 ++
 backend/src/main/resources/i18n/messages_zh_TW.properties  | 2 ++
 .../components/api/automation/report/ApiReportList.vue     | 2 +-
 frontend/src/business/components/task/TaskCenter.vue       | 6 +++---
 frontend/src/i18n/en-US.js                                 | 5 ++++-
 frontend/src/i18n/zh-CN.js                                 | 3 +++
 frontend/src/i18n/zh-TW.js                                 | 7 +++++--
 9 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/MockConfigService.java b/backend/src/main/java/io/metersphere/api/service/MockConfigService.java
index 4bcf49b976..ab46220191 100644
--- a/backend/src/main/java/io/metersphere/api/service/MockConfigService.java
+++ b/backend/src/main/java/io/metersphere/api/service/MockConfigService.java
@@ -1202,7 +1202,7 @@ public class MockConfigService {
 
         if (!isMatch) {
             response.setStatus(404);
-            returnStr = "未找到匹配的Mock期望!";
+            returnStr = Translator.get("mock_warning");
         }
         return returnStr;
     }
@@ -1244,7 +1244,7 @@ public class MockConfigService {
 
         if (!isMatch) {
             response.setStatus(404);
-            returnStr = "未找到匹配的Mock期望!";
+            returnStr = Translator.get("mock_warning");
         }
         return returnStr;
     }
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index 8fe2bc555c..5a41eeb6fc 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -281,5 +281,6 @@ performance_case=PERFORMANCE
 scenario_case=SCENARIO
 create_user=Create user
 test_case_status=Case status
-
 id_not_rightful=ID is not rightful
+# mock
+mock_warning=No matching Mock expectation was found
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index 594b68af75..5f24c862cb 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -281,3 +281,5 @@ test_case_status_saved=已保存
 create_user=创建人
 test_case_status=用例状态
 id_not_rightful=ID 不合法
+# mock
+mock_warning=未找到匹配的Mock期望
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index b9f3b23a5c..8e22d67225 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -282,3 +282,5 @@ test_case_status_saved=已保存
 create_user=創建人
 test_case_status=用例狀態
 id_not_rightful=ID 不合法
+# mock
+mock_warning=未找到匹配的Mock期望
diff --git a/frontend/src/business/components/api/automation/report/ApiReportList.vue b/frontend/src/business/components/api/automation/report/ApiReportList.vue
index 4fb89c617e..48754cd82f 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportList.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportList.vue
@@ -166,7 +166,7 @@ export default {
     handleView(report) {
       this.reportId = report.id;
       if (report.status === 'Running') {
-        this.$warning("正在运行中，请稍后查看")
+        this.$warning(this.$t('commons.run_warning'))
         return;
       }
       this.currentProjectId = report.projectId;
diff --git a/frontend/src/business/components/task/TaskCenter.vue b/frontend/src/business/components/task/TaskCenter.vue
index aca580ebe4..a910835b7f 100644
--- a/frontend/src/business/components/task/TaskCenter.vue
+++ b/frontend/src/business/components/task/TaskCenter.vue
@@ -33,7 +33,7 @@
       :size="size.toString()"
       custom-class="ms-drawer-task">
       <el-card style="float: left;width: 850px" v-if="size > 550 ">
-        <div class="ms-task-opt-btn" @click="packUp">收起</div>
+        <div class="ms-task-opt-btn" @click="packUp">{{ this.$t('') }}</div>
         <!-- 接口用例结果 -->
         <ms-request-result-tail :response="response" ref="debugResult" v-if="reportType === 'API'"/>
 
@@ -349,9 +349,9 @@ export default {
             this.getExecResult(row.id);
           }
         } else if (status === 'stop') {
-          this.$warning("当前任务已停止，无法查看报告");
+          this.$warning(this.$t('commons.run_stop'));
         } else {
-          this.$warning("正在运行中，请稍后查看");
+          this.$warning(this.$t('commons.run_warning'))
         }
       }
     },
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 287fad2836..0c902b0e0f 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -188,6 +188,7 @@ export default {
     api_case: "Api Case",
     scenario_case: "Scenario Case",
     task_center: "Task center",
+    task_close: "Put away",
     notice_center: "Notice center",
     notice_count: 'Messages',
     notice_tips: 'Only display the news within the last 3 months',
@@ -205,7 +206,9 @@ export default {
     run_success: "Run Success",
     run_completed: "Run Completed",
     run_fail: "Run Fail",
-    follow_success:"Follow Success",
+    run_warning: "Is running, please check later",
+    run_stop: "當前任務已停止，無法查看報告",
+    follow_success: "Follow Success",
     cancel_follow_success: "Cancel Follow Success",
     generate_test_data: "Generate test data",
     type: "Type",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index b3447038b6..8d911d83ae 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -189,6 +189,7 @@ export default {
     api_case: "接口用例",
     scenario_case: "场景用例",
     task_center: "任务中心",
+    task_close: "收起",
     notice_center: "消息中心",
     notice_count: '条消息',
     notice_tips: '仅显示最近3个月的站内消息',
@@ -205,6 +206,8 @@ export default {
     environment: "运行环境",
     run_success: "执行成功",
     run_completed: "执行完成",
+    run_warning: "正在运行中，请稍后查看",
+    run_stop: "The current task has been stopped and the report cannot be viewed",
     run_fail: "执行失败",
     follow_success: "关注成功",
     cancel_follow_success: "取消关注成功",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index dfe34fb5e9..e2a9b56d8c 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -189,6 +189,7 @@ export default {
     api_case: "接口用例",
     scenario_case: "場景用例",
     task_center: "任務中心",
+    task_close: "收起",
     notice_center: "消息中心",
     notice_count: '條消息',
     notice_tips: '僅顯示最近3個月的站內消息',
@@ -205,9 +206,11 @@ export default {
     environment: "運行環境",
     run_success: "執行成功",
     run_completed: "執行完成",
+    run_warning: "正在運行中，請稍後查看",
+    run_stop: "當前任務已停止，無法查看報告",
     run_fail: "執行失敗",
-    follow_success:"關註成功",
-    cancel_follow_success:"取消關註成功",
+    follow_success: "關註成功",
+    cancel_follow_success: "取消關註成功",
     type: "類型",
     relationship: {
       name: '依賴關系',

From 1ae3ebdfeb0488f73c67ae9c249e0ba9a29ae7ae Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 17 Dec 2021 15:58:47 +0800
Subject: [PATCH 169/256] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E7=9B=B8=E5=85=B3=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/components/MsTabButton.vue         | 8 +++++---
 frontend/src/business/components/common/head/AboutUs.vue | 2 +-
 .../components/settings/personal/TapdUserInfo.vue        | 9 ++++-----
 frontend/src/business/components/track/case/TestCase.vue | 4 ----
 .../components/track/case/components/TestCaseList.vue    | 2 +-
 frontend/src/i18n/en-US.js                               | 3 ++-
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsTabButton.vue b/frontend/src/business/components/common/components/MsTabButton.vue
index 2683d05c4c..f0c9c2c17b 100644
--- a/frontend/src/business/components/common/components/MsTabButton.vue
+++ b/frontend/src/business/components/common/components/MsTabButton.vue
@@ -4,15 +4,15 @@
     <el-button-group v-if="isShowChangeButton">
 
       <el-tooltip v-if="leftButtonEnable" class="item" effect="dark" :content="leftTip" placement="left">
-        <el-button plain style="height: 32px;padding: 5px 8px;"  :class="{active: leftActive}" @click="changeTab('left')">{{leftContent}}</el-button>
+        <el-button plain :class="{active: leftActive}" @click="changeTab('left')">{{leftContent}}</el-button>
       </el-tooltip>
 
       <el-tooltip v-if="middleButtonEnable" class="item" effect="dark" :content="middleTip" placement="top">
-        <el-button plain style="height: 32px;padding: 1px;"  :class="{active: middleActive}" @click="changeTab('middle')">{{middleContent}}</el-button>
+        <el-button plain :class="{active: middleActive}" @click="changeTab('middle')">{{middleContent}}</el-button>
       </el-tooltip>
 
       <el-tooltip v-if="rightButtonEnable" class="item" effect="dark" :content="rightTip" placement="right">
-        <el-button plain  style="height: 32px;padding: 1px;"  :class="{active: rightActive}" @click="changeTab('right')">
+        <el-button plain :class="{active: rightActive}" @click="changeTab('right')">
           {{rightContent}}
         </el-button>
       </el-tooltip>
@@ -112,6 +112,8 @@ export default {
 }
 
 .item{
+  height: 32px;
+  padding: 5px 8px;
   border: solid 1px var(--primary_color);
 }
 
diff --git a/frontend/src/business/components/common/head/AboutUs.vue b/frontend/src/business/components/common/head/AboutUs.vue
index 29172a6eca..7071882bc7 100644
--- a/frontend/src/business/components/common/head/AboutUs.vue
+++ b/frontend/src/business/components/common/head/AboutUs.vue
@@ -29,7 +29,7 @@
 
     <el-row>
       <el-col class="version">
-        <span>版本:</span> &nbsp;
+        <span>{{ $t('commons.version') }}:</span> &nbsp;
         <span>{{version}}</span>
       </el-col>
     </el-row>
diff --git a/frontend/src/business/components/settings/personal/TapdUserInfo.vue b/frontend/src/business/components/settings/personal/TapdUserInfo.vue
index e891ce4235..082e721eee 100644
--- a/frontend/src/business/components/settings/personal/TapdUserInfo.vue
+++ b/frontend/src/business/components/settings/personal/TapdUserInfo.vue
@@ -10,11 +10,6 @@
     <el-form-item :label="'Tapd '+ $t('commons.nick_name')" prop="account">
       <el-input v-model="data.tapdUserName" :placeholder="$t('organization.integration.input_api_account')"/>
     </el-form-item>
-<!--    <el-form-item >-->
-<!--      <el-button type="primary" style="float: right" @click="$emit('auth', 'Tapd')" size="mini">-->
-<!--        {{$t('commons.validate')}}-->
-<!--      </el-button>-->
-<!--    </el-form-item>-->
   </el-form>
 </template>
 
@@ -31,4 +26,8 @@ export default {
 .instructions-icon {
   margin-left: -5px;
 }
+
+.el-form {
+  margin-bottom: 45px;
+}
 </style>
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index 3516472803..2f28e099e5 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -555,10 +555,6 @@ export default {
   padding: 5px 10px;
 }
 
-/deep/ .el-button-group > .el-button:first-child {
-  padding: 4px 1px !important;
-}
-
 /deep/ .el-tabs__header {
   margin: 0 0 0px;
   /*width: calc(100% - 90px);*/
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 4cce3f83d9..63ab4d96f3 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -176,7 +176,7 @@
                          :field="item"
                          :fields-width="fieldsWidth"
                          :label="field.system ? $t(systemFiledMap[field.name]) :field.name"
-                         :min-width="90"
+                         :min-width="120"
                          :prop="field.name">
           <template v-slot="scope">
             <span v-if="field.name === '用例等级'">
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 0c902b0e0f..1679faa92c 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -31,7 +31,8 @@ export default {
     close_schedule: 'Close Schedule',
     review_complete: 'Review Completed',
     examples: 'examples',
-    help_documentation: 'Help documentation',
+    help_documentation: 'Help',
+    api_help_documentation: 'API',
     confirm_delete: 'Whether to delete',
     delete_cancelled: 'Delete cancelled',
     option_cannot_spread_pages: 'This options not support spread pages.Do you want continue?',

From 406482ca41b2a94638424c8a0afb4d89180b8c0b Mon Sep 17 00:00:00 2001
From: junhong <junhong.zhou@fit2cloud.com>
Date: Thu, 16 Dec 2021 00:12:45 +0800
Subject: [PATCH 170/256] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E5=86=85=E7=BD=AE=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E6=9E=84=E9=80=A0=E5=99=A8=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20mock=20=E6=95=B0=E6=8D=AE=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E7=A4=BA=E4=BE=8B=E5=8F=8A=E5=9C=BA=E6=99=AF=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1004200 --user=周骏弘 内置函数构造器优化 https://www.tapd.cn/55049933/s/1082243
---
 .../automation/scenario/EditApiScenario.vue   |   2 +
 .../api/definition/components/ApiKeyValue.vue |   2 +-
 .../components/ApiVariableAdvance.vue         | 130 +++++++++++++++++-
 frontend/src/common/js/constants.js           | 104 +++++++-------
 frontend/src/i18n/en-US.js                    |  51 +++++++
 frontend/src/i18n/zh-CN.js                    |  51 +++++++
 frontend/src/i18n/zh-TW.js                    |  51 +++++++
 7 files changed, 334 insertions(+), 57 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 26518e0f15..ea97fc7114 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -1371,6 +1371,8 @@ export default {
             this.resetResourceId(this.scenarioDefinition);
           }
           this.$store.state.scenarioMap.set(this.currentScenario.id, 0);
+          // 让接口自动化参数设置的地方，可以拿到场景变量
+          this.$store.state.scenarioMap.set("currentScenarioId", this.currentScenario.variables);
         })
       }
     },
diff --git a/frontend/src/business/components/api/definition/components/ApiKeyValue.vue b/frontend/src/business/components/api/definition/components/ApiKeyValue.vue
index d11195909d..264137814d 100644
--- a/frontend/src/business/components/api/definition/components/ApiKeyValue.vue
+++ b/frontend/src/business/components/api/definition/components/ApiKeyValue.vue
@@ -223,7 +223,7 @@
     },
     created() {
       if (this.items.length === 0 || this.items[this.items.length - 1].name) {
-        this.items.push(new KeyValue({enable: true}));
+        this.items.push(new KeyValue({enable: true, name: '', value: ''}));
       }
     }
   }
diff --git a/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue b/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue
index 0dcc06784d..baf1a35020 100644
--- a/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue
+++ b/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue
@@ -3,11 +3,13 @@
              :visible.sync="itemValueVisible"
              :append-to-body="appendToBody"
              class="advanced-item-value"
-             width="70%">
+             width="100%"
+             :fullscreen="dialogVisible">
+
     <el-tabs tab-position="top" style="height: 50vh;" @tab-click="selectTab">
       <el-tab-pane :label="$t('api_test.request.parameters_advance_mock')">
         <el-row type="flex" :gutter="20">
-          <el-col :span="6" class="col-height">
+          <el-col :span="10" class="col-height">
             <div>
               <el-input size="small" v-model="filterText"
                         :placeholder="$t('api_test.request.parameters_mock_filter_tips')"/>
@@ -34,6 +36,52 @@
           </el-col>
         </el-row>
       </el-tab-pane>
+
+      <!--场景自定义变量-->
+      <el-tab-pane :label="$t('api_test.automation.scenario_total')" name="variable">
+        <div>
+          <el-row style="margin-bottom: 10px">
+            <div style="float: left">
+              <el-input :placeholder="$t('commons.search_by_name')" v-model="defineVariable" size="small"
+                        @change="filter"
+                        @keyup.enter="filter">
+                <el-select v-model="searchType" slot="prepend" :placeholder="$t('test_resource_pool.type')"
+                           style="width: 90px" @change="filter">
+                  <el-option value="CONSTANT" :label="$t('api_test.automation.constant')"></el-option>
+                  <el-option value="LIST" :label="$t('test_track.case.list')"></el-option>
+                  <el-option value="CSV" label="CSV"></el-option>
+                  <el-option value="COUNTER" :label="$t('api_test.automation.counter')"></el-option>
+                  <el-option value="RANDOM" :label="$t('api_test.automation.random')"></el-option>
+                </el-select>
+              </el-input>
+            </div>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div style="border:1px #DCDFE6 solid; min-height: 325px;border-radius: 4px ;width: 100% ;">
+                <el-table ref="table" border :data="variables" class="adjust-table"
+                          :row-class-name="tableRowClassName"
+                          @select-all="select"
+                          @select="select"
+                          @row-click="edit"
+                          v-loading="loading" height="325px">
+                  <el-table-column type="selection" width="38"/>
+                  <el-table-column prop="num" label="ID" sortable width="60"/>
+                  <el-table-column prop="name" :label="$t('api_test.variable_name')" sortable
+                                   show-overflow-tooltip/>
+                  <el-table-column prop="type" :label="$t('test_track.case.type')" width="70">
+                    <template v-slot:default="scope">
+                      <span>{{ types.get(scope.row.type) }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="value" :label="$t('api_test.value')" show-overflow-tooltip/>
+                </el-table>
+              </div>
+            </el-col>
+          </el-row>
+        </div>
+      </el-tab-pane>
+
       <el-tab-pane :label="$t('api_test.variable')">
         <el-row>
           <el-col :span="6" class="col-height">
@@ -62,6 +110,12 @@
           </el-col>
         </el-row>
       </el-tab-pane>
+
+
+
+
+
+
     </el-tabs>
     <el-form>
       <el-form-item>
@@ -93,6 +147,8 @@
 <script>
   import {calculate, Scenario} from "../model/ApiTestModel";
   import {JMETER_FUNC, MOCKJS_FUNC} from "@/common/js/constants";
+  import {buttons} from "../../automation/scenario/menu/Menu";
+  import {ENV_TYPE} from "@/common/js/constants";
 
   export default {
     name: "MsApiVariableAdvance",
@@ -144,11 +200,26 @@
           {name: "number"}
         ],
         mockFuncs: MOCKJS_FUNC.map(f => {
-          return {name: f.name, value: f.name}
+          return {name: f.name + " " + f.des + " " + this.$t('api_test.request.parameters_filter_example') + "：" + f.ex, value: f.name}
         }),
         jmeterFuncs: JMETER_FUNC,
         mockVariableFuncs: [],
         jmeterVariableFuncs: [],
+        dialogVisible: true,
+
+        // 自定义变量相关
+        defineVariable: "",
+        searchType: "",
+        variables: [],
+        selection: [],
+        loading: false,
+        types: new Map([
+          ['CONSTANT', this.$t('api_test.automation.constant')],
+          ['LIST', this.$t('test_track.case.list')],
+          ['CSV', 'CSV'],
+          ['COUNTER', this.$t('api_test.automation.counter')],
+          ['RANDOM', this.$t('api_test.automation.random')]
+        ])
       }
     },
     computed: {
@@ -162,11 +233,15 @@
     watch: {
       filterText(val) {
         this.$refs.tree.filter(val);
-      },
+      }
     },
     methods: {
       open() {
         this.itemValueVisible = true;
+        if(this.$store.state.scenarioMap.get != undefined
+          && this.$store.state.scenarioMap.get("currentScenarioId") != undefined){
+          this.variables = this.$store.state.scenarioMap.get("currentScenarioId");
+        }
       },
       prepareData() {
         if (this.scenario) {
@@ -278,7 +353,9 @@
         this.mockVariableFuncs.push({name: '', params: []});
       },
       saveAdvanced() {
-        if(this.itemValue.indexOf('@') == -1){
+        if(this.itemValue != null && this.itemValue != undefined
+          && this.itemValue.indexOf('@') == -1
+          && this.itemValue.indexOf('$') == -1){
           this.currentItem.value = '@' + this.itemValue;
         } else {
           this.currentItem.value = this.itemValue;
@@ -286,6 +363,49 @@
         this.itemValueVisible = false;
         this.mockVariableFuncs = [];
         this.$emit('advancedRefresh', this.itemValue);
+      },
+
+      // 自定义变量
+      filter() {
+        let datas = [];
+        this.variables.forEach(item => {
+          if (this.searchType && this.searchType != "" && this.defineVariable && this.defineVariable != "") {
+            if ((item.type && item.type.toLowerCase().indexOf(this.searchType.toLowerCase()) == -1) || (item.name && item.name.toLowerCase().indexOf(this.defineVariable.toLowerCase()) == -1)) {
+              item.hidden = true;
+            } else {
+              item.hidden = undefined;
+            }
+          } else if (this.defineVariable && this.defineVariable != "") {
+            if (item.name && item.name.toLowerCase().indexOf(this.defineVariable.toLowerCase()) == -1) {
+              item.hidden = true;
+            } else {
+              item.hidden = undefined;
+            }
+          } else if (this.searchType && this.searchType != "") {
+            if (item.type && item.type.toLowerCase().indexOf(this.searchType.toLowerCase()) == -1) {
+              item.hidden = true;
+            } else {
+              item.hidden = undefined;
+            }
+          } else {
+            item.hidden = undefined;
+          }
+          datas.push(item);
+        });
+        this.variables = datas;
+      },
+      tableRowClassName(row) {
+        if (row.row.hidden) {
+          return 'ms-variable-hidden-row';
+        }
+        return '';
+      },
+      select(selection) {
+        this.selection = selection.map(s => s.id);
+      },
+      edit(row) {
+        this.selection = [row.id];
+        this.itemValue = '${' + row.name + '}';
       }
     }
   }
diff --git a/frontend/src/common/js/constants.js b/frontend/src/common/js/constants.js
index 626fea123f..433e11fcf7 100644
--- a/frontend/src/common/js/constants.js
+++ b/frontend/src/common/js/constants.js
@@ -1,3 +1,5 @@
+import i18n from "@/i18n/i18n";
+
 export const TEST_CASE_LIST = 'test_case_list'
 export const TEST_CASE_REVIEW_LIST = 'test_case_review_list'
 export const API_LIST = 'api_list'
@@ -85,57 +87,57 @@ export const REQUEST_HEADERS = [
 ]
 
 export const MOCKJS_FUNC = [
-  {name: '@boolean'},
-  {name: '@natural'},
-  {name: '@integer'},
-  {name: '@float'},
-  {name: '@character'},
-  {name: '@string'},
-  {name: '@range'},
-  {name: '@date'},
-  {name: '@time'},
-  {name: '@datetime'},
-  {name: '@now'},
-  {name: '@img'},
-  {name: '@dataImage'},
-  {name: '@color'},
-  {name: '@hex'},
-  {name: '@rgb'},
-  {name: '@rgba'},
-  {name: '@hsl'},
-  {name: '@paragraph'},
-  {name: '@sentence'},
-  {name: '@word'},
-  {name: '@title'},
-  {name: '@cparagraph'},
-  {name: '@csentence'},
-  {name: '@cword'},
-  {name: '@ctitle'},
-  {name: '@first'},
-  {name: '@last'},
-  {name: '@name'},
-  {name: '@cfirst'},
-  {name: '@clast'},
-  {name: '@cname'},
-  {name: '@url'},
-  {name: '@domain'},
-  {name: '@protocol'},
-  {name: '@tld'},
-  {name: '@email'},
-  {name: '@ip'},
-  {name: '@region'},
-  {name: '@province'},
-  {name: '@city'},
-  {name: '@county'},
-  {name: '@zip'},
-  {name: '@capitalize'},
-  {name: '@upper'},
-  {name: '@lower'},
-  {name: '@pick'},
-  {name: '@shuffle'},
-  {name: '@guid'},
-  {name: '@id'},
-  {name: '@increment'}
+  {name: '@boolean', des: i18n.t('api_test.request.boolean'), ex: true},
+  {name: '@natural', des: i18n.t('api_test.request.natural'), ex: 72834},
+  {name: '@integer', des: i18n.t('api_test.request.integer'), ex: 79750},
+  {name: '@float', des: i18n.t('api_test.request.float'), ex: 24.2},
+  {name: '@character', des: i18n.t('api_test.request.character'), ex: "k"},
+  {name: '@string', des: i18n.t('api_test.request.string'), ex: "hello"},
+  {name: '@range', des: i18n.t('api_test.request.range'), ex: "org.mozilla.javascript.NavicatArray@1739f809"},
+  {name: '@date', des: i18n.t('api_test.request.date'), ex: "1973-01-08"},
+  {name: '@time', des: i18n.t('api_test.request.time'), ex: "06:15:27"},
+  {name: '@datetime', des: i18n.t('api_test.request.datetime'), ex: "1975-10-12 02:32:04"},
+  {name: '@now', des: i18n.t('api_test.request.now'), ex: (new Date()).toLocaleTimeString().toLocaleString()},
+  {name: '@img', des: i18n.t('api_test.request.img'), ex: "http://dummyimage.com/120x60"},
+  {name: '@dataImage', des: i18n.t('api_test.request.dataImage'), ex: "data:image/png;base64,iVBORw0KG=="},
+  {name: '@color', des: i18n.t('api_test.request.color'), ex: "#b479f2"},
+  {name: '@hex', des: i18n.t('api_test.request.hex'), ex: "#f27984"},
+  {name: '@rgb', des: i18n.t('api_test.request.rgb'), ex: "rgb(203, 242, 121)"},
+  {name: '@rgba', des: i18n.t('api_test.request.rgba'), ex: "rgba(242, 121, 238, 0.66)"},
+  {name: '@hsl', des: i18n.t('api_test.request.hsl'), ex: "hsl(164, 82, 71)"},
+  {name: '@paragraph', des: i18n.t('api_test.request.paragraph'), ex: "Iwvh qxuvn uigzjw xijvntv dfidxtof"},
+  {name: '@sentence', des: i18n.t('api_test.request.sentence'), ex: "Hfi fpqnqerrs sghxldx oqpghvnmy"},
+  {name: '@word', des: i18n.t('api_test.request.word'), ex: "shnjlyazvi"},
+  {name: '@title', des: i18n.t('api_test.request.title'), ex: "Tefsdc Vhs Ujx"},
+  {name: '@cparagraph', des: i18n.t('api_test.request.cparagraph'), ex: "色青元处才不米拉律消叫别金如上。"},
+  {name: '@csentence', des: i18n.t('api_test.request.csentence'), ex: "与形府部速她运改织图集料进完。"},
+  {name: '@cword', des: i18n.t('api_test.request.cword'), ex: "满"},
+  {name: '@ctitle', des: i18n.t('api_test.request.ctitle'), ex: "运满前省快"},
+  {name: '@first', des: i18n.t('api_test.request.first'), ex: "Mary"},
+  {name: '@last', des: i18n.t('api_test.request.last'), ex: "Miller"},
+  {name: '@name', des: i18n.t('api_test.request.name'), ex: "Robert Lee"},
+  {name: '@cfirst', des: i18n.t('api_test.request.cfirst'), ex: "龚"},
+  {name: '@clast', des: i18n.t('api_test.request.clast'), ex: "刚"},
+  {name: '@cname', des: i18n.t('api_test.request.cname'), ex: "江娟"},
+  {name: '@url', des: i18n.t('api_test.request.url'), ex: "wais://jopnwwj.bh/lqnhn"},
+  {name: '@domain', des: i18n.t('api_test.request.domain'), ex: "rsh.bt"},
+  {name: '@protocol', des: i18n.t('api_test.request.protocol'), ex: "rlogin"},
+  {name: '@tld', des: i18n.t('api_test.request.tld'), ex: "sa"},
+  {name: '@email', des: i18n.t('api_test.request.email'), ex: "d.somdg@edntlm.cd"},
+  {name: '@ip', des: i18n.t('api_test.request.ip'), ex: "22.151.93.255"},
+  {name: '@region', des: i18n.t('api_test.request.region'), ex: "东北"},
+  {name: '@province', des: i18n.t('api_test.request.province'), ex: "陕西省"},
+  {name: '@city', des: i18n.t('api_test.request.city'), ex: "珠海市"},
+  {name: '@county', des: i18n.t('api_test.request.county'), ex: "正宁县"},
+  {name: '@zip', des: i18n.t('api_test.request.zip'), ex: 873247},
+  {name: '@capitalize', des: i18n.t('api_test.request.capitalize'), ex: "Undefined"},
+  {name: '@upper', des: i18n.t('api_test.request.upper'), ex: "UNDEFINED"},
+  {name: '@lower', des: i18n.t('api_test.request.lower'), ex: "undefined"},
+  {name: '@pick', des: i18n.t('api_test.request.pick'), ex: "None example"},
+  {name: '@shuffle', des: i18n.t('api_test.request.shuffle'), ex: "org.mozilla.javascript.NavicatArray@2264545d"},
+  {name: '@guid', des: i18n.t('api_test.request.guid'), ex: "4f9CeC2c-8d59-40f6-ec4F-2Abbc5C94Ddf"},
+  {name: '@id', des: i18n.t('api_test.request.id'), ex: "450000197511051762"},
+  {name: '@increment', des: i18n.t('api_test.request.increment'), ex: 1}
 ]
 
 export const JMETER_FUNC = [
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 1679faa92c..c8f7e5ef13 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1129,6 +1129,7 @@ export default {
         post_script: "Postscript",
         all_post_script: "Postscript",
         pre_sql: "JDBC Preprocessor",
+        pre_return: "pre return",
         post_sql: "JDBC Postprocessor",
         extract_param: "Extract parameters",
         add_module: "Add module",
@@ -1370,6 +1371,56 @@ export default {
       condition: "condition",
       condition_variable: "Variable, e.g: ${var}",
       wait: "wait",
+
+      all_name:"name",
+      all_url:"url",
+      boolean:"Boolean value",
+      capitalize:"Start with a capital letter",
+      cfirst:"Last name (Chinese)",
+      character:"character",
+      city:"city",
+      clast:"First name (Chinese)",
+      cname:"Chinese name",
+      color:"colour",
+      county:"county",
+      ctitle:"Chinese title",
+      dataImage:"Data image",
+      date:"date",
+      datetime:"Date time",
+      domain:"field",
+      email:"E-mail",
+      first:"surname",
+      float:"Floating point number",
+      guid:"guid",
+      hex:"hexadecimal",
+      hsl:"hsl",
+      id:"id",
+      img:"Picture address",
+      increment:"increment",
+      integer:"integer",
+      ip:"intellectual property right",
+      last:"name",
+      lower:"Lowercase letters",
+      natural:"Natural number",
+      now:"current time ",
+      paragraph:"paragraph",
+      pick:"choice",
+      protocol:"agreement",
+      province:"province",
+      range:"Range",
+      region:"region",
+      rgb:"rgb",
+      rgba:"rgba",
+      sentence:"sentence",
+      shuffle:"shuffle the cards",
+      string:"character string",
+      time:"time",
+      title:"title",
+      tld:"tld",
+      upper:"capital",
+      word:"Words",
+      zip:"Postal Code",
+
       assertions: {
         label: "Assertion",
         text: "Text",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 8d911d83ae..91376dc30c 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1136,6 +1136,7 @@ export default {
         post_script: "后置脚本",
         all_post_script: "全局后置脚本",
         pre_sql: "前置SQL",
+        pre_return: "前置返回",
         post_sql: "后置SQL",
         extract_param: "提取参数",
         add_module: "创建模块",
@@ -1376,6 +1377,56 @@ export default {
       condition: "条件",
       condition_variable: "变量，例如: ${var}",
       wait: "等待",
+
+      all_name: "名字",
+      all_url: "url",
+      boolean: "布尔值",
+      capitalize: "大写字母开头",
+      cfirst: "姓（中文）",
+      character: "字符",
+      city: "城市",
+      clast: "名（中文）",
+      cname: "中文名",
+      color: "颜色",
+      county: "县",
+      ctitle: "中文标题",
+      dataImage: "数据图像",
+      date: "日期",
+      datetime: "日期时间",
+      domain: "域",
+      email: "电子邮件",
+      first: "姓",
+      float: "浮点数",
+      guid: "guid",
+      hex: "十六进制",
+      hsl: "hsl",
+      id: "id",
+      img: "图片地址",
+      increment: "增量",
+      integer: "整数",
+      ip: "知识产权",
+      last: "名",
+      lower: "小写字母",
+      natural: "自然数",
+      now: "当前时间",
+      paragraph: "段",
+      pick: "选择",
+      protocol: "协议",
+      province: "省",
+      range: "范围",
+      region: "地区",
+      rgb: "rgb",
+      rgba: "rgba",
+      sentence: "句子",
+      shuffle: "洗牌",
+      string: "字符串",
+      time: "时间",
+      title: "标题",
+      tld: "tld",
+      upper: "大写字母",
+      word: "词",
+      zip: "邮政编码",
+
       assertions: {
         label: "断言",
         text: "文本",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index e2a9b56d8c..64bf216308 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1136,6 +1136,7 @@ export default {
         post_script: "後置腳本",
         all_post_script: "全局後置腳本",
         pre_sql: "前置SQL",
+        pre_return: "前置返回",
         post_sql: "後置SQL",
         extract_param: "提取參數",
         add_module: "創建模塊",
@@ -1376,6 +1377,56 @@ export default {
       condition: "條件",
       condition_variable: "變量，例如: ${var}",
       wait: "等待",
+
+      all_name:"名字",
+      all_url:"網址",
+      boolean:"布林值",
+      capitalize:"大寫字母開頭",
+      cfirst:"姓（中文）",
+      character:"字元",
+      city:"都市",
+      clast:"名（中文）",
+      cname:"中文名",
+      color:"顏色",
+      county:"縣",
+      ctitle:"中文標題",
+      dataImage:"數據影像",
+      date:"日期",
+      datetime:"日期時間",
+      domain:"域",
+      email:"電子郵件",
+      first:"姓",
+      float:"浮點數",
+      guid:"指南",
+      hex:"十六進位",
+      hsl:"hsl",
+      id:"身份證件",
+      img:"圖片地址",
+      increment:"增量",
+      integer:"整數",
+      ip:"知識產權",
+      last:"名",
+      lower:"小寫字母",
+      natural:"自然數",
+      now:"當前時間",
+      paragraph:"段",
+      pick:"選擇",
+      protocol:"協定",
+      province:"省",
+      range:"範圍",
+      region:"地區",
+      rgb:"rgb",
+      rgba:"rgba",
+      sentence:"句子",
+      shuffle:"洗牌",
+      string:"字串",
+      time:"時間",
+      title:"標題",
+      tld:"tld",
+      upper:"大寫字母",
+      word:"詞",
+      zip:"郵遞區號",
+
       assertions: {
         label: "斷言",
         text: "文本",

From 9cdde62cbc38a59f8fe3d2490db4ddf08fad85a4 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 17 Dec 2021 17:02:20 +0800
Subject: [PATCH 171/256] refactor: i18n

---
 backend/src/main/resources/permission.json    | 420 +++++++++---------
 .../settings/system/group/EditPermission.vue  |   7 +-
 .../settings/system/group/GroupPermission.vue |   4 +-
 frontend/src/common/js/table-constants.js     |   8 +-
 frontend/src/i18n/en-US.js                    | 293 +++++++++++-
 frontend/src/i18n/zh-CN.js                    | 291 ++++++++++++
 frontend/src/i18n/zh-TW.js                    | 294 +++++++++++-
 7 files changed, 1096 insertions(+), 221 deletions(-)

diff --git a/backend/src/main/resources/permission.json b/backend/src/main/resources/permission.json
index 1e4e1ca0e8..ddc58ed2f8 100644
--- a/backend/src/main/resources/permission.json
+++ b/backend/src/main/resources/permission.json
@@ -2,886 +2,886 @@
   "permissions": [
     {
       "id": "SYSTEM_USER:READ",
-      "name": "查询用户",
+      "name": "permission.system_user.read",
       "resourceId": "SYSTEM_USER"
     },
     {
       "id": "SYSTEM_USER:READ+CREATE",
-      "name": "创建用户",
+      "name": "permission.system_user.create",
       "resourceId": "SYSTEM_USER"
     },
     {
       "id": "SYSTEM_USER:READ+IMPORT",
-      "name": "导入用户",
+      "name": "permission.system_user.import",
       "resourceId": "SYSTEM_USER"
     },
     {
       "id": "SYSTEM_USER:READ+EDIT",
-      "name": "编辑用户",
+      "name": "permission.system_user.edit",
       "resourceId": "SYSTEM_USER"
     },
     {
       "id": "SYSTEM_USER:READ+DELETE",
-      "name": "删除用户",
+      "name": "permission.system_user.delete",
       "resourceId": "SYSTEM_USER"
     },
     {
       "id": "SYSTEM_USER:READ+EDIT_PASSWORD",
-      "name": "修改密码",
+      "name": "permission.system_user.edit_password",
       "resourceId": "SYSTEM_USER"
     },
     {
       "id": "SYSTEM_WORKSPACE:READ",
-      "name": "查询工作空间",
+      "name": "permission.system_workspace.read",
       "resourceId": "SYSTEM_WORKSPACE"
     },
     {
       "id": "SYSTEM_WORKSPACE:READ+CREATE",
-      "name": "创建工作空间",
+      "name": "permission.system_workspace.create",
       "resourceId": "SYSTEM_WORKSPACE"
     },
     {
       "id": "SYSTEM_WORKSPACE:READ+EDIT",
-      "name": "编辑工作空间",
+      "name": "permission.system_workspace.edit",
       "resourceId": "SYSTEM_WORKSPACE"
     },
     {
       "id": "SYSTEM_WORKSPACE:READ+DELETE",
-      "name": "删除工作空间",
+      "name": "permission.system_workspace.delete",
       "resourceId": "SYSTEM_WORKSPACE"
     },
     {
       "id": "SYSTEM_GROUP:READ",
-      "name": "查询用户组与权限",
+      "name": "permission.system_group.read",
       "resourceId": "SYSTEM_GROUP"
     },
     {
       "id": "SYSTEM_GROUP:READ+CREATE",
-      "name": "创建用户组",
+      "name": "permission.system_group.create",
       "resourceId": "SYSTEM_GROUP"
     },
     {
       "id": "SYSTEM_GROUP:READ+EDIT",
-      "name": "编辑用户组",
+      "name": "permission.system_group.edit",
       "resourceId": "SYSTEM_GROUP"
     },
     {
       "id": "SYSTEM_GROUP:READ+SETTING_PERMISSION",
-      "name": "设置权限",
+      "name": "permission.system_group.setting_permission",
       "resourceId": "SYSTEM_GROUP"
     },
     {
       "id": "SYSTEM_GROUP:READ+DELETE",
-      "name": "删除",
+      "name": "permission.system_group.delete",
       "resourceId": "SYSTEM_GROUP"
     },
     {
       "id": "SYSTEM_TEST_POOL:READ",
-      "name": "查询测试资源池",
+      "name": "permission.system_test_pool.read",
       "resourceId": "SYSTEM_TEST_POOL"
     },
     {
       "id": "SYSTEM_TEST_POOL:READ+CREATE",
-      "name": "创建测试资源池",
+      "name": "permission.system_test_pool.create",
       "resourceId": "SYSTEM_TEST_POOL"
     },
     {
       "id": "SYSTEM_TEST_POOL:READ+EDIT",
-      "name": "编辑测试资源池",
+      "name": "permission.system_test_pool.edit",
       "resourceId": "SYSTEM_TEST_POOL"
     },
     {
       "id": "SYSTEM_TEST_POOL:READ+DELETE",
-      "name": "删除测试资源池",
+      "name": "permission.system_test_pool.delete",
       "resourceId": "SYSTEM_TEST_POOL"
     },
     {
       "id": "SYSTEM_SETTING:READ",
-      "name": "查询系统设置",
+      "name": "permission.system_setting.read",
       "resourceId": "SYSTEM_SETTING"
     },
     {
       "id": "SYSTEM_SETTING:READ+EDIT",
-      "name": "编辑",
+      "name": "permission.system_setting.edit",
       "resourceId": "SYSTEM_SETTING"
     },
     {
       "id": "SYSTEM_QUOTA:READ",
-      "name": "查询系统配额",
+      "name": "permission.system_quota.read",
       "resourceId": "SYSTEM_QUOTA"
     },
     {
       "id": "SYSTEM_QUOTA:READ+EDIT",
-      "name": "编辑",
+      "name": "permission.system_quota.edit",
       "resourceId": "SYSTEM_QUOTA"
     },
     {
       "id": "SYSTEM_AUTH:READ",
-      "name": "查询系统授权",
+      "name": "permission.system_auth.read",
       "resourceId": "SYSTEM_AUTH"
     },
     {
       "id": "SYSTEM_AUTH:READ+EDIT",
-      "name": "编辑",
+      "name": "permission.system_auth.edit",
       "resourceId": "SYSTEM_AUTH"
     },
     {
       "id": "SYSTEM_OPERATING_LOG:READ",
-      "name": "查询操作日志",
+      "name": "permission.system_operation_log.read",
       "resourceId": "SYSTEM_OPERATING_LOG"
     },
     {
       "id": "WORKSPACE_SERVICE:READ",
-      "name": "查询",
+      "name": "permission.workspace_service.read",
       "resourceId": "WORKSPACE_SERVICE"
     },
     {
       "id": "WORKSPACE_SERVICE:READ+EDIT",
-      "name": "编辑",
+      "name": "permission.workspace_service.edit",
       "resourceId": "WORKSPACE_SERVICE"
     },
     {
       "id": "WORKSPACE_MESSAGE:READ",
-      "name": "查询",
+      "name": "permission.workspace_message.read",
       "resourceId": "WORKSPACE_MESSAGE"
     },
     {
       "id": "WORKSPACE_MESSAGE:READ+EDIT",
-      "name": "编辑",
+      "name": "permission.workspace_message.edit",
       "resourceId": "WORKSPACE_MESSAGE"
     },
     {
       "id": "WORKSPACE_USER:READ",
-      "name": "查询成员",
+      "name": "permission.workspace_user.read",
       "resourceId": "WORKSPACE_USER"
     },
     {
       "id": "WORKSPACE_USER:READ+CREATE",
-      "name": "添加成员",
+      "name": "permission.workspace_user.create",
       "resourceId": "WORKSPACE_USER"
     },
     {
       "id": "WORKSPACE_USER:READ+EDIT",
-      "name": "编辑成员",
+      "name": "permission.workspace_user.edit",
       "resourceId": "WORKSPACE_USER"
     },
     {
       "id": "WORKSPACE_USER:READ+DELETE",
-      "name": "删除成员",
+      "name": "permission.workspace_user.delete",
       "resourceId": "WORKSPACE_USER"
     },
     {
       "id": "WORKSPACE_PROJECT_MANAGER:READ",
-      "name": "查询项目",
+      "name": "permission.workspace_project_manager.read",
       "resourceId": "WORKSPACE_PROJECT_MANAGER"
     },
     {
       "id": "WORKSPACE_PROJECT_MANAGER:READ+CREATE",
-      "name": "创建项目",
+      "name": "permission.workspace_project_manager.create",
       "resourceId": "WORKSPACE_PROJECT_MANAGER"
     },
     {
       "id": "WORKSPACE_PROJECT_MANAGER:READ+EDIT",
-      "name": "编辑项目",
+      "name": "permission.workspace_project_manager.edit",
       "resourceId": "WORKSPACE_PROJECT_MANAGER"
     },
     {
       "id": "WORKSPACE_PROJECT_MANAGER:READ+DELETE",
-      "name": "删除项目",
+      "name": "permission.workspace_project_manager.delete",
       "resourceId": "WORKSPACE_PROJECT_MANAGER"
     },
     {
       "id": "WORKSPACE_PROJECT_MANAGER:READ+UPLOAD_JAR",
-      "name": "上传jar包",
+      "name": "permission.workspace_project_manager.upload_jar",
       "resourceId": "WORKSPACE_PROJECT_MANAGER"
     },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ",
-      "name": "查询",
+      "name": "permission.workspace_project_environment.read",
       "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
     },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+CREATE",
-      "name": "创建环境",
+      "name": "permission.workspace_project_environment.create",
       "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
     },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT",
-      "name": "编辑环境",
+      "name": "permission.workspace_project_environment.edit",
       "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
     },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE",
-      "name": "删除环境",
+      "name": "permission.workspace_project_environment.delete",
       "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
     },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+COPY",
-      "name": "复制环境",
+      "name": "permission.workspace_project_environment.copy",
       "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
     },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+IMPORT",
-      "name": "导入环境",
+      "name": "permission.workspace_project_environment.import",
       "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
     },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+EXPORT",
-      "name": "导出环境",
+      "name": "permission.workspace_project_environment.export",
       "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
     },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+CREATE_GROUP",
-      "name": "创建环境组",
+      "name": "permission.workspace_project_environment.create_group",
       "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
     },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT_GROUP",
-      "name": "编辑环境组",
+      "name": "permission.workspace_project_environment.edit_group",
       "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
     },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+COPY_GROUP",
-      "name": "复制环境组",
+      "name": "permission.workspace_project_environment.copy_group",
       "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
     },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE_GROUP",
-      "name": "删除环境组",
+      "name": "permission.workspace_project_environment.delete_group",
       "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT"
     },
     {
       "id": "WORKSPACE_OPERATING_LOG:READ",
-      "name": "查询操作日志",
+      "name": "permission.workspace_operation_log.read",
       "resourceId": "WORKSPACE_OPERATING_LOG"
     },
     {
       "id": "WORKSPACE_TEMPLATE:READ",
-      "name": "查询",
+      "name": "permission.workspace_template.read",
       "resourceId": "WORKSPACE_TEMPLATE"
     },
     {
       "id": "WORKSPACE_TEMPLATE:READ+CASE_TEMPLATE",
-      "name": "用例模版",
+      "name": "permission.workspace_template.case_template",
       "resourceId": "WORKSPACE_TEMPLATE"
     },
     {
       "id": "WORKSPACE_TEMPLATE:READ+ISSUE_TEMPLATE",
-      "name": "缺陷模版",
+      "name": "permission.workspace_template.issue_template",
       "resourceId": "WORKSPACE_TEMPLATE"
     },
     {
       "id": "WORKSPACE_TEMPLATE:READ+CUSTOM",
-      "name": "自定义字段",
+      "name": "permission.workspace_template.custom",
       "resourceId": "WORKSPACE_TEMPLATE"
     },
     {
       "id": "PROJECT_USER:READ",
-      "name": "查询成员",
+      "name": "permission.project_user.read",
       "resourceId": "PROJECT_USER"
     },
     {
       "id": "PROJECT_USER:READ+CREATE",
-      "name": "添加成员",
+      "name": "permission.project_user.create",
       "resourceId": "PROJECT_USER"
     },
     {
       "id": "PROJECT_USER:READ+EDIT",
-      "name": "编辑成员",
+      "name": "permission.project_user.edit",
       "resourceId": "PROJECT_USER"
     },
     {
       "id": "PROJECT_USER:READ+DELETE",
-      "name": "移除成员",
+      "name": "permission.project_user.delete",
       "resourceId": "PROJECT_USER"
     },
     {
       "id": "PROJECT_GROUP:READ",
-      "name": "查询用户组与权限",
+      "name": "permission.project_group.read",
       "resourceId": "PROJECT_GROUP"
     },
     {
       "id": "PROJECT_GROUP:READ+CREATE",
-      "name": "创建用户组与权限",
+      "name": "permission.project_group.create",
       "resourceId": "PROJECT_GROUP"
     },
     {
       "id": "PROJECT_GROUP:READ+EDIT",
-      "name": "编辑用户组与权限",
+      "name": "permission.project_group.edit",
       "resourceId": "PROJECT_GROUP"
     },
     {
       "id": "PROJECT_GROUP:READ+DELETE",
-      "name": "删除用户组与权限",
+      "name": "permission.project_group.delete",
       "resourceId": "PROJECT_GROUP"
     },
     {
       "id": "PROJECT_GROUP:READ+SETTING_PERMISSION",
-      "name": "设置权限",
+      "name": "permission.project_group.setting_permission",
       "resourceId": "PROJECT_GROUP"
     },
     {
       "id": "PROJECT_MANAGER:READ",
-      "name": "查询项目",
+      "name": "permission.project_manager.read",
       "resourceId": "PROJECT_MANAGER"
     },
     {
       "id": "PROJECT_MANAGER:READ+EDIT",
-      "name": "编辑项目",
+      "name": "permission.project_manager.edit",
       "resourceId": "PROJECT_MANAGER"
     },
     {
       "id": "PROJECT_ENVIRONMENT:READ",
-      "name": "查询环境",
+      "name": "permission.project_environment.read",
       "resourceId": "PROJECT_ENVIRONMENT"
     },
     {
       "id": "PROJECT_ENVIRONMENT:READ+CREATE",
-      "name": "创建环境",
+      "name": "permission.project_environment.create",
       "resourceId": "PROJECT_ENVIRONMENT"
     },
     {
       "id": "PROJECT_ENVIRONMENT:READ+EDIT",
-      "name": "编辑环境",
+      "name": "permission.project_environment.edit",
       "resourceId": "PROJECT_ENVIRONMENT"
     },
     {
       "id": "PROJECT_ENVIRONMENT:READ+DELETE",
-      "name": "删除环境",
+      "name": "permission.project_environment.delete",
       "resourceId": "PROJECT_ENVIRONMENT"
     },
     {
       "id": "PROJECT_ENVIRONMENT:READ+COPY",
-      "name": "复制环境",
+      "name": "permission.project_environment.copy",
       "resourceId": "PROJECT_ENVIRONMENT"
     },
     {
       "id": "PROJECT_ENVIRONMENT:READ+IMPORT",
-      "name": "导入环境",
+      "name": "permission.project_environment.import",
       "resourceId": "PROJECT_ENVIRONMENT"
     },
     {
       "id": "PROJECT_ENVIRONMENT:READ+EXPORT",
-      "name": "导出环境",
+      "name": "permission.project_environment.export",
       "resourceId": "PROJECT_ENVIRONMENT"
     },
     {
       "id": "PROJECT_OPERATING_LOG:READ",
-      "name": "查询操作日志",
+      "name": "permission.project_operation_log.read",
       "resourceId": "PROJECT_OPERATING_LOG"
     },
     {
       "id": "PROJECT_FILE:READ+JAR",
-      "name": "查询jar包",
+      "name": "permission.project_file.jar",
       "resourceId": "PROJECT_FILE"
     },
     {
       "id": "PROJECT_FILE:READ+UPLOAD+JAR",
-      "name": "上传jar包",
+      "name": "permission.project_file.upload_jar",
       "resourceId": "PROJECT_FILE"
     },
     {
       "id": "PROJECT_FILE:READ+DELETE+JAR",
-      "name": "删除jar包",
+      "name": "permission.project_file.delete_jar",
       "resourceId": "PROJECT_FILE"
     },
     {
       "id": "PROJECT_FILE:READ+FILE",
-      "name": "查询文件",
+      "name": "permission.project_file.read",
       "resourceId": "PROJECT_FILE"
     },
     {
       "id": "PROJECT_FILE:READ+UPLOAD+FILE",
-      "name": "上传文件",
+      "name": "permission.project_file.upload_file",
       "resourceId": "PROJECT_FILE"
     },
     {
       "id": "PROJECT_FILE:READ+DELETE+FILE",
-      "name": "删除文件",
+      "name": "permission.project_file.delete_file",
       "resourceId": "PROJECT_FILE"
     },
     {
       "id": "PROJECT_CUSTOM_CODE:READ",
-      "name": "查询",
+      "name": "permission.project_custom_code.read",
       "resourceId": "PROJECT_CUSTOM_CODE"
     },
     {
       "id": "PROJECT_CUSTOM_CODE:READ+CREATE",
-      "name": "创建",
+      "name": "permission.project_custom_code.create",
       "resourceId": "PROJECT_CUSTOM_CODE"
     },
     {
       "id": "PROJECT_CUSTOM_CODE:READ+EDIT",
-      "name": "编辑",
+      "name": "permission.project_custom_code.edit",
       "resourceId": "PROJECT_CUSTOM_CODE"
     },
     {
       "id": "PROJECT_CUSTOM_CODE:READ+DELETE",
-      "name": "删除",
+      "name": "permission.project_custom_code.delete",
       "resourceId": "PROJECT_CUSTOM_CODE"
     },
     {
       "id": "PROJECT_CUSTOM_CODE:READ+COPY",
-      "name": "复制",
+      "name": "permission.project_custom_code.copy",
       "resourceId": "PROJECT_CUSTOM_CODE"
     },
     {
       "id": "PROJECT_TRACK_CASE:READ",
-      "name": "查询用例",
+      "name": "permission.project_track_case.read",
       "resourceId": "PROJECT_TRACK_CASE"
     },
     {
       "id": "PROJECT_TRACK_CASE:READ+CREATE",
-      "name": "创建用例",
+      "name": "permission.project_track_case.create",
       "resourceId": "PROJECT_TRACK_CASE"
     },
     {
       "id": "PROJECT_TRACK_CASE:READ+EDIT",
-      "name": "编辑用例",
+      "name": "permission.project_track_case.edit",
       "resourceId": "PROJECT_TRACK_CASE"
     },
     {
       "id": "PROJECT_TRACK_CASE:READ+DELETE",
-      "name": "删除用例",
+      "name": "permission.project_track_case.delete",
       "resourceId": "PROJECT_TRACK_CASE"
     },
     {
       "id": "PROJECT_TRACK_CASE:READ+COPY",
-      "name": "复制用例",
+      "name": "permission.project_track_case.copy",
       "resourceId": "PROJECT_TRACK_CASE"
     },
     {
       "id": "PROJECT_TRACK_CASE:READ+IMPORT",
-      "name": "导入用例",
+      "name": "permission.project_track_case.import",
       "resourceId": "PROJECT_TRACK_CASE"
     },
     {
       "id": "PROJECT_TRACK_CASE:READ+EXPORT",
-      "name": "导出用例",
+      "name": "permission.project_track_case.export",
       "resourceId": "PROJECT_TRACK_CASE"
     },
     {
       "id": "PROJECT_TRACK_CASE:READ+RECOVER",
-      "name": "恢复用例",
+      "name": "permission.project_track_case.recover",
       "resourceId": "PROJECT_TRACK_CASE"
     },
     {
       "id": "PROJECT_TRACK_REVIEW:READ",
-      "name": "查询评审",
+      "name": "permission.project_track_review.read",
       "resourceId": "PROJECT_TRACK_REVIEW"
     },
     {
       "id": "PROJECT_TRACK_REVIEW:READ+CREATE",
-      "name": "创建评审",
+      "name": "permission.project_track_review.create",
       "resourceId": "PROJECT_TRACK_REVIEW"
     },
     {
       "id": "PROJECT_TRACK_REVIEW:READ+EDIT",
-      "name": "编辑评审",
+      "name": "permission.project_track_review.edit",
       "resourceId": "PROJECT_TRACK_REVIEW"
     },
     {
       "id": "PROJECT_TRACK_REVIEW:READ+DELETE",
-      "name": "删除评审",
+      "name": "permission.project_track_review.delete",
       "resourceId": "PROJECT_TRACK_REVIEW"
     },
     {
       "id": "PROJECT_TRACK_REVIEW:READ+REVIEW",
-      "name": "评审用例",
+      "name": "permission.project_track_review.review",
       "resourceId": "PROJECT_TRACK_REVIEW"
     },
     {
       "id": "PROJECT_TRACK_REVIEW:READ+COMMENT",
-      "name": "发表评论",
+      "name": "permission.project_track_review.comment",
       "resourceId": "PROJECT_TRACK_REVIEW"
     },
     {
       "id": "PROJECT_TRACK_REVIEW:READ+RELEVANCE_OR_CANCEL",
-      "name": "关联/取消关联用例",
+      "name": "permission.project_track_review.relevance_or_cancel",
       "resourceId": "PROJECT_TRACK_REVIEW"
     },
     {
       "id": "PROJECT_TRACK_PLAN:READ",
-      "name": "查询测试计划",
+      "name": "permission.project_track_plan.read",
       "resourceId": "PROJECT_TRACK_PLAN"
     },
     {
       "id": "PROJECT_TRACK_PLAN:READ+CREATE",
-      "name": "创建测试计划",
+      "name": "permission.project_track_plan.create",
       "resourceId": "PROJECT_TRACK_PLAN"
     },
     {
       "id": "PROJECT_TRACK_PLAN:READ+EDIT",
-      "name": "编辑测试计划",
+      "name": "permission.project_track_plan.edit",
       "resourceId": "PROJECT_TRACK_PLAN"
     },
     {
       "id": "PROJECT_TRACK_PLAN:READ+DELETE",
-      "name": "删除测试计划",
+      "name": "permission.project_track_plan.delete",
       "resourceId": "PROJECT_TRACK_PLAN"
     },
     {
       "id": "PROJECT_TRACK_PLAN:READ+COPY",
-      "name": "复制测试计划",
+      "name": "permission.project_track_plan.copy",
       "resourceId": "PROJECT_TRACK_PLAN"
     },
     {
       "id": "PROJECT_TRACK_PLAN:READ+RUN",
-      "name": "执行测试计划",
+      "name": "permission.project_track_plan.run",
       "resourceId": "PROJECT_TRACK_PLAN"
     },
     {
       "id": "PROJECT_TRACK_PLAN:READ+CASE_BATCH_RUN",
-      "name": "批量执行用例",
+      "name": "permission.project_track_plan.batch_run",
       "resourceId": "PROJECT_TRACK_PLAN"
     },
     {
       "id": "PROJECT_TRACK_PLAN:READ+CASE_BATCH_EDIT",
-      "name": "批量编辑用例",
+      "name": "permission.project_track_plan.batch_edit",
       "resourceId": "PROJECT_TRACK_PLAN"
     },
     {
       "id": "PROJECT_TRACK_PLAN:READ+SCHEDULE",
-      "name": "定时任务",
+      "name": "permission.project_track_plan.schedule",
       "resourceId": "PROJECT_TRACK_PLAN"
     },
     {
       "id": "PROJECT_TRACK_PLAN:READ+RELEVANCE_OR_CANCEL",
-      "name": "关联/取消关联用例",
+      "name": "permission.project_track_plan.relevance_or_cancel",
       "resourceId": "PROJECT_TRACK_PLAN"
     },
     {
       "id": "PROJECT_TRACK_PLAN:READ+CASE_BATCH_DELETE",
-      "name": "批量取消关联用例",
+      "name": "permission.project_track_plan.batch_delete",
       "resourceId": "PROJECT_TRACK_PLAN"
     },
     {
       "id": "PROJECT_TRACK_ISSUE:READ",
-      "name": "查询缺陷",
+      "name": "permission.project_track_issue.read",
       "resourceId": "PROJECT_TRACK_ISSUE"
     },
     {
       "id": "PROJECT_TRACK_ISSUE:READ+CREATE",
-      "name": "创建缺陷",
+      "name": "permission.project_track_issue.create",
       "resourceId": "PROJECT_TRACK_ISSUE"
     },
     {
       "id": "PROJECT_TRACK_ISSUE:READ+EDIT",
-      "name": "编辑缺陷",
+      "name": "permission.project_track_issue.edit",
       "resourceId": "PROJECT_TRACK_ISSUE"
     },
     {
       "id": "PROJECT_TRACK_ISSUE:READ+DELETE",
-      "name": "删除缺陷",
+      "name": "permission.project_track_issue.delete",
       "resourceId": "PROJECT_TRACK_ISSUE"
     },
     {
       "id": "PROJECT_TRACK_REPORT:READ",
-      "name": "查询报告",
+      "name": "permission.project_track_report.read",
       "resourceId": "PROJECT_TRACK_REPORT"
     },
     {
       "id": "PROJECT_TRACK_REPORT:READ+DELETE",
-      "name": "删除报告",
+      "name": "permission.project_track_report.delete",
       "resourceId": "PROJECT_TRACK_REPORT"
     },
     {
       "id": "PROJECT_TRACK_REPORT:READ+EXPORT",
-      "name": "导出报告",
+      "name": "permission.project_track_report.export",
       "resourceId": "PROJECT_TRACK_REPORT"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ",
-      "name": "查询接口",
+      "name": "permission.project_api_definition.read",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+CREATE_API",
-      "name": "创建接口",
+      "name": "permission.project_api_definition.create_api",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+EDIT_API",
-      "name": "编辑接口",
+      "name": "permission.project_api_definition.edit_api",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+DELETE_API",
-      "name": "删除接口",
+      "name": "permission.project_api_definition.delete_api",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+COPY_API",
-      "name": "复制接口",
+      "name": "permission.project_api_definition.copy_api",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+CREATE_CASE",
-      "name": "添加用例",
+      "name": "permission.project_api_definition.create_case",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+EDIT_CASE",
-      "name": "编辑用例",
+      "name": "permission.project_api_definition.edit_case",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+DELETE_CASE",
-      "name": "删除用例",
+      "name": "permission.project_api_definition.delete_case",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+COPY_CASE",
-      "name": "复制用例",
+      "name": "permission.project_api_definition.copy_case",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+IMPORT_API",
-      "name": "导入接口",
+      "name": "permission.project_api_definition.import_api",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+EXPORT_API",
-      "name": "导出接口",
+      "name": "permission.project_api_definition.export_api",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+TIMING_SYNC",
-      "name": "定时同步",
+      "name": "permission.project_api_definition.timing_sync",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+CREATE_PERFORMANCE",
-      "name": "创建性能测试",
+      "name": "permission.project_api_definition.create_performance",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+RUN",
-      "name": "执行",
+      "name": "permission.project_api_definition.run",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+DEBUG",
-      "name": "调试",
+      "name": "permission.project_api_definition.debug",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_DEFINITION:READ+MOCK",
-      "name": "MOCK设置",
+      "name": "permission.project_api_definition.mock",
       "resourceId": "PROJECT_API_DEFINITION"
     },
     {
       "id": "PROJECT_API_SCENARIO:READ",
-      "name": "查询场景",
+      "name": "permission.project_api_scenario.read",
       "resourceId": "PROJECT_API_SCENARIO"
     },
     {
       "id": "PROJECT_API_SCENARIO:READ+CREATE",
-      "name": "创建场景",
+      "name": "permission.project_api_scenario.create",
       "resourceId": "PROJECT_API_SCENARIO"
     },
     {
       "id": "PROJECT_API_SCENARIO:READ+EDIT",
-      "name": "编辑场景",
+      "name": "permission.project_api_scenario.edit",
       "resourceId": "PROJECT_API_SCENARIO"
     },
     {
       "id": "PROJECT_API_SCENARIO:READ+DELETE",
-      "name": "删除场景",
+      "name": "permission.project_api_scenario.delete",
       "resourceId": "PROJECT_API_SCENARIO"
     },
     {
       "id": "PROJECT_API_SCENARIO:READ+COPY",
-      "name": "复制场景",
+      "name": "permission.project_api_scenario.copy",
       "resourceId": "PROJECT_API_SCENARIO"
     },
     {
       "id": "PROJECT_API_SCENARIO:READ+RUN",
-      "name": "执行场景",
+      "name": "permission.project_api_scenario.run",
       "resourceId": "PROJECT_API_SCENARIO"
     },
     {
       "id": "PROJECT_API_SCENARIO:READ+DEBUG",
-      "name": "调试场景",
+      "name": "permission.project_api_scenario.debug",
       "resourceId": "PROJECT_API_SCENARIO"
     },
     {
       "id": "PROJECT_API_SCENARIO:READ+SCHEDULE",
-      "name": "定时任务",
+      "name": "permission.project_api_scenario.schedule",
       "resourceId": "PROJECT_API_SCENARIO"
     },
     {
       "id": "PROJECT_API_SCENARIO:READ+IMPORT_SCENARIO",
-      "name": "导入场景",
+      "name": "permission.project_api_scenario.import",
       "resourceId": "PROJECT_API_SCENARIO"
     },
     {
       "id": "PROJECT_API_SCENARIO:READ+EXPORT_SCENARIO",
-      "name": "导出场景",
+      "name": "permission.project_api_scenario.export",
       "resourceId": "PROJECT_API_SCENARIO"
     },
     {
       "id": "PROJECT_API_SCENARIO:READ+MOVE_BATCH",
-      "name": "批量移动",
+      "name": "permission.project_api_scenario.move_batch",
       "resourceId": "PROJECT_API_SCENARIO"
     },
     {
       "id": "PROJECT_API_SCENARIO:READ+CREATE_PERFORMANCE",
-      "name": "创建性能测试",
+      "name": "permission.project_api_scenario.create_performance",
       "resourceId": "PROJECT_API_SCENARIO"
     },
     {
       "id": "PROJECT_API_SCENARIO:READ+CREATE_PERFORMANCE_BATCH",
-      "name": "批量创建性能测试",
+      "name": "permission.project_api_scenario.create_performance_batch",
       "resourceId": "PROJECT_API_SCENARIO"
     },
     {
       "id": "PROJECT_API_SCENARIO:READ+BATCH_COPY",
-      "name": "批量复制",
+      "name": "permission.project_api_scenario.batch_copy",
       "resourceId": "PROJECT_API_SCENARIO"
     },
     {
       "id": "PROJECT_API_REPORT:READ",
-      "name": "查询报告",
+      "name": "permission.project_api_report.read",
       "resourceId": "PROJECT_API_REPORT"
     },
     {
       "id": "PROJECT_API_REPORT:READ+DELETE",
-      "name": "删除报告",
+      "name": "permission.project_api_report.delete",
       "resourceId": "PROJECT_API_REPORT"
     },
     {
       "id": "PROJECT_API_REPORT:READ+EXPORT",
-      "name": "导出报告",
+      "name": "permission.project_api_report.export",
       "resourceId": "PROJECT_API_REPORT"
     },
     {
       "id": "PROJECT_PERFORMANCE_TEST:READ",
-      "name": "查询测试",
+      "name": "permission.project_performance_test.read",
       "resourceId": "PROJECT_PERFORMANCE_TEST"
     },
     {
       "id": "PROJECT_PERFORMANCE_TEST:READ+CREATE",
-      "name": "创建测试",
+      "name": "permission.project_performance_test.create",
       "resourceId": "PROJECT_PERFORMANCE_TEST"
     },
     {
       "id": "PROJECT_PERFORMANCE_TEST:READ+EDIT",
-      "name": "编辑测试",
+      "name": "permission.project_performance_test.edit",
       "resourceId": "PROJECT_PERFORMANCE_TEST"
     },
     {
       "id": "PROJECT_PERFORMANCE_TEST:READ+DELETE",
-      "name": "删除测试",
+      "name": "permission.project_performance_test.delete",
       "resourceId": "PROJECT_PERFORMANCE_TEST"
     },
     {
       "id": "PROJECT_PERFORMANCE_TEST:READ+COPY",
-      "name": "复制测试",
+      "name": "permission.project_performance_test.copy",
       "resourceId": "PROJECT_PERFORMANCE_TEST"
     },
     {
       "id": "PROJECT_PERFORMANCE_TEST:READ+RUN",
-      "name": "运行",
+      "name": "permission.project_performance_test.run",
       "resourceId": "PROJECT_PERFORMANCE_TEST"
     },
     {
       "id": "PROJECT_PERFORMANCE_TEST:READ+SCHEDULE",
-      "name": "定时任务",
+      "name": "permission.project_performance_test.schedule",
       "resourceId": "PROJECT_PERFORMANCE_TEST"
     },
     {
       "id": "PROJECT_PERFORMANCE_REPORT:READ",
-      "name": "查询报告",
+      "name": "permission.project_performance_report.read",
       "resourceId": "PROJECT_PERFORMANCE_REPORT"
     },
     {
       "id": "PROJECT_PERFORMANCE_REPORT:READ+DELETE",
-      "name": "删除报告",
+      "name": "permission.project_performance_report.delete",
       "resourceId": "PROJECT_PERFORMANCE_REPORT"
     },
     {
       "id": "PROJECT_PERFORMANCE_REPORT:READ+EXPORT",
-      "name": "导出报告",
+      "name": "permission.project_performance_report.export",
       "resourceId": "PROJECT_PERFORMANCE_REPORT"
     },
     {
       "id": "PROJECT_PERFORMANCE_REPORT:READ+COMPARE",
-      "name": "对比报告",
+      "name": "permission.project_performance_report.compare",
       "resourceId": "PROJECT_PERFORMANCE_REPORT"
     },
     {
       "id": "PROJECT_REPORT_ANALYSIS:READ",
-      "name": "查看",
+      "name": "permission.project_report_analysis.read",
       "resourceId": "PROJECT_REPORT_ANALYSIS",
       "license": false
     },
     {
       "id": "PROJECT_REPORT_ANALYSIS:READ+EXPORT",
-      "name": "导出",
+      "name": "permission.project_report_analysis.export",
       "resourceId": "PROJECT_REPORT_ANALYSIS",
       "license": false
     },
     {
       "id": "PROJECT_REPORT_ANALYSIS:READ+UPDATE",
-      "name": "保存",
+      "name": "permission.project_report_analysis.update",
       "resourceId": "PROJECT_REPORT_ANALYSIS",
       "license": false
     },
     {
       "id": "PROJECT_REPORT_ANALYSIS:READ+CREATE",
-      "name": "另存为",
+      "name": "permission.project_report_analysis.create",
       "resourceId": "PROJECT_REPORT_ANALYSIS",
       "license": false
     },
     {
       "id": "SYSTEM_PLUGIN:UPLOAD",
-      "name": "点击上传",
+      "name": "permission.system_plugin.upload",
       "resourceId": "SYSTEM_PLUGIN"
     },
     {
       "id": "SYSTEM_PLUGIN:DEL",
-      "name": "删除",
+      "name": "permission.system_plugin.delete",
       "resourceId": "SYSTEM_PLUGIN"
     },
     {
       "id": "SYSTEM_PLUGIN:READ",
-      "name": "查看脚本",
+      "name": "permission.system_plugin.read",
       "resourceId": "SYSTEM_PLUGIN"
     },
     {
       "id": "PROJECT_ENTERPRISE_REPORT:READ+EXPORT",
-      "name": "发送邮件",
+      "name": "permission.project_enterprise_report.export",
       "resourceId": "PROJECT_ENTERPRISE_REPORT",
       "license": true
     },
     {
       "id": "PROJECT_ENTERPRISE_REPORT:READ+CREATE",
-      "name": "创建报告",
+      "name": "permission.project_enterprise_report.create",
       "resourceId": "PROJECT_ENTERPRISE_REPORT",
       "license": true
     },
     {
       "id": "PROJECT_ENTERPRISE_REPORT:READ+DELETE",
-      "name": "删除报告",
+      "name": "permission.project_enterprise_report.delete",
       "resourceId": "PROJECT_ENTERPRISE_REPORT",
       "license": true
     },
     {
       "id": "PROJECT_ENTERPRISE_REPORT:READ+COPY",
-      "name": "复制报告",
+      "name": "permission.project_enterprise_report.copy",
       "resourceId": "PROJECT_ENTERPRISE_REPORT",
       "license": true
     },
     {
       "id": "PROJECT_ENTERPRISE_REPORT:READ+SCHEDULE",
-      "name": "定时发送",
+      "name": "permission.project_enterprise_report.schedule",
       "resourceId": "PROJECT_ENTERPRISE_REPORT",
       "license": true
     },
     {
       "id": "PROJECT_ENTERPRISE_REPORT:READ+EDIT",
-      "name": "修改报告",
+      "name": "permission.project_enterprise_report.edit",
       "resourceId": "PROJECT_ENTERPRISE_REPORT",
       "license": true
     }
@@ -889,144 +889,144 @@
   "resource": [
     {
       "id": "SYSTEM_USER",
-      "name": "用户"
+      "name": "permission.system_user.name"
     },
     {
       "id": "SYSTEM_WORKSPACE",
-      "name": "工作空间"
+      "name": "permission.system_workspace.name"
     },
     {
       "id": "SYSTEM_GROUP",
-      "name": "用户组与权限"
+      "name": "permission.system_group.name"
     },
     {
       "id": "SYSTEM_TEST_POOL",
-      "name": "测试资源池"
+      "name": "permission.system_test_pool.name"
     },
     {
       "id": "SYSTEM_SETTING",
-      "name": "系统参数设置"
+      "name": "permission.system_setting.name"
     },
     {
       "id": "SYSTEM_QUOTA",
-      "name": "配额管理"
+      "name": "permission.system_quota.name"
     },
     {
       "id": "SYSTEM_AUTH",
-      "name": "授权管理"
+      "name": "permission.system_auth.name"
     },
     {
       "id": "SYSTEM_OPERATING_LOG",
-      "name": "操作日志"
+      "name": "permission.system_operation_log.name"
     },
     {
       "id": "WORKSPACE_USER",
-      "name": "成员"
+      "name": "permission.workspace_user.name"
     },
     {
       "id": "WORKSPACE_SERVICE",
-      "name": "服务集成"
+      "name": "permission.workspace_service.name"
     },
     {
       "id": "WORKSPACE_MESSAGE",
-      "name": "消息设置"
+      "name": "permission.workspace_message.name"
     },
     {
       "id": "WORKSPACE_TEMPLATE",
-      "name": "模版设置"
+      "name": "permission.workspace_template.name"
     },
     {
       "id": "WORKSPACE_PROJECT_MANAGER",
-      "name": "项目管理"
+      "name": "permission.workspace_project_manager.name"
     },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT",
-      "name": "环境设置"
+      "name": "permission.workspace_project_environment.name"
     },
     {
       "id": "WORKSPACE_OPERATING_LOG",
-      "name": "操作日志"
+      "name": "permission.workspace_operation_log.name"
     },
     {
       "id": "PROJECT_USER",
-      "name": "成员"
+      "name": "permission.project_user.name"
     },
     {
       "id": "PROJECT_MANAGER",
-      "name": "项目管理"
+      "name": "permission.project_manager.name"
     },
     {
       "id": "PROJECT_GROUP",
-      "name": "用户组与权限"
+      "name": "permission.project_group.name"
     },
     {
       "id": "PROJECT_ENVIRONMENT",
-      "name": "环境设置"
+      "name": "permission.project_environment.name"
     },
     {
       "id": "PROJECT_OPERATING_LOG",
-      "name": "操作日志"
+      "name": "permission.project_operation_log.name"
     },
     {
       "id": "PROJECT_CUSTOM_CODE",
-      "name": "自定义代码片段"
+      "name": "permission.project_custom_code.name"
     },
     {
       "id": "PROJECT_FILE",
-      "name": "文件管理"
+      "name": "permission.project_file.name"
     },
     {
       "id": "PROJECT_TRACK_CASE",
-      "name": "测试用例"
+      "name": "permission.project_track_case.name"
     },
     {
       "id": "PROJECT_TRACK_REVIEW",
-      "name": "测试评审"
+      "name": "permission.project_track_review.name"
     },
     {
       "id": "PROJECT_TRACK_PLAN",
-      "name": "测试计划"
+      "name": "permission.project_track_plan.name"
     },
     {
       "id": "PROJECT_TRACK_ISSUE",
-      "name": "缺陷"
+      "name": "permission.project_track_issue.name"
     },
     {
       "id": "PROJECT_TRACK_REPORT",
-      "name": "报告"
+      "name": "permission.project_track_report.name"
     },
     {
       "id": "PROJECT_API_DEFINITION",
-      "name": "接口定义"
+      "name": "permission.project_api_definition.name"
     },
     {
       "id": "PROJECT_API_SCENARIO",
-      "name": "接口自动化"
+      "name": "permission.project_api_scenario.name"
     },
     {
       "id": "PROJECT_API_REPORT",
-      "name": "测试报告"
+      "name": "permission.project_api_report.name"
     },
     {
       "id": "PROJECT_PERFORMANCE_TEST",
-      "name": "测试"
+      "name": "permission.project_performance_test.name"
     },
     {
       "id": "PROJECT_PERFORMANCE_REPORT",
-      "name": "报告"
+      "name": "permission.project_performance_report.name"
     },
     {
       "id": "PROJECT_REPORT_ANALYSIS",
-      "name": "报表"
+      "name": "permission.project_report_analysis.name"
     },
     {
       "id": "PROJECT_ENTERPRISE_REPORT",
-      "name": "项目报告",
+      "name": "permission.project_enterprise_report.name",
       "license": true
     },
     {
       "id": "SYSTEM_PLUGIN",
-      "name": "插件管理"
+      "name": "permission.system_plugin.name"
     }
   ]
 }
\ No newline at end of file
diff --git a/frontend/src/business/components/settings/system/group/EditPermission.vue b/frontend/src/business/components/settings/system/group/EditPermission.vue
index 47643d3401..6614f886c2 100644
--- a/frontend/src/business/components/settings/system/group/EditPermission.vue
+++ b/frontend/src/business/components/settings/system/group/EditPermission.vue
@@ -19,7 +19,7 @@
           width="180">
           <template v-slot:default="scope">
             <span v-if="scope.row.type !== 'PROJECT'">
-              {{ userGroupType[scope.row.type] ? $t(userGroupType[scope.row.type]) : scope.row.type }}
+              {{ userGroupType[scope.row.type] ? $t(userGroupType[scope.row.type]) : $t(scope.row.type) }}
             </span>
             <span v-else>{{ _computedMenuName(scope.row.resource) }}</span>
           </template>
@@ -29,7 +29,7 @@
           :label="$t('group.operation_object')"
           width="180">
           <template v-slot:default="scope">
-            {{ scope.row.resource.name }}
+            {{ $t(scope.row.resource.name) }}
           </template>
         </el-table-column>
         <el-table-column
@@ -127,7 +127,8 @@ export default {
       }
     },
     _computedMenuName(resource) {
-      return PROJECT_GROUP_SCOPE[resource.id.split('_')[1]] ? PROJECT_GROUP_SCOPE[resource.id.split('_')[1]] : '项目设置';
+      return this.$t(PROJECT_GROUP_SCOPE[resource.id.split('_')[1]]) ?
+        this.$t(PROJECT_GROUP_SCOPE[resource.id.split('_')[1]]) : this.$t('permission.other.project');
     },
     onSubmit() {
       let param = {};
diff --git a/frontend/src/business/components/settings/system/group/GroupPermission.vue b/frontend/src/business/components/settings/system/group/GroupPermission.vue
index 6b4edc7843..d743b8416f 100644
--- a/frontend/src/business/components/settings/system/group/GroupPermission.vue
+++ b/frontend/src/business/components/settings/system/group/GroupPermission.vue
@@ -3,11 +3,11 @@
     <span v-for="(permission, index) in permissions" :key="index">
       <el-checkbox v-if="permission.license" v-xpack class="permission-checkbox"
                    v-model="permission['checked']" @change="change($event, permission)">
-        {{ permission.name }}
+        {{ $t(permission.name) }}
       </el-checkbox>
       <el-checkbox v-else class="permission-checkbox"
                    v-model="permission['checked']" @change="change($event, permission)">
-        {{ permission.name }}
+        {{ $t(permission.name) }}
       </el-checkbox>
     </span>
   </div>
diff --git a/frontend/src/common/js/table-constants.js b/frontend/src/common/js/table-constants.js
index bf2fda1e5a..a7a54b4772 100644
--- a/frontend/src/common/js/table-constants.js
+++ b/frontend/src/common/js/table-constants.js
@@ -130,8 +130,8 @@ export const USER_GROUP_SCOPE = {
 }
 
 export const PROJECT_GROUP_SCOPE = {
-  'TRACK': '测试跟踪',
-  'API': '接口测试',
-  'PERFORMANCE': '性能测试',
-  'REPORT': '报表统计'
+  'TRACK': 'permission.other.track',
+  'API': 'permission.other.api',
+  'PERFORMANCE': 'permission.other.performance',
+  'REPORT': 'permission.other.report'
 }
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index c8f7e5ef13..d3654c3576 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -2472,6 +2472,297 @@ export default {
       'EXECUTE_FAILED': ' Failed',
       'EXECUTE_COMPLETED': ' Completed',
     },
-    api_case: 'API Case'
+    api_case: 'API Case',
+  },
+  permission: {
+    system_user: {
+      name: "User",
+      read: "READ",
+      create: "CREATE",
+      import: "IMPORT",
+      edit: "EDIT",
+      delete: "DELETE",
+      edit_password: "EDIT PASSWORD"
+    },
+    system_workspace: {
+      name: "Workspace",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+    },
+    system_group: {
+      name: "User Group",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+      setting_permission: "SET PERMISSION",
+    },
+    system_test_pool: {
+      name: "Test Pool",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+    },
+    system_setting: {
+      name: "Params Setting",
+      read: "READ",
+      edit: "EDIT"
+    },
+    system_quota: {
+      name: "Quota",
+      read: "READ",
+      edit: "EDIT"
+    },
+    system_auth: {
+      name: "Auth",
+      read: "READ",
+      edit: "EDIT"
+    },
+    system_operation_log: {
+      name: "Operation Log",
+      read: "READ"
+    },
+    workspace_user: {
+      name: "User",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+    },
+    workspace_service: {
+      name: "Service",
+      read: "READ",
+      edit: "EDIT",
+    },
+    workspace_message: {
+      name: "Message",
+      read: "READ",
+      edit: "EDIT",
+    },
+    workspace_template: {
+      name: "Template",
+      read: "READ",
+      case_template: "CASE TEMPLATE",
+      issue_template: "ISSUE TEMPLATE",
+      custom: "CUSTOM FIELDS"
+    },
+    workspace_project_manager: {
+      name: "Manage",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+      upload_jar: "UPLOAD JAR",
+    },
+    workspace_project_environment: {
+      name: "Environment",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+      copy: "COPY",
+      import: "IMPORT",
+      export: "EXPORT",
+      create_group: "CREATE GROUP",
+      edit_group: "EDIT GROUP",
+      copy_group: "COPY GROUP",
+      delete_group: "DELETE GROUP",
+    },
+    workspace_operation_log: {
+      name: "Operation Log",
+      read: "READ"
+    },
+    project_user: {
+      name: "User",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+    },
+    project_manager: {
+      name: "Manage",
+      read: "READ",
+      edit: "EDIT",
+    },
+    project_group: {
+      name: "Group",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+      setting_permission: "SET PERMISSION",
+    },
+    project_environment: {
+      name: "Environment",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+      copy: "COPY",
+      import: "IMPORT",
+      export: "EXPORT",
+    },
+    project_operation_log: {
+      name: "Operation Log",
+      read: "READ"
+    },
+    project_custom_code: {
+      name: "Custom Code",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+      copy: "COPY",
+    },
+    project_file: {
+      name: "File",
+      jar: "READ JAR",
+      upload_jar: "UPLOAD JAR",
+      delete_jar: "DELETE JAR",
+      read: "READ",
+      upload_file: "UPLOAD FILE",
+      delete_file: "DELETE FILE",
+    },
+    project_track_case: {
+      name: "Case",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+      copy: "COPY",
+      import: "IMPORT",
+      export: "EXPORT",
+      recover: "RECOVER",
+    },
+    project_track_review: {
+      name: "Review",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+      review: "REVIEW",
+      comment: "COMMENT",
+      relevance_or_cancel: "RELEVANCE/CANCEL",
+
+    },
+    project_track_plan: {
+      name: "Plan",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+      copy: "COPY",
+      run: "RUN",
+      batch_run: "BATCH RUN",
+      batch_edit: "BATCH EDIT",
+      schedule: "SCHEDULE",
+      relevance_or_cancel: "RELEVANCE/CANCEL",
+      batch_delete: "BATCH DELETE",
+    },
+    project_track_issue: {
+      name: "Issue",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+    },
+    project_track_report: {
+      name: "Report",
+      read: "READ",
+      delete: "DELETE",
+      export: "EXPORT",
+    },
+    project_api_definition: {
+      name: "Definition",
+      read: "READ",
+      create_api: "CREATE API",
+      edit_api: "EDIT API",
+      delete_api: "DELETE API",
+      copy_api: "COPY API",
+      create_case: "CREATE CASE",
+      edit_case: "EDIT CASE",
+      delete_case: "DELETE CASE",
+      copy_case: "COPY CASE",
+      import_api: "IMPORT API",
+      export_api: "EXPORT API",
+      timing_sync: "TIMING SYNC",
+      create_performance: "CREATE PERFORMANCE",
+      run: "RUN",
+      debug: "DEBUG",
+      mock: "MOCK",
+    },
+    project_api_scenario: {
+      name: "Scenario",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+      copy: "COPY",
+      run: "RUN",
+      debug: "DEBUG",
+      schedule: "SCHEDULE",
+      import: "IMPORT",
+      export: "EXPORT",
+      move_batch: "MOVE BATCH",
+      create_performance: "CREATE PERFORMANCE",
+      create_performance_batch: "BATCH CREATE PERFORMANCE",
+      batch_copy: "BATCH COPY",
+    },
+    project_api_report: {
+      name: "Report",
+      read: "READ",
+      delete: "DELETE",
+      export: "EXPORT",
+    },
+    project_performance_test: {
+      name: "Test",
+      read: "READ",
+      create: "CREATE",
+      edit: "EDIT",
+      delete: "DELETE",
+      copy: "COPY",
+      run: "RUN",
+      schedule: "SCHEDULE",
+    },
+    project_performance_report: {
+      name: "Report",
+      read: "READ",
+      delete: "DELETE",
+      export: "EXPORT",
+      compare: "COMPARE",
+    },
+    project_report_analysis: {
+      name: "Report Analysis",
+      read: "READ",
+      export: "EXPORT",
+      update: "SAVE",
+      create: "CREATE",
+    },
+    project_enterprise_report: {
+      name: "Enterprise Report",
+      export: "EXPORT",
+      create: "CREATE",
+      delete: "DELETE",
+      copy: "COPY",
+      schedule: "SCHEDULE",
+      edit: "EDIT",
+    },
+    system_plugin: {
+      name: "Plugin",
+      upload: "UPLOAD",
+      delete: "DELETE",
+      read: "READ",
+    },
+    other: {
+      track: "Track",
+      api: "API",
+      performance: "Performance",
+      project: "Project",
+      report: "Report Statistics"
+    }
   }
+
 };
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 91376dc30c..46f0afcdf6 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -2478,5 +2478,296 @@ export default {
       'EXECUTE_COMPLETED': '完成',
     },
     api_case: '接口用例'
+  },
+  permission: {
+    system_user: {
+      name: "用户",
+      read: "查询用户",
+      create: "创建用户",
+      import: "导入用户",
+      edit: "编辑用户",
+      delete: "删除用户",
+      edit_password: "修改密码"
+    },
+    system_workspace: {
+      name: "工作空间",
+      read: "查询工作空间",
+      create: "创建工作空间",
+      edit: "编辑工作空间",
+      delete: "删除工作空间",
+    },
+    system_group: {
+      name: "用户组与权限",
+      read: "查询用户组与权限",
+      create: "创建用户组",
+      edit: "编辑用户组",
+      setting_permission: "设置权限",
+      delete: "删除"
+    },
+    system_test_pool: {
+      name: "测试资源池",
+      read: "查询测试资源池",
+      create: "创建测试资源池",
+      edit: "编辑测试资源池",
+      delete: "删除测试资源池",
+    },
+    system_setting: {
+      name: "系统参数设置",
+      read: "查询系统设置",
+      edit: "编辑"
+    },
+    system_quota: {
+      name: "配额管理",
+      read: "查询系统配额",
+      edit: "编辑"
+    },
+    system_auth: {
+      name: "授权管理",
+      read: "查询系统授权",
+      edit: "编辑"
+    },
+    system_operation_log: {
+      name: "操作日志",
+      read: "查询操作日志"
+    },
+    workspace_user: {
+      name: "成员",
+      read: "查询成员",
+      create: "添加成员",
+      edit: "编辑成员",
+      delete: "删除成员",
+    },
+    workspace_service: {
+      name: "服务集成",
+      read: "查询",
+      edit: "编辑"
+    },
+    workspace_message: {
+      name: "消息设置",
+      read: "查询",
+      edit: "编辑"
+    },
+    workspace_template: {
+      name: "模版设置",
+      read: "查询",
+      case_template: "用例模版",
+      issue_template: "缺陷模版",
+      custom: "自定义字段"
+    },
+    workspace_project_manager: {
+      name: "项目管理",
+      read: "查询项目",
+      create: "创建项目",
+      edit: "编辑项目",
+      delete: "删除项目",
+      upload_jar: "上传jar包",
+    },
+    workspace_project_environment: {
+      name: "环境设置",
+      read: "查询",
+      create: "创建环境",
+      edit: "编辑环境",
+      delete: "删除环境",
+      copy: "复制环境",
+      import: "导入环境",
+      export: "导出环境",
+      create_group: "创建环境组",
+      edit_group: "编辑环境组",
+      copy_group: "复制环境组",
+      delete_group: "删除环境组",
+    },
+    workspace_operation_log: {
+      name: "操作日志",
+      read: "查询操作日志"
+    },
+    project_user: {
+      name: "成员",
+      read: "查询成员",
+      create: "添加成员",
+      edit: "编辑成员",
+      delete: "移除成员",
+    },
+    project_manager: {
+      name: "项目管理",
+      read: "查询项目",
+      edit: "编辑项目"
+    },
+    project_group: {
+      name: "用户组与权限",
+      read: "查询用户组与权限",
+      create: "创建用户组与权限",
+      edit: "编辑用户组与权限",
+      delete: "删除用户组与权限",
+      setting_permission: "设置权限",
+    },
+    project_environment: {
+      name: "环境设置",
+      read: "查询环境",
+      create: "创建环境",
+      edit: "编辑环境",
+      delete: "删除环境",
+      copy: "复制环境",
+      import: "导入环境",
+      export: "导出环境",
+    },
+    project_operation_log: {
+      name: "操作日志",
+      read: "查询操作日志"
+    },
+    project_custom_code: {
+      name: "自定义代码片段",
+      read: "查询",
+      create: "创建",
+      edit: "编辑",
+      delete: "删除",
+      copy: "复制",
+    },
+    project_file: {
+      name: "文件管理",
+      jar: "查询jar包",
+      upload_jar: "上传jar包",
+      delete_jar: "删除jar包",
+      read: "查询文件",
+      upload_file: "上传文件",
+      delete_file: "删除文件",
+    },
+    project_track_case: {
+      name: "测试用例",
+      read: "查询用例",
+      create: "创建用例",
+      edit: "编辑用例",
+      delete: "删除用例",
+      copy: "复制用例",
+      import: "导入用例",
+      export: "导出用例",
+      recover: "恢复用例",
+    },
+    project_track_review: {
+      name: "测试评审",
+      read: "查询评审",
+      create: "创建评审",
+      edit: "编辑评审",
+      delete: "删除评审",
+      review: "评审用例",
+      comment: "发表评论",
+      relevance_or_cancel: "关联/取消关联用例",
+
+    },
+    project_track_plan: {
+      name: "测试计划",
+      read: "查询测试计划",
+      create: "创建测试计划",
+      edit: "编辑测试计划",
+      delete: "删除测试计划",
+      copy: "复制测试计划",
+      run: "执行测试计划",
+      batch_run: "批量执行用例",
+      batch_edit: "批量编辑用例",
+      schedule: "定时任务",
+      relevance_or_cancel: "关联/取消关联用例",
+      batch_delete: "批量取消关联用例",
+    },
+    project_track_issue: {
+      name: "缺陷",
+      read: "查询缺陷",
+      create: "创建缺陷",
+      edit: "编辑缺陷",
+      delete: "删除缺陷",
+    },
+    project_track_report: {
+      name: "报告",
+      read: "查询报告",
+      delete: "删除报告",
+      export: "导出报告",
+    },
+    project_api_definition: {
+      name: "接口定义",
+      read: "查询接口",
+      create_api: "创建接口",
+      edit_api: "编辑接口",
+      delete_api: "删除接口",
+      copy_api: "复制接口",
+      create_case: "添加用例",
+      edit_case: "编辑用例",
+      delete_case: "删除用例",
+      copy_case: "复制用例",
+      import_api: "导入接口",
+      export_api: "导出接口",
+      timing_sync: "定时同步",
+      create_performance: "创建性能测试",
+      run: "执行",
+      debug: "调试",
+      mock: "MOCK设置",
+    },
+    project_api_scenario: {
+      name: "接口自动化",
+      read: "查询场景",
+      create: "创建场景",
+      edit: "编辑场景",
+      delete: "删除场景",
+      copy: "复制场景",
+      run: "执行场景",
+      debug: "调试场景",
+      schedule: "定时任务",
+      import: "导入场景",
+      export: "导出场景",
+      move_batch: "批量移动",
+      create_performance: "创建性能测试",
+      create_performance_batch: "批量创建性能测试",
+      batch_copy: "批量复制",
+    },
+    project_api_report: {
+      name: "测试报告",
+      read: "查询报告",
+      delete: "删除报告",
+      export: "导出报告",
+    },
+    project_performance_test: {
+      name: "测试",
+      read: "查询测试",
+      create: "创建测试",
+      edit: "编辑测试",
+      delete: "删除测试",
+      copy: "复制测试",
+      run: "运行",
+      schedule: "定时任务",
+    },
+    project_performance_report: {
+      name: "报告",
+      read: "查询报告",
+      delete: "删除报告",
+      export: "导出报告",
+      compare: "对比报告",
+    },
+    project_report_analysis: {
+      name: "报表",
+      read: "查看",
+      export: "导出",
+      update: "保存",
+      create: "另存为",
+    },
+    project_enterprise_report: {
+      name: "项目报告",
+      export: "发送邮件",
+      create: "创建报告",
+      delete: "删除报告",
+      copy: "复制报告",
+      schedule: "定时发送",
+      edit: "修改报告",
+
+    },
+    system_plugin: {
+      name: "插件管理",
+      upload: "点击上传",
+      delete: "删除",
+      read: "查看脚本",
+    },
+    other: {
+      track: "测试跟踪",
+      api: "接口测试",
+      performance: "性能测试",
+      project: "项目设置",
+      report: "报表统计"
+    }
   }
 };
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 64bf216308..d7c027975e 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -2146,7 +2146,7 @@ export default {
       status_resolved: '已解決',
       status_closed: '已關閉',
       status_active:'激活',
-      status_delete:'删除',
+      status_delete:'刪除',
       please_choose_current_owner: "請選擇處理人",
       tapd_current_owner: "Tapd 處理人",
       zentao_bug_build: "禪道 影響版本",
@@ -2478,5 +2478,297 @@ export default {
       'EXECUTE_COMPLETED': '完成',
     },
     api_case: '接口用例'
+  },
+  permission: {
+    system_user: {
+      name: "用戶",
+      read: "查詢用戶",
+      create: "創建用戶",
+      import: "導入用戶",
+      edit: "編輯用戶",
+      delete: "刪除用戶",
+      edit_password: "修改密碼"
+    },
+    system_workspace: {
+      name: "工作空间",
+      read: "查詢工作空间",
+      create: "創建工作空间",
+      edit: "編輯工作空间",
+      delete: "刪除工作空间",
+    },
+    system_group: {
+      name: "用戶组与权限",
+      read: "查詢用戶组与权限",
+      create: "創建用戶组",
+      edit: "編輯用戶组",
+      setting_permission: "设置权限",
+      delete: "刪除"
+    },
+    system_test_pool: {
+      name: "測試資源池",
+      read: "查詢測試資源池",
+      create: "創建測試資源池",
+      edit: "編輯測試資源池",
+      delete: "刪除測試資源池",
+    },
+    system_setting: {
+      name: "系統參數設置",
+      read: "查詢系統設置",
+      edit: "編輯"
+    },
+    system_quota: {
+      name: "配額管理",
+      read: "查詢系統配額",
+      edit: "編輯"
+    },
+    system_auth: {
+      name: "授權管理",
+      read: "查詢系統授權",
+      edit: "編輯"
+    },
+    system_operation_log: {
+      name: "操作日誌",
+      read: "查詢操作日志"
+    },
+    workspace_user: {
+      name: "成員",
+      read: "查詢成員",
+      create: "添加成員",
+      edit: "編輯成員",
+      delete: "刪除成員",
+    },
+    workspace_service: {
+      name: "服務集成",
+      read: "查詢",
+      edit: "編輯"
+    },
+    workspace_message: {
+      name: "消息設置",
+      read: "查詢",
+      edit: "編輯"
+    },
+    workspace_template: {
+      name: "模版設置",
+      read: "查詢",
+      case_template: "用例模版",
+      issue_template: "缺陷模版",
+      custom: "自定義字段"
+    },
+    workspace_project_manager: {
+      name: "项目管理",
+      read: "查詢项目",
+      create: "創建项目",
+      edit: "編輯项目",
+      delete: "刪除项目",
+      upload_jar: "上传jar包",
+    },
+    workspace_project_environment: {
+      name: "环境设置",
+      read: "查詢",
+      create: "創建环境",
+      edit: "編輯环境",
+      delete: "刪除环境",
+      copy: "複製环境",
+      import: "導入环境",
+      export: "導出环境",
+      create_group: "創建环境组",
+      edit_group: "編輯环境组",
+      copy_group: "複製环境组",
+      delete_group: "刪除环境组",
+    },
+    workspace_operation_log: {
+      name: "操作日志",
+      read: "查詢操作日志"
+    },
+    project_user: {
+      name: "成員",
+      read: "查詢成員",
+      create: "添加成員",
+      edit: "編輯成員",
+      delete: "移除成員",
+    },
+    project_manager: {
+      name: "项目管理",
+      read: "查詢项目",
+      edit: "編輯项目"
+    },
+    project_group: {
+      name: "用戶组与权限",
+      read: "查詢用戶组与权限",
+      create: "創建用戶组与权限",
+      edit: "編輯用戶组与权限",
+      delete: "刪除用戶组与权限",
+      setting_permission: "设置权限",
+    },
+    project_environment: {
+      name: "环境设置",
+      read: "查詢环境",
+      create: "創建环境",
+      edit: "編輯环境",
+      delete: "刪除环境",
+      copy: "複製环境",
+      import: "導入环境",
+      export: "導出环境",
+    },
+    project_operation_log: {
+      name: "操作日志",
+      read: "查詢操作日志"
+    },
+    project_custom_code: {
+      name: "自定義代码片段",
+      read: "查詢",
+      create: "創建",
+      edit: "編輯",
+      delete: "刪除",
+      copy: "複製",
+    },
+    project_file: {
+      name: "文件管理",
+      jar: "查詢jar包",
+      upload_jar: "上传jar包",
+      delete_jar: "刪除jar包",
+      read: "查詢文件",
+      upload_file: "上传文件",
+      delete_file: "刪除文件",
+    },
+    project_track_case: {
+      name: "測試用例",
+      read: "查詢用例",
+      create: "創建用例",
+      edit: "編輯用例",
+      delete: "刪除用例",
+      copy: "複製用例",
+      import: "導入用例",
+      export: "導出用例",
+      recover: "恢复用例",
+    },
+    project_track_review: {
+      name: "測試評審",
+      read: "查詢評審",
+      create: "創建評審",
+      edit: "編輯評審",
+      delete: "刪除評審",
+      review: "評審用例",
+      comment: "發表評論",
+      relevance_or_cancel: "關聯/取消關聯用例",
+
+    },
+    project_track_plan: {
+      name: "測試計劃",
+      read: "查詢測試計劃",
+      create: "創建測試計劃",
+      edit: "編輯測試計劃",
+      delete: "刪除測試計劃",
+      copy: "複製測試計劃",
+      run: "执行測試計劃",
+      batch_run: "批量执行用例",
+      batch_edit: "批量編輯用例",
+      schedule: "定时任务",
+      relevance_or_cancel: "關聯/取消關聯用例",
+      batch_delete: "批量取消关联用例",
+    },
+    project_track_issue: {
+      name: "缺陷",
+      read: "查詢缺陷",
+      create: "創建缺陷",
+      edit: "編輯缺陷",
+      delete: "刪除缺陷",
+    },
+    project_track_report: {
+      name: "報告",
+      read: "查詢報告",
+      delete: "刪除報告",
+      export: "導出報告",
+    },
+    project_api_definition: {
+      name: "接口定义",
+      read: "查詢接口",
+      create_api: "創建接口",
+      edit_api: "編輯接口",
+      delete_api: "刪除接口",
+      copy_api: "複製接口",
+      create_case: "添加用例",
+      edit_case: "編輯用例",
+      delete_case: "刪除用例",
+      copy_case: "複製用例",
+      import_api: "導入接口",
+      export_api: "導出接口",
+      timing_sync: "定时同步",
+      create_performance: "創建性能測試",
+      run: "执行",
+      debug: "调试",
+      mock: "MOCK设置",
+    },
+    project_api_scenario: {
+      name: "接口自动化",
+      read: "查詢場景",
+      create: "創建場景",
+      edit: "編輯場景",
+      delete: "刪除場景",
+      copy: "複製場景",
+      run: "执行場景",
+      debug: "调试場景",
+      schedule: "定时任务",
+      import: "導入場景",
+      export: "導出場景",
+      move_batch: "批量移动",
+      create_performance: "創建性能測試",
+      create_performance_batch: "批量創建性能測試",
+      batch_copy: "批量複製",
+    },
+    project_api_report: {
+      name: "測試報告",
+      read: "查詢報告",
+      delete: "刪除報告",
+      export: "導出報告",
+    },
+    project_performance_test: {
+      name: "測試",
+      read: "查詢測試",
+      create: "創建測試",
+      edit: "編輯測試",
+      delete: "刪除測試",
+      copy: "複製測試",
+      run: "运行",
+      schedule: "定时任务",
+    },
+    project_performance_report: {
+      name: "報告",
+      read: "查詢報告",
+      delete: "刪除報告",
+      export: "導出報告",
+      compare: "对比報告",
+    },
+    project_report_analysis: {
+      name: "報表",
+      read: "查看",
+      export: "導出",
+      update: "保存",
+      create: "另存为",
+    },
+    project_enterprise_report: {
+      name: "项目報告",
+      export: "发送邮件",
+      create: "創建報告",
+      delete: "刪除報告",
+      copy: "複製報告",
+      schedule: "定时发送",
+      edit: "修改報告",
+
+    },
+    system_plugin: {
+      name: "插件管理",
+      upload: "點擊上傳",
+      delete: "刪除",
+      read: "查看腳本",
+    },
+    other: {
+      track: "測試跟踪",
+      api: "接口測試",
+      performance: "性能測試",
+      project: "項目設置",
+      report: "報表統計"
+    }
   }
+
 };

From 7d940d9e03b302a1ef87c6481e6ad2614fb3a9c8 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Fri, 17 Dec 2021 18:31:47 +0800
Subject: [PATCH 172/256] =?UTF-8?q?fix:=20=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E8=AE=BE=E7=BD=AE=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008929 --user=刘瑞斌 【国际化】-消息通知-通知信息未翻译
https://www.tapd.cn/55049933/s/1082095
---
 frontend/src/business/components/notice/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/notice/util.js b/frontend/src/business/components/notice/util.js
index 2a795fd746..5044c8d70a 100644
--- a/frontend/src/business/components/notice/util.js
+++ b/frontend/src/business/components/notice/util.js
@@ -23,7 +23,7 @@ export function getResource(d) {
       resourceType += i18n.t('notice.result.' + d.operation);
       break;
     case "API_DEFINITION_TASK" :
-      resourceType = i18n.t('notice.result.api_case') + i18n.t('notice.result.' + d.operation);
+      resourceType = i18n.t('notice.api_case') + i18n.t('notice.result.' + d.operation);
       break;
     default:
       break;

From b5fcaad3da78cb4575bbd808c07e884ca33e4040 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 17 Dec 2021 18:45:49 +0800
Subject: [PATCH 173/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E5=9B=BD=E9=99=85=E5=8C=96=E6=8E=92=E7=89=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008941 --user=王孝刚 【国际化】接口测试 模块 ，国际化排版问题汇总
https://www.tapd.cn/55049933/s/1082651
---
 frontend/src/i18n/en-US.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index d3654c3576..4c777c9d55 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1458,7 +1458,7 @@ export default {
         select_type: "Choose type",
         description: "Extract data from the response and store it in variables. Use the variables in subsequent requests.",
         regex: "Regex",
-        multiple_matching: "Multiple matching",
+        multiple_matching: "Match multiple",
         regex_expression: "Regular expression",
         json_path_expression: "JSONPath expression",
         xpath_expression: "XPath expression",

From 201c1b2b741c49f30c696f323a4823b40dbead0b Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Thu, 16 Dec 2021 19:18:46 +0800
Subject: [PATCH 174/256] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE):=20=E5=BA=94=E7=94=A8=E8=AE=BE=E7=BD=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008893 --user=王孝刚 【公共用例库】-提示信息字体过大,不应该是正式文本一样参考原型设计
https://www.tapd.cn/55049933/s/1082003
---
 .../db/migration/V103__v1.16_release.sql      |  33 +-
 backend/src/main/resources/permission.json    |   9 +
 .../project/head/ProjectHeaderMenus.vue       |  17 +-
 .../components/project/home/ProjectHome.vue   |  13 +
 .../components/project/menu/EditProject.vue   |   9 -
 .../project/menu/appmanage/AppManage.vue      | 122 ++++---
 .../settings/workspace/EditProject.vue        | 321 ++++++++++++++++++
 .../settings/workspace/MsProject.vue          |   2 +-
 frontend/src/i18n/en-US.js                    |  12 +-
 frontend/src/i18n/zh-CN.js                    |  10 +-
 frontend/src/i18n/zh-TW.js                    |   1 +
 11 files changed, 461 insertions(+), 88 deletions(-)
 create mode 100644 frontend/src/business/components/settings/workspace/EditProject.vue

diff --git a/backend/src/main/resources/db/migration/V103__v1.16_release.sql b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
index dc1ee90a9b..e07f9d8043 100644
--- a/backend/src/main/resources/db/migration/V103__v1.16_release.sql
+++ b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
@@ -42,11 +42,30 @@ CREATE TABLE IF NOT EXISTS `api_scenario_report_result`
 
 CREATE TABLE IF NOT EXISTS `api_scenario_report_structure`
 (
-    `id` varchar(50) NOT NULL COMMENT 'ID',
-    `report_id` VARCHAR(50) DEFAULT NULL COMMENT '请求资源 id',
-    `create_time` bigint(13)  NULL COMMENT '创建时间',
-    `resource_tree` longblob  DEFAULT NULL COMMENT '资源步骤结构树',
+    `id` varchar
+(
+    50
+) NOT NULL COMMENT 'ID',
+    `report_id` VARCHAR
+(
+    50
+) DEFAULT NULL COMMENT '请求资源 id',
+    `create_time` bigint
+(
+    13
+) NULL COMMENT '创建时间',
+    `resource_tree` longblob DEFAULT NULL COMMENT '资源步骤结构树',
     `console` LONGTEXT DEFAULT NULL COMMENT '执行日志',
-    PRIMARY KEY (`id`),
-    KEY `index_report_id` (`report_id`) USING BTREE
-) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
+    PRIMARY KEY
+(
+    `id`
+),
+    KEY `index_report_id`
+(
+    `report_id`
+) USING BTREE
+    ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
+
+
+INSERT INTO user_group_permission (id, group_id, permission_id, module_id)
+VALUES (UUID(), 'project_app_manager', 'PROJECT_APP_MANAGER:READ+EDIT', 'PROJECT_APP_MANAGER');
diff --git a/backend/src/main/resources/permission.json b/backend/src/main/resources/permission.json
index ddc58ed2f8..0e3e93e0fd 100644
--- a/backend/src/main/resources/permission.json
+++ b/backend/src/main/resources/permission.json
@@ -330,6 +330,11 @@
       "name": "permission.project_manager.edit",
       "resourceId": "PROJECT_MANAGER"
     },
+    {
+      "id": "PROJECT_APP_MANAGER:READ+EDIT",
+      "name": "编辑应用设置",
+      "resourceId": "PROJECT_APP_MANAGER"
+    },
     {
       "id": "PROJECT_ENVIRONMENT:READ",
       "name": "permission.project_environment.read",
@@ -975,6 +980,10 @@
       "id": "PROJECT_FILE",
       "name": "permission.project_file.name"
     },
+    {
+      "id": "PROJECT_APP_MANAGER",
+      "name": "应用设置"
+    },
     {
       "id": "PROJECT_TRACK_CASE",
       "name": "permission.project_track_case.name"
diff --git a/frontend/src/business/components/project/head/ProjectHeaderMenus.vue b/frontend/src/business/components/project/head/ProjectHeaderMenus.vue
index b385cf7908..95b400c555 100644
--- a/frontend/src/business/components/project/head/ProjectHeaderMenus.vue
+++ b/frontend/src/business/components/project/head/ProjectHeaderMenus.vue
@@ -33,7 +33,8 @@
           <el-menu-item popper-class="submenu" @click="clickPlanMenu">
             {{ $t('project.version_manage') }}
           </el-menu-item>
-          <el-menu-item :index="'/project/app'" popper-class="submenu" :disabled="this.isProjectAdmin">
+          <el-menu-item :index="'/project/app'" popper-class="submenu"
+                        v-permission="['PROJECT_APP_MANAGER:READ+EDIT']">
             {{ $t('project.app_manage') }}
           </el-menu-item>
         </el-menu>
@@ -68,20 +69,6 @@ export default {
       }
     }
   },
-  created() {
-    this.$get("/user/group/list/project/" + getCurrentProjectID() + "/" + getCurrentUserId(), res => {
-      let data = res.data;
-      if (data) {
-        data.forEach(row => {
-          if (row.id === 'project_admin') {
-            this.isProjectAdmin = false;
-          }
-        })
-      } else {
-        this.isProjectAdmin = true;
-      }
-    })
-  },
   methods: {
     clickPlanMenu() {
       this.$info(this.$t('commons.function_planning'));
diff --git a/frontend/src/business/components/project/home/ProjectHome.vue b/frontend/src/business/components/project/home/ProjectHome.vue
index c68824f2c8..d7d0eba569 100644
--- a/frontend/src/business/components/project/home/ProjectHome.vue
+++ b/frontend/src/business/components/project/home/ProjectHome.vue
@@ -114,6 +114,19 @@
                     <span class="desc">{{ $t('project.log_desc') }}</span>
                   </div>
                 </div>
+                <div class="div-item">
+                  <div style="float: left">
+                    <i class="el-icon-mobile-phone icon-color"
+                       @click="click('/project/app', ['PROJECT_APP_MANAGER:READ+EDIT'])">
+                    </i>
+                  </div>
+                  <div style="float: left">
+                    <span class="title" @click="click('/project/app', ['PROJECT_APP_MANAGER:READ+EDIT'])">
+                      {{ $t('project.app_manage') }}
+                    </span><br/>
+                    <span class="desc">{{ $t('project.app_manage_desc') }}</span>
+                  </div>
+                </div>
               </div>
             </el-card>
           </el-col>
diff --git a/frontend/src/business/components/project/menu/EditProject.vue b/frontend/src/business/components/project/menu/EditProject.vue
index 00bfaa8b8c..d5e4a5dcf4 100644
--- a/frontend/src/business/components/project/menu/EditProject.vue
+++ b/frontend/src/business/components/project/menu/EditProject.vue
@@ -63,15 +63,6 @@
           <el-input v-model="form.azureFilterId" autocomplete="off"/>
           <ms-instructions-icon content="非必填项，用例关联需求时，可以只筛选出，所填的 workItem 下的选项" effect="light"/>
         </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.repeatable')" prop="repeatable">
-          <el-switch v-model="form.repeatable"></el-switch>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.test_case_custom_id')" prop="customNum">
-          <el-switch v-model="form.customNum"></el-switch>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.scenario_custom_id')" prop="scenarioCustomNum">
-          <el-switch v-model="form.scenarioCustomNum"></el-switch>
-        </el-form-item>
       </el-form>
       <template v-slot:footer>
         <div class="dialog-footer">
diff --git a/frontend/src/business/components/project/menu/appmanage/AppManage.vue b/frontend/src/business/components/project/menu/appmanage/AppManage.vue
index 8b9d485c1c..a2db59c250 100644
--- a/frontend/src/business/components/project/menu/appmanage/AppManage.vue
+++ b/frontend/src/business/components/project/menu/appmanage/AppManage.vue
@@ -12,22 +12,25 @@
                 <div>
                   <el-col :span="8">
                     <el-row style="margin-top: 10px">
-                      <span>{{ this.$t('commons.enable_settings') }}</span>
+                      <span style="font-weight:bold">{{ this.$t('commons.enable_settings') }}</span>
                     </el-row>
-                    <el-row style="margin-top: 10px">
-                      <fieldset>
-                        <el-form :model="form" ref="form" label-position="left" label-width="200px" size="small">
-                          <el-form-item :label-width="labelWidth" :label="$t('project.public_info')" prop="casePublic"
-                                        v-if="this.isXpack">
-                            <el-switch v-model="form.casePublic" style="margin-top:20px"></el-switch>
-                          </el-form-item>
-                          <el-divider v-if="this.isXpack"></el-divider>
-                          <el-form-item :label-width="labelWidth" :label="$t('project.test_case_custom_id_info')"
-                                        prop="customNum">
-                            <el-switch v-model="form.customNum" style="margin-top:20px"></el-switch>
-                          </el-form-item>
-                        </el-form>
-                      </fieldset>
+                    <el-row style="margin-top: 15px">
+                      <div style="width: 550px" class="divBorder" :model="form">
+                        <div v-if="isXpack">
+                          <span style="margin-left: 10px; margin-top: 5px; display: block">{{
+                              this.$t('project.public')
+                            }}</span>
+                          <span class="spanCss">{{ this.$t('project.public_info') }}</span>
+                          <el-switch v-model="form.casePublic"
+                                     style="margin-left: 500px ; margin-top: -60px"></el-switch>
+                          <el-divider></el-divider>
+                        </div>
+                        <span style="margin-left: 10px; margin-top: 5px; display: block">{{
+                            this.$t('project.test_case_custom_id')
+                          }}</span>
+                        <span class="spanCss">{{ this.$t('project.test_case_custom_id_info') }}</span>
+                        <el-switch v-model="form.customNum" style="margin-left: 500px ; margin-top: -60px"></el-switch>
+                      </div>
                     </el-row>
                   </el-col>
                 </div>
@@ -36,44 +39,47 @@
                 <el-row :gutter="20">
                   <el-col :span="8">
                     <el-row style="margin-top: 10px">
-                      <span>{{ this.$t('commons.enable_settings') }}</span>
+                      <span style="font-weight:bold">{{ this.$t('commons.enable_settings') }}</span>
                     </el-row>
-                    <el-row style="margin-top: 10px">
-                      <fieldset>
-                        <el-form :model="form" ref="form" label-position="left" label-width="200px" size="small">
-                          <el-form-item :label-width="labelWidth" :label="$t('project.repeatable_info')"
-                                        prop="repeatable">
-                            <el-switch v-model="form.repeatable" style="margin-top:20px"></el-switch>
-                          </el-form-item>
-                          <el-divider></el-divider>
-                          <el-form-item :label-width="labelWidth" :label="$t('project.scenario_custom_id_info')"
-                                        prop="scenarioCustomNum">
-                            <el-switch v-model="form.scenarioCustomNum" style="margin-top:20px"></el-switch>
-                          </el-form-item>
-                        </el-form>
-                      </fieldset>
+                    <el-row style="margin-top: 15px">
+                      <div style="width: 550px" class="divBorder" :model="form">
+                        <span style="margin-left: 10px ; margin-top: 10px; display: block;">{{
+                            this.$t('project.repeatable')
+                          }}</span>
+                        <span class="spanCss">{{ this.$t('project.repeatable_info') }}</span>
+                        <el-switch v-model="form.repeatable" style="margin-left: 500px ; margin-top: -60px"></el-switch>
+                        <el-divider></el-divider>
+                        <span style="margin-left: 10px">{{ this.$t('project.scenario_custom_id') }}</span>
+                        <span class="spanCss">{{ this.$t('project.scenario_custom_id_info') }}</span>
+                        <el-switch v-model="form.scenarioCustomNum"
+                                   style="margin-left: 500px ; margin-top: -60px"></el-switch>
+                        <el-divider></el-divider>
+                        <span style="margin-left: 10px">{{ 'TCP Mock Port' }}</span>
+                        <el-input-number v-model="form.mockTcpPort" :controls="false"
+                                         style="width: 37%;margin-left: 100px; margin-top: 5px"></el-input-number>
+                        <el-switch v-model="form.isMockTcpOpen" @change="chengeMockTcpSwitch"
+                                   style="margin-left: 500px;margin-top: -60px "></el-switch>
+                      </div>
                     </el-row>
                   </el-col>
                   <el-col :span="8" :offset="4">
                     <el-row style="margin-top: 10px">
-                      <span>{{ this.$t('commons.view_settings') }}</span>
+                      <span style="font-weight:bold">{{ this.$t('commons.view_settings') }}</span>
                     </el-row>
-                    <el-row style="margin-top: 10px">
-                      <fieldset>
-                        <el-form :model="form" ref="form" label-position="left" label-width="200px" size="small">
-                          <el-form-item label-width="200px" :label="$t('api_test.definition.api_quick_button')"
-                                        prop="apiQuick">
-                            <el-radio-group v-model="form.apiQuick">
-                              <el-radio label="debug" value="debug">
-                                {{ this.$t('api_test.definition.request.fast_debug') }}
-                              </el-radio>
-                              <el-radio label="api" value="api">
-                                {{ this.$t('api_test.definition.request.title') }}
-                              </el-radio>
-                            </el-radio-group>
-                          </el-form-item>
-                        </el-form>
-                      </fieldset>
+                    <el-row style="margin-top: 15px">
+                      <div style="width: 550px" class="divBorder" :model="form">
+                        <span style="margin-left: 10px;margin-top: 10px; display: block;">{{
+                            this.$t('api_test.definition.api_quick_button')
+                          }}</span>
+                        <el-radio-group v-model="form.apiQuick" style="margin-left: 300px; margin-top: -40px">
+                          <el-radio label="debug" value="debug">
+                            {{ this.$t('api_test.definition.request.fast_debug') }}
+                          </el-radio>
+                          <el-radio label="api" value="api">
+                            {{ this.$t('api_test.definition.request.title') }}
+                          </el-radio>
+                        </el-radio-group>
+                      </div>
                     </el-row>
                   </el-col>
                 </el-row>
@@ -96,6 +102,7 @@
 
 import MsContainer from "@/business/components/common/components/MsContainer";
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
+
 import {
   getCurrentProjectID,
   getCurrentUser,
@@ -161,6 +168,14 @@ export default {
         this.$success(this.$t('commons.save_success'));
       });
     },
+    chengeMockTcpSwitch(value) {
+      if (value && this.form.mockTcpPort === 0) {
+        this.result = this.$get('/project/genTcpMockPort/' + this.form.id, res => {
+          let port = res.data;
+          this.form.mockTcpPort = port;
+        })
+      }
+    }
 
   }
 };
@@ -172,5 +187,18 @@ export default {
   white-space: pre-line;
 }
 
+.divBorder {
+  border: 1px solid #DCDFE6;
+}
 
+.spanCss {
+  display: block;
+  color: #929295;
+  margin-left: 10px;
+  font-size: 13px
+}
+
+.el-divider--horizontal {
+  margin: 0 0 5px 0;
+}
 </style>
diff --git a/frontend/src/business/components/settings/workspace/EditProject.vue b/frontend/src/business/components/settings/workspace/EditProject.vue
new file mode 100644
index 0000000000..f89f5c8eb1
--- /dev/null
+++ b/frontend/src/business/components/settings/workspace/EditProject.vue
@@ -0,0 +1,321 @@
+<template>
+  <div v-loading="result.loading">
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="createVisible" destroy-on-close
+               @close="handleClose">
+      <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="80px" size="small">
+        <el-form-item :label-width="labelWidth" :label="$t('commons.name')" prop="name">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+
+        <el-form-item v-if="platformOptions.length > 1" :label-width="labelWidth" :label="$t('集成第三方平台')"
+                      prop="platform">
+          <el-select filterable v-model="form.platform">
+            <el-option v-for="item in platformOptions" :key="item.value" :label="item.text" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item :label-width="labelWidth" :label="$t('workspace.case_template_manage')" prop="caseTemplateId">
+          <template-select :data="form" scene="API_CASE" prop="caseTemplateId" ref="caseTemplate"/>
+        </el-form-item>
+
+        <el-form-item v-if="xpackEable" :label-width="labelWidth" :label="$t('使用第三方平台模板')" prop="scenarioCustomNum">
+          <el-switch v-model="form.thirdPartTemplate"></el-switch>
+        </el-form-item>
+
+        <el-form-item v-if="!xpackEable || !form.thirdPartTemplate" :label-width="labelWidth"
+                      :label="$t('workspace.issue_template_manage')" prop="issueTemplateId">
+          <template-select :platform="form.platform" :data="form" scene="ISSUE" prop="issueTemplateId"
+                           ref="issueTemplate"/>
+        </el-form-item>
+
+        <el-form-item :label-width="labelWidth" label="TCP Mock Port">
+          <el-input-number v-model="form.mockTcpPort" :controls="false"
+                           style="width: 37%;margin-right: 30px"></el-input-number>
+          <el-switch v-model="form.isMockTcpOpen" @change="chengeMockTcpSwitch"></el-switch>
+        </el-form-item>
+
+        <el-form-item :label-width="labelWidth" :label="$t('commons.description')" prop="description">
+          <el-input :autosize="{ minRows: 2, maxRows: 4}" type="textarea" v-model="form.description"></el-input>
+        </el-form-item>
+        <el-form-item :label-width="labelWidth" :label="$t('project.tapd_id')" v-if="tapd">
+          <el-input v-model="form.tapdId" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item :label-width="labelWidth" :label="$t('project.jira_key')" v-if="jira">
+          <el-input v-model="form.jiraKey" autocomplete="off"/>
+          <ms-instructions-icon effect="light">
+            <template>
+              <img class="jira-image" src="../../../../assets/jira-key.png"/>
+            </template>
+          </ms-instructions-icon>
+        </el-form-item>
+        <el-form-item :label-width="labelWidth" :label="$t('project.zentao_id')" v-if="zentao">
+          <el-input v-model="form.zentaoId" autocomplete="off"></el-input>
+          <ms-instructions-icon effect="light">
+            <template>
+              禅道流程：产品-项目 | 产品-迭代 | 产品-冲刺 | 项目-迭代 | 项目-冲刺 <br/><br/>
+              根据 "后台 -> 自定义 -> 流程" 查看对应流程，根据流程填写ID <br/><br/>
+              产品-项目 | 产品-迭代 | 产品-冲刺 需要填写产品ID <br/><br/>
+              项目-迭代 | 项目-冲刺 需要填写项目ID
+            </template>
+          </ms-instructions-icon>
+        </el-form-item>
+        <el-form-item :label-width="labelWidth" :label="$t('project.azureDevops_id')" v-if="azuredevops">
+          <el-input v-model="form.azureDevopsId" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item :label-width="labelWidth" :label="$t('project.azureDevops_filter_id')" v-if="azuredevops">
+          <el-input v-model="form.azureFilterId" autocomplete="off"/>
+          <ms-instructions-icon content="非必填项，用例关联需求时，可以只筛选出，所填的 workItem 下的选项" effect="light"/>
+        </el-form-item>
+        <el-form-item :label-width="labelWidth" :label="$t('project.repeatable')" prop="repeatable">
+          <el-switch v-model="form.repeatable"></el-switch>
+        </el-form-item>
+        <el-form-item :label-width="labelWidth" :label="$t('project.test_case_custom_id')" prop="customNum">
+          <el-switch v-model="form.customNum"></el-switch>
+        </el-form-item>
+        <el-form-item :label-width="labelWidth" :label="$t('project.scenario_custom_id')" prop="scenarioCustomNum">
+          <el-switch v-model="form.scenarioCustomNum"></el-switch>
+        </el-form-item>
+      </el-form>
+      <template v-slot:footer>
+        <div class="dialog-footer">
+          <ms-dialog-footer
+            @cancel="createVisible = false"
+            @confirm="submit('form')"/>
+        </div>
+      </template>
+    </el-dialog>
+
+    <ms-delete-confirm :title="$t('project.delete')" @delete="_handleDelete" ref="deleteConfirm"/>
+  </div>
+</template>
+
+<script>
+
+import {
+  getCurrentProjectID,
+  getCurrentUser, getCurrentUserId,
+  getCurrentWorkspaceId, hasLicense,
+  listenGoBack,
+  removeGoBackListener
+} from "@/common/js/utils";
+
+import {AZURE_DEVOPS, JIRA, PROJECT_ID, TAPD, ZEN_TAO} from "@/common/js/constants";
+import {PROJECT_CONFIGS} from "@/business/components/common/components/search/search-components";
+import MsInstructionsIcon from "@/business/components/common/components/MsInstructionsIcon";
+import TemplateSelect from "@/business/components/settings/workspace/template/TemplateSelect";
+import MsResourceFiles from "@/business/components/performance/test/components/ResourceFiles";
+import MsTableButton from "@/business/components/common/components/MsTableButton";
+import MsJarConfig from "@/business/components/api/test/components/jar/JarConfig";
+import TemplateComponent
+  from "@/business/components/track/plan/view/comonents/report/TemplateComponent/TemplateComponent";
+import ApiEnvironmentConfig from "@/business/components/api/test/components/ApiEnvironmentConfig";
+import MsTableOperatorButton from "@/business/components/common/components/MsTableOperatorButton";
+import MsDeleteConfirm from "@/business/components/common/components/MsDeleteConfirm";
+import MsMainContainer from "@/business/components/common/components/MsMainContainer";
+import MsContainer from "@/business/components/common/components/MsContainer";
+import MsTableOperator from "@/business/components/common/components/MsTableOperator";
+import MsTablePagination from "@/business/components/common/pagination/TablePagination";
+import MsTableHeader from "@/business/components/common/components/MsTableHeader";
+import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
+import {ISSUE_PLATFORM_OPTION} from "@/common/js/table-constants";
+
+export default {
+  name: "EditProject",
+  components: {
+    MsInstructionsIcon,
+    TemplateSelect,
+    MsResourceFiles,
+    MsTableButton,
+    MsJarConfig,
+    TemplateComponent,
+    ApiEnvironmentConfig,
+    MsTableOperatorButton,
+    MsDeleteConfirm,
+    MsMainContainer,
+    MsContainer, MsTableOperator, MsTablePagination, MsTableHeader, MsDialogFooter
+  },
+  data() {
+    return {
+      createVisible: false,
+      result: {},
+      btnTips: this.$t('project.create'),
+      title: this.$t('project.create'),
+      condition: {components: PROJECT_CONFIGS},
+      items: [],
+      form: {},
+      currentPage: 1,
+      pageSize: 10,
+      total: 0,
+      userFilters: [],
+      rules: {
+        name: [
+          {required: true, message: this.$t('project.input_name'), trigger: 'blur'},
+          {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'}
+        ],
+        description: [
+          {max: 250, message: this.$t('commons.input_limit', [0, 250]), trigger: 'blur'}
+        ],
+        // caseTemplateId: [{required: true}],
+        // issueTemplateId: [{required: true}],
+      },
+      screenHeight: 'calc(100vh - 195px)',
+      labelWidth: '150px',
+      platformOptions: [],
+      xpackEable: false
+    };
+  },
+  props: {
+    baseUrl: {
+      type: String
+    }
+  },
+  mounted() {
+    if (this.$route.path.split('/')[2] === 'project' &&
+      this.$route.path.split('/')[3] === 'create') {
+      this.create();
+      this.$router.replace('/setting/project/all');
+    }
+    this.xpackEable = hasLicense();
+  },
+  computed: {
+    currentUser: () => {
+      return getCurrentUser();
+    },
+    tapd() {
+      return this.form.platform === TAPD && this.platformOptions.map(i => i.value).indexOf(TAPD) > -1;
+    },
+    jira() {
+      return this.form.platform === JIRA && this.platformOptions.map(i => i.value).indexOf(JIRA) > -1;
+    },
+    zentao() {
+      return this.form.platform === ZEN_TAO && this.platformOptions.map(i => i.value).indexOf(ZEN_TAO) > -1;
+    },
+    azuredevops() {
+      return this.form.platform === AZURE_DEVOPS && this.platformOptions.map(i => i.value).indexOf(AZURE_DEVOPS) > -1;
+    },
+  },
+  inject: [
+    'reload'
+  ],
+  destroyed() {
+    this.createVisible = false;
+  },
+  methods: {
+    getOptions() {
+      if (this.$refs.issueTemplate) {
+        this.$refs.issueTemplate.getTemplateOptions();
+      }
+      if (this.$refs.caseTemplate) {
+        this.$refs.caseTemplate.getTemplateOptions();
+      }
+    },
+    edit(row) {
+      this.title = this.$t('project.edit');
+      this.getOptions();
+      this.createVisible = true;
+      listenGoBack(this.handleClose);
+      if (row) {
+        this.form = Object.assign({}, row);
+      } else {
+        this.form = {};
+      }
+      this.platformOptions = [];
+      this.platformOptions.push(...ISSUE_PLATFORM_OPTION);
+      this.$get("/service/integration/all/" + getCurrentUser().lastWorkspaceId, response => {
+        let data = response.data;
+        let platforms = data.map(d => d.platform);
+        this.filterPlatformOptions(platforms, TAPD);
+        this.filterPlatformOptions(platforms, JIRA);
+        this.filterPlatformOptions(platforms, ZEN_TAO);
+        this.filterPlatformOptions(platforms, AZURE_DEVOPS);
+      });
+    },
+    filterPlatformOptions(platforms, platform) {
+      if (platforms.indexOf(platform) === -1) {
+        for (let i = 0; i < this.platformOptions.length; i++) {
+          if (this.platformOptions[i].value === platform) {
+            this.platformOptions.splice(1, i);
+            break;
+          }
+        }
+      }
+    },
+    submit(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          let saveType = "add";
+          if (this.form.id) {
+            saveType = "update";
+          }
+          let protocol = document.location.protocol;
+          protocol = protocol.substring(0, protocol.indexOf(":"));
+          this.form.protocal = protocol;
+          this.form.workspaceId = getCurrentWorkspaceId();
+          this.form.createUser = getCurrentUserId();
+          this.result = this.$post("/project/" + saveType, this.form, () => {
+            this.createVisible = false;
+            this.reload();
+            this.$success(this.$t('commons.save_success'));
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+    handleDelete(project) {
+      this.$refs.deleteConfirm.open(project);
+    },
+    _handleDelete(project) {
+      this.$confirm(this.$t('project.delete_tip'), '', {
+        confirmButtonText: this.$t('commons.confirm'),
+        cancelButtonText: this.$t('commons.cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.$get('/project/delete/' + project.id, () => {
+          if (project.id === getCurrentProjectID()) {
+            localStorage.removeItem(PROJECT_ID);
+            this.$post("/user/update/current", {id: getCurrentUser().id, lastProjectId: ''});
+          }
+          this.$success(this.$t('commons.delete_success'));
+          this.list();
+        });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: this.$t('commons.delete_cancelled')
+        });
+      });
+    },
+    handleClose() {
+      removeGoBackListener(this.handleClose);
+      this.createVisible = false;
+    },
+    chengeMockTcpSwitch(value) {
+      if (value && this.form.mockTcpPort === 0) {
+        this.result = this.$get('/project/genTcpMockPort/' + this.form.id, res => {
+          let port = res.data;
+          this.form.mockTcpPort = port;
+        })
+      }
+    }
+  },
+  created() {
+    document.addEventListener('keydown', this.handleEvent);
+  },
+  beforeDestroy() {
+    document.removeEventListener('keydown', this.handleEvent);
+  },
+};
+</script>
+
+<style scoped>
+pre {
+  margin: 0 0;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
+}
+
+.el-input, .el-textarea {
+  width: 80%;
+}
+</style>
diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue
index 008a5fa5e4..7547000d3f 100644
--- a/frontend/src/business/components/settings/workspace/MsProject.vue
+++ b/frontend/src/business/components/settings/workspace/MsProject.vue
@@ -209,7 +209,7 @@ import {PROJECT_CONFIGS} from "@/business/components/common/components/search/se
 import MsRolesTag from "@/business/components/common/components/MsRolesTag";
 import AddMember from "@/business/components/settings/common/AddMember";
 import MsInstructionsIcon from "@/business/components/common/components/MsInstructionsIcon";
-import EditProject from "@/business/components/project/menu/EditProject";
+import EditProject from "@/business/components/settings/workspace/EditProject";
 
 export default {
   name: "MsProject",
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 4c777c9d55..f1da8a8fe5 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -659,9 +659,10 @@ export default {
     no_data: 'No Data',
     select: 'Select',
     repeatable: 'Interface definition URL repeatable',
-    repeatable_info: 'Interface definition URL repeatable \n When enabled, the interface definition repeatability check will not check the URL',
-    case_public: 'Common use case library',
-    public_info: 'Start common use case library \n You can use the public use case library data or add your own use cases to the public use case library',
+    repeatable_info: 'After enabling, the interface definition repeatability check will not check the URL',
+    case_public: 'Public Library',
+    public: 'Start Public Library',
+    public_info: 'You can use public use case library data, or you can add use cases to the public use case library by yourself',
     upload_file_again: 'Upload again',
     code_segment: {
       code_segment: "Custom Code",
@@ -694,6 +695,7 @@ export default {
     log: 'Log',
     version_manage: 'Version',
     app_manage: 'App Management',
+    app_manage_desc: 'Edit application management',
     desc: 'Project Description',
     manage_people: 'Project Manager',
     creator: 'Creator',
@@ -705,9 +707,9 @@ export default {
     group_desc: 'Add user groups and global configuration',
     code_segment_desc: 'Custom code snippet',
     test_case_custom_id: 'Test Case Custom ID',
-    test_case_custom_id_info: 'Test Case Custom ID \n The Case ID defaults to the system self increment ID',
+    test_case_custom_id_info: 'The Case ID defaults to the system self incrementing ID',
     scenario_custom_id: 'Scenario Custom ID',
-    scenario_custom_id_info: 'Scenario Custom ID \n The scenario Case ID defaults to the system self increment ID',
+    scenario_custom_id_info: 'The scenario use case ID defaults to the system self-incremented ID',
   },
   member: {
     create: 'Create',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 46f0afcdf6..3874391170 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -663,9 +663,10 @@ export default {
     no_data: '无数据',
     select: '选择项目',
     repeatable: '接口定义URL可重复',
-    repeatable_info: '接口定义URL可重复 \n 启用后接口定义重复性校验将不校验URL',
+    repeatable_info: '启用后接口定义重复性校验将不校验URL',
     case_public: '公共用例库',
-    public_info: '启动公共用例库 \n 可以使用公共用例库数据，也可以自行添加用例至公共用例库',
+    public: '启动公共用例库',
+    public_info: '可以使用公共用例库数据，也可以自行添加用例至公共用例库',
     upload_file_again: '重新上传',
     code_segment: {
       code_segment: "自定义代码片段",
@@ -698,6 +699,7 @@ export default {
     log: '操作日志',
     version_manage: '版本管理',
     app_manage: '应用管理',
+    app_manage_desc: '编辑应用管理',
     desc: '项目描述',
     manage_people: '管理员',
     creator: '创建人',
@@ -709,9 +711,9 @@ export default {
     log_desc: '项目全部操作过程',
     code_segment_desc: '自定义代码片段',
     test_case_custom_id: '测试用例自定义ID',
-    test_case_custom_id_info: '测试用例自定义ID \n 用例ID默认为系统自增ID',
+    test_case_custom_id_info: '用例ID默认为系统自增ID',
     scenario_custom_id: '场景自定义ID',
-    scenario_custom_id_info: '场景自定义ID \n 场景用例ID默认为系统自增ID',
+    scenario_custom_id_info: '场景用例ID默认为系统自增ID',
   },
   member: {
     create: '添加成员',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index d7c027975e..493ee0ce2c 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -698,6 +698,7 @@ export default {
     log: '操作日誌',
     version_manage: '版本管理',
     app_manage: '應用管理',
+    app_manage_desc: '編輯應用管理',
     desc: '項目描述',
     manage_people: '管理員',
     creator: '創建人',

From cf9a65cc08c919786190a61a3a8b07bfa27c6328 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 17 Dec 2021 16:28:50 +0800
Subject: [PATCH 175/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008956 --user=王孝刚 【国际化】-API Automation-未翻译汇总
https://www.tapd.cn/55049933/s/1082453
---
 .../report/components/AssertionResults.vue    |  2 +-
 .../automation/scenario/AddBasisScenario.vue  |  4 +-
 .../component/ApiScenarioComponent.vue        | 14 +++--
 .../components/ApiVariableSetting.vue         |  6 +-
 .../assertion/ApiAssertionJsonPath.vue        |  4 +-
 .../assertion/document/DocumentBody.vue       | 57 +++++++++++--------
 .../mock/Components/MockApiResponseBody.vue   |  3 +-
 .../mock/Components/MockResponseParam.vue     |  2 +-
 .../components/response/AssertionResults.vue  |  2 +-
 .../common/json-schema/import/ImportJson.vue  |  6 +-
 .../common/json-schema/schema/editor/main.vue |  2 +-
 .../business/components/task/TaskCenter.vue   |  2 +-
 frontend/src/i18n/en-US.js                    | 33 ++++++++++-
 frontend/src/i18n/zh-CN.js                    | 29 +++++++++-
 frontend/src/i18n/zh-TW.js                    | 29 +++++++++-
 15 files changed, 144 insertions(+), 51 deletions(-)

diff --git a/frontend/src/business/components/api/automation/report/components/AssertionResults.vue b/frontend/src/business/components/api/automation/report/components/AssertionResults.vue
index 2f2a0a419d..2ec619b634 100644
--- a/frontend/src/business/components/api/automation/report/components/AssertionResults.vue
+++ b/frontend/src/business/components/api/automation/report/components/AssertionResults.vue
@@ -5,7 +5,7 @@
         <span>{{ !scope.row.name || scope.row.name === 'null' ? "" : scope.row.name }}</span>
       </template>
     </el-table-column>
-    <el-table-column prop="content" label="内容" width="300" show-overflow-tooltip/>
+    <el-table-column prop="content" :label="$t('api_report.assertions_content')" width="300" show-overflow-tooltip/>
     <el-table-column prop="message" :label="$t('api_report.assertions_error_message')"/>
     <el-table-column prop="pass" :label="$t('api_report.assertions_is_success')" width="180">
       <template v-slot:default="{row}">
diff --git a/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue b/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
index 827c07cafc..09ef12a413 100644
--- a/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
@@ -2,7 +2,7 @@
   <el-dialog :close-on-click-modal="false" :title="$t('api_test.automation.add_scenario')" :visible.sync="visible"
              width="45%"
              :destroy-on-close="true">
-    <el-form :model="scenarioForm" label-position="right" label-width="80px" size="small" :rules="rule"
+    <el-form :model="scenarioForm" label-position="right" label-width="100px" size="small" :rules="rule"
              ref="scenarioForm">
       <el-form-item :label="$t('commons.name')" prop="name">
         <el-input v-model="scenarioForm.name" autocomplete="off" :placeholder="$t('commons.name')"/>
@@ -47,7 +47,7 @@
       <ms-dialog-footer
         @cancel="visible = false"
         :isShow="true"
-        title="编辑详情"
+        :title="$t('commons.edit_info')"
         @saveAsEdit="saveScenario(true)"
         @confirm="saveScenario">
       </ms-dialog-footer>
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
index 495c25ee58..41c248cc2f 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
@@ -13,11 +13,11 @@
     :show-btn="showBtn"
     color="#606266"
     background-color="#F4F4F5"
-    title='场景'>
+    :title="$t('commons.scenario')">
 
     <template v-slot:afterTitle v-if="isSameSpace">
-      <span v-if="isShowNum" @click = "clickResource(scenario)">{{"（ ID: "+scenario.num+"）"}}</span>
-      <span v-else >
+      <span v-if="isShowNum" @click="clickResource(scenario)">{{ "（ ID: " + scenario.num + "）" }}</span>
+      <span v-else>
         <el-tooltip class="ms-num" effect="dark" :content="$t('api_test.automation.scenario.num_none')" placement="top">
           <i class="el-icon-warning"/>
         </el-tooltip>
@@ -40,8 +40,10 @@
       </span>
     </template>
     <template v-slot:scenarioEnable>
-      <el-tooltip content="启用场景环境：当前步骤使用场景原始环境配置运行" placement="top">
-        <el-checkbox v-model="scenario.environmentEnable" @change="checkEnv" :disabled="scenario.disabled">启用场景环境</el-checkbox>
+      <el-tooltip :content="$t('commons.enable_scene_info')" placement="top">
+        <el-checkbox v-model="scenario.environmentEnable" @change="checkEnv" :disabled="scenario.disabled">
+          {{ $t('commons.enable_scene') }}
+        </el-checkbox>
       </el-tooltip>
     </template>
     <template v-slot:button>
@@ -185,7 +187,7 @@ export default {
       this.$get("/api/automation/checkScenarioEnv/" + this.scenario.id, res => {
         if (this.scenario.environmentEnable && !res.data) {
           this.scenario.environmentEnable = false;
-          this.$warning("当前场景没有环境，需要先设置自身环境");
+          this.$warning(this.$t('commons.scenario_warning'));
           return;
         }
         this.setDomain(val);
diff --git a/frontend/src/business/components/api/definition/components/ApiVariableSetting.vue b/frontend/src/business/components/api/definition/components/ApiVariableSetting.vue
index eb7b4bacd9..aa09c4b28f 100644
--- a/frontend/src/business/components/api/definition/components/ApiVariableSetting.vue
+++ b/frontend/src/business/components/api/definition/components/ApiVariableSetting.vue
@@ -19,7 +19,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="编码">
+          <el-form-item :label="$t('commons.encode')">
             <el-select v-model="data.urlEncode" size="small" clearable style="width: 50%;">
               <el-option
                 v-for="item in options"
@@ -48,10 +48,10 @@ export default {
       data: {},
       options: [{
         value: true,
-        label: '是'
+        label: this.$t('commons.yes')
       }, {
         value: false,
-        label: '否'
+        label: this.$t('commons.no')
       }],
     }
   },
diff --git a/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsonPath.vue b/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsonPath.vue
index 97d30ea20a..7da4f481c0 100644
--- a/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsonPath.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsonPath.vue
@@ -13,12 +13,12 @@
           <el-option :label="$t('commons.adv_search.operators.not_equals')" value="NOT_EQUALS"/>
           <el-option :label="$t('commons.adv_search.operators.gt')" value="GT"/>
           <el-option :label="$t('commons.adv_search.operators.lt')" value="LT"/>
-          <el-option label="正则匹配" value="REGEX"/>
+          <el-option :label="$t('api_test.request.assertions.regular_match')" value="REGEX"/>
         </el-select>
         <el-input :disabled="isReadOnly" v-model="jsonPath.expect" size="small" show-word-limit
                   :placeholder="$t('api_test.request.assertions.expect')" style="width: 50%"/>
         <el-tooltip placement="top" v-if="jsonPath.option === 'REGEX'">
-          <div slot="content">特殊字符"$ ( ) * + . [ ] \ ^ { } |"需转义为"\ "+"特殊字符",如"\$"</div>
+          <div slot="content">{{ $t('api_test.request.assertions.regex_info') }}</div>
           <i class="el-icon-question" style="cursor: pointer"/>
         </el-tooltip>
       </el-col>
diff --git a/frontend/src/business/components/api/definition/components/assertion/document/DocumentBody.vue b/frontend/src/business/components/api/definition/components/assertion/document/DocumentBody.vue
index 5a55e4ef5d..03f7cb41bc 100644
--- a/frontend/src/business/components/api/definition/components/assertion/document/DocumentBody.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/document/DocumentBody.vue
@@ -6,7 +6,7 @@
          {{ $t('commons.import') }}
        </span>
       <span v-if="apiId!=='none'">
-         <el-checkbox v-model="checked" @change="checkedAPI">跟随API定义</el-checkbox>
+         <el-checkbox v-model="checked" @change="checkedAPI">{{ $t('commons.follow_api') }}</el-checkbox>
       </span>
     </div>
     <el-table
@@ -27,13 +27,15 @@
         </template>
       </el-table-column>
 
-      <el-table-column prop="include" width="78" label="必含" :render-header="renderHeader">
+      <el-table-column prop="include" width="78" :label="$t('api_test.request.assertions.must_contain')"
+                       :render-header="renderHeader">
         <template slot-scope="scope">
           <el-checkbox v-model="scope.row.include" @change="handleCheckOneChange" :disabled="checked"/>
         </template>
       </el-table-column>
 
-      <el-table-column prop="typeVerification" width="100" label="类型校验" :render-header="renderHeaderType">
+      <el-table-column prop="typeVerification" width="100" :label="$t('api_test.request.assertions.type_verification')"
+                       :render-header="renderHeaderType">
         <template slot-scope="scope">
           <el-checkbox v-model="scope.row.typeVerification" @change="handleCheckOneChange" :disabled="checked"/>
         </template>
@@ -47,34 +49,43 @@
         </template>
       </el-table-column>
 
-      <el-table-column prop="contentVerification" label="内容校验" width="200">
+      <el-table-column prop="contentVerification" :label="$t('api_test.request.assertions.content_verification')"
+                       width="200">
         <template slot-scope="scope">
-          <el-select v-model="scope.row.contentVerification" :placeholder="$t('commons.please_select')" size="mini" :disabled="checked">
+          <el-select v-model="scope.row.contentVerification" :placeholder="$t('commons.please_select')" size="mini"
+                     :disabled="checked">
             <el-option v-for="item in verificationOptions " :key="item.value" :label="item.label" :value="item.value"/>
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column prop="expectedOutcome" label="预期结果" min-width="200">
+      <el-table-column prop="expectedOutcome" :label="$t('api_test.request.assertions.expected_results')"
+                       min-width="200">
         <template slot-scope="scope">
           <el-input v-if="scope.row.status && scope.column.fixed" v-model="scope.row.expectedOutcome" size="mini"/>
           <span v-else>{{ scope.row.expectedOutcome }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column prop="arrayVerification" width="140" label="校验数组内元素" :render-header="renderHeaderArray">
+      <el-table-column prop="arrayVerification" width="140" :label="$t('api_test.request.assertions.check')"
+                       :render-header="renderHeaderArray">
         <template slot-scope="scope">
-          <el-checkbox v-model="scope.row.arrayVerification" @change="handleCheckOneChange" v-if="scope.row.type==='array'" :disabled="checked"/>
+          <el-checkbox v-model="scope.row.arrayVerification" @change="handleCheckOneChange"
+                       v-if="scope.row.type==='array'" :disabled="checked"/>
         </template>
       </el-table-column>
 
       <el-table-column :label="$t('commons.operating')" width="130" fixed="right">
         <template v-slot:default="scope">
           <span>
-            <el-tooltip effect="dark" content="添加校验" placement="top-start">
-              <el-button icon="el-icon-document-checked" circle type="primary" size="mini" @click="addVerification(scope.row)" :disabled="scope.row.type ==='object' ||scope.row.type ==='array' || checked || scope.row.id==='root'"/>
+            <el-tooltip effect="dark" :content="$t('api_test.request.assertions.add_check')" placement="top-start">
+              <el-button icon="el-icon-document-checked" circle type="primary" size="mini"
+                         @click="addVerification(scope.row)"
+                         :disabled="scope.row.type ==='object' ||scope.row.type ==='array' || checked || scope.row.id==='root'"/>
             </el-tooltip>
-            <el-tooltip effect="dark" content="添加子字段" placement="top-start">
-              <el-button icon="el-icon-plus" circle type="primary" size="mini" style="margin-left: 10px" @click="addRow(scope.row)" :disabled="(scope.row.type !=='object' && scope.row.type !=='array')  || checked"/>
+            <el-tooltip effect="dark" :content="$t('api_test.request.assertions.add_subfield')" placement="top-start">
+              <el-button icon="el-icon-plus" circle type="primary" size="mini" style="margin-left: 10px"
+                         @click="addRow(scope.row)"
+                         :disabled="(scope.row.type !=='object' && scope.row.type !=='array')  || checked"/>
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('commons.remove')" placement="top-start">
               <el-button icon="el-icon-delete" type="primary" circle size="mini" style="margin-left: 10px" @click="remove(scope.row)" :disabled="checked || scope.row.id==='root'"/>
@@ -105,15 +116,15 @@ export default {
     return {
       loading: false,
       verificationOptions: [
-        {value: 'none', label: '不校验[]'},
-        {value: 'value_eq', label: '值-等于[value=]'},
-        {value: 'value_not_eq', label: '值-不等于[value!=]'},
-        {value: 'value_in', label: '值-包含[include=]'},
-        {value: 'length_eq', label: '长度-等于[length=]'},
-        {value: 'length_not_eq', label: '长度-不等于[length!=]'},
-        {value: 'length_gt', label: '长度-大于[length>]'},
-        {value: 'length_lt', label: '长度-小于[length<]'},
-        {value: 'regular', label: '正则匹配'}
+        {value: 'none', label: this.$t('api_test.request.assertions.none')},
+        {value: 'value_eq', label: this.$t('api_test.request.assertions.value_eq')},
+        {value: 'value_not_eq', label: this.$t('api_test.request.assertions.value_not_eq')},
+        {value: 'value_in', label: this.$t('api_test.request.assertions.value_in')},
+        {value: 'length_eq', label: this.$t('api_test.request.assertions.length_eq')},
+        {value: 'length_not_eq', label: this.$t('api_test.request.assertions.length_not_eq')},
+        {value: 'length_gt', label: this.$t('api_test.request.assertions.length_gt')},
+        {value: 'length_lt', label: this.$t('api_test.request.assertions.length_lt')},
+        {value: 'regular', label: this.$t('api_test.request.assertions.regular_match')}
       ],
       typeSelectOptions: [
         {value: 'object', label: 'object'},
@@ -124,8 +135,8 @@ export default {
 
       ],
       requiredSelectOptions: [
-        {value: true, label: '必填'},
-        {value: false, label: '非必填'},
+        {value: true, label: this.$t('commons.selector.required')},
+        {value: false, label: this.$t('commons.selector.not_required')},
       ],
       checked: false,
       tableData: Array,
diff --git a/frontend/src/business/components/api/definition/components/mock/Components/MockApiResponseBody.vue b/frontend/src/business/components/api/definition/components/mock/Components/MockApiResponseBody.vue
index e40a1ee802..52f877cf08 100644
--- a/frontend/src/business/components/api/definition/components/mock/Components/MockApiResponseBody.vue
+++ b/frontend/src/business/components/api/definition/components/mock/Components/MockApiResponseBody.vue
@@ -5,8 +5,7 @@
         {{ $t('api_test.definition.request.body_json') }}
       </el-radio>
       <el-radio :disabled="isReadOnly" label="fromApi" @change="modeChange">
-<!--        {{ 跟随API定义 }}-->
-        跟随API定义
+        {{ $t('commons.follow_api') }}
       </el-radio>
       <el-radio :disabled="isReadOnly" :label="type.XML" @change="modeChange">
         {{ $t('api_test.definition.request.body_xml') }}
diff --git a/frontend/src/business/components/api/definition/components/mock/Components/MockResponseParam.vue b/frontend/src/business/components/api/definition/components/mock/Components/MockResponseParam.vue
index 3fbf5cc1cf..9528773077 100644
--- a/frontend/src/business/components/api/definition/components/mock/Components/MockResponseParam.vue
+++ b/frontend/src/business/components/api/definition/components/mock/Components/MockResponseParam.vue
@@ -20,7 +20,7 @@
               <el-col :span="2"/>
             </el-row>
           </el-tab-pane>
-          <el-tab-pane label="响应延迟时间" name="delayed" class="pane">
+          <el-tab-pane :label="$t('commons.response_time_delay')" name="delayed" class="pane">
             <el-row>
               <el-input-number v-model="response.delayed" :min="0">
                 <template slot="append">ms</template>
diff --git a/frontend/src/business/components/api/definition/components/response/AssertionResults.vue b/frontend/src/business/components/api/definition/components/response/AssertionResults.vue
index c7b0ad9b24..316468b3b1 100644
--- a/frontend/src/business/components/api/definition/components/response/AssertionResults.vue
+++ b/frontend/src/business/components/api/definition/components/response/AssertionResults.vue
@@ -1,7 +1,7 @@
 <template>
   <el-table :data="assertions" :row-style="getRowStyle" :header-cell-style="getRowStyle">
     <el-table-column prop="name" :label="$t('api_report.assertions_name')" width="200" show-overflow-tooltip/>
-    <el-table-column prop="content" label="内容" width="300" show-overflow-tooltip/>
+    <el-table-column prop="content" :label="$t('api_report.assertions_content')" width="300" show-overflow-tooltip/>
     <el-table-column prop="message" :label="$t('api_report.assertions_error_message')"/>
     <el-table-column prop="pass" :label="$t('api_report.assertions_is_success')" width="100">
       <template v-slot:default="{row}">
diff --git a/frontend/src/business/components/common/json-schema/import/ImportJson.vue b/frontend/src/business/components/common/json-schema/import/ImportJson.vue
index ab0065c945..4048c49570 100644
--- a/frontend/src/business/components/common/json-schema/import/ImportJson.vue
+++ b/frontend/src/business/components/common/json-schema/import/ImportJson.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="导入"
+    :title="$t('commons.import')"
     :visible.sync="importVisible"
     width="50%"
     append-to-body
@@ -90,7 +90,7 @@
       saveConfirm() {
         if (this.activeName === 'JSON') {
           if (!this.checkIsJson(this.json)) {
-            this.$error("导入的数据非JSON格式");
+            this.$error(this.$t('schema.json_warning'));
             return;
           }
           let jsonData = MsConvert.format(json5.parse(this.json));
@@ -98,7 +98,7 @@
           this.$emit('jsonData', jsonData);
         } else {
           if (!this.checkIsJsonSchema(this.jsonSchema)) {
-            this.$error("导入的数据非JSON-SCHEMA 格式");
+            this.$error(this.$t('schema.json_schema_warning'));
             return;
           }
           let obj = json5.parse(this.jsonSchema);
diff --git a/frontend/src/business/components/common/json-schema/schema/editor/main.vue b/frontend/src/business/components/common/json-schema/schema/editor/main.vue
index a319706880..24e37b4679 100644
--- a/frontend/src/business/components/common/json-schema/schema/editor/main.vue
+++ b/frontend/src/business/components/common/json-schema/schema/editor/main.vue
@@ -49,7 +49,7 @@
     <!-- 高级设置-->
     <el-dialog append-to-body :close-on-click-modal="true" :title="$t('schema.adv_setting')" :visible.sync="modalVisible" :destroy-on-close="true"
                @close="handleClose">
-      <p class="tip">基础设置 </p>
+      <p class="tip">{{ $t("schema.base_setting") }} </p>
 
       <el-form label-position="left" label-width="100px" v-model="advancedValue" class="ms-advanced-search-form">
            <div :span="8" v-for="(item,key) in advancedValue" :key="key">
diff --git a/frontend/src/business/components/task/TaskCenter.vue b/frontend/src/business/components/task/TaskCenter.vue
index a910835b7f..0a6404f47f 100644
--- a/frontend/src/business/components/task/TaskCenter.vue
+++ b/frontend/src/business/components/task/TaskCenter.vue
@@ -33,7 +33,7 @@
       :size="size.toString()"
       custom-class="ms-drawer-task">
       <el-card style="float: left;width: 850px" v-if="size > 550 ">
-        <div class="ms-task-opt-btn" @click="packUp">{{ this.$t('') }}</div>
+        <div class="ms-task-opt-btn" @click="packUp">{{ $t('commons.task_close') }}</div>
         <!-- 接口用例结果 -->
         <ms-request-result-tail :response="response" ref="debugResult" v-if="reportType === 'API'"/>
 
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index f1da8a8fe5..c41218a46c 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -99,6 +99,9 @@ export default {
     test_resource_pool: 'Resource Pool',
     system_setting: 'Settings',
     api: 'API',
+    encode: 'Encode',
+    follow_api: 'Follow API definition',
+    response_time_delay: 'Response delay time',
     my_workstation: 'MyWorkstation',
     performance: 'Performance',
     enable_settings: 'Enable Settings',
@@ -179,7 +182,7 @@ export default {
     batch_add: "Batch add",
     check_project_tip: "Create or select the project first",
     auth_redirect_tip: 'Jump to the authentication source page for authentication',
-    tag_tip: "Enter Enter to Add Label",
+    tag_tip: "Enter to Add Label",
     node_name_tip: "The name cannot contain'\\'",
     more_operator: "More operator",
     mock: "Mock settings",
@@ -203,6 +206,9 @@ export default {
     execute_history: "Execute history",
     debug_history: "Debug history",
     testing: "Testing",
+    enable_scene: "Enable scene environment",
+    enable_scene_info: "Enable scene environment: the current step uses the original environment configuration of the scene to run",
+    edit_info: "Edit details",
     environment: "Environment",
     run_success: "Run Success",
     run_completed: "Run Completed",
@@ -1012,6 +1018,7 @@ export default {
     copy: "Copy Test",
     please_select_case: "Please select case",
     fail_to_stop: "Fail to stop",
+    batch_add_parameter: "Format: parameter name: parameter value <br/> like：Accept-Encoding:utf-8",
     jar_config: {
       title: "Upload jar package",
       jar_file: "Jar package",
@@ -1454,6 +1461,23 @@ export default {
         json_path_clear: "Clear JSONPath Assertion",
         debug_first: "First, debug to get the response",
         suggest_tip: "Click the note to add the JSONPath assertion",
+        regex_info: 'Special characters "$ () * +. [] \\ ^ {} |" need to be escaped as "\\ "+"special characters", such as "\\$"',
+        regular_match: 'Regular match',
+        none: 'Do not verify []',
+        value_eq: 'Value-equal to [value=]',
+        value_not_eq: 'Value-not equal to [value!=]',
+        value_in: 'Value-include [include=]',
+        length_eq: 'Length-equal to [length=]',
+        length_not_eq: 'Length-not equal to [length!=]',
+        length_gt: 'Length-greater than [length>]',
+        length_lt: 'Length-less than [length<]',
+        must_contain: 'Must contain',
+        type_verification: 'Type verification',
+        content_verification: 'Content verification',
+        expected_results: 'Expected results',
+        check: 'Check the elements in the array',
+        add_check: 'Add check',
+        add_subfield: 'Add subfield'
       },
       extract: {
         label: "Extract from response",
@@ -1728,6 +1752,7 @@ export default {
     assertions: "Assertions",
     assertions_pass: "Passed Assertions",
     assertions_name: "Assertion Name",
+    assertions_content: "Content",
     assertions_error_message: "Error Message",
     assertions_is_success: "Fail/Success",
     result: "Result",
@@ -1850,7 +1875,7 @@ export default {
       please_select_relate_test: "Please select the test to associate",
       relate_test_not_find: 'The associated test does not exist, please check the test case',
       other_relate_test_not_find: 'Associated test name, please go to the third party platform to execute',
-      batch_handle: 'Batch processing (select {0} item)',
+      batch_handle: 'Batch processing (select {0} items)',
       batch_update: 'Update the attributes of {0} cases',
       select_catalog: 'Please select use case catalog',
       updated_attr_value: 'The updated attribute value',
@@ -2364,7 +2389,9 @@ export default {
     format: "Format",
     nothing: "Nothing",
     preview: "Preview",
-    add_custom: "Add Custom Prop"
+    add_custom: "Add Custom Prop",
+    json_warning: 'The imported data is not in JSON format',
+    json_schema_warning: 'The imported data is not in JSON-SCHEMA format',
   },
   loop: {
     loops_title: "loops",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 3874391170..30c2a5c085 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -57,6 +57,7 @@ export default {
     confirm: '确定',
     cancel: '取消',
     scenario: '场景',
+    scenario_warning: '当前场景没有环境，需要先设置自身环境',
     confirm_info: '未保存，是否确认关闭？',
     track: '用例',
     actuator: '执行器',
@@ -99,6 +100,9 @@ export default {
     test_resource_pool: '测试资源池',
     system_setting: '系统设置',
     api: '接口测试',
+    follow_api: '跟随API定义',
+    encode: '编码',
+    response_time_delay: '响应延迟时间',
     performance: '性能测试',
     enable_settings: '启用设置',
     view_settings: '显示设置',
@@ -203,6 +207,9 @@ export default {
     execute_history: "执行历史",
     debug_history: "调试历史",
     testing: "测试中",
+    edit_info: "编辑详情",
+    enable_scene: "启用场景环境",
+    enable_scene_info: "启用场景环境：当前步骤使用场景原始环境配置运行",
     environment: "运行环境",
     run_success: "执行成功",
     run_completed: "执行完成",
@@ -1460,6 +1467,23 @@ export default {
         set_failure_status: "设置失败状态",
         set_failure_msg: "设置失败消息",
         suggest_tip: "点击便签添加JSONPath断言",
+        regex_info: '特殊字符"$ ( ) * + . [ ] \\ ^ { } |"需转义为"\\ "+"特殊字符",如"\\$"',
+        regular_match: '正则匹配',
+        none: '不校验[]',
+        value_eq: '值-等于[value=]',
+        value_not_eq: '值-不等于[value!=]',
+        value_in: '值-包含[include=]',
+        length_eq: '长度-等于[length=]',
+        length_not_eq: '长度-不等于[length!=]',
+        length_gt: '长度-大于[length>]',
+        length_lt: '长度-小于[length<]',
+        must_contain: '必含',
+        type_verification: '类型校验',
+        content_verification: '内容校验',
+        expected_results: '预期结果',
+        check: '校验组内元素',
+        add_check: '添加校验',
+        add_subfield: '添加子字段'
       },
       extract: {
         label: "提取",
@@ -1736,6 +1760,7 @@ export default {
     assertions_pass: "成功断言",
     assertions_name: "断言名称",
     assertions_error_message: "错误信息",
+    assertions_content: "内容",
     assertions_is_success: "是否成功",
     result: "结果",
     success: "成功",
@@ -2369,7 +2394,9 @@ export default {
     format: "格式化",
     nothing: "无",
     preview: "预览",
-    add_custom: "添加自定义属性"
+    add_custom: "添加自定义属性",
+    json_warning: "导入的数据非JSON格式",
+    json_schema_warning: '导入的数据非JSON-SCHEMA 格式',
   },
   loop: {
     loops_title: "次数循环",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 493ee0ce2c..99cddfc52d 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -57,6 +57,7 @@ export default {
     confirm: '確定',
     cancel: '取消',
     scenario: '場景',
+    scenario_warning: '當前場景沒有環境，需要先設定自身環境',
     confirm_info: '未保存，是否確認關閉？',
     track: '用例',
     actuator: '執行器',
@@ -99,6 +100,9 @@ export default {
     test_resource_pool: '測試資源池',
     system_setting: '系統設置',
     api: '接口測試',
+    encode: '编码',
+    follow_api: '跟隨API定義',
+    response_time_delay: '響應延遲時間',
     performance: '性能測試',
     enable_settings: '啟用設置',
     view_settings: '顯示設置',
@@ -200,6 +204,9 @@ export default {
     create_user_id: '創建人ID',
     run_message: "任務執行中，請到任務中心查看詳情",
     executor: "執行人",
+    edit_info: "編輯詳情",
+    enable_scene: "啟用場景環境",
+    enable_scene_info: "啟用場景環境：當前步驟使用場景原始環境配寘運行",
     execute_history: "執行歷史",
     debug_history: "調試歷史",
     testing: "測試中",
@@ -1459,6 +1466,23 @@ export default {
         set_failure_status: "設置失敗狀態",
         set_failure_msg: "設置失敗消息",
         suggest_tip: "點擊便簽添加JSONPath斷言",
+        regex_info: '特殊字元“$（）* + . [ ] \\ ^ { } |”需轉義為“\\”+“特殊字元”，如“\\$”',
+        regular_match: '正則匹配',
+        none: '不校驗[]',
+        value_eq: '值-等於[value=]',
+        value_not_eq: '值-不等於[value！=]',
+        value_in: '值-包含[include=]',
+        length_eq: '長度-等於[length=]',
+        length_not_eq: '長度-不等於[length！=]',
+        length_gt: '長度-大於[length>]',
+        length_lt: '長度-小於[length<]',
+        must_contain: '必含',
+        type_verification: '類型校驗',
+        content_verification: '内容校驗',
+        expected_results: '預期結果',
+        check: '校驗組內元素',
+        add_check: '添加校驗',
+        add_subfield: '添加子字段'
       },
       extract: {
         label: "提取",
@@ -1735,6 +1759,7 @@ export default {
     assertions_pass: "成功斷言",
     assertions_name: "斷言名稱",
     assertions_error_message: "錯誤信息",
+    assertions_content: "內容",
     assertions_is_success: "是否成功",
     result: "結果",
     success: "成功",
@@ -2368,7 +2393,9 @@ export default {
     format: "格式化",
     nothing: "無",
     preview: "預覽",
-    add_custom: "添加自定義屬性"
+    add_custom: "添加自定義屬性",
+    json_warning: "導入的數據非JSON格式",
+    json_schema_warning: '導入的數據非JSON-SCHEMA格式',
   },
   loop: {
     loops_title: "次數循環",

From 8e12fc087cc6fbdeaeb3d895a2e96d6001622faa Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Fri, 17 Dec 2021 17:49:23 +0800
Subject: [PATCH 176/256] =?UTF-8?q?perf(=E4=BB=BB=E5=8A=A1=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83):=20=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 任务中心页面优化-头部对齐
---
 frontend/src/business/components/task/TaskCenter.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/task/TaskCenter.vue b/frontend/src/business/components/task/TaskCenter.vue
index 0a6404f47f..10469ada96 100644
--- a/frontend/src/business/components/task/TaskCenter.vue
+++ b/frontend/src/business/components/task/TaskCenter.vue
@@ -521,16 +521,11 @@ export default {
 }
 
 /deep/ .el-badge__content {
- /* border-radius: 10px;*/
+  border-radius: 10px;
   height: 10px;
   line-height: 10px;
 }
-/deep/ .el-card{
-  /* border-radius: 10px;*/
-  background: #FFF;
-  border: 0px;
-  box-shadow: 0 0 0 rgb(0,0,0,0) !important;
-}
+
 
 
 

From 72fd7f8bd45170093b7a3f0347fd99aa35e29e59 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Fri, 17 Dec 2021 18:38:30 +0800
Subject: [PATCH 177/256] =?UTF-8?q?fix(=E6=88=91=E7=9A=84=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0):=20=E6=88=91=E7=9A=84=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E5=8F=B0=E5=9B=BD=E9=99=85=E5=8C=96=E5=90=8E=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BC=9A=E5=8F=98=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 解决我的工作台国际化后表头变形
---
 .../track/issue/IssueDescriptionTableItem.vue          |  1 +
 frontend/src/i18n/en-US.js                             | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/track/issue/IssueDescriptionTableItem.vue b/frontend/src/business/components/track/issue/IssueDescriptionTableItem.vue
index 814856acf3..b25480d718 100644
--- a/frontend/src/business/components/track/issue/IssueDescriptionTableItem.vue
+++ b/frontend/src/business/components/track/issue/IssueDescriptionTableItem.vue
@@ -3,6 +3,7 @@
     :label="$t('test_track.issue.description')"
     prop="description"
     :field="field"
+    min-width="120"
     :fields-width="fieldsWidth">
     <template v-slot:default="scope">
       <el-popover
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index c41218a46c..db74192222 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -377,8 +377,8 @@ export default {
     workspace_unit: "",
     dash_board:'DashBoard',
     all_project:'All Project',
-    to_be_completed:'To be completed',
-    pending_upgrade:'Pending upgrade',
+    to_be_completed:'Unfinished',
+    pending_upgrade:'To be update',
     information:'Information',
     nick_name:'Nick name',
     resourceId:'Resource ID',
@@ -1970,8 +1970,8 @@ export default {
       plan_status_finished: "Finished",
       plan_status_completed: "Completed",
       plan_status_trash: "Trashed",
-      planned_start_time: "Scheduled Start Time",
-      planned_end_time: "Scheduled End Time",
+      planned_start_time: "Plan Start Time",
+      planned_end_time: "Plan End Time",
       actual_start_time: "Actual Start Time",
       actual_end_time: "Actual End Time",
       plan_delete_confirm: "All use cases under this plan will be deleted,confirm delete test plan: ",
@@ -2153,7 +2153,7 @@ export default {
       input_title: "Please enter title",
       id: "Issue ID",
       title: "Issue Title",
-      description: "Issue Description",
+      description: "Issue Describe",
       status: "Issue Status",
       platform: "Platform",
       issue_project:"Project",

From 04c3d462647bad4d532fe80ebdf370d05716e4e8 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 17 Dec 2021 19:33:19 +0800
Subject: [PATCH 178/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BF=AE=E5=A4=8DSSL=E8=AE=A4=E8=AF=81=E5=88=AB?=
 =?UTF-8?q?=E5=90=8D=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApiTestEnvironmentController.java         |  8 ------
 .../request/sampler/MsHTTPSamplerProxy.java   |  2 ++
 .../api/dto/ssl/KeyStoreConfig.java           | 10 +++++++
 .../ApiScenarioReportResultService.java       | 26 ++++++++++---------
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java b/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java
index 6c27bc4ec7..a5cfc101ff 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java
@@ -12,7 +12,6 @@ import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.controller.request.EnvironmentRequest;
 import io.metersphere.log.annotation.MsAuditLog;
-import io.metersphere.service.CheckPermissionService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -26,13 +25,10 @@ public class ApiTestEnvironmentController {
     @Resource
     ApiTestEnvironmentService apiTestEnvironmentService;
     @Resource
-    private CheckPermissionService checkPermissionService;
-    @Resource
     private CommandService commandService;
 
     @GetMapping("/list/{projectId}")
     public List<ApiTestEnvironmentWithBLOBs> list(@PathVariable String projectId) {
-//        checkPermissionService.checkProjectOwner(projectId);
         return apiTestEnvironmentService.list(projectId);
     }
 
@@ -46,10 +42,6 @@ public class ApiTestEnvironmentController {
      */
     @PostMapping("/list/{goPage}/{pageSize}")
     public Pager<List<ApiTestEnvironmentWithBLOBs>> listByCondition(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody EnvironmentRequest environmentRequest) {
-//        List<String> projectIds = environmentRequest.getProjectIds();
-//        for (String projectId : projectIds) {
-//            checkPermissionService.checkProjectOwner(projectId);
-//        }
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
         return PageUtils.setPageInfo(page, apiTestEnvironmentService.listByConditions(environmentRequest));
     }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
index 9b4ee6c025..5c4316aa11 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
@@ -551,6 +551,8 @@ public class MsHTTPSamplerProxy extends MsTestElement {
                 }
                 if (StringUtils.isEmpty(this.alias)) {
                     this.alias = sslConfig.getDefaultAlias();
+                } else {
+                    this.alias = sslConfig.getAlias(this.alias);
                 }
 
                 if (StringUtils.isNotEmpty(this.alias)) {
diff --git a/backend/src/main/java/io/metersphere/api/dto/ssl/KeyStoreConfig.java b/backend/src/main/java/io/metersphere/api/dto/ssl/KeyStoreConfig.java
index b042e0a13b..c74437bbe1 100644
--- a/backend/src/main/java/io/metersphere/api/dto/ssl/KeyStoreConfig.java
+++ b/backend/src/main/java/io/metersphere/api/dto/ssl/KeyStoreConfig.java
@@ -25,4 +25,14 @@ public class KeyStoreConfig {
         }
         return null;
     }
+
+    public String getAlias(String asName) {
+        if (CollectionUtils.isNotEmpty(entrys)) {
+            List<KeyStoreEntry> entryList = this.entrys.stream().filter(ks -> StringUtils.equals(asName, ks.getNewAsName())).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(entryList) && CollectionUtils.isNotEmpty(files) && files.size() == 1) {
+                return entryList.get(0).getOriginalAsName();
+            }
+        }
+        return asName;
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
index 7bbdd1d1b7..2b8488fd42 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
@@ -22,18 +22,20 @@ public class ApiScenarioReportResultService {
     private ApiScenarioReportResultMapper apiScenarioReportResultMapper;
 
     public void save(String reportId, List<RequestResult> queue) {
-        queue.forEach(item -> {
-            // 事物控制器出来的结果特殊处理
-            if (StringUtils.isNotEmpty(item.getName()) && item.getName().startsWith("Transaction=") && CollectionUtils.isEmpty(item.getSubRequestResults())) {
-                LoggerUtil.debug("合并事物请求暂不入库");
-            } else if (StringUtils.isNotEmpty(item.getName()) && item.getName().startsWith("Transaction=") && CollectionUtils.isNotEmpty(item.getSubRequestResults())) {
-                item.getSubRequestResults().forEach(subItem -> {
-                    apiScenarioReportResultMapper.insert(this.newApiScenarioReportResult(reportId, subItem));
-                });
-            } else {
-                apiScenarioReportResultMapper.insert(this.newApiScenarioReportResult(reportId, item));
-            }
-        });
+        if (CollectionUtils.isNotEmpty(queue)) {
+            queue.forEach(item -> {
+                // 事物控制器出来的结果特殊处理
+                if (StringUtils.isNotEmpty(item.getName()) && item.getName().startsWith("Transaction=") && CollectionUtils.isEmpty(item.getSubRequestResults())) {
+                    LoggerUtil.debug("合并事物请求暂不入库");
+                } else if (StringUtils.isNotEmpty(item.getName()) && item.getName().startsWith("Transaction=") && CollectionUtils.isNotEmpty(item.getSubRequestResults())) {
+                    item.getSubRequestResults().forEach(subItem -> {
+                        apiScenarioReportResultMapper.insert(this.newApiScenarioReportResult(reportId, subItem));
+                    });
+                } else {
+                    apiScenarioReportResultMapper.insert(this.newApiScenarioReportResult(reportId, item));
+                }
+            });
+        }
     }
 
     private ApiScenarioReportResult newApiScenarioReportResult(String reportId, RequestResult result) {

From bbe0242ae4bebad64106c2ad68fba85511c71905 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Sat, 18 Dec 2021 14:46:31 +0800
Subject: [PATCH 179/256] build: jmeter version

---
 backend/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 7cbb182edd..f89a42e22c 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -147,7 +147,7 @@
         <dependency>
             <groupId>io.metersphere</groupId>
             <artifactId>ms-jmeter-core</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
         </dependency>
 
         <!--   排除jmeter中的 xstream 解决bug     -->
@@ -429,7 +429,7 @@
                         <artifactItem>
                             <groupId>org.apache.jmeter</groupId>
                             <artifactId>ApacheJMeter_functions</artifactId>
-                            <version>5.4.1</version>
+                            <version>5.4.2</version>
                             <type>jar</type>
                             <overWrite>true</overWrite>
                             <outputDirectory>src/main/resources/jmeter/lib/ext</outputDirectory>

From df432e35933c531d8b0f8c282a4f19ddef990d1b Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 17 Dec 2021 19:21:39 +0800
Subject: [PATCH 180/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E5=A4=8D=E5=88=B6case=E5=90=8E=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008947 --user=王孝刚 【github#8504】复制case后路径显示不一致
https://www.tapd.cn/55049933/s/1082706
---
 .../components/api/automation/scenario/ApiScenarioList.vue    | 4 ++--
 .../components/api/definition/components/case/ApiCaseList.vue | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index ef81d9a6c7..16197c4676 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -52,7 +52,7 @@
                            :fields-width="fieldsWidth"
                            min-width="120px">
             <template slot-scope="scope">
-              <el-tooltip content="编辑">
+              <el-tooltip :content="$t('commons.edit')">
                 <a style="cursor:pointer" @click="edit(scope.row)"> {{ scope.row.num }} </a>
               </el-tooltip>
             </template>
@@ -65,7 +65,7 @@
             :fields-width="fieldsWidth"
             min-width="120px">
             <template slot-scope="scope">
-              <el-tooltip content="编辑">
+              <el-tooltip :content="$t('commons.edit')">
                 <a style="cursor:pointer" @click="edit(scope.row)"> {{ scope.row.customNum }} </a>
               </el-tooltip>
             </template>
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
index 53e3aec060..051e6721fd 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -158,6 +158,7 @@ export default {
         }
         this.api.method = apiCase.request.method
         this.api.name = apiCase.request.name;
+        this.api.path = apiCase.request.path;
       }
       if (apiCase.tags) {
         apiCase.tags = JSON.parse(apiCase.tags);

From 04f10bf9fb63bcc92c831512070f5be7a2469b4b Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 17 Dec 2021 17:15:38 +0800
Subject: [PATCH 181/256] =?UTF-8?q?fix:=20=E7=99=BB=E5=85=A5=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/js/constants.js |   1 +
 frontend/src/i18n/en-US.js          |   3 +
 frontend/src/i18n/i18n.js           |   2 +
 frontend/src/i18n/zh-CN.js          |   3 +
 frontend/src/i18n/zh-TW.js          | 481 ++++++++++++++--------------
 frontend/src/login/Login.vue        |  33 +-
 6 files changed, 271 insertions(+), 252 deletions(-)

diff --git a/frontend/src/common/js/constants.js b/frontend/src/common/js/constants.js
index 433e11fcf7..e2eaf01e39 100644
--- a/frontend/src/common/js/constants.js
+++ b/frontend/src/common/js/constants.js
@@ -15,6 +15,7 @@ export const TEST_PLAN_SCENARIO_CASE = 'test_plan_scenario_case'
 export const TokenKey = 'Admin-Token';
 export const LicenseKey = 'License';
 export const DEFAULT_LANGUAGE = 'default_language';
+export const CURRENT_LANGUAGE = 'current_language';
 
 export const ROLE_ADMIN = 'admin';
 export const ROLE_ORG_ADMIN = 'org_admin';
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index db74192222..bf18e71169 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -388,6 +388,9 @@ export default {
     version:'Version',
     is_new:"Is new"
   },
+  login: {
+    normal_Login: "Normal Login",
+  },
   license: {
     title: 'Authorization management',
     corporation: 'corporation',
diff --git a/frontend/src/i18n/i18n.js b/frontend/src/i18n/i18n.js
index 16d9ee5db2..3cce748971 100644
--- a/frontend/src/i18n/i18n.js
+++ b/frontend/src/i18n/i18n.js
@@ -7,6 +7,7 @@ import zh_TWLocale from "element-ui/lib/locale/lang/zh-TW";
 import zh_CN from "./zh-CN";
 import en_US from "./en-US";
 import zh_TW from "./zh-TW";
+import {CURRENT_LANGUAGE} from "@/common/js/constants";
 
 Vue.use(VueI18n);
 
@@ -37,6 +38,7 @@ function setI18nLanguage(lang) {
   i18n.locale = lang;
   axios.defaults.headers.common['Accept-Language'] = lang.replace("_", "-");
   document.querySelector('html').setAttribute('lang', lang);
+  localStorage.setItem(CURRENT_LANGUAGE, lang);
   return lang;
 }
 
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 30c2a5c085..addaf83adb 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -390,6 +390,9 @@ export default {
     version: '版本',
     is_new: "是否新建"
   },
+  login: {
+    normal_Login: "普通登录",
+  },
   license: {
     title: '授权管理',
     corporation: '客户名称',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 99cddfc52d..7c0d40aa76 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -57,7 +57,7 @@ export default {
     confirm: '確定',
     cancel: '取消',
     scenario: '場景',
-    scenario_warning: '當前場景沒有環境，需要先設定自身環境',
+    scenario_warning: '當前場景沒有環境，需要先設置自身環境',
     confirm_info: '未保存，是否確認關閉？',
     track: '用例',
     actuator: '執行器',
@@ -73,11 +73,11 @@ export default {
     input_password: '請輸入密碼',
     test: '測試',
     create_time: '創建時間',
-    update_user_id:'更新人ID',
+    update_user_id: '更新人ID',
     update_time: '更新時間',
     delete_time: '刪除時間',
     delete_user: '刪除人',
-    delete_user_id:'刪除人ID',
+    delete_user_id: '刪除人ID',
     add: '添加',
     preview: '預覽',
     member: '成員',
@@ -100,8 +100,8 @@ export default {
     test_resource_pool: '測試資源池',
     system_setting: '系統設置',
     api: '接口測試',
-    encode: '编码',
     follow_api: '跟隨API定義',
+    encode: '編碼',
     response_time_delay: '響應延遲時間',
     performance: '性能測試',
     enable_settings: '啟用設置',
@@ -189,7 +189,7 @@ export default {
     mock: "Mock 設置",
     encrypted: "不加密",
     no_corresponding: "無對應的",
-    code_template: "代码模版",
+    code_template: "代碼模版",
     api_case: "接口用例",
     scenario_case: "場景用例",
     task_center: "任務中心",
@@ -204,17 +204,17 @@ export default {
     create_user_id: '創建人ID',
     run_message: "任務執行中，請到任務中心查看詳情",
     executor: "執行人",
-    edit_info: "編輯詳情",
-    enable_scene: "啟用場景環境",
-    enable_scene_info: "啟用場景環境：當前步驟使用場景原始環境配寘運行",
     execute_history: "執行歷史",
     debug_history: "調試歷史",
     testing: "測試中",
+    edit_info: "編輯詳情",
+    enable_scene: "啟用場景環境",
+    enable_scene_info: "啟用場景環境：當前步驟使用場景原始環境配置運行",
     environment: "運行環境",
     run_success: "執行成功",
     run_completed: "執行完成",
     run_warning: "正在運行中，請稍後查看",
-    run_stop: "當前任務已停止，無法查看報告",
+    run_stop: "The current task has been stopped and the report cannot be viewed",
     run_fail: "執行失敗",
     follow_success: "關註成功",
     cancel_follow_success: "取消關註成功",
@@ -376,19 +376,22 @@ export default {
     system_project: "項目",
     user_unit: "人",
     workspace_unit: "個",
-    dash_board:'儀表盤',
-    all_project:'全部項目',
-    to_be_completed:'待完成',
-    pending_upgrade:'待更新',
-    information:'信息',
-    nick_name:'昵稱',
-    resourceId:'資源ID',
-    level:'級別',
-    num:'數量',
-    original_state:'原始狀態',
-    custom_num:'自定義編號',
-    version:'版本',
-    is_new:"是否新建"
+    dash_board: '儀表盤',
+    all_project: '全部項目',
+    to_be_completed: '待完成',
+    pending_upgrade: '待更新',
+    information: '信息',
+    nick_name: '昵稱',
+    resourceId: '資源ID',
+    level: '級別',
+    num: '數量',
+    original_state: '原始狀態',
+    custom_num: '自定義編號',
+    version: '版本',
+    is_new: "是否新建"
+  },
+  login: {
+    normal_Login: "普通登錄",
   },
   license: {
     title: '授權管理',
@@ -406,25 +409,25 @@ export default {
     invalid: '無效',
     expired: '已過期',
   },
-  workstation:{
+  workstation: {
     dash_board: '我的儀表盤',
     upcoming: '我的待辦',
     focus: '我的關註',
     creation: '我創建的',
-    creation_case:'我創建的用例',
-    creation_issue:'我創建的缺陷',
-    creation_case_tip:'暫時還沒有創建用例，馬上創建',
-    creation_issue_tip:'暫時還沒有創建缺陷，馬上創建',
-    table_name:{
-      track_case:'功能用例',
-      track_plan:'測試計劃',
-      track_review:'用例評審',
-      track_issue:'缺陷管理',
-      api_definition:'接口定義',
-      api_automation:'接口自動化',
-      api_case:'接口用例',
-      performance:'性能測試',
-      scenario_case:'場景用例'
+    creation_case: '我創建的用例',
+    creation_issue: '我創建的缺陷',
+    creation_case_tip: '暫時還沒有創建用例，馬上創建',
+    creation_issue_tip: '暫時還沒有創建缺陷，馬上創建',
+    table_name: {
+      track_case: '功能用例',
+      track_plan: '測試計劃',
+      track_review: '用例評審',
+      track_issue: '缺陷管理',
+      api_definition: '接口定義',
+      api_automation: '接口自動化',
+      api_case: '接口用例',
+      performance: '性能測試',
+      scenario_case: '場景用例'
     }
   },
   display: {
@@ -486,7 +489,7 @@ export default {
     option_value_check: '請填寫完整選項值',
   },
   workspace: {
-    id:'工作空間ID',
+    id: '工作空間ID',
     create: '創建工作空間',
     update: '修改工作空間',
     delete: '刪除工作空間',
@@ -608,10 +611,10 @@ export default {
       zentao_request: '請求方式',
       input_zentao_request: '請輸入Zentao請求方式',
       input_zentao_url: '請輸入Zentao地址，例：http://xx.xx.xx.xx/zentao/',
-      zentao_info:'禪道信息',
-      zentao_account:'禪道賬戶',
-      zentao_password:'禪道密碼',
-      zentao_prompt_information:'該信息為通過禪道提交缺陷的的用戶名、密碼，若未填寫，則使用工作空間中配置的默認信息',
+      zentao_info: '禪道信息',
+      zentao_account: '禪道賬戶',
+      zentao_password: '禪道密碼',
+      zentao_prompt_information: '該信息為通過禪道提交缺陷的的用戶名、密碼，若未填寫，則使用工作空間中配置的默認信息',
       use_tip: '使用指引：',
       use_tip_tapd: 'Tapd Basic Auth 賬號信息在"公司管理-安全與集成-開放平臺"中查詢',
       use_tip_jira: 'Jira software server 認證信息為 賬號密碼，Jira software cloud 認證信息為 賬號+令牌(賬戶設置-安全-創建API令牌)',
@@ -638,11 +641,11 @@ export default {
       input_azure_url: '請輸入 Azure Devops 地址',
       input_azure_organization_id: '請輸入 Azure 組織ID',
       use_tip_azure: 'Azure Devops 地址+令牌(賬戶設置-個人訪問令牌-創建令牌)',
-      jira_prompt_information:'該信息為通過Jira提交缺陷的用戶認證信息，若未填寫，則使用工作空間中配置的默認信息'
+      jira_prompt_information: '該信息為通過Jira提交缺陷的用戶認證信息，若未填寫，則使用工作空間中配置的默認信息'
     }
   },
   project: {
-    id:'項目ID',
+    id: '項目ID',
     recent: '最近的項目',
     create: '創建項目',
     edit: '編輯項目',
@@ -670,9 +673,10 @@ export default {
     no_data: '無數據',
     select: '選擇項目',
     repeatable: '接口定義URL可重復',
-    repeatable_info: '接口定義URL可重復 \n 啟用後接口定義重復性校驗將不校驗URL',
+    repeatable_info: '啟用後接口定義重復性校驗將不校驗URL',
     case_public: '公共用例庫',
-    public_info: '啟動公共用例庫 \n 可以使用公共用例庫數據，也可以自行添加用例至公共用例庫',
+    public: '啟動公共用例庫',
+    public_info: '可以使用公共用例庫數據，也可以自行添加用例至公共用例庫',
     upload_file_again: '重新上傳',
     code_segment: {
       code_segment: "自定義代碼片段",
@@ -717,9 +721,9 @@ export default {
     log_desc: '項目全部操作過程',
     code_segment_desc: '自定義代碼片段',
     test_case_custom_id: '測試用例自定義ID',
-    test_case_custom_id_info: '測試用例自定義ID \n 用例ID默認為系統自增ID',
+    test_case_custom_id_info: '用例ID默認為系統自增ID',
     scenario_custom_id: '場景自定義ID',
-    scenario_custom_id_info: '場景自定義ID \n 場景用例ID默認為系統自增ID',
+    scenario_custom_id_info: '場景用例ID默認為系統自增ID',
   },
   member: {
     create: '添加成員',
@@ -746,7 +750,7 @@ export default {
     no_such_user: '無此用戶信息, 請輸入正確的用戶 ID 或者 用戶郵箱！',
   },
   user: {
-    id:'用戶ID',
+    id: '用戶ID',
     create: '創建用戶',
     modify: '修改用戶',
     input_name: '請輸入用戶姓名',
@@ -816,7 +820,7 @@ export default {
     add: '添加角色',
   },
   report: {
-    id:'報告ID',
+    id: '報告ID',
     api_test_report: '接口測試報告',
     load_test_report: '性能測試報告',
     test_plan_report: '測試計劃報告',
@@ -863,12 +867,12 @@ export default {
     delete_batch_confirm: '確認批量刪除報告',
     response_time: '響應時間(s)',
     max_users: '並發數',
-    file_id:'文件ID',
-    avg_response_time:'平均響應時間',
-    tps:'每秒傳輸的事物處理個數'
+    file_id: '文件ID',
+    avg_response_time: '平均響應時間',
+    tps: '每秒傳輸的事物處理個數'
   },
   load_test: {
-    id:'測試ID',
+    id: '測試ID',
     concurrency_thread_group: '並發讀取組',
     thread_group: '線程組',
     completed_test_report: '已完成測試報告',
@@ -991,7 +995,7 @@ export default {
       LatencyChart: '延遲',
       BytesThroughputChart: '字節數',
       Network: '網絡',
-      url:'路徑'
+      url: '路徑'
     },
     project_file_update_type_error: '更新的文件類型必須一致',
     add_monitor: '添加監控',
@@ -1048,7 +1052,7 @@ export default {
         update_time: "更新時間"
       },
       expect_detail: "期望詳情",
-      request_condition:"請求觸發條件",
+      request_condition: "請求觸發條件",
       base_info: "基本信息",
       req_param: "請求參數",
       rsp_param: "響應內容",
@@ -1059,9 +1063,9 @@ export default {
     },
     definition: {
       api_quick_button: '接口定義快捷添加按鈕',
+      id: '接口定義ID',
       api_all: '全部接口',
       unplanned_api: '未規劃接口',
-      id: '接口定義ID',
       api_title: "接口列表",
       case_title: "用例列表",
       doc_title: "文檔",
@@ -1080,7 +1084,7 @@ export default {
       create_tip: "註: 詳細的接口信息可以在編輯頁面填寫",
       api_import: "接口導入",
       check_select: "請勾選接口",
-      api_project:"所屬項目",
+      api_project: "所屬項目",
       select_comp: {
         no_data: "無數據",
         add_data: "去添加"
@@ -1201,7 +1205,7 @@ export default {
           none: "無"
         },
       },
-      case_reduction_error_text:"請先恢復"
+      case_reduction_error_text: "請先恢復"
     },
     automation: {
       open_expansion: "一鍵展開",
@@ -1239,7 +1243,7 @@ export default {
       update_time: "最後更新時間",
       step: "步驟數",
       last_result: "最後結果",
-      last_result_id:'最後結果ID',
+      last_result_id: '最後結果ID',
       passing_rate: "通過率",
       success: "通過",
       fail: "失敗",
@@ -1263,9 +1267,9 @@ export default {
         select_table: "選擇可見數據",
         select_all: "選擇全部數據",
         check_case: "請勾選場景用例",
-        api_none:"原始API不存在",
-        case_none:"原始CASE不存在",
-        num_none:"原始場景不存在"
+        api_none: "原始API不存在",
+        case_none: "原始CASE不存在",
+        num_none: "原始場景不存在"
       },
       report_name_info: '請輸入報告名稱',
       save_case_info: '請先保存用例',
@@ -1282,7 +1286,7 @@ export default {
       generate_report: "生成報告",
     },
     environment: {
-      id:'環境ID',
+      id: '環境ID',
       create: '創建環境',
       name: "環境名稱",
       socket: "環境域名",
@@ -1306,7 +1310,7 @@ export default {
       response_timeout: "響應超時",
     },
     scenario: {
-      id:"場景ID",
+      id: "場景ID",
       scenario: "場景",
       dubbo: "Dubbo配置",
       config: "場景配置",
@@ -1330,12 +1334,12 @@ export default {
       clone: "復製",
       cant_reference: '歷史測試文件，重新保存後才可被引用',
       share_cookie: '共享cookie',
-      module_id:'場景模塊ID',
+      module_id: '場景模塊ID',
       level: '級別',
-      version:"場景版本",
-      warning_context:"暫不支持批量添加所有場景到測試計劃!",
-      jmx_file_set:"場景JMX文件集",
-      error_report_jmx:"導出JMX文件失敗",
+      version: "場景版本",
+      warning_context: "暫不支持批量添加所有場景到測試計劃!",
+      jmx_file_set: "場景JMX文件集",
+      error_report_jmx: "導出JMX文件失敗",
     },
     request: {
       debug: "調試",
@@ -1386,54 +1390,54 @@ export default {
       condition_variable: "變量，例如: ${var}",
       wait: "等待",
 
-      all_name:"名字",
-      all_url:"網址",
-      boolean:"布林值",
-      capitalize:"大寫字母開頭",
-      cfirst:"姓（中文）",
-      character:"字元",
-      city:"都市",
-      clast:"名（中文）",
-      cname:"中文名",
-      color:"顏色",
-      county:"縣",
-      ctitle:"中文標題",
-      dataImage:"數據影像",
-      date:"日期",
-      datetime:"日期時間",
-      domain:"域",
-      email:"電子郵件",
-      first:"姓",
-      float:"浮點數",
-      guid:"指南",
-      hex:"十六進位",
-      hsl:"hsl",
-      id:"身份證件",
-      img:"圖片地址",
-      increment:"增量",
-      integer:"整數",
-      ip:"知識產權",
-      last:"名",
-      lower:"小寫字母",
-      natural:"自然數",
-      now:"當前時間",
-      paragraph:"段",
-      pick:"選擇",
-      protocol:"協定",
-      province:"省",
-      range:"範圍",
-      region:"地區",
-      rgb:"rgb",
-      rgba:"rgba",
-      sentence:"句子",
-      shuffle:"洗牌",
-      string:"字串",
-      time:"時間",
-      title:"標題",
-      tld:"tld",
-      upper:"大寫字母",
-      word:"詞",
-      zip:"郵遞區號",
+      all_name: "名字",
+      all_url: "url",
+      boolean: "布爾值",
+      capitalize: "大寫字母開頭",
+      cfirst: "姓（中文）",
+      character: "字符",
+      city: "城市",
+      clast: "名（中文）",
+      cname: "中文名",
+      color: "顏色",
+      county: "縣",
+      ctitle: "中文標題",
+      dataImage: "數據圖像",
+      date: "日期",
+      datetime: "日期時間",
+      domain: "域",
+      email: "電子郵件",
+      first: "姓",
+      float: "浮點數",
+      guid: "guid",
+      hex: "十六進製",
+      hsl: "hsl",
+      id: "id",
+      img: "圖片地址",
+      increment: "增量",
+      integer: "整數",
+      ip: "知識產權",
+      last: "名",
+      lower: "小寫字母",
+      natural: "自然數",
+      now: "當前時間",
+      paragraph: "段",
+      pick: "選擇",
+      protocol: "協議",
+      province: "省",
+      range: "範圍",
+      region: "地區",
+      rgb: "rgb",
+      rgba: "rgba",
+      sentence: "句子",
+      shuffle: "洗牌",
+      string: "字符串",
+      time: "時間",
+      title: "標題",
+      tld: "tld",
+      upper: "大寫字母",
+      word: "詞",
+      zip: "郵政編碼",
 
       assertions: {
         label: "斷言",
@@ -1466,19 +1470,19 @@ export default {
         set_failure_status: "設置失敗狀態",
         set_failure_msg: "設置失敗消息",
         suggest_tip: "點擊便簽添加JSONPath斷言",
-        regex_info: '特殊字元“$（）* + . [ ] \\ ^ { } |”需轉義為“\\”+“特殊字元”，如“\\$”',
+        regex_info: '特殊字符"$ ( ) * + . [ ] \\ ^ { } |"需轉義為"\\ "+"特殊字符",如"\\$"',
         regular_match: '正則匹配',
         none: '不校驗[]',
         value_eq: '值-等於[value=]',
-        value_not_eq: '值-不等於[value！=]',
+        value_not_eq: '值-不等於[value!=]',
         value_in: '值-包含[include=]',
         length_eq: '長度-等於[length=]',
-        length_not_eq: '長度-不等於[length！=]',
+        length_not_eq: '長度-不等於[length!=]',
         length_gt: '長度-大於[length>]',
         length_lt: '長度-小於[length<]',
         must_contain: '必含',
         type_verification: '類型校驗',
-        content_verification: '内容校驗',
+        content_verification: '內容校驗',
         expected_results: '預期結果',
         check: '校驗組內元素',
         add_check: '添加校驗',
@@ -1566,10 +1570,10 @@ export default {
       title: "接口測試導入",
       data_format: "數據格式",
       file_size_limit: "文件大小不超過 50 M",
+      support_format: "支持p12,jks,pfx格式",
       tip: "說明",
       export_tip: "導出方法",
       ms_tip: "支持 MeterSphere json 格式",
-      support_format: "支持p12,jks,pfx格式",
       ms_export_tip: "通過 MeterSphere 接口測試頁面或者瀏覽器插件導出 json 格式文件",
       har_export_tip: "通過 瀏覽器的開發者工具 導出 HAR 格式文件",
       esb_export_tip: "暫時不支持ESB文件的導出",
@@ -1813,9 +1817,9 @@ export default {
     performance_test_case: "性能測試用例",
     scenario_test_case: "場景測試用例",
     report_statistics: "報告統計",
-    sort:'種類',
-    other_test_name:'其他測試名稱',
-    automatic_status_update:"自動狀態更新",
+    sort: '種類',
+    other_test_name: '其他測試名稱',
+    automatic_status_update: "自動狀態更新",
     case: {
       list: "列表",
       minder: "腦圖",
@@ -1903,10 +1907,10 @@ export default {
       upload_tip: "只能上傳jpg、jpeg、png、docx、doc、pdf、xlsx、txt文件",
       attachment: "附件",
       upload_time: "上傳時間",
-      total:"用例總數",
-      node_id:"節點ID",
-      node_path:"節點路徑",
-      match_rule:"測試用例匹配規則",
+      total: "用例總數",
+      node_id: "節點ID",
+      node_path: "節點路徑",
+      match_rule: "測試用例匹配規則",
       import: {
         import: "導入用例",
         case_import: "導入測試用例",
@@ -1938,12 +1942,12 @@ export default {
         export_tip: "請切換成接口列表勾選用例導出！"
       },
       case_desc: "用例描述",
-      passing_rate:'用例通過率'
+      passing_rate: '用例通過率'
 
     },
     plan: {
       test_plan: "測試計劃",
-      test_plan_id:'測試計劃Id',
+      test_plan_id: '測試計劃Id',
       create_plan: "創建測試計劃",
       edit_plan: "編輯測試計劃",
       plan_name: "計劃名稱",
@@ -1980,10 +1984,10 @@ export default {
       api_case: "接口測試用例",
       scenario_case: "場景測試用例",
       execute_result: "執行結果",
-      execute_time:'執行時間',
-      is_api_case_executing:"是否執行接口用例",
-      is_scenario_executing:'是否執行場景',
-      is_performance_executing:'是否執行性能',
+      execute_time: '執行時間',
+      is_api_case_executing: "是否執行接口用例",
+      is_scenario_executing: '是否執行場景',
+      is_performance_executing: '是否執行性能',
       test_plan_test_case_count: "功能用例數",
       test_plan_api_case_count: "接口用例數",
       test_plan_api_scenario_count: "場景用例數",
@@ -2000,11 +2004,11 @@ export default {
         report_not_found: "報告不存在",
       }
     },
-    demand:{
-      id:'需求ID',
-      name:'需求名稱'
+    demand: {
+      id: '需求ID',
+      name: '需求名稱'
     },
-    step_model:'步驟模型',
+    step_model: '步驟模型',
     review: {
       test_review: "用例評審",
       create_review: "創建用例評審",
@@ -2052,7 +2056,7 @@ export default {
       execute_result: "評審結果",
     },
     module: {
-      id:'模塊ID',
+      id: '模塊ID',
       search: "搜索模塊",
       rename: "重命名",
       add_submodule: "添加子模塊",
@@ -2095,7 +2099,7 @@ export default {
       relevance_test_case: "關聯測試用例",
       cancel_all_relevance: "取消全部關聯",
       executor: "執行人",
-      executor_match_rule:"執行者匹配規則",
+      executor_match_rule: "執行者匹配規則",
       execute_result: "執行結果",
       pass: "通過",
       not_pass: "不通過",
@@ -2120,7 +2124,7 @@ export default {
       submit_issues: "提缺陷",
       operate_step: "操作步驟",
       edit_component: "編輯組件",
-      component:"組件",
+      component: "組件",
       base_info: "基礎信息",
       mock_info: "Mock服務",
       test_result: "測試結果",
@@ -2160,7 +2164,7 @@ export default {
       title: "缺陷標題",
       description: "缺陷描述",
       status: "缺陷狀態",
-      issue_project:"所屬項目",
+      issue_project: "所屬項目",
       platform: "平臺",
       operate: "操作",
       close: "關閉缺陷",
@@ -2171,8 +2175,8 @@ export default {
       status_new: '新建',
       status_resolved: '已解決',
       status_closed: '已關閉',
-      status_active:'激活',
-      status_delete:'刪除',
+      status_active: '激活',
+      status_delete: '刪除',
       please_choose_current_owner: "請選擇處理人",
       tapd_current_owner: "Tapd 處理人",
       zentao_bug_build: "禪道 影響版本",
@@ -2196,11 +2200,11 @@ export default {
         automation: "自動觸發",
       },
     },
-    reporter:'報告人',
-    lastmodify:'最後更改'
+    reporter: '報告人',
+    lastmodify: '最後更改'
   },
   test_resource_pool: {
-    id:"測試資源池ID",
+    id: "測試資源池ID",
     type: '類型',
     enable_disable: '啟用/禁用',
     search_by_name: '根據名稱搜索',
@@ -2289,7 +2293,7 @@ export default {
     not_set: "未設置",
     test_name: '測試名稱',
     running_rule: '運行規則',
-    job:'任務',
+    job: '任務',
     job_status: '任務狀態',
     running_task: '運行中的任務',
     next_execution_time: "下次執行時間",
@@ -2395,7 +2399,7 @@ export default {
     preview: "預覽",
     add_custom: "添加自定義屬性",
     json_warning: "導入的數據非JSON格式",
-    json_schema_warning: '導入的數據非JSON-SCHEMA格式',
+    json_schema_warning: '導入的數據非JSON-SCHEMA 格式',
   },
   loop: {
     loops_title: "次數循環",
@@ -2425,7 +2429,7 @@ export default {
   },
   module: {
     title: '模塊管理',
-    path:'模塊路徑'
+    path: '模塊路徑'
   },
   table: {
     header_display_field: '表頭顯示字段',
@@ -2497,8 +2501,8 @@ export default {
       'PERFORMANCE_TEST_TASK': '性能測試',
       'PERFORMANCE_REPORT_TASK': '性能測試報告',
       'TRACK_TEST_CASE_TASK': '測試用例',
-      'TRACK_HOME_TASK': '測試跟踪首頁',
-      'TRACK_REPORT_TASK': '測試跟踪報告',
+      'TRACK_HOME_TASK': '測試跟蹤首頁',
+      'TRACK_REPORT_TASK': '測試跟蹤報告',
     },
     result: {
       'EXECUTE_SUCCESSFUL': '成功',
@@ -2518,18 +2522,18 @@ export default {
       edit_password: "修改密碼"
     },
     system_workspace: {
-      name: "工作空间",
-      read: "查詢工作空间",
-      create: "創建工作空间",
-      edit: "編輯工作空间",
-      delete: "刪除工作空间",
+      name: "工作空間",
+      read: "查詢工作空間",
+      create: "創建工作空間",
+      edit: "編輯工作空間",
+      delete: "刪除工作空間",
     },
     system_group: {
-      name: "用戶组与权限",
-      read: "查詢用戶组与权限",
-      create: "創建用戶组",
-      edit: "編輯用戶组",
-      setting_permission: "设置权限",
+      name: "用戶組與權限",
+      read: "查詢用戶組與權限",
+      create: "創建用戶組",
+      edit: "編輯用戶組",
+      setting_permission: "設置權限",
       delete: "刪除"
     },
     system_test_pool: {
@@ -2556,7 +2560,7 @@ export default {
     },
     system_operation_log: {
       name: "操作日誌",
-      read: "查詢操作日志"
+      read: "查詢操作日誌"
     },
     workspace_user: {
       name: "成員",
@@ -2583,30 +2587,30 @@ export default {
       custom: "自定義字段"
     },
     workspace_project_manager: {
-      name: "项目管理",
-      read: "查詢项目",
-      create: "創建项目",
-      edit: "編輯项目",
-      delete: "刪除项目",
-      upload_jar: "上传jar包",
+      name: "項目管理",
+      read: "查詢項目",
+      create: "創建項目",
+      edit: "編輯項目",
+      delete: "刪除項目",
+      upload_jar: "上傳jar包",
     },
     workspace_project_environment: {
-      name: "环境设置",
+      name: "環境設置",
       read: "查詢",
-      create: "創建环境",
-      edit: "編輯环境",
-      delete: "刪除环境",
-      copy: "複製环境",
-      import: "導入环境",
-      export: "導出环境",
-      create_group: "創建环境组",
-      edit_group: "編輯环境组",
-      copy_group: "複製环境组",
-      delete_group: "刪除环境组",
+      create: "創建環境",
+      edit: "編輯環境",
+      delete: "刪除環境",
+      copy: "復製環境",
+      import: "導入環境",
+      export: "導出環境",
+      create_group: "創建環境組",
+      edit_group: "編輯環境組",
+      copy_group: "復製環境組",
+      delete_group: "刪除環境組",
     },
     workspace_operation_log: {
-      name: "操作日志",
-      read: "查詢操作日志"
+      name: "操作日誌",
+      read: "查詢操作日誌"
     },
     project_user: {
       name: "成員",
@@ -2616,47 +2620,47 @@ export default {
       delete: "移除成員",
     },
     project_manager: {
-      name: "项目管理",
-      read: "查詢项目",
-      edit: "編輯项目"
+      name: "項目管理",
+      read: "查詢項目",
+      edit: "編輯項目"
     },
     project_group: {
-      name: "用戶组与权限",
-      read: "查詢用戶组与权限",
-      create: "創建用戶组与权限",
-      edit: "編輯用戶组与权限",
-      delete: "刪除用戶组与权限",
-      setting_permission: "设置权限",
+      name: "用戶組與權限",
+      read: "查詢用戶組與權限",
+      create: "創建用戶組與權限",
+      edit: "編輯用戶組與權限",
+      delete: "刪除用戶組與權限",
+      setting_permission: "設置權限",
     },
     project_environment: {
-      name: "环境设置",
-      read: "查詢环境",
-      create: "創建环境",
-      edit: "編輯环境",
-      delete: "刪除环境",
-      copy: "複製环境",
-      import: "導入环境",
-      export: "導出环境",
+      name: "環境設置",
+      read: "查詢環境",
+      create: "創建環境",
+      edit: "編輯環境",
+      delete: "刪除環境",
+      copy: "復製環境",
+      import: "導入環境",
+      export: "導出環境",
     },
     project_operation_log: {
-      name: "操作日志",
-      read: "查詢操作日志"
+      name: "操作日誌",
+      read: "查詢操作日誌"
     },
     project_custom_code: {
-      name: "自定義代码片段",
+      name: "自定義代碼片段",
       read: "查詢",
       create: "創建",
       edit: "編輯",
       delete: "刪除",
-      copy: "複製",
+      copy: "復製",
     },
     project_file: {
       name: "文件管理",
       jar: "查詢jar包",
-      upload_jar: "上传jar包",
+      upload_jar: "上傳jar包",
       delete_jar: "刪除jar包",
       read: "查詢文件",
-      upload_file: "上传文件",
+      upload_file: "上傳文件",
       delete_file: "刪除文件",
     },
     project_track_case: {
@@ -2665,10 +2669,10 @@ export default {
       create: "創建用例",
       edit: "編輯用例",
       delete: "刪除用例",
-      copy: "複製用例",
+      copy: "復製用例",
       import: "導入用例",
       export: "導出用例",
-      recover: "恢复用例",
+      recover: "恢復用例",
     },
     project_track_review: {
       name: "測試評審",
@@ -2687,13 +2691,13 @@ export default {
       create: "創建測試計劃",
       edit: "編輯測試計劃",
       delete: "刪除測試計劃",
-      copy: "複製測試計劃",
-      run: "执行測試計劃",
-      batch_run: "批量执行用例",
+      copy: "復製測試計劃",
+      run: "執行測試計劃",
+      batch_run: "批量執行用例",
       batch_edit: "批量編輯用例",
-      schedule: "定时任务",
+      schedule: "定時任務",
       relevance_or_cancel: "關聯/取消關聯用例",
-      batch_delete: "批量取消关联用例",
+      batch_delete: "批量取消關聯用例",
     },
     project_track_issue: {
       name: "缺陷",
@@ -2709,40 +2713,40 @@ export default {
       export: "導出報告",
     },
     project_api_definition: {
-      name: "接口定义",
+      name: "接口定義",
       read: "查詢接口",
       create_api: "創建接口",
       edit_api: "編輯接口",
       delete_api: "刪除接口",
-      copy_api: "複製接口",
+      copy_api: "復製接口",
       create_case: "添加用例",
       edit_case: "編輯用例",
       delete_case: "刪除用例",
-      copy_case: "複製用例",
+      copy_case: "復製用例",
       import_api: "導入接口",
       export_api: "導出接口",
-      timing_sync: "定时同步",
+      timing_sync: "定時同步",
       create_performance: "創建性能測試",
-      run: "执行",
-      debug: "调试",
-      mock: "MOCK设置",
+      run: "執行",
+      debug: "調試",
+      mock: "MOCK設置",
     },
     project_api_scenario: {
-      name: "接口自动化",
+      name: "接口自動化",
       read: "查詢場景",
       create: "創建場景",
       edit: "編輯場景",
       delete: "刪除場景",
-      copy: "複製場景",
-      run: "执行場景",
-      debug: "调试場景",
-      schedule: "定时任务",
+      copy: "復製場景",
+      run: "執行場景",
+      debug: "調試場景",
+      schedule: "定時任務",
       import: "導入場景",
       export: "導出場景",
-      move_batch: "批量移动",
+      move_batch: "批量移動",
       create_performance: "創建性能測試",
       create_performance_batch: "批量創建性能測試",
-      batch_copy: "批量複製",
+      batch_copy: "批量復製",
     },
     project_api_report: {
       name: "測試報告",
@@ -2756,31 +2760,31 @@ export default {
       create: "創建測試",
       edit: "編輯測試",
       delete: "刪除測試",
-      copy: "複製測試",
-      run: "运行",
-      schedule: "定时任务",
+      copy: "復製測試",
+      run: "運行",
+      schedule: "定時任務",
     },
     project_performance_report: {
       name: "報告",
       read: "查詢報告",
       delete: "刪除報告",
       export: "導出報告",
-      compare: "对比報告",
+      compare: "對比報告",
     },
     project_report_analysis: {
       name: "報表",
       read: "查看",
       export: "導出",
       update: "保存",
-      create: "另存为",
+      create: "另存為",
     },
     project_enterprise_report: {
-      name: "项目報告",
-      export: "发送邮件",
+      name: "項目報告",
+      export: "發送郵件",
       create: "創建報告",
       delete: "刪除報告",
-      copy: "複製報告",
-      schedule: "定时发送",
+      copy: "復製報告",
+      schedule: "定時發送",
       edit: "修改報告",
 
     },
@@ -2791,12 +2795,11 @@ export default {
       read: "查看腳本",
     },
     other: {
-      track: "測試跟踪",
+      track: "測試跟蹤",
       api: "接口測試",
       performance: "性能測試",
       project: "項目設置",
       report: "報表統計"
     }
   }
-
 };
diff --git a/frontend/src/login/Login.vue b/frontend/src/login/Login.vue
index 1c4d42a9b8..0e0905b079 100644
--- a/frontend/src/login/Login.vue
+++ b/frontend/src/login/Login.vue
@@ -8,7 +8,7 @@
               <img :src="'/display/file/loginLogo'" alt="">
             </div>
             <div class="welcome">
-              <span>{{ loginTitle }}</span>
+              <span>{{ $t("commons.welcome") }}</span>
             </div>
           </div>
           <div class="form">
@@ -16,7 +16,7 @@
               <el-form-item v-slot:default>
                 <el-radio-group v-model="form.authenticate" @change="redirectAuth(form.authenticate)">
                   <el-radio label="LDAP" size="mini" v-if="openLdap">LDAP</el-radio>
-                  <el-radio label="LOCAL" size="mini" v-if="openLdap">普通登录</el-radio>
+                  <el-radio label="LOCAL" size="mini" v-if="openLdap">{{ $t('login.normal_Login') }}</el-radio>
                   <el-radio :label="auth.id" size="mini" v-for="auth in authSources" :key="auth.id">{{ auth.type }}
                     {{ auth.name }}
                   </el-radio>
@@ -59,7 +59,7 @@
 
 <script>
 import {publicKeyEncrypt, saveLocalStorage} from '@/common/js/utils';
-import {DEFAULT_LANGUAGE, PRIMARY_COLOR} from "@/common/js/constants";
+import {CURRENT_LANGUAGE, DEFAULT_LANGUAGE, PRIMARY_COLOR} from "@/common/js/constants";
 
 const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
 const display = requireComponent.keys().length > 0 ? requireComponent("./display/Display.vue") : {};
@@ -76,19 +76,10 @@ export default {
         password: '',
         authenticate: 'LOCAL'
       },
-      rules: {
-        username: [
-          {required: true, message: this.$t('commons.input_login_username'), trigger: 'blur'},
-        ],
-        password: [
-          {required: true, message: this.$t('commons.input_password'), trigger: 'blur'},
-          {min: 6, max: 30, message: this.$t('commons.input_limit', [6, 30]), trigger: 'blur'}
-        ]
-      },
+      rules: this.getDefaultRules(),
       msg: '',
       ready: false,
       openLdap: false,
-      loginTitle: this.$t("commons.welcome"),
       authSources: [],
       loginUrl: 'signin',
     };
@@ -119,6 +110,11 @@ export default {
         this.ready = true;
         // 保存公钥
         localStorage.setItem("publicKey", response.data.message);
+        let lang = localStorage.getItem(CURRENT_LANGUAGE);
+        if (lang) {
+          this.$setLang(lang);
+          this.rules = this.getDefaultRules();
+        }
       } else {
         let user = response.data.data;
         saveLocalStorage(response.data);
@@ -207,6 +203,17 @@ export default {
       if (auth.default) {
         auth.default.redirectAuth(this, authId);
       }
+    },
+    getDefaultRules() { // 设置完语言要重新赋值
+      return {
+        username: [
+            {required: true, message: this.$t('commons.input_login_username'), trigger: 'blur'},
+          ],
+            password: [
+          {required: true, message: this.$t('commons.input_password'), trigger: 'blur'},
+          {min: 6, max: 30, message: this.$t('commons.input_limit', [6, 30]), trigger: 'blur'}
+        ]
+      };
     }
   }
 };

From 6eb1af2f063778b44f1d0c91b372ff45d08a97b6 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Sat, 18 Dec 2021 15:25:16 +0800
Subject: [PATCH 182/256] =?UTF-8?q?fix:=20=E7=BF=BB=E8=AF=91=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/zh-CN.js | 2 +-
 frontend/src/i18n/zh-TW.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index addaf83adb..1cbf5052ab 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -214,7 +214,7 @@ export default {
     run_success: "执行成功",
     run_completed: "执行完成",
     run_warning: "正在运行中，请稍后查看",
-    run_stop: "The current task has been stopped and the report cannot be viewed",
+    run_stop: "当前任务已停止，无法查看报告",
     run_fail: "执行失败",
     follow_success: "关注成功",
     cancel_follow_success: "取消关注成功",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 7c0d40aa76..3df5289058 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -214,7 +214,7 @@ export default {
     run_success: "執行成功",
     run_completed: "執行完成",
     run_warning: "正在運行中，請稍後查看",
-    run_stop: "The current task has been stopped and the report cannot be viewed",
+    run_stop: "當前任務已停止，無法查看報告",
     run_fail: "執行失敗",
     follow_success: "關註成功",
     cancel_follow_success: "取消關註成功",

From 23ab8ff8a69e4671515c0bb775c5c11312d059f1 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 17 Dec 2021 18:43:37 +0800
Subject: [PATCH 183/256] =?UTF-8?q?fix:=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/project/menu/EditProject.vue   |  6 ++--
 .../settings/workspace/MsProject.vue          |  2 +-
 .../workspace/template/CustomFieldEdit.vue    | 16 +++++++---
 .../workspace/template/CustomFieldList.vue    | 12 +++----
 frontend/src/common/js/table-constants.js     | 32 +++++++++----------
 frontend/src/common/js/utils.js               | 13 ++++++++
 frontend/src/i18n/en-US.js                    |  7 ++--
 frontend/src/i18n/zh-CN.js                    |  2 ++
 8 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/frontend/src/business/components/project/menu/EditProject.vue b/frontend/src/business/components/project/menu/EditProject.vue
index d5e4a5dcf4..94afeaf5a9 100644
--- a/frontend/src/business/components/project/menu/EditProject.vue
+++ b/frontend/src/business/components/project/menu/EditProject.vue
@@ -7,7 +7,7 @@
           <el-input v-model="form.name" autocomplete="off"></el-input>
         </el-form-item>
 
-        <el-form-item v-if="platformOptions.length > 1" :label-width="labelWidth" :label="$t('集成第三方平台')" prop="platform">
+        <el-form-item v-if="platformOptions.length > 1" :label-width="labelWidth" :label="$t('test_track.issue.third_party_integrated')" prop="platform">
           <el-select filterable v-model="form.platform">
             <el-option v-for="item in platformOptions" :key="item.value" :label="item.text" :value="item.value">
             </el-option>
@@ -18,7 +18,7 @@
           <template-select :data="form" scene="API_CASE" prop="caseTemplateId" ref="caseTemplate"/>
         </el-form-item>
 
-        <el-form-item v-if="xpackEable && form.platform === 'Jira'" :label-width="labelWidth" :label="$t('使用第三方平台模板')" prop="scenarioCustomNum">
+        <el-form-item v-if="xpackEable && form.platform === 'Jira'" :label-width="labelWidth" :label="$t('test_track.issue.use_third_party')" prop="scenarioCustomNum">
           <el-switch v-model="form.thirdPartTemplate"></el-switch>
         </el-form-item>
 
@@ -147,7 +147,7 @@ export default {
         // issueTemplateId: [{required: true}],
       },
       screenHeight: 'calc(100vh - 195px)',
-      labelWidth: '150px',
+      labelWidth: '210px',
       platformOptions: [],
       xpackEable: false
     };
diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue
index 7547000d3f..06d431ec11 100644
--- a/frontend/src/business/components/settings/workspace/MsProject.vue
+++ b/frontend/src/business/components/settings/workspace/MsProject.vue
@@ -4,7 +4,7 @@
       <template v-slot:header>
         <ms-table-header :create-permission="['WORKSPACE_PROJECT_MANAGER:READ+CREATE']" :condition.sync="condition"
                          @search="search" @create="create"
-                         :create-tip="btnTips" :title="$t('commons.project')">
+                         :create-tip="btnTips" :title="$t('project.manager')">
           <template v-slot:button>
             <ms-table-button icon="el-icon-box" v-permission="['WORKSPACE_PROJECT_MANAGER:READ+UPLOAD_JAR']"
                              :content="$t('api_test.jar_config.title')" @click="openJarConfig"/>
diff --git a/frontend/src/business/components/settings/workspace/template/CustomFieldEdit.vue b/frontend/src/business/components/settings/workspace/template/CustomFieldEdit.vue
index bf29627d32..8b9776b3dd 100644
--- a/frontend/src/business/components/settings/workspace/template/CustomFieldEdit.vue
+++ b/frontend/src/business/components/settings/workspace/template/CustomFieldEdit.vue
@@ -7,7 +7,7 @@
     append-to-body
     ref="msEditDialog">
 
-    <el-form :model="form" :rules="rules" label-position="right" label-width="auto" size="small" ref="form">
+    <el-form :model="form" :rules="rules" label-position="right" size="small" ref="form">
       <el-form-item :label="$t('custom_field.field_name')" prop="name" :label-width="labelWidth">
         <el-input v-if="isSystem" :disabled="isSystem" :value="$t(systemNameMap[form.name])" autocomplete="off"></el-input>
         <el-input v-else v-model="form.name" autocomplete="off"></el-input>
@@ -22,7 +22,7 @@
           <el-option
             v-for="item in (form.scene === 'PLAN' ? planSceneOptions : sceneOptions)"
             :key="item.value"
-            :label="item.text"
+            :label="$t(item.text)"
             :value="item.value">
           </el-option>
         </el-select>
@@ -33,7 +33,7 @@
           <el-option
             v-for="item in fieldTypeOptions"
             :key="item.value"
-            :label="item.text"
+            :label="$t(item.text)"
             :value="item.value">
           </el-option>
         </el-select>
@@ -63,7 +63,15 @@ import i18n from "@/i18n/i18n";
 export default {
   name: "CustomFieldEdit",
   components: {MsSingleHandleDrag, MsEditDialog},
-  props: ['scene','labelWidth'],
+  props: {
+    scene: String,
+    labelWidth: {
+      Object: String,
+      default() {
+        return '100px';
+      }
+    }
+  },
   data() {
     return {
       form: {
diff --git a/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue b/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue
index 5610cfa6a9..bbfa463792 100644
--- a/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue
+++ b/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue
@@ -120,7 +120,7 @@
 
 <script>
 import MsTable from "@/business/components/common/components/table/MsTable";
-import {getCurrentWorkspaceId, getDefaultTableHeight} from "@/common/js/utils";
+import {getCurrentWorkspaceId, getDefaultTableHeight, getTranslateOptions} from "@/common/js/utils";
 import MsTableColumn from "@/business/components/common/components/table/MsTableColumn";
 import MsTableOperators from "@/business/components/common/components/MsTableOperators";
 import MsTableButton from "@/business/components/common/components/MsTableButton";
@@ -168,18 +168,16 @@ export default {
           isDisable: this.systemDisable
         }
       ],
+      fieldFilters: [],
+      sceneFilters: [],
     };
   },
   activated() {
     this.getCustomFields();
+    this.fieldFilters = getTranslateOptions(CUSTOM_FIELD_TYPE_OPTION);
+    this.sceneFilters = getTranslateOptions(CUSTOM_FIELD_SCENE_OPTION);
   },
   computed: {
-    fieldFilters() {
-      return CUSTOM_FIELD_TYPE_OPTION;
-    },
-    sceneFilters() {
-      return CUSTOM_FIELD_SCENE_OPTION;
-    },
     fieldTypeMap() {
       return FIELD_TYPE_MAP;
     },
diff --git a/frontend/src/common/js/table-constants.js b/frontend/src/common/js/table-constants.js
index a7a54b4772..afd110feb0 100644
--- a/frontend/src/common/js/table-constants.js
+++ b/frontend/src/common/js/table-constants.js
@@ -3,25 +3,25 @@ import i18n from "@/i18n/i18n";
 import {AZURE_DEVOPS, JIRA, LOCAL, TAPD, ZEN_TAO} from "@/common/js/constants";
 
 export const CUSTOM_FIELD_TYPE_OPTION = [
-  {value: 'input',text: i18n.t('workspace.custom_filed.input')},
-  {value: 'textarea',text: i18n.t('workspace.custom_filed.textarea')},
-  {value: 'select',text: i18n.t('workspace.custom_filed.select')},
-  {value: 'multipleSelect',text: i18n.t('workspace.custom_filed.multipleSelect')},
-  {value: 'radio',text: i18n.t('workspace.custom_filed.radio')},
-  {value: 'checkbox',text: i18n.t('workspace.custom_filed.checkbox')},
-  {value: 'member',text: i18n.t('workspace.custom_filed.member')},
-  {value: 'multipleMember',text: i18n.t('workspace.custom_filed.multipleMember')},
-  {value: 'date',text: i18n.t('workspace.custom_filed.date')},
-  {value: 'datetime',text: i18n.t('workspace.custom_filed.datetime')},
-  {value: 'richText',text: i18n.t('workspace.custom_filed.richText')},
-  {value: 'int',text: i18n.t('workspace.custom_filed.int')},
-  {value: 'float',text: i18n.t('workspace.custom_filed.float')},
-  {value: 'multipleInput',text: i18n.t('workspace.custom_filed.multipleInput')}
+  {value: 'input',text: 'workspace.custom_filed.input'},
+  {value: 'textarea',text: 'workspace.custom_filed.textarea'},
+  {value: 'select',text: 'workspace.custom_filed.select'},
+  {value: 'multipleSelect',text: 'workspace.custom_filed.multipleSelect'},
+  {value: 'radio',text: 'workspace.custom_filed.radio'},
+  {value: 'checkbox',text: 'workspace.custom_filed.checkbox'},
+  {value: 'member',text: 'workspace.custom_filed.member'},
+  {value: 'multipleMember',text: 'workspace.custom_filed.multipleMember'},
+  {value: 'date',text: 'workspace.custom_filed.date'},
+  {value: 'datetime',text: 'workspace.custom_filed.datetime'},
+  {value: 'richText',text: 'workspace.custom_filed.richText'},
+  {value: 'int',text: 'workspace.custom_filed.int'},
+  {value: 'float',text: 'workspace.custom_filed.float'},
+  {value: 'multipleInput',text: 'workspace.custom_filed.multipleInput'}
 ];
 
 export const CUSTOM_FIELD_SCENE_OPTION = [
-  {value: 'TEST_CASE',text: i18n.t('workspace.case_template_manage')},
-  {value: 'ISSUE',text: i18n.t('workspace.issue_template_manage')},
+  {value: 'TEST_CASE',text: 'workspace.case_template_manage'},
+  {value: 'ISSUE',text: 'workspace.issue_template_manage'},
 ];
 
 export const CASE_TYPE_OPTION = [
diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index 7f368970d8..f826c656c5 100644
--- a/frontend/src/common/js/utils.js
+++ b/frontend/src/common/js/utils.js
@@ -18,6 +18,8 @@ import {
 import axios from "axios";
 import {jsPDF} from "jspdf";
 import JSEncrypt from 'jsencrypt';
+import {CUSTOM_FIELD_TYPE_OPTION} from "@/common/js/table-constants";
+import i18n from "@/i18n/i18n";
 
 export function hasRole(role) {
   let user = getCurrentUser();
@@ -503,3 +505,14 @@ export function setCurTabId(vueObj, tab, ref) {
     }
   })
 }
+
+export function getTranslateOptions(data) {
+  let options = [];
+  data.forEach(i => {
+    let option = {};
+    Object.assign(option, i)
+    option.text = i18n.t(option.text);
+    options.push(option);
+  });
+  return options;
+}
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index bf18e71169..26be29ef74 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -626,6 +626,7 @@ export default {
       successful_operation: 'Successful operation',
       not_integrated: 'The platform is not integrated',
       choose_platform: 'Please choose an integrated platform',
+      verified: "verified",
       azure_issuetype: 'Azure issue type',
       azure_storytype: 'Azure story type',
       input_azure_issuetype: 'Please enter the issue type',
@@ -664,10 +665,10 @@ export default {
     azureDevops_filter_id: 'AzureDevops Filter ID',
     azureDevops_info: 'AzureDevops Information',
     azureDevops_tip: 'This information is the user token information for submitting defects through Azure Devops. If not filled in, the default information configured in the workspace will be used',
-    manager: 'Manager',
+    manager: 'Project Manager',
     no_data: 'No Data',
     select: 'Select',
-    repeatable: 'Interface definition URL repeatable',
+    repeatable: 'API URL Repeatable',
     repeatable_info: 'After enabling, the interface definition repeatability check will not check the URL',
     case_public: 'Public Library',
     public: 'Start Public Library',
@@ -2175,6 +2176,8 @@ export default {
       tapd_current_owner: "Tapd Current Owner",
       zentao_bug_build: "Zentao Impact version",
       zentao_bug_assigned: "Zentao handler",
+      third_party_integrated: "Third-party Platform Integrated",
+      use_third_party: "Enable Jira Issue Template",
       update_third_party_bugs: "Update the defects of third-party platforms",
       sync_bugs: "Synchronization Issue"
     },
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 1cbf5052ab..a7d96102cf 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -2181,6 +2181,8 @@ export default {
       tapd_current_owner: "Tapd 处理人",
       zentao_bug_build: "禅道 影响版本",
       zentao_bug_assigned: "禅道 处理人",
+      third_party_integrated: "集成第三方平台",
+      use_third_party: "使用第 Jira 缺陷模板",
       update_third_party_bugs: "更新第三方平台的缺陷",
       sync_bugs: "同步缺陷"
     },

From b779dfe360a62d54e451e87fd8b5c0757b2cc166 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Sun, 19 Dec 2021 16:14:26 +0800
Subject: [PATCH 184/256] =?UTF-8?q?fix:=20=E8=84=91=E5=9B=BE=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=94=A8=E4=BE=8B=E6=AD=A5=E9=AA=A4=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=85=B3=E8=81=94=E7=BC=BA=E9=99=B7=20--bug?=
 =?UTF-8?q?=3D1008872=20--user=3D=E9=99=88=E5=BB=BA=E6=98=9F=20=E3=80=90?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA=E3=80=91=E8=84=91=E5=9B=BE?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=EF=BC=8C=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=AD=A5=E9=AA=A4=EF=BC=8C=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E2=80=9D=E5=8F=96=E6=B6=88=E5=85=B3=E8=81=94=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E2=80=9C=E3=80=90+github#8537=E3=80=91=20htt?=
 =?UTF-8?q?ps://www.tapd.cn/55049933/s/1082862?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/workspace/template/TemplateSelect.vue         | 3 ++-
 .../business/components/track/common/minder/minderUtils.js | 7 ++++---
 frontend/src/business/components/xpack                     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue b/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
index 0f7c63cabe..21b13bb180 100644
--- a/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
+++ b/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
@@ -11,6 +11,7 @@
 
 <script>
 import {getCurrentWorkspaceId} from "@/common/js/utils";
+import {LOCAL} from "@/common/js/constants";
 
 export default {
   name: "TemplateSelect",
@@ -59,7 +60,7 @@ export default {
                 break;
               }
             } else {
-              if (item.system && item.platform === 'metersphere' && item.name === 'default') {
+              if (item.system && item.platform === LOCAL && item.name === 'default') {
                 this.$set(this.data, this.prop, item.id);
                 break;
               }
diff --git a/frontend/src/business/components/track/common/minder/minderUtils.js b/frontend/src/business/components/track/common/minder/minderUtils.js
index bdff9ad3cd..7da402b5a7 100644
--- a/frontend/src/business/components/track/common/minder/minderUtils.js
+++ b/frontend/src/business/components/track/common/minder/minderUtils.js
@@ -544,9 +544,10 @@ export function handleMinderIssueDelete(commandName, isPlan) {
           isAllIssue = false;
         }
       });
-      Promise.all(promises).then(() => {
-        success(i18n.t('test_track.case.minder_create_tip'));
-      });
+      if (promises.length > 0)
+        Promise.all(promises).then(() => {
+          success(i18n.t('test_track.case.minder_issue_delete_tip'));
+        });
       return isAllIssue;
     }
   }
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 938171fa50..84bab3f25e 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 938171fa506d5b3d8fff9857cb21a83c8e31063e
+Subproject commit 84bab3f25eaef5b58f2928ae5aed6dd50cad3d29

From eb00835b8bf7b5910ce8942046a18472176f12f0 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Sun, 19 Dec 2021 18:12:03 +0800
Subject: [PATCH 185/256] =?UTF-8?q?fix:=20swagger=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E8=AF=B7=E6=B1=82=E5=93=8D=E5=BA=94=E4=BD=93?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8F=8F=E8=BF=B0=20=E3=80=90=E3=80=90?=
 =?UTF-8?q?=E6=B3=B0=E8=BF=9C=E6=B7=91=E3=80=91=E9=80=9A=E8=BF=87swagger?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=9A=84API=EF=BC=8C=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E4=BD=93=E9=83=A8=E5=88=86=E7=9A=84=E6=8F=8F=E8=BF=B0=E6=9C=AA?=
 =?UTF-8?q?=E8=83=BD=E6=AD=A3=E7=A1=AE=E5=90=8C=E6=AD=A5=E8=BF=87=E6=9D=A5?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E4=BF=AE=E5=A4=8D=E3=80=91https://www.tapd.c?=
 =?UTF-8?q?n/33805590/bugtrace/bugs/view=3Fbug=5Fid=3D1133805590001008723?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/definition/parse/Swagger3Parser.java  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java
index 847673ec68..7a6b50d732 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java
@@ -252,14 +252,15 @@ public class Swagger3Parser extends SwaggerAbstractParser {
                 responses.forEach((responseCode, response) -> {
                     parseResponseHeader(response, msResponse.getHeaders());
                     parseResponseBody(response, msResponse.getBody());
-                    parseResponseCode(responseCode, msResponse);
                 });
             } else {
                 parseResponseHeader(apiResponse, msResponse.getHeaders());
                 parseResponseBody(apiResponse, msResponse.getBody());
-                parseResponseCode("200", msResponse);
             }
         }
+        responses.forEach((responseCode, response) -> {
+            parseResponseCode(msResponse.getStatusCode(), responseCode, response);
+        });
         return msResponse;
     }
 
@@ -272,14 +273,13 @@ public class Swagger3Parser extends SwaggerAbstractParser {
         }
     }
 
-    private void parseResponseCode(String response, HttpResponse msResponse) {
-        if (StringUtils.isNotEmpty(response)) {
-            try {
-                msResponse.setStatusCode(JSON.parseObject(response, List.class));
-            } catch (Exception e) {
-                LogUtil.error(e);
-            }
+    private void parseResponseCode(List<KeyValue> statusCode, String responseCode, ApiResponse response) {
+        try {
+            statusCode.add(new KeyValue(responseCode, response.getDescription(), response.getDescription()));
+        } catch (Exception e) {
+            LogUtil.error(e);
         }
+
     }
 
     private void parseResponseBody(ApiResponse response, Body body) {
@@ -317,6 +317,9 @@ public class Swagger3Parser extends SwaggerAbstractParser {
                 return;
             }
             mediaType = content.get(contentType);
+            if (contentType.equals("*/*")) {
+                contentType = org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+            }
         }
 
         Set<String> refSet = new HashSet<>();

From 058ce481fcc8dbbfef882035f8da3d962b225d92 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 20 Dec 2021 09:51:48 +0800
Subject: [PATCH 186/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BF=AE=E5=A4=8D=E6=89=A7=E8=A1=8C=E6=9C=AA?=
 =?UTF-8?q?=E6=94=B6=E5=88=B0=E7=BB=93=E6=9E=9C=E7=9A=84=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/ApiScenarioReportService.java | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
index b2b1260239..0d961705e0 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
@@ -107,15 +107,13 @@ public class ApiScenarioReportService {
         example.createCriteria().andReportIdEqualTo(dto.getReportId());
         List<ApiScenarioReportResult> requestResults = apiScenarioReportResultMapper.selectByExample(example);
 
-        ApiScenarioReport scenarioReport = null;
-        if (CollectionUtils.isNotEmpty(requestResults)) {
-            if (StringUtils.equals(dto.getRunMode(), ApiRunMode.SCENARIO_PLAN.name())) {
-                scenarioReport = updatePlanCase(requestResults, dto);
-            } else if (StringUtils.equalsAny(dto.getRunMode(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
-                scenarioReport = updateSchedulePlanCase(requestResults, dto);
-            } else {
-                scenarioReport = updateScenario(requestResults, dto);
-            }
+        ApiScenarioReport scenarioReport;
+        if (StringUtils.equals(dto.getRunMode(), ApiRunMode.SCENARIO_PLAN.name())) {
+            scenarioReport = updatePlanCase(requestResults, dto);
+        } else if (StringUtils.equalsAny(dto.getRunMode(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
+            scenarioReport = updateSchedulePlanCase(requestResults, dto);
+        } else {
+            scenarioReport = updateScenario(requestResults, dto);
         }
         // 串行队列
         SerialBlockingQueueUtil.offer(dto, scenarioReport != null ? scenarioReport : SerialBlockingQueueUtil.END_SIGN);
@@ -270,7 +268,7 @@ public class ApiScenarioReportService {
                 apiScenarioMapper.updateByPrimaryKey(scenario);
             }
         }
-        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), errorSize > 0 ? "Error" : "Success", dto.getRunMode());
+        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), errorSize > 0 || requestResults.isEmpty() ? "Error" : "Success", dto.getRunMode());
         return report;
     }
 
@@ -282,7 +280,7 @@ public class ApiScenarioReportService {
         Map<String, String> planScenarioReportMap = new HashMap<>();
 
         long errorSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), "Error")).count();
-        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), errorSize > 0 ? "Error" : "Success", dto.getRunMode());
+        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), errorSize > 0 || requestResults.isEmpty() ? "Error" : "Success", dto.getRunMode());
         if (report != null) {
             if (StringUtils.isNotEmpty(dto.getTestPlanReportId()) && !testPlanReportIdList.contains(dto.getTestPlanReportId())) {
                 testPlanReportIdList.add(dto.getTestPlanReportId());
@@ -360,7 +358,7 @@ public class ApiScenarioReportService {
     public ApiScenarioReport updateScenario(List<ApiScenarioReportResult> requestResults, ResultDTO dto) {
         long errorSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), "Error")).count();
         // 更新报告状态
-        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), errorSize > 0 ? "Error" : "Success", dto.getRunMode());
+        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), errorSize > 0 || requestResults.isEmpty() ? "Error" : "Success", dto.getRunMode());
         // 更新场景状态
         ApiScenarioWithBLOBs scenario = apiScenarioMapper.selectByPrimaryKey(dto.getTestId());
         if (scenario == null) {

From 992a11b2c1608b68b5174a552943fb79d5f3a196 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 20 Dec 2021 14:14:12 +0800
Subject: [PATCH 187/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Djs=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9B=B8=E4=BA=92=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/i18n.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/i18n/i18n.js b/frontend/src/i18n/i18n.js
index 3cce748971..de3eb372f8 100644
--- a/frontend/src/i18n/i18n.js
+++ b/frontend/src/i18n/i18n.js
@@ -7,7 +7,8 @@ import zh_TWLocale from "element-ui/lib/locale/lang/zh-TW";
 import zh_CN from "./zh-CN";
 import en_US from "./en-US";
 import zh_TW from "./zh-TW";
-import {CURRENT_LANGUAGE} from "@/common/js/constants";
+
+export const CURRENT_LANGUAGE = 'current_language';
 
 Vue.use(VueI18n);
 

From 572412e2cfb9a2c97aa34a3557970443fda1bdc7 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 20 Dec 2021 14:34:58 +0800
Subject: [PATCH 188/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E5=88=9B=E5=BB=BA=E6=96=B0=E7=9A=84=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E6=97=B6=E4=BC=9A=E5=8D=A1=E5=9C=A8?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=B8=AD=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008976 --user=lyh
【测试跟踪】创建新的用例时至空点击创建并执行，之后点击自动更新状态，就会卡在加载中的状态
https://www.tapd.cn/55049933/s/1083309
---
 .../business/components/track/plan/components/TestPlanEdit.vue   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
index 7833c42d85..f40d8c9203 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@@ -222,7 +222,6 @@ export default {
       this.reload();
     },
     testPlanInfo() {
-      this.result.loading = true;
       this.$refs['planFrom'].validate((valid) => {
         if (valid) {
           let param = {};

From 9dd9620dac51588c0f40292fb5d8eb1456fc2925 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 20 Dec 2021 14:58:07 +0800
Subject: [PATCH 189/256] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BF=AE=E5=A4=8D=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E5=A4=9A=E8=8A=82=E7=82=B9=E6=89=A7=E8=A1=8C=E6=98=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8D=A1=E5=9C=A8starting=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008998 --user=刘瑞斌 【性能测试】多个node执行性能测试失败
https://www.tapd.cn/55049933/s/1083328
---
 .../performance/service/JmeterFileService.java    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java b/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java
index 292f6dd410..1b206a28eb 100644
--- a/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java
+++ b/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java
@@ -9,7 +9,6 @@ import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.performance.engine.EngineContext;
 import io.metersphere.performance.engine.EngineFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.ByteArrayOutputStream;
@@ -17,13 +16,13 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import static org.python.modules.time.Time.sleep;
 
+// 非事务运行
 @Service
-@Transactional(rollbackFor = Exception.class)
 public class JmeterFileService {
     @Resource
     private ExtLoadTestReportMapper extLoadTestReportMapper;
@@ -32,14 +31,14 @@ public class JmeterFileService {
 
     public byte[] downloadZip(String reportId, double[] ratios, int resourceIndex) {
         try {
-            LoadTestReportWithBLOBs loadTestReport = null;
-            double waitingSeconds = 0;
+            LoadTestReportWithBLOBs loadTestReport = loadTestReportMapper.selectByPrimaryKey(reportId);
+            int wait = 0;
             while (loadTestReport == null) {
-                if (waitingSeconds > 12000) {
+                if (wait > 120_000) {
                     break;
                 }
-                sleep(0.3);
-                waitingSeconds += 0.3;
+                TimeUnit.MILLISECONDS.sleep(200);
+                wait += 200;
                 loadTestReport = loadTestReportMapper.selectByPrimaryKey(reportId);
             }
             if (loadTestReport == null) {

From 8c8c69998ef23f3dc13e5d71895e1240b8cd6c6d Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 20 Dec 2021 15:08:59 +0800
Subject: [PATCH 190/256] build: spring boot version

---
 backend/pom.xml | 3 ++-
 pom.xml         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index f89a42e22c..547a2c7bab 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -17,6 +17,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <shiro.version>1.6.0</shiro.version>
         <java.version>1.8</java.version>
+        <flyway.version>7.15.0</flyway.version>
     </properties>
 
     <dependencies>
@@ -167,7 +168,7 @@
         <dependency>
             <groupId>com.fit2cloud</groupId>
             <artifactId>quartz-spring-boot-starter</artifactId>
-            <version>0.0.7</version>
+            <version>0.0.9</version>
         </dependency>
 
 
diff --git a/pom.xml b/pom.xml
index 95437f52c4..207e439f01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.4</version>
+        <version>2.6.1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 

From 982385b1a6a9e051aae1f363866a6c1a6dba3048 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 20 Dec 2021 15:26:20 +0800
Subject: [PATCH 191/256] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BF=AE=E5=A4=8D=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E5=8E=8B=E5=8A=9B=E9=85=8D=E7=BD=AE=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/components/PerformancePressureConfig.vue   | 12 ++++++------
 .../view/comonents/load/PerformanceLoadConfig.vue   | 12 ++++++------
 frontend/src/i18n/en-US.js                          | 13 ++++++++-----
 frontend/src/i18n/zh-CN.js                          |  3 +++
 frontend/src/i18n/zh-TW.js                          |  3 +++
 5 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index 513e1d1871..acf5acacb9 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -50,13 +50,13 @@
                     {{ $t('load_test.thread_num') }}{{ threadGroup.threadNumber }},
                     {{ $t('load_test.duration') }}:
                     <span v-if="threadGroup.durationHours">
-                      {{ threadGroup.durationHours }}{{ $t('schedule.cron.hours') }}
+                      {{ threadGroup.durationHours }}{{ $t('load_test.hours') }}
                     </span>
                     <span v-if="threadGroup.durationMinutes">
-                      {{ threadGroup.durationMinutes }}{{ $t('schedule.cron.minutes') }}
+                      {{ threadGroup.durationMinutes }}{{ $t('load_test.minutes') }}
                     </span>
                     <span v-if="threadGroup.durationSeconds">
-                      {{ threadGroup.durationSeconds }}{{ $t('schedule.cron.seconds') }}
+                      {{ threadGroup.durationSeconds }}{{ $t('load_test.seconds') }}
                     </span>
                   </el-tag>
                   <el-tag type="primary" size="mini" v-if="threadGroup.threadType === 'ITERATION'">
@@ -106,7 +106,7 @@
                                    @change="calculateTotalChart()"
                                    size="mini"/>
                 </el-form-item>
-                <el-form-item :label="$t('schedule.cron.hours')" label-width="40px"/>
+                <el-form-item :label="$t('load_test.hours')" label-width="20px"/>
                 <el-form-item>
                   <el-input-number controls-position="right"
 
@@ -116,7 +116,7 @@
                                    @change="calculateTotalChart()"
                                    size="mini"/>
                 </el-form-item>
-                <el-form-item :label="$t('schedule.cron.minutes')" label-width="40px"/>
+                <el-form-item :label="$t('load_test.minutes')" label-width="20px"/>
                 <el-form-item>
                   <el-input-number controls-position="right"
 
@@ -126,7 +126,7 @@
                                    @change="calculateTotalChart()"
                                    size="mini"/>
                 </el-form-item>
-                <el-form-item :label="$t('schedule.cron.seconds')" label-width="20px"/>
+                <el-form-item :label="$t('load_test.seconds')" label-width="20px"/>
                 <br>
                 <el-form-item :label="$t('load_test.rps_limit_enable')">
                   <el-switch v-model="threadGroup.rpsLimitEnable" @change="calculateTotalChart()"/>
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/PerformanceLoadConfig.vue b/frontend/src/business/components/track/plan/view/comonents/load/PerformanceLoadConfig.vue
index 7aac5eba0d..f7ab63d9a7 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/PerformanceLoadConfig.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/PerformanceLoadConfig.vue
@@ -51,13 +51,13 @@
                     {{ $t('load_test.thread_num') }}{{ threadGroup.threadNumber }},
                     {{ $t('load_test.duration') }}:
                     <span v-if="threadGroup.durationHours">
-                      {{ threadGroup.durationHours }}{{ $t('schedule.cron.hours') }}
+                      {{ threadGroup.durationHours }}{{ $t('load_test.hours') }}
                     </span>
                     <span v-if="threadGroup.durationMinutes">
-                      {{ threadGroup.durationMinutes }}{{ $t('schedule.cron.minutes') }}
+                      {{ threadGroup.durationMinutes }}{{ $t('load_test.minutes') }}
                     </span>
                     <span v-if="threadGroup.durationSeconds">
-                      {{ threadGroup.durationSeconds }}{{ $t('schedule.cron.seconds') }}
+                      {{ threadGroup.durationSeconds }}{{ $t('load_test.seconds') }}
                     </span>
                   </el-tag>
                   <el-tag type="primary" size="mini" v-if="threadGroup.threadType === 'ITERATION'">
@@ -105,7 +105,7 @@
                                    @change="calculateTotalChart()"
                                    size="mini"/>
                 </el-form-item>
-                <el-form-item :label="$t('schedule.cron.hours')" label-width="40px"/>
+                <el-form-item :label="$t('load_test.hours')" label-width="20px"/>
                 <el-form-item>
                   <el-input-number controls-position="right"
                                    :disabled="isReadOnly"
@@ -115,7 +115,7 @@
                                    @change="calculateTotalChart()"
                                    size="mini"/>
                 </el-form-item>
-                <el-form-item :label="$t('schedule.cron.minutes')" label-width="40px"/>
+                <el-form-item :label="$t('load_test.minutes')" label-width="20px"/>
                 <el-form-item>
                   <el-input-number controls-position="right"
                                    :disabled="isReadOnly"
@@ -125,7 +125,7 @@
                                    @change="calculateTotalChart()"
                                    size="mini"/>
                 </el-form-item>
-                <el-form-item :label="$t('schedule.cron.seconds')" label-width="20px"/>
+                <el-form-item :label="$t('load_test.seconds')" label-width="20px"/>
                 <br>
                 <el-form-item :label="$t('load_test.rps_limit_enable')">
                   <el-switch v-model="threadGroup.rpsLimitEnable" @change="calculateTotalChart()"/>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 26be29ef74..3303e16a58 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -904,23 +904,23 @@ export default {
     delete_file_confirm: 'Confirm delete file:',
     file_size_limit: "The number of files exceeds the limit！",
     delete_file: "The file already exists, please delete the file with the same name first!",
-    thread_num: 'Concurrent users:',
+    thread_num: 'VUs:',
     input_thread_num: 'Please enter the number of threads',
     duration: 'Duration time',
     granularity: 'Aggregation time (seconds)',
     input_duration: 'Please enter a duration',
     rps_limit: 'RPS Limit',
     rps_limit_enable: 'RPS Value',
-    resource_strategy: 'Allocation Strategy',
+    resource_strategy: 'Strategy',
     run_mode: 'Run Mode',
     input_rps_limit: 'Please enter a limit',
     ramp_up_time_within: 'In',
     ramp_up_time_minutes: 'seconds, separate',
-    ramp_up_time_seconds: 'seconds add concurrent users',
+    ramp_up_time_seconds: 'seconds add VUs',
     iterate_num: 'Iterations',
     by_iteration: 'By iterations',
     by_duration: 'By duration',
-    ramp_up_time_times: 'add concurrent users',
+    ramp_up_time_times: 'add VUs',
     advanced_config_error: 'Advanced configuration verification failed',
     domain_bind: 'Domain bind',
     domain: 'Domain',
@@ -970,7 +970,7 @@ export default {
     project_file_update_type_error: 'Updated file types must be consistent',
     csv_has_header: 'Contains Title',
     csv_split: 'CSV Split',
-    on_sample_error: 'After a Sampler error',
+    on_sample_error: 'Sampler error',
     continue: 'Continue',
     startnextloop: 'Start the next loop',
     stopthread: 'Stop thread',
@@ -995,6 +995,9 @@ export default {
     add_monitor: 'Add Monitor',
     monitor_item: 'Monitor',
     monitor_host: 'Target host',
+    seconds: "S",
+    minutes: "M",
+    hours: "H",
   },
   api_test: {
     is_continue: "Is continue",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index a7d96102cf..476f747f5b 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1001,6 +1001,9 @@ export default {
     add_monitor: '添加监控',
     monitor_item: '监控项',
     monitor_host: '监控配置',
+    seconds: "秒",
+    minutes: "分",
+    hours: "时",
   },
   api_test: {
     is_continue: "是否继续",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 3df5289058..a9ae8e559c 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1001,6 +1001,9 @@ export default {
     add_monitor: '添加監控',
     monitor_item: '監控項',
     monitor_host: '監控配置',
+    seconds: "秒",
+    minutes: "分",
+    hours: "時",
   },
   api_test: {
     is_continue: "是否繼續",

From 29b733ce7ba3785fb7a5b3a4cc95c7cc1a65cf29 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 20 Dec 2021 15:45:01 +0800
Subject: [PATCH 192/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E5=BE=AE=E4=BF=A1=E5=90=8D=E7=A7=B0=E7=BF=BB=E8=AF=91?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008990 --user=刘瑞斌 【消息通知】变量显示问题汇总 https://www.tapd.cn/55049933/s/1083464
---
 frontend/src/i18n/en-US.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 3303e16a58..e4d365d94c 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -574,7 +574,7 @@ export default {
       mail: 'Email',
       in_site: 'InSite',
       nail_robot: 'Nail robot',
-      enterprise_wechat_robot: 'Enterprise wechat robot',
+      enterprise_wechat_robot: 'WeCom robot',
       lark: "Lark Robot",
       notes: '1. Nail and create a custom robot in the enterprise group, and then copy the webhook address on our platform;<br/>' +
         '2. Robots are selected as swarm robots, and "custom keyword" is selected for security verification: "task notification";<br/>' +

From 16af01bfee149fc95291f82eea5b934db78ee93b Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 20 Dec 2021 14:47:42 +0800
Subject: [PATCH 193/256] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE):=20=E5=BA=94=E7=94=A8=E8=AE=BE=E7=BD=AE=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/permission.json | 4 ++--
 frontend/src/i18n/en-US.js                 | 6 +++++-
 frontend/src/i18n/zh-CN.js                 | 4 ++++
 frontend/src/i18n/zh-TW.js                 | 4 ++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/resources/permission.json b/backend/src/main/resources/permission.json
index 0e3e93e0fd..e46cf7bad1 100644
--- a/backend/src/main/resources/permission.json
+++ b/backend/src/main/resources/permission.json
@@ -332,7 +332,7 @@
     },
     {
       "id": "PROJECT_APP_MANAGER:READ+EDIT",
-      "name": "编辑应用设置",
+      "name": "permission.project_app_manager.edit",
       "resourceId": "PROJECT_APP_MANAGER"
     },
     {
@@ -982,7 +982,7 @@
     },
     {
       "id": "PROJECT_APP_MANAGER",
-      "name": "应用设置"
+      "name": "permission.project_app_manager.name"
     },
     {
       "id": "PROJECT_TRACK_CASE",
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index e4d365d94c..9aeac47234 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -672,7 +672,7 @@ export default {
     repeatable_info: 'After enabling, the interface definition repeatability check will not check the URL',
     case_public: 'Public Library',
     public: 'Start Public Library',
-    public_info: 'You can use public use case library data, or you can add use cases to the public use case library by yourself',
+    public_info: 'You can use public test case library data, or you can add test cases to the public test case library by yourself',
     upload_file_again: 'Upload again',
     code_segment: {
       code_segment: "Custom Code",
@@ -2647,6 +2647,10 @@ export default {
       name: "Operation Log",
       read: "READ"
     },
+    project_app_manager: {
+      name: "App Manager",
+      edit: "EDIT"
+    },
     project_custom_code: {
       name: "Custom Code",
       read: "READ",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 476f747f5b..59d1b819f2 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -2690,6 +2690,10 @@ export default {
       relevance_or_cancel: "关联/取消关联用例",
 
     },
+    project_app_manager: {
+      name: "应用设置",
+      edit: "编辑应用设置"
+    },
     project_track_plan: {
       name: "测试计划",
       read: "查询测试计划",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index a9ae8e559c..0b8a61bec9 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -2666,6 +2666,10 @@ export default {
       upload_file: "上傳文件",
       delete_file: "刪除文件",
     },
+    project_app_manager: {
+      name: "應用設置",
+      edit: "編輯應用設置"
+    },
     project_track_case: {
       name: "測試用例",
       read: "查詢用例",

From b2f307ce4ae897d8aaaf161d1c0f66fa56f778a3 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 20 Dec 2021 14:06:19 +0800
Subject: [PATCH 194/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E5=9C=A8?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=86=85=E5=AE=B9=E9=80=89no=20auth=20?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【接口用例在请求内容选no auth报错】
https://www.tapd.cn/33805590/bugtrace/bugs/view?bug_id=1133805590001008973
---
 .../components/auth/ApiAuthConfig.vue         | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue b/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue
index e6dbec11b4..043a33e448 100644
--- a/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue
+++ b/frontend/src/business/components/api/definition/components/auth/ApiAuthConfig.vue
@@ -8,10 +8,10 @@
           <el-select v-model="authConfig.verification" @change="change"
                      :placeholder="$t('api_test.definition.request.verification_method')" filterable size="small">
             <el-option
-              v-for="item in options"
-              :key="item.name"
-              :label="item.name"
-              :value="item.name">
+                v-for="item in options"
+                :key="item.name"
+                :label="item.name"
+                :value="item.name">
             </el-option>
           </el-select>
 
@@ -24,7 +24,8 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item :label="$t('commons.password')" prop="password" v-if=" authConfig.verification!=undefined && authConfig.verification !='No Auth'">
+        <el-form-item :label="$t('commons.password')" prop="password"
+                      v-if=" authConfig.verification!=undefined && authConfig.verification !='No Auth'">
           <el-input v-model="authConfig.password" :placeholder="$t('commons.password')" show-password autocomplete="off"
                     maxlength="50" show-word-limit/>
         </el-form-item>
@@ -42,10 +43,10 @@
           <el-select v-model="authConfig.encrypt"
                      :placeholder="$t('api_test.definition.request.verification_method')" filterable size="small">
             <el-option
-              v-for="item in encryptOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+                v-for="item in encryptOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -90,25 +91,28 @@ export default {
         let authManager = createComponent("AuthManager");
         authManager.verification = "Basic Auth";
         authManager.environment = this.request.useEnvironment;
-        if(this.request.hashTree == undefined){
+        if (this.request.hashTree == undefined) {
           this.request.hashTree = [];
         }
         this.request.hashTree.push(authManager);
         // 这里做个判断，如果原来有值则不覆盖
-        if(this.authConfig.username == undefined && this.authConfig.password == undefined){
+        if (this.authConfig.username == undefined && this.authConfig.password == undefined) {
           this.authConfig = authManager;
         }
       } else {
-        for (let index in this.request.hashTree) {
-          if (this.request.hashTree[index].type === "AuthManager") {
-            this.request.hashTree.splice(index, 1);
+        if (this.request.hashTree) {
+          for (let index in this.request.hashTree) {
+            if (this.request.hashTree[index].type === "AuthManager") {
+              this.request.hashTree.splice(index, 1);
+            }
           }
         }
         this.request.authManager = {};
       }
+
       this.request.authManager = this.authConfig;
     },
-    initData(){
+    initData() {
       if (this.request.hashTree) {
         for (let index in this.request.hashTree) {
           if (this.request.hashTree[index].type == 'AuthManager') {

From 6bf54034ed2c73a6d660e5cd56e1c32dd24b9ff2 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 20 Dec 2021 15:52:15 +0800
Subject: [PATCH 195/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20i18n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008911 --user=lyh 【国际化】测试跟踪 模块，未进行国际化的问题汇总
https://www.tapd.cn/55049933/s/1083409
---
 .../components/common/head/HeaderCustom.vue   |  1 +
 .../track/case/components/TestCaseCreate.vue  |  4 +--
 .../track/plan/components/TestPlanEdit.vue    | 10 ++++----
 .../review/components/TestCaseReviewEdit.vue  |  2 +-
 frontend/src/i18n/en-US.js                    | 25 +++++++++++--------
 frontend/src/i18n/zh-CN.js                    |  5 ++++
 frontend/src/i18n/zh-TW.js                    |  5 ++++
 7 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/frontend/src/business/components/common/head/HeaderCustom.vue b/frontend/src/business/components/common/head/HeaderCustom.vue
index bd8f9ad28a..63bdce4a92 100644
--- a/frontend/src/business/components/common/head/HeaderCustom.vue
+++ b/frontend/src/business/components/common/head/HeaderCustom.vue
@@ -5,6 +5,7 @@
                    :draggable="true"
                    :to_data='fieldSelected'
                    :defaultProps="{label:'label'}"
+                   :placeholder="$t('api_test.request.parameters_mock_filter_tips')"
                    :allow-drop="allowDrop"
                    :default-checked-keys="defaultCheckedKeys"
                    :default-transfer="defaultTransfer"
diff --git a/frontend/src/business/components/track/case/components/TestCaseCreate.vue b/frontend/src/business/components/track/case/components/TestCaseCreate.vue
index 2e1aa2090c..1f32d77a87 100644
--- a/frontend/src/business/components/track/case/components/TestCaseCreate.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseCreate.vue
@@ -2,7 +2,7 @@
   <el-dialog :close-on-click-modal="false" :title="$t('test_track.case.create')" :visible.sync="visible"
              width="45%"
              :destroy-on-close="true">
-    <el-form :model="testCaseForm" label-position="right" label-width="80px" size="small" :rules="rule"
+    <el-form :model="testCaseForm" label-position="right" label-width="100px" size="small" :rules="rule"
              ref="testCaseForm">
       <el-form-item :label="$t('commons.name')" prop="name">
         <el-input v-model="testCaseForm.name" autocomplete="off" :placeholder="$t('commons.name')"/>
@@ -47,7 +47,7 @@
       <ms-dialog-footer
         @cancel="visible = false"
         :isShow="true"
-        title="编辑详情"
+        :title="$t('commons.edit_info')"
         @saveAsEdit="saveTestCase(true)"
         @confirm="saveTestCase">
       </ms-dialog-footer>
diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
index f40d8c9203..9ca9f95b1b 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@@ -81,20 +81,20 @@
         <el-row type="flex" :gutter="20">
           <el-col :span="12">
             <el-form-item
-              :label="$t('自动更新状态')"
-              :label-width="formLabelWidth"
+              :label="$t('test_track.plan_view.automatically_update_status')"
+              label-width="140px"
               prop="automaticStatusUpdate">
               <el-switch v-model="form.automaticStatusUpdate"/>
-              <ms-instructions-icon :content="'当功能用例关联的接口或性能用例在测试计划执行后，自动更新功能用例的状态'"/>
+              <ms-instructions-icon :content="$t('test_track.plan_view.automatically_update_status_tip')"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item
-              :label="$t('允许关联重复用例')"
+              :label="$t('test_track.plan_view.allow_associated_repetitive_cases')"
               label-width="140px"
               prop="automaticStatusUpdate">
               <el-switch v-model="form.repeatCase"/>
-              <ms-instructions-icon :content="'是否允许同一个测试计划中多次关联相同用例'"/>
+              <ms-instructions-icon :content="$t('test_track.plan_view.allow_associated_repetitive_cases_tip')"/>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
index c49ba09dc5..b99321c634 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
@@ -146,7 +146,7 @@ export default {
         userIds: [{required: true, message: this.$t('test_track.review.input_reviewer'), trigger: 'change'}],
         stage: [{required: true, message: this.$t('test_track.plan.input_plan_stage'), trigger: 'change'}],
         description: [{max: 200, message: this.$t('test_track.length_less_than') + '200', trigger: 'blur'}],
-        endTime: [{required: true, message: '请选择截止时间', trigger: 'blur'}]
+        endTime: [{required: true, message: this.$t('commons.please_select_a_deadline'), trigger: 'blur'}]
       },
       formLabelWidth: "100px",
       operationType: '',
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 9aeac47234..890a5baeb2 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -219,6 +219,7 @@ export default {
     cancel_follow_success: "Cancel Follow Success",
     generate_test_data: "Generate test data",
     type: "Type",
+    please_select_a_deadline: "Please select a deadline",
     relationship: {
       name: 'Dependencies',
       pre_case: 'Prepositional Case',
@@ -285,12 +286,12 @@ export default {
         not_like: "Not included",
         in: "Belong to",
         not_in: "Not belonging",
-        gt: ">",
-        ge: ">=",
-        lt: "<",
-        le: "<=",
-        equals: "=",
-        not_equals: "!=",
+        gt: "Greater than",
+        ge: "Greater than or equal to",
+        lt: "Less than",
+        le: "Less than or equal to",
+        equals: "Equal to",
+        not_equals: "Not Equal to",
         between: "Between",
         current_user: "Current user"
       }
@@ -1808,7 +1809,7 @@ export default {
     execution_result: ": Please select the execution result",
     actual_result: ": The actual result is empty",
     cancel_relevance_success: "Unlinked successfully",
-    switch_project: "Switch project",
+    switch_project: "Project",
     functional_test_case: "Functional Case",
     api_test_case: "Api Case",
     performance_test_case: "Performance Case",
@@ -1953,7 +1954,7 @@ export default {
       test_plan_id:'Plan ID',
       create_plan: "Create test plan",
       edit_plan: "Edit test plan",
-      plan_name: "Test plan name",
+      plan_name: "Name",
       plan_project: "Project",
       related_project: "Related Project",
       related_tip: "After linking the project, you can add test cases under the linking project to the test plan list",
@@ -1977,8 +1978,8 @@ export default {
       plan_status_finished: "Finished",
       plan_status_completed: "Completed",
       plan_status_trash: "Trashed",
-      planned_start_time: "Plan Start Time",
-      planned_end_time: "Plan End Time",
+      planned_start_time: "Start Time",
+      planned_end_time: "End Time",
       actual_start_time: "Actual Start Time",
       actual_end_time: "Actual End Time",
       plan_delete_confirm: "All use cases under this plan will be deleted,confirm delete test plan: ",
@@ -2146,6 +2147,10 @@ export default {
       failure_case: "Failure case",
       export_report: "Export Report",
       no_case_relevance: "No related use cases",
+      automatically_update_status: "Auto update status",
+      allow_associated_repetitive_cases: "Repetitive Case",
+      automatically_update_status_tip: "When the interface or performance use case associated with the functional use case is executed in the test plan, the status of the functional use case is automatically updated",
+      allow_associated_repetitive_cases_tip: "Whether to allow the same use case to be associated multiple times in the same test plan"
     },
     issue: {
       issue: "Issue",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 59d1b819f2..5a1887c543 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -219,6 +219,7 @@ export default {
     follow_success: "关注成功",
     cancel_follow_success: "取消关注成功",
     type: "类型",
+    please_select_a_deadline: "请选择截止时间",
     relationship: {
       name: '依赖关系',
       pre_case: '前置用例',
@@ -2151,6 +2152,10 @@ export default {
       failure_case: "失败用例",
       export_report: "导出报告",
       no_case_relevance: "没有关联用例",
+      automatically_update_status: "自动更新状态",
+      automatically_update_status_tip: "当功能用例关联的接口或性能用例在测试计划执行后，自动更新功能用例的状态",
+      allow_associated_repetitive_cases: "允许关联重复用例",
+      allow_associated_repetitive_cases_tip: "是否允许同一个测试计划中多次关联相同用例"
     },
     issue: {
       issue: "缺陷",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 0b8a61bec9..664c001803 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -219,6 +219,7 @@ export default {
     follow_success: "關註成功",
     cancel_follow_success: "取消關註成功",
     type: "類型",
+    please_select_a_deadline: "請選擇截止時間",
     relationship: {
       name: '依賴關系',
       pre_case: '前置用例',
@@ -2151,6 +2152,10 @@ export default {
       failure_case: "失敗用例",
       export_report: "導出報告",
       no_case_relevance: "沒有關聯用例",
+      automatically_update_status: "自動更新狀態",
+      allow_associated_repetitive_cases: "允許關聯重複用例",
+      automatically_update_status_tip: "當功能用例關聯的接口或性能用例在測試計劃執行後，自動更新功能用例的狀態",
+      allow_associated_repetitive_cases_tip: "是否允許同一個測試計劃中多次關聯相同用例"
     },
     issue: {
       issue: "缺陷",

From 5ff12bd5dd0512b372f1aa610814f410576dbcab Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 20 Dec 2021 16:47:03 +0800
Subject: [PATCH 196/256] =?UTF-8?q?chore:=20=E7=B3=BB=E7=BB=9F=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=E5=88=B0=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/logback.xml | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/backend/src/main/resources/logback.xml b/backend/src/main/resources/logback.xml
index 2743753829..5d6e43631c 100644
--- a/backend/src/main/resources/logback.xml
+++ b/backend/src/main/resources/logback.xml
@@ -141,6 +141,39 @@
         <appender-ref ref="warnAppender"/>
     </appender>
 
+    <!--  系统调用日志输出到指定文件  -->
+    <appender name="backendApiAppender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <File>${logging.file.path}/api/info.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${logging.file.path}/history/api/info.%d{yyyyMMdd}-%i.log
+            </FileNamePattern>
+            <maxHistory>30</maxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>50MB</maxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <charset>UTF-8</charset>
+            <Pattern>%d [%thread] %-5level %logger{36} %line - %msg%n</Pattern>
+        </encoder>
+    </appender>
+    <appender name="backendApiAsyncAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <queueSize>10000</queueSize>
+        <appender-ref ref="backendApiAppender"/>
+    </appender>
+    <logger name="io.metersphere.controller.handler.WebLogAspect" additivity="false">
+        <level value="${logger.level:INFO}"/>
+        <appender-ref ref="backendApiAsyncAppender"/>
+    </logger>
+
     <!-- 自定义测试计划执行的日志	-->
     <appender name="infoTestPlanAppender"
               class="ch.qos.logback.core.rolling.RollingFileAppender">

From 0ed7ade8102139efb409371f14ee7c17f28aa140 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 20 Dec 2021 14:54:46 +0800
Subject: [PATCH 197/256] =?UTF-8?q?chore(=E6=88=91=E7=9A=84=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=98):=20xpack-=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 sync
---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 84bab3f25e..4a5eedec92 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 84bab3f25eaef5b58f2928ae5aed6dd50cad3d29
+Subproject commit 4a5eedec92615e35558f547f1a2e8bf8398b9f13

From 1308f7bb63683c032c714e33a5dc4d0a1d4672dc Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 20 Dec 2021 16:19:37 +0800
Subject: [PATCH 198/256] =?UTF-8?q?fix(=E6=88=91=E7=9A=84=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0):=20=E6=88=91=E7=9A=84=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98=E7=BC=BA=E9=99=B7=E7=8A=B6=E6=80=81=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=8A=B6=E6=80=81=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 增加我的仪表盘缺陷状态三方平台状态国际化
---
 frontend/src/i18n/en-US.js | 3 +++
 frontend/src/i18n/zh-CN.js | 3 +++
 frontend/src/i18n/zh-TW.js | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 890a5baeb2..a1a0b3cf06 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -2180,6 +2180,9 @@ export default {
       status_closed: 'closed',
       status_active:'active',
       status_delete:'delete',
+      status_in_progress: 'in_progress',
+      status_rejected: 'rejected',
+      status_upcoming:'upcoming',
       please_choose_current_owner: "Please choose current owner",
       tapd_current_owner: "Tapd Current Owner",
       zentao_bug_build: "Zentao Impact version",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 5a1887c543..6df36ae795 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -2185,6 +2185,9 @@ export default {
       status_closed: '已关闭',
       status_active: '激活',
       status_delete: '删除',
+      status_in_progress: '接受/处理',
+      status_rejected: '拒绝',
+      status_upcoming:'待办',
       please_choose_current_owner: "请选择处理人",
       tapd_current_owner: "Tapd 处理人",
       zentao_bug_build: "禅道 影响版本",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 664c001803..619be7bfaa 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -2185,6 +2185,9 @@ export default {
       status_closed: '已關閉',
       status_active: '激活',
       status_delete: '刪除',
+      status_in_progress: '接受/處理',
+      status_rejected: '拒絕',
+      status_upcoming:'待辦',
       please_choose_current_owner: "請選擇處理人",
       tapd_current_owner: "Tapd 處理人",
       zentao_bug_build: "禪道 影響版本",

From 8db027af08d593db7b0459f5eb37b12a3514f488 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 20 Dec 2021 16:21:29 +0800
Subject: [PATCH 199/256] =?UTF-8?q?fix(=E6=88=91=E7=9A=84=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0):=20=E6=88=91=E7=9A=84=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98=E7=BC=BA=E9=99=B7=E7=8A=B6=E6=80=81=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=8A=B6=E6=80=81=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 增加我的仪表盘缺陷状态三方平台状态国际化
---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 4a5eedec92..77076b0e65 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 4a5eedec92615e35558f547f1a2e8bf8398b9f13
+Subproject commit 77076b0e650fe18119b434c86c724ad61d43ce21

From 8b69b04feb5e66fffa652588b337a71574b300cb Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 20 Dec 2021 17:12:38 +0800
Subject: [PATCH 200/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=9F=A5=E7=BC=BA=E9=99=B7=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008990 --user=刘瑞斌 【消息通知】变量显示问题汇总 https://www.tapd.cn/55049933/s/1083601
---
 .../api/automation/schedule/ScheduleNotification.vue        | 2 +-
 .../workspace/components/api/ApiAutomationNotification.vue  | 2 +-
 .../workspace/components/api/ApiDefinitionNotification.vue  | 4 ++--
 .../workspace/components/api/ApiReportNotification.vue      | 2 +-
 .../components/performance/PerformanceTestNotification.vue  | 2 +-
 .../workspace/components/track/DefectTaskNotification.vue   | 6 +++---
 .../workspace/components/track/TestCaseNotification.vue     | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
index 0766e26a68..098f9674e0 100644
--- a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
+++ b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
@@ -259,7 +259,7 @@ export default {
           value:'reportId',
         },
         {
-          label:this.$t('commons.num'),
+          label:this.$t('test_track.case.number'),
           value:'num',
         },
         {
diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue
index 2423a39452..7a95b32e21 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue
@@ -251,7 +251,7 @@ export default {
           value:'reportId',
         },
         {
-          label:this.$t('commons.num'),
+          label:this.$t('test_track.case.number'),
           value:'num',
         },
         {
diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue
index d5a0b41ec9..4d28b2f600 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue
@@ -243,7 +243,7 @@ export default {
           value:'updateTime',
         },
         {
-          label:this.$t('commons.num'),
+          label:this.$t('test_track.case.number'),
           value:'num',
         },
         {
@@ -325,7 +325,7 @@ export default {
           value:'updateTime',
         },
         {
-          label:this.$t('commons.num'),
+          label:this.$t('test_track.case.number'),
           value:'num',
         },
         {
diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue
index 39af4c8371..385ac5055f 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue
@@ -235,7 +235,7 @@ export default {
           value:'updateTime',
         },
         {
-          label:this.$t('commons.num'),
+          label:this.$t('test_track.case.number'),
           value:'num',
         },
         {
diff --git a/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue b/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue
index 3081748561..5309182bd6 100644
--- a/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue
@@ -218,7 +218,7 @@ export default {
           value:'userId',
         },
         {
-          label:this.$t('commons.num'),
+          label:this.$t('test_track.case.number'),
           value:'num',
         },
         {
diff --git a/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue b/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue
index 0820b025c6..f862d70f60 100644
--- a/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue
@@ -155,11 +155,11 @@ export default {
         "</head>\n" +
         "<body>\n" +
         "<div>\n" +
-        "    <p>${operator}创建了缺陷:${name}</p>\n" +
+        "    <p>${operator}创建了缺陷:${title}</p>\n" +
         "</div>\n" +
         "</body>\n" +
         "</html>",
-      robotTitle: "${operator}创建了缺陷:${name}",
+      robotTitle: "${operator}创建了缺陷:${title}",
       defectTask: [{
         taskType: "defectTask",
         event: "",
@@ -225,7 +225,7 @@ export default {
           value:'resourceId',
         },
         {
-          label:this.$t('commons.num'),
+          label:this.$t('test_track.case.number'),
           value:'num',
         },
         {
diff --git a/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue
index d260b1473b..1e41ea0eb9 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue
@@ -234,7 +234,7 @@ export default {
           value:'sort',
         },
         {
-          label:this.$t('commons.num'),
+          label:this.$t('test_track.case.number'),
           value:'num',
         },
         {

From 16dd3fe837ad4ec4a61732af445a41164af588b2 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 20 Dec 2021 17:32:58 +0800
Subject: [PATCH 201/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=97=A0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=9F=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009012 --user=刘瑞斌 【消息中心】复制测试计划后无创建的消息通知 https://www.tapd.cn/55049933/s/1083617
---
 .../java/io/metersphere/track/controller/TestPlanController.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java b/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
index 052a0bbb8c..d650310393 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
@@ -188,6 +188,7 @@ public class TestPlanController {
     }
 
     @PostMapping("/copy/{id}")
+    @SendNotice(taskType = NoticeConstants.TaskType.TEST_PLAN_TASK, event = NoticeConstants.Event.CREATE, mailTemplate = "track/TestPlanStart", subject = "测试计划通知")
     public TestPlan copy(@PathVariable String id) {
         return testPlanService.copy(id);
     }

From 40ddddc44a232ac055b3da18bd33ff571c3d1b32 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 20 Dec 2021 17:47:18 +0800
Subject: [PATCH 202/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20i18n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008911 --user=lyh 【国际化】测试跟踪 模块，未进行国际化的问题汇总
https://www.tapd.cn/55049933/s/1083409
---
 .../report/detail/TestPlanOverviewReport.vue  | 14 ++++-----
 .../report/detail/TestPlanReportButtons.vue   | 10 +++----
 .../report/detail/TestPlanReportContent.vue   | 30 +++++++++----------
 .../detail/TestPlanReportNavigationBar.vue    | 14 ++++-----
 .../report/detail/TestPlanSummaryReport.vue   |  6 ++--
 .../detail/component/TestPlanReportEdit.vue   |  2 +-
 frontend/src/i18n/en-US.js                    | 20 +++++++++++++
 frontend/src/i18n/zh-CN.js                    | 20 +++++++++++++
 frontend/src/i18n/zh-TW.js                    | 20 +++++++++++++
 9 files changed, 98 insertions(+), 38 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
index 784ab70369..f5c3e29517 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
@@ -1,25 +1,25 @@
 <template>
-  <test-plan-report-container id="overview" :title="'概览'">
+  <test-plan-report-container id="overview" :title="$t('test_track.report.overview')">
     <el-form class="form-info" v-loading="result.loading">
-      <el-form-item :label="$t('测试时间') + ':'">
+      <el-form-item :label="$t('test_track.report.testing_time') + ':'">
         {{showTime}}
       </el-form-item>
       <el-row type="flex" justify="space-between" class="select-time">
         <el-col :span="8">
-          <el-form-item :label="'测试总数' + ':'">
+          <el-form-item :label="$t('test_track.report.total_number_tests') + ':'">
             {{report.caseCount}}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item :label="'执行率' + ':'">
+          <el-form-item :label="$t('test_track.report.exacutive_rate') + ':'">
             {{ (report.executeRate ? (report.executeRate * 100).toFixed(1) : 0) + '%'}}
-            <ms-instructions-icon content="执行过的用例/所有用例 * 100%"/>
+            <ms-instructions-icon :content="$t('test_track.report.exacutive_rate_tip')"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item :label="'通过率' + ':'">
+          <el-form-item :label="$t('test_track.report.passing_rate') + ':'">
             {{ (report.passRate ? (report.passRate  * 100 ).toFixed(1) : 0) + '%'}}
-            <ms-instructions-icon content="执行通过用例/所有用例 * 100%"/>
+            <ms-instructions-icon :content="$t('test_track.report.passing_rate_tip')"/>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportButtons.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportButtons.vue
index 4b4d1905d7..1819116f06 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportButtons.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportButtons.vue
@@ -5,30 +5,30 @@
         placement="right"
         width="300">
         <p>{{shareUrl}}</p>
-        <span style="color: red;float: left;margin-left: 10px;">24小时有效</span>
+        <span style="color: red;float: left;margin-left: 10px;">{{ $t('test_track.report.valid_for_24_hours') }}</span>
         <div style="text-align: right; margin: 0">
           <el-button type="primary" size="mini" :disabled="!shareUrl"
                      v-clipboard:copy="shareUrl">{{ $t("commons.copy") }}</el-button>
         </div>
         <el-button icon="el-icon-share" slot="reference" :disabled="!isTestManagerOrTestUser"
                    plain size="mini" @click="handleShare()">
-          {{'分享'}}
+          {{ $t('test_track.report.share') }}
         </el-button>
       </el-popover>
     </el-row>
     <el-row>
       <el-button icon="el-icon-receiving" v-if="!isDb" :disabled="!isTestManagerOrTestUser" plain size="mini" @click="handleSave()">
-        {{'保存'}}
+        {{ $t('commons.save')}}
       </el-button>
     </el-row>
     <el-row>
       <el-button icon="el-icon-download" :disabled="!isTestManagerOrTestUser" plain size="mini" @click="handleExportHtml()">
-        {{'导出'}}
+        {{ $t('commons.export')}}
       </el-button>
     </el-row>
     <el-row>
       <el-button icon="el-icon-setting" v-if="!isDb"  :disabled="!isTestManagerOrTestUser" plain size="mini" @click="handleEditTemplate()">
-        {{'配置'}}
+        {{ $t('test_track.report.configuration') }}
       </el-button>
     </el-row>
     <test-plan-report-edit :plan-id="planId" :config.sync="report.config" ref="reportEdit"/>
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent.vue
index 1bedfe8b63..57a9f2899f 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent.vue
@@ -157,67 +157,67 @@ export default {
       return {
         overview: {
           enable: true,
-          name: '概览'
+          name: this.$t('test_track.report.overview')
         },
         summary: {
           enable: true,
-          name: '报告总结'
+          name: this.$t('test_track.report.report_summary')
         },
         functional: {
           enable: true,
-          name: '功能用例统计分析',
+          name: this.$t('test_track.report.analysis_functional'),
           children: {
             result: {
               enable: true,
-              name: '测试结果',
+              name: this.$t('test_track.report.test_result'),
             },
             failure: {
               enable: true,
-              name: '失败用例',
+              name: this.$t('test_track.report.fail_case'),
             },
             issue: {
               enable: true,
-              name: '缺陷列表',
+              name: this.$t('test_track.report.issue_list'),
             },
             all: {
               enable: true,
-              name: '所有用例',
+              name: this.$t('test_track.report.all_case'),
             }
           }
         },
         api: {
           enable: true,
-          name: '接口用例统计分析',
+          name: this.$t('test_track.report.analysis_api'),
           children: {
             result: {
               enable: true,
-              name: '测试结果',
+              name: this.$t('test_track.report.test_result'),
             },
             failure: {
               enable: true,
-              name: '失败用例',
+              name: this.$t('test_track.report.fail_case'),
             },
             all: {
               enable: true,
-              name: '所有用例',
+              name: this.$t('test_track.report.all_case'),
             }
           }
         },
         load: {
           enable: true,
-          name: '性能用例统计分析',
+          name: this.$t('test_track.report.analysis_load'),
           children: {
             result: {
               enable: true,
-              name: '测试结果',
+              name: this.$t('test_track.report.test_result'),
             },
             failure: {
               enable: true,
-              name: '失败用例',
+              name: this.$t('test_track.report.fail_case'),
             },
             all: {
               enable: true,
-              name: '所有用例',
+              name: this.$t('test_track.report.all_case'),
             }
           }
         }
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue
index f1476149e2..8370e07e50 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue
@@ -2,13 +2,13 @@
   <div>
     <ms-drawer class="drawer-content" :visible="true" :size="10" direction="left" :show-full-screen="false" :is-show-close="false">
       <div class="title-item" >
-         <span class="title-name">目录</span>
+         <span class="title-name">{{$t('test_track.report.content')}}</span>
         <el-tabs tab-position="right" v-model="activeName">
           <el-tab-pane v-for="item in data" :key="item.title" :label="item.title" :name="item.link"/>
         </el-tabs>
       </div>
         <div class="hiddenBottom">
-          <span>目录</span>
+          <span>{{$t('test_track.report.content')}}</span>
         </div>
     </ms-drawer>
   </div>
@@ -34,23 +34,23 @@ export default {
       contents: [
         {
           link: 'overview',
-          title: '概览',
+          title: this.$t('test_track.report.overview'),
         },
         {
           link: 'summary',
-          title: '报告总结',
+          title: this.$t('test_track.report.report_summary'),
         },
         {
           link: 'functional',
-          title: '功能用例统计分析',
+          title: this.$t('test_track.report.analysis_functional'),
         },
         {
           link: 'api',
-          title: '接口用例统计分析',
+          title: this.$t('test_track.report.analysis_api'),
         },
         {
           link: 'load',
-          title: '性能用例统计分析',
+          title: this.$t('test_track.report.analysis_load'),
         }
       ]
     }
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanSummaryReport.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanSummaryReport.vue
index 51c89c0a9b..c0fd1ecb69 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanSummaryReport.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanSummaryReport.vue
@@ -1,11 +1,11 @@
 <template>
-  <test-plan-report-container id='summary' :title="'报告总结'">
+  <test-plan-report-container id='summary' :title="$t('test_track.report.report_summary')">
     <template v-slot:title>
       <el-link class="edit-link" v-if="!isTemplate && !isShare && !isEdit" @click="isEdit = true">
-        编辑
+        {{ $t('commons.edit') }}
       </el-link>
       <el-link class="edit-link" v-if="!isTemplate && !isShare && !isDb && isEdit" @click="saveSummary">
-        保存
+        {{ $t('commons.save')}}
       </el-link>
     </template>
     <el-form class="form-info" v-loading="result.loading">
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/TestPlanReportEdit.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/TestPlanReportEdit.vue
index 9c6049c2af..a074348900 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/TestPlanReportEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/TestPlanReportEdit.vue
@@ -3,7 +3,7 @@
     width="600px"
     :visible.sync="visible"
     @confirm="confirm"
-    :title="'模板配置'"
+    :title="$t('test_track.report.template_configuration')"
     append-to-body
     ref="msEditDialog">
     <el-scrollbar>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index a1a0b3cf06..e247bb6a1b 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -2207,6 +2207,26 @@ export default {
         manual: "Manual",
         automation: "Automation",
       },
+      overview: "Overview",
+      testing_time: "Testing time",
+      total_number_tests: "Total",
+      exacutive_rate: "Exacutive rate",
+      exacutive_rate_tip: "Use cases executed/all use cases * 100%",
+      passing_rate: "Passing rate",
+      passing_rate_tip: "Execute passed use cases/all use cases * 100%",
+      content: "Content",
+      report_summary: "Summary",
+      analysis_functional: "Analysis Functional",
+      analysis_api: "Analysis Api",
+      analysis_load: "Analysis Performance",
+      valid_for_24_hours: "Valid for 24 hours",
+      configuration: "Config",
+      share: "Share",
+      template_configuration: "Template configuration",
+      test_result: "Test Result",
+      fail_case: "Fail Case",
+      issue_list: "Issue List",
+      all_case: "All Case",
     },
     reporter:'Reporter',
     lastmodify:'Last Modify'
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 6df36ae795..00afb74feb 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -2212,6 +2212,26 @@ export default {
         manual: "手动触发",
         automation: "自动触发",
       },
+      overview: "概览",
+      testing_time: "测试时间",
+      total_number_tests: "测试总数",
+      exacutive_rate: "执行率",
+      exacutive_rate_tip: "执行过的用例/所有用例 * 100%",
+      passing_rate: "通过率",
+      passing_rate_tip: "执行通过用例/所有用例 * 100%",
+      content: "目录",
+      report_summary: "报告总结",
+      analysis_functional: "功能用例统计分析",
+      analysis_api: "接口用例统计分析",
+      analysis_load: "性能用例统计分析",
+      valid_for_24_hours: "24小时有效",
+      configuration: "配置",
+      share: "分享",
+      template_configuration: "模板配置",
+      test_result: "测试结果",
+      fail_case: "失败用例",
+      issue_list: "缺陷列表",
+      all_case: "所有用例",
     },
     reporter: '报告人',
     lastmodify: '最后更改'
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 619be7bfaa..738db798da 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -2210,6 +2210,26 @@ export default {
         manual: "手動觸發",
         automation: "自動觸發",
       },
+      overview: "概覽",
+      testing_time: "測試時間",
+      total_number_tests: "測試總數",
+      exacutive_rate: "執行率",
+      exacutive_rate_tip: "執行過的用例/所有用例 * 100%",
+      passing_rate: "通過率",
+      passing_rate_tip: "執行通過用例/所有用例 * 100%",
+      content: "目錄",
+      report_summary: "報告總結",
+      analysis_functional: "功能用例統計分析",
+      analysis_api: "接口用例統計分析",
+      analysis_load: "性能用例統計分析",
+      valid_for_24_hours: "24小時有效",
+      configuration: "配置",
+      share: "分享",
+      template_configuration: "模板配置",
+      test_result: "測試結果",
+      fail_case: "失敗用例",
+      issue_list: "缺陷列表",
+      all_case: "所有用例",
     },
     reporter: '報告人',
     lastmodify: '最後更改'

From 0d59e3494e5c7d3284d0e7bd8c68833cb022d4d0 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Sat, 18 Dec 2021 13:22:35 +0800
Subject: [PATCH 203/256] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E6=8A=A5=E5=91=8A):=20=E9=A1=B9=E7=9B=AE=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E6=8A=A5=E5=91=8A=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

基于docker-selenium的项目定时报告开发
---
 .../commons/constants/ParamConstants.java     |  5 +-
 .../metersphere/dto/BaseSystemConfigDTO.java  |  1 +
 .../reportstatistics/dto/HeadlessRequest.java |  9 +++-
 .../service/ReportStatisticsService.java      |  7 +--
 .../reportstatistics/utils/ChromeUtils.java   | 52 +++++++++++--------
 .../service/SystemParameterService.java       |  3 ++
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 .../resources/i18n/messages_en_US.properties  |  8 +--
 .../settings/system/BaseSetting.vue           |  5 ++
 frontend/src/business/components/xpack        |  2 +-
 frontend/src/i18n/en-US.js                    |  4 ++
 frontend/src/i18n/zh-CN.js                    |  4 ++
 frontend/src/i18n/zh-TW.js                    |  4 ++
 13 files changed, 72 insertions(+), 34 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/commons/constants/ParamConstants.java b/backend/src/main/java/io/metersphere/commons/constants/ParamConstants.java
index 3abdeee089..552527c378 100644
--- a/backend/src/main/java/io/metersphere/commons/constants/ParamConstants.java
+++ b/backend/src/main/java/io/metersphere/commons/constants/ParamConstants.java
@@ -88,7 +88,7 @@ public interface ParamConstants {
         }
     }
 
-    enum MAIL implements ParamConstants{
+    enum MAIL implements ParamConstants {
         SERVER("smtp.host"),
         PORT("smtp.port"),
         ACCOUNT("smtp.account"),
@@ -112,7 +112,8 @@ public interface ParamConstants {
     enum BASE implements ParamConstants {
         URL("base.url"),
         CONCURRENCY("base.concurrency"),
-        PROMETHEUS_HOST("base.prometheus.host");
+        PROMETHEUS_HOST("base.prometheus.host"),
+        SELENIUM_DOCKER_URL("base.selenium.docker.url");
 
         private String value;
 
diff --git a/backend/src/main/java/io/metersphere/dto/BaseSystemConfigDTO.java b/backend/src/main/java/io/metersphere/dto/BaseSystemConfigDTO.java
index 7d0cf7bd7a..804ba93ecd 100644
--- a/backend/src/main/java/io/metersphere/dto/BaseSystemConfigDTO.java
+++ b/backend/src/main/java/io/metersphere/dto/BaseSystemConfigDTO.java
@@ -9,4 +9,5 @@ public class BaseSystemConfigDTO {
     private String url;
     private String concurrency;
     private String prometheusHost;
+    private String seleniumDockerUrl;
 }
diff --git a/backend/src/main/java/io/metersphere/reportstatistics/dto/HeadlessRequest.java b/backend/src/main/java/io/metersphere/reportstatistics/dto/HeadlessRequest.java
index 90faa26654..171a007233 100644
--- a/backend/src/main/java/io/metersphere/reportstatistics/dto/HeadlessRequest.java
+++ b/backend/src/main/java/io/metersphere/reportstatistics/dto/HeadlessRequest.java
@@ -2,10 +2,15 @@ package io.metersphere.reportstatistics.dto;
 
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
 
 @Getter
 @Setter
 public class HeadlessRequest {
-    public String url;
-    public String driverPath;
+    private String url;
+    private String remoteDriverUrl;
+
+    public boolean isEmpty() {
+        return StringUtils.isEmpty(this.url) || StringUtils.isEmpty(this.remoteDriverUrl);
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java b/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
index f879d36bc4..b20462e173 100644
--- a/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
+++ b/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
@@ -251,18 +251,19 @@ public class ReportStatisticsService {
     }
 
     public String getImageContentById(ReportStatisticsWithBLOBs reportRecordId) {
-        ChromeUtils chromeUtils = new ChromeUtils();
+        ChromeUtils chromeUtils = ChromeUtils.getInstance();
         HeadlessRequest headlessRequest = new HeadlessRequest();
-
         BaseSystemConfigDTO baseInfo = CommonBeanFactory.getBean(SystemParameterService.class).getBaseInfo();
         // 占位符
         String platformUrl = "http://localhost:8081";
+        String remoteDriverUrl = "http://localhost:4444";
         if (baseInfo != null) {
             platformUrl = baseInfo.getUrl();
+            remoteDriverUrl = baseInfo.getSeleniumDockerUrl();
         }
         platformUrl += "/echartPic?shareId=" + reportRecordId.getId();
-
         headlessRequest.setUrl(platformUrl);
+        headlessRequest.setRemoteDriverUrl(remoteDriverUrl);
         String imageData = chromeUtils.getImageInfo(headlessRequest);
         return imageData;
     }
diff --git a/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java b/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java
index 5f73764e36..75bb773055 100644
--- a/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java
+++ b/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java
@@ -1,21 +1,30 @@
 package io.metersphere.reportstatistics.utils;
 
+import com.alibaba.fastjson.JSON;
 import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.reportstatistics.dto.HeadlessRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.chrome.ChromeDriver;
-import org.openqa.selenium.chrome.ChromeDriverService;
 import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.remote.RemoteWebDriver;
+
+import java.net.URL;
 
 public class ChromeUtils {
-    private static final String DEFAULT_DRIVERPATH = "/Users/handsomesong/chromeDriver/chromedriver_mac64_m1/chromedriver";
+    private static ChromeUtils chromeUtils = new ChromeUtils();
 
-    private WebDriver genWebDriver(HeadlessRequest headlessRequest) {
-        String driverPath = headlessRequest.driverPath;
-        if (StringUtils.isEmpty(driverPath)) {
-            driverPath = DEFAULT_DRIVERPATH;
+    private ChromeUtils() {
+    }
+
+    public static ChromeUtils getInstance() {
+        return chromeUtils;
+    }
+
+    private synchronized WebDriver genWebDriver(HeadlessRequest headlessRequest) {
+        if (headlessRequest.isEmpty()) {
+            LogUtil.error("Headless request is null! " + JSON.toJSONString(headlessRequest));
+            return null;
         }
         //初始化一个chrome浏览器实例driver
         ChromeOptions options = new ChromeOptions();
@@ -30,45 +39,46 @@ public class ChromeUtils {
         options.addArguments("no-proxy-server");
         options.addArguments("disable-dev-shm-usage");
         options.addArguments("lang=zh_CN.UTF-8");
+
         WebDriver driver = null;
         try {
-            System.setProperty(ChromeDriverService.CHROME_DRIVER_EXE_PROPERTY, driverPath);
-            driver = new ChromeDriver(options);
-            driver.get(headlessRequest.url);
+            driver = new RemoteWebDriver(new URL(headlessRequest.getRemoteDriverUrl()), options);
+            driver.get(headlessRequest.getUrl());
             driver.manage().window().fullscreen();
-        }catch (Exception e){
-            if(driver != null){
+        } catch (Exception e) {
+            if (driver != null) {
                 driver.quit();
                 driver = null;
             }
             LogUtil.error(e);
         }
-        return  driver;
+        return driver;
     }
 
-    public String getImageInfo(HeadlessRequest request){
+    public synchronized String getImageInfo(HeadlessRequest request) {
         WebDriver driver = this.genWebDriver(request);
         String files = null;
-        if(driver != null){
+        if (driver != null) {
             try {
                 //预留echart动画的加载时间
                 Thread.sleep(3 * 1000);
                 String js = "var chartsCanvas = document.getElementById('picChart').getElementsByTagName('canvas')[0];" +
                         "var imageUrl = null;" +
                         "if (chartsCanvas!= null) {" +
-                        " imageUrl = chartsCanvas && chartsCanvas.toDataURL('image/png');"+
+                        " imageUrl = chartsCanvas && chartsCanvas.toDataURL('image/png');" +
                         "return imageUrl;" +
                         "}";
-                files = ((JavascriptExecutor)driver).executeScript(js).toString();
-            }catch (Exception e){
+                files = ((JavascriptExecutor) driver).executeScript(js).toString();
+            } catch (Exception e) {
                 LogUtil.error(e);
-            }finally {
+            } finally {
                 driver.quit();
             }
         }
-        if(StringUtils.isNotEmpty(files)){
+        if (StringUtils.isNotEmpty(files)) {
             return files;
-        }else {
+        } else {
+            LogUtil.error("获取报表图片失败！参数：" + JSON.toJSONString(request));
             return null;
         }
     }
diff --git a/backend/src/main/java/io/metersphere/service/SystemParameterService.java b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
index dd87660a8d..8e90ef8947 100644
--- a/backend/src/main/java/io/metersphere/service/SystemParameterService.java
+++ b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
@@ -253,6 +253,9 @@ public class SystemParameterService {
                 if (StringUtils.equals(param.getParamKey(), ParamConstants.BASE.PROMETHEUS_HOST.getValue())) {
                     baseSystemConfigDTO.setPrometheusHost(param.getParamValue());
                 }
+                if (StringUtils.equals(param.getParamKey(), ParamConstants.BASE.SELENIUM_DOCKER_URL.getValue())) {
+                    baseSystemConfigDTO.setSeleniumDockerUrl(param.getParamValue());
+                }
             }
         }
         return baseSystemConfigDTO;
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 2165b7cc0b..b0c1379883 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 2165b7cc0b0358b0b792bc06ff25570dbb230a5c
+Subproject commit b0c13798836a8bfbc1d415bc5a9610c56df61833
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index 5a41eeb6fc..acea013e9e 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -113,7 +113,7 @@ test_case_remark=Remark
 test_case_step_desc=Step description
 test_case_step_result=Step result
 test_case_module=Module
-test_case=Test case
+test_case=Case
 user=User
 user_import_template_name=User import templates
 user_import_template_sheet=templates
@@ -276,9 +276,9 @@ test_case_status_success=Success
 test_case_status_trash=Trash
 test_case_status_saved=Saved
 # track home
-api_case=API
-performance_case=PERFORMANCE
-scenario_case=SCENARIO
+api_case=Api test
+performance_case=Performance test
+scenario_case=Scenario test
 create_user=Create user
 test_case_status=Case status
 id_not_rightful=ID is not rightful
diff --git a/frontend/src/business/components/settings/system/BaseSetting.vue b/frontend/src/business/components/settings/system/BaseSetting.vue
index 92514a6c0a..143e9984ac 100644
--- a/frontend/src/business/components/settings/system/BaseSetting.vue
+++ b/frontend/src/business/components/settings/system/BaseSetting.vue
@@ -15,6 +15,10 @@
             <el-input v-model="formInline.prometheusHost" :placeholder="$t('system_config.prometheus.host_tip')"/>
             <i>({{ $t('commons.examples') }}:http://ms-prometheus:9090)</i>
           </el-form-item>
+          <el-form-item :label="$t('system_config.selenium_docker_url')" prop="seleniumDockerUrl">
+            <el-input v-model="formInline.seleniumDockerUrl" :placeholder="$t('system_config.selenium_docker.url_tip')"/>
+            <i>({{ $t('commons.examples') }}:http://localhost:4444)</i>
+          </el-form-item>
         </el-col>
       </el-row>
     </el-form>
@@ -91,6 +95,7 @@ export default {
         {paramKey: "base.url", paramValue: this.formInline.url, type: "text", sort: 1},
         {paramKey: "base.concurrency", paramValue: this.formInline.concurrency, type: "text", sort: 2},
         {paramKey: "base.prometheus.host", paramValue: this.formInline.prometheusHost, type: "text", sort: 1},
+        {paramKey: "base.selenium.docker.url", paramValue: this.formInline.seleniumDockerUrl, type: "text", sort: 1},
       ];
 
       this.$refs[formInline].validate(valid => {
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 77076b0e65..11750dbae3 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 77076b0e650fe18119b434c86c724ad61d43ce21
+Subproject commit 11750dbae3a23590a8e58c7b42f5838be51677af
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index e247bb6a1b..1317615983 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -449,6 +449,10 @@ export default {
       host: 'Prometheus Host',
       host_tip: 'example: http://ms-prometheus:9090',
       host_is_null: 'Prometheus Host cannot be empty'
+    },
+    selenium_docker_url: 'selenium-docker URL',
+    selenium_docker: {
+      url_tip: 'example: http://localhost:4444',
     }
   },
   custom_field: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 00afb74feb..6e5bb111c7 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -451,6 +451,10 @@ export default {
       host: 'Prometheus地址',
       host_tip: '例如:http://ms-prometheus:9090',
       host_is_null: 'Prometheus地址不能为空'
+    },
+    selenium_docker_url: 'selenium-docker 地址',
+    selenium_docker: {
+      url_tip: '例如:http://localhost:4444',
     }
   },
   custom_field: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 738db798da..d4e00bc13a 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -451,6 +451,10 @@ export default {
       host: 'Prometheus地址',
       host_tip: '例如:http://ms-prometheus:9090',
       host_is_null: 'Prometheus地址不能為空'
+    },
+    selenium_docker_url: 'selenium-docker 地址',
+    selenium_docker: {
+      url_tip: '例如:http://localhost:4444',
     }
   },
   custom_field: {

From b04cd9c3db8980412acb01c9329dc09efc13cc30 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 20 Dec 2021 18:25:58 +0800
Subject: [PATCH 204/256] =?UTF-8?q?build:=20dockerfile=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 010d1af8d3..2535600ba6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,10 +16,11 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib
 COPY --from=build ${DEPENDENCY}/META-INF /app/META-INF
 COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app
 
+RUN mv /app/lib/ms-jmeter-core-*.jar /app/lib/ms-jmeter-core.jar
 RUN mv /app/jmeter /opt/
 RUN mkdir -p /opt/jmeter/lib/junit
 
-ENV JAVA_CLASSPATH=/app:/app/lib/*
+ENV JAVA_CLASSPATH=/app:/app/lib/ms-jmeter-core.jar:/app/lib/*
 ENV JAVA_MAIN_CLASS=io.metersphere.Application
 ENV AB_OFF=true
 ENV MS_VERSION=${MS_VERSION}

From 17fc3d0871095001c27afb2623afff075d116942 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 20 Dec 2021 18:53:55 +0800
Subject: [PATCH 205/256] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A):=20=E9=A1=B9=E7=9B=AE=E6=8A=A5=E5=91=8A=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

项目报告编辑页面的国际化问题修改
---
 frontend/src/business/components/xpack | 2 +-
 frontend/src/i18n/en-US.js             | 9 +++++++++
 frontend/src/i18n/zh-CN.js             | 9 +++++++++
 frontend/src/i18n/zh-TW.js             | 9 +++++++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 11750dbae3..ebae9a1706 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 11750dbae3a23590a8e58c7b42f5838be51677af
+Subproject commit ebae9a17065b354f9357edc023de7a0ce64e2cf5
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 1317615983..c20b465040 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -312,6 +312,12 @@ export default {
         project_statistics: "Project statistics",
         project_report: "Project report",
       },
+      option: {
+        add_report: "Add content ",
+        select_user_group: "Select user group",
+        send: "Send",
+        save_as_draft: "Draft",
+      },
       project_report: {
         create_report: "Create report",
         report_name: "Report name",
@@ -321,6 +327,8 @@ export default {
         show: "Show",
       },
       title: "Report Statistics",
+      text: "Text",
+      report: "Report",
       test_case_analysis: "Test case analysis",
       test_case_activity: "Test case activity",
       test_case_count: "Count test case",
@@ -363,6 +371,7 @@ export default {
         }
       },
       alert: {
+        mail_is_exist: "E-mail is exist",
         cannot_add_more_options: "Cannot add more options",
         end_time_cannot_over_than_start_time: "End time cannot before than start time",
       },
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 6e5bb111c7..5df1a32f2e 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -313,6 +313,12 @@ export default {
         project_statistics: "项目报表",
         project_report: "项目报告",
       },
+      option: {
+        add_report: "添加报告内容",
+        select_user_group: "选择用户组",
+        send: "发送",
+        save_as_draft: "保存草稿",
+      },
       project_report: {
         create_report: "创建报告",
         report_name: "报告名称",
@@ -322,6 +328,8 @@ export default {
         show: "查看",
       },
       title: "报表统计",
+      text: "文本",
+      report: "报表",
       test_case_analysis: "测试用例趋势",
       test_case_activity: "测试用例活动情况",
       test_case_count: "测试用例统计",
@@ -364,6 +372,7 @@ export default {
         }
       },
       alert: {
+        mail_is_exist: "邮箱已存在",
         cannot_add_more_options: "无法添加更多条件",
         end_time_cannot_over_than_start_time: "结束时间不能超过当前时间",
       },
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index d4e00bc13a..c41bb21dbf 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -313,6 +313,12 @@ export default {
         project_statistics: "項目報表",
         project_report: "項目報告",
       },
+      option: {
+        add_report: "添加報告內容",
+        select_user_group: "選擇用戶組",
+        send: "發送",
+        save_as_draft: "保存草稿",
+      },
       project_report: {
         create_report: "創建報告",
         report_name: "報告名稱",
@@ -322,6 +328,8 @@ export default {
         show: "查看",
       },
       title: "報表統計",
+      text: "文本",
+      report: "報表",
       test_case_analysis: "測試用例趨勢",
       test_case_activity: "測試用例活動情況",
       test_case_count: "測試用例統計",
@@ -364,6 +372,7 @@ export default {
         }
       },
       alert: {
+        mail_is_exist: "郵箱已存在",
         cannot_add_more_options: "無法添加更多條件",
         end_time_cannot_over_than_start_time: "結束時間不能超過當前時間",
       },

From 74308ac4e0d5f58ae51d88676033589fa7eff9fa Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 20 Dec 2021 16:31:42 +0800
Subject: [PATCH 206/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E4=B8=AD?=
 =?UTF-8?q?=E5=89=8D=E7=BD=AE=E8=84=9A=E6=9C=AC=E8=8B=B1=E6=96=87=E4=B8=8B?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   |   7 +-
 .../common/Jsr233ProcessorContent.vue         |   1 +
 .../mock/Components/MockApiScriptEditor.vue   |   1 +
 .../components/processor/Jsr233Processor.vue  |   1 +
 .../components/project/home/ProjectHome.vue   |   5 +-
 .../components/project/menu/EditProject.vue   |  40 ++-
 .../project/menu/function/EditFunction.vue    |   1 +
 .../settings/workspace/EditProject.vue        | 321 ------------------
 .../settings/workspace/MsProject.vue          |   2 +-
 frontend/src/i18n/en-US.js                    |  13 +-
 frontend/src/i18n/zh-CN.js                    |   3 +
 frontend/src/i18n/zh-TW.js                    |   3 +
 12 files changed, 56 insertions(+), 342 deletions(-)
 delete mode 100644 frontend/src/business/components/settings/workspace/EditProject.vue

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index ea97fc7114..9a68628940 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -486,6 +486,7 @@ export default {
         this.$store.state.scenarioMap.set(this.currentScenario.id, change);
       }
     },
+
   },
   created() {
     if (!this.currentScenario.apiScenarioModuleId) {
@@ -905,9 +906,9 @@ export default {
     fabClick() {
       if (this.operatingElements && this.operatingElements.length < 1) {
         if (this.selectedTreeNode && this.selectedTreeNode.referenced === 'REF' || this.selectedTreeNode.disabled) {
-          this.$warning("引用的场景步骤及子步骤都无法添加其他步骤");
+          this.$warning(this.$t('api_test.scenario.scenario_warning'));
         } else {
-          this.$warning("当前步骤下不能添加其他步骤");
+          this.$warning(this.$t('api_test.scenario.scenario_step_warning'));
         }
       }
     },
@@ -1005,7 +1006,7 @@ export default {
       if (arr && arr.length > 0) {
         arr.forEach(item => {
           if (item.id === this.currentScenario.id) {
-            this.$error("不能引用或复制自身！");
+            this.$error(this.$t("api_test.scenario.scenario_error"));
             this.$refs.scenarioRelevance.changeButtonLoadingType();
             return;
           }
diff --git a/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue b/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue
index 5e09ec245d..4c9076b2a1 100644
--- a/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue
@@ -235,6 +235,7 @@
 
   .script-index {
     padding: 0 20px;
+    width: 230px;
   }
 
   .template-title {
diff --git a/frontend/src/business/components/api/definition/components/mock/Components/MockApiScriptEditor.vue b/frontend/src/business/components/api/definition/components/mock/Components/MockApiScriptEditor.vue
index 5b526e7d05..10b96cb153 100644
--- a/frontend/src/business/components/api/definition/components/mock/Components/MockApiScriptEditor.vue
+++ b/frontend/src/business/components/api/definition/components/mock/Components/MockApiScriptEditor.vue
@@ -208,6 +208,7 @@ export default {
 
 .script-index {
   padding: 0 20px;
+  width: 230px;
 }
 
 .template-title {
diff --git a/frontend/src/business/components/api/test/components/processor/Jsr233Processor.vue b/frontend/src/business/components/api/test/components/processor/Jsr233Processor.vue
index fbc77e82d8..8304ff825e 100644
--- a/frontend/src/business/components/api/test/components/processor/Jsr233Processor.vue
+++ b/frontend/src/business/components/api/test/components/processor/Jsr233Processor.vue
@@ -130,6 +130,7 @@ export default {
 
 .script-index {
   padding: 0 20px;
+  width: 230px;
 }
 
 .template-title {
diff --git a/frontend/src/business/components/project/home/ProjectHome.vue b/frontend/src/business/components/project/home/ProjectHome.vue
index d7d0eba569..6533eb005a 100644
--- a/frontend/src/business/components/project/home/ProjectHome.vue
+++ b/frontend/src/business/components/project/home/ProjectHome.vue
@@ -133,7 +133,7 @@
         </el-row>
       </el-card>
 
-      <edit-project ref="editProject"/>
+      <edit-project ref="editProject" :is-show-app="isShowApp"/>
     </ms-main-container>
   </ms-container>
 
@@ -157,7 +157,8 @@ export default {
         createUser: ''
       },
       memberSize: 0,
-      result: {}
+      result: {},
+      isShowApp: false
     }
   },
   methods: {
diff --git a/frontend/src/business/components/project/menu/EditProject.vue b/frontend/src/business/components/project/menu/EditProject.vue
index 94afeaf5a9..7e672c8200 100644
--- a/frontend/src/business/components/project/menu/EditProject.vue
+++ b/frontend/src/business/components/project/menu/EditProject.vue
@@ -7,7 +7,8 @@
           <el-input v-model="form.name" autocomplete="off"></el-input>
         </el-form-item>
 
-        <el-form-item v-if="platformOptions.length > 1" :label-width="labelWidth" :label="$t('test_track.issue.third_party_integrated')" prop="platform">
+        <el-form-item v-if="platformOptions.length > 1" :label-width="labelWidth" :label="$t('集成第三方平台')"
+                      prop="platform">
           <el-select filterable v-model="form.platform">
             <el-option v-for="item in platformOptions" :key="item.value" :label="item.text" :value="item.value">
             </el-option>
@@ -18,16 +19,19 @@
           <template-select :data="form" scene="API_CASE" prop="caseTemplateId" ref="caseTemplate"/>
         </el-form-item>
 
-        <el-form-item v-if="xpackEable && form.platform === 'Jira'" :label-width="labelWidth" :label="$t('test_track.issue.use_third_party')" prop="scenarioCustomNum">
+        <el-form-item v-if="xpackEable" :label-width="labelWidth" :label="$t('使用第三方平台模板')" prop="scenarioCustomNum">
           <el-switch v-model="form.thirdPartTemplate"></el-switch>
         </el-form-item>
 
-        <el-form-item v-if="!xpackEable || !form.thirdPartTemplate" :label-width="labelWidth" :label="$t('workspace.issue_template_manage')" prop="issueTemplateId">
-          <template-select :platform="form.platform" :data="form" scene="ISSUE" prop="issueTemplateId" ref="issueTemplate"/>
+        <el-form-item v-if="!xpackEable || !form.thirdPartTemplate" :label-width="labelWidth"
+                      :label="$t('workspace.issue_template_manage')" prop="issueTemplateId">
+          <template-select :platform="form.platform" :data="form" scene="ISSUE" prop="issueTemplateId"
+                           ref="issueTemplate"/>
         </el-form-item>
 
         <el-form-item :label-width="labelWidth" label="TCP Mock Port">
-          <el-input-number v-model="form.mockTcpPort" :controls="false" style="width: 37%;margin-right: 30px"></el-input-number>
+          <el-input-number v-model="form.mockTcpPort" :controls="false"
+                           style="width: 37%;margin-right: 30px"></el-input-number>
           <el-switch v-model="form.isMockTcpOpen" @change="chengeMockTcpSwitch"></el-switch>
         </el-form-item>
 
@@ -63,6 +67,18 @@
           <el-input v-model="form.azureFilterId" autocomplete="off"/>
           <ms-instructions-icon content="非必填项，用例关联需求时，可以只筛选出，所填的 workItem 下的选项" effect="light"/>
         </el-form-item>
+        <el-form-item :label-width="labelWidth" :label="$t('project.repeatable')" prop="repeatable"
+                      v-if="this.isShowApp">
+          <el-switch v-model="form.repeatable"></el-switch>
+        </el-form-item>
+        <el-form-item :label-width="labelWidth" :label="$t('project.test_case_custom_id')" prop="customNum"
+                      v-if="this.isShowApp">
+          <el-switch v-model="form.customNum"></el-switch>
+        </el-form-item>
+        <el-form-item :label-width="labelWidth" :label="$t('project.scenario_custom_id')" prop="scenarioCustomNum"
+                      v-if="this.isShowApp">
+          <el-switch v-model="form.scenarioCustomNum"></el-switch>
+        </el-form-item>
       </el-form>
       <template v-slot:footer>
         <div class="dialog-footer">
@@ -147,7 +163,7 @@ export default {
         // issueTemplateId: [{required: true}],
       },
       screenHeight: 'calc(100vh - 195px)',
-      labelWidth: '210px',
+      labelWidth: '150px',
       platformOptions: [],
       xpackEable: false
     };
@@ -155,6 +171,10 @@ export default {
   props: {
     baseUrl: {
       type: String
+    },
+    isShowApp: {
+      type: Boolean,
+      default: true
     }
   },
   mounted() {
@@ -222,7 +242,7 @@ export default {
       if (platforms.indexOf(platform) === -1) {
         for (let i = 0; i < this.platformOptions.length; i++) {
           if (this.platformOptions[i].value === platform) {
-            this.platformOptions.splice(i, 1);
+            this.platformOptions.splice(1, i);
             break;
           }
         }
@@ -278,8 +298,8 @@ export default {
       removeGoBackListener(this.handleClose);
       this.createVisible = false;
     },
-    chengeMockTcpSwitch(value){
-      if(value && this.form.mockTcpPort === 0){
+    chengeMockTcpSwitch(value) {
+      if (value && this.form.mockTcpPort === 0) {
         this.result = this.$get('/project/genTcpMockPort/' + this.form.id, res => {
           let port = res.data;
           this.form.mockTcpPort = port;
@@ -302,7 +322,7 @@ pre {
   font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
 }
 
-.el-input,.el-textarea {
+.el-input, .el-textarea {
   width: 80%;
 }
 </style>
diff --git a/frontend/src/business/components/project/menu/function/EditFunction.vue b/frontend/src/business/components/project/menu/function/EditFunction.vue
index 1040d4e343..91db34d387 100644
--- a/frontend/src/business/components/project/menu/function/EditFunction.vue
+++ b/frontend/src/business/components/project/menu/function/EditFunction.vue
@@ -331,6 +331,7 @@ export default {
 
 .script-index {
   margin-top: 10px;
+  width: 230px;
 }
 
 .show-menu {
diff --git a/frontend/src/business/components/settings/workspace/EditProject.vue b/frontend/src/business/components/settings/workspace/EditProject.vue
deleted file mode 100644
index f89f5c8eb1..0000000000
--- a/frontend/src/business/components/settings/workspace/EditProject.vue
+++ /dev/null
@@ -1,321 +0,0 @@
-<template>
-  <div v-loading="result.loading">
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="createVisible" destroy-on-close
-               @close="handleClose">
-      <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="80px" size="small">
-        <el-form-item :label-width="labelWidth" :label="$t('commons.name')" prop="name">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
-        </el-form-item>
-
-        <el-form-item v-if="platformOptions.length > 1" :label-width="labelWidth" :label="$t('集成第三方平台')"
-                      prop="platform">
-          <el-select filterable v-model="form.platform">
-            <el-option v-for="item in platformOptions" :key="item.value" :label="item.text" :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item :label-width="labelWidth" :label="$t('workspace.case_template_manage')" prop="caseTemplateId">
-          <template-select :data="form" scene="API_CASE" prop="caseTemplateId" ref="caseTemplate"/>
-        </el-form-item>
-
-        <el-form-item v-if="xpackEable" :label-width="labelWidth" :label="$t('使用第三方平台模板')" prop="scenarioCustomNum">
-          <el-switch v-model="form.thirdPartTemplate"></el-switch>
-        </el-form-item>
-
-        <el-form-item v-if="!xpackEable || !form.thirdPartTemplate" :label-width="labelWidth"
-                      :label="$t('workspace.issue_template_manage')" prop="issueTemplateId">
-          <template-select :platform="form.platform" :data="form" scene="ISSUE" prop="issueTemplateId"
-                           ref="issueTemplate"/>
-        </el-form-item>
-
-        <el-form-item :label-width="labelWidth" label="TCP Mock Port">
-          <el-input-number v-model="form.mockTcpPort" :controls="false"
-                           style="width: 37%;margin-right: 30px"></el-input-number>
-          <el-switch v-model="form.isMockTcpOpen" @change="chengeMockTcpSwitch"></el-switch>
-        </el-form-item>
-
-        <el-form-item :label-width="labelWidth" :label="$t('commons.description')" prop="description">
-          <el-input :autosize="{ minRows: 2, maxRows: 4}" type="textarea" v-model="form.description"></el-input>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.tapd_id')" v-if="tapd">
-          <el-input v-model="form.tapdId" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.jira_key')" v-if="jira">
-          <el-input v-model="form.jiraKey" autocomplete="off"/>
-          <ms-instructions-icon effect="light">
-            <template>
-              <img class="jira-image" src="../../../../assets/jira-key.png"/>
-            </template>
-          </ms-instructions-icon>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.zentao_id')" v-if="zentao">
-          <el-input v-model="form.zentaoId" autocomplete="off"></el-input>
-          <ms-instructions-icon effect="light">
-            <template>
-              禅道流程：产品-项目 | 产品-迭代 | 产品-冲刺 | 项目-迭代 | 项目-冲刺 <br/><br/>
-              根据 "后台 -> 自定义 -> 流程" 查看对应流程，根据流程填写ID <br/><br/>
-              产品-项目 | 产品-迭代 | 产品-冲刺 需要填写产品ID <br/><br/>
-              项目-迭代 | 项目-冲刺 需要填写项目ID
-            </template>
-          </ms-instructions-icon>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.azureDevops_id')" v-if="azuredevops">
-          <el-input v-model="form.azureDevopsId" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.azureDevops_filter_id')" v-if="azuredevops">
-          <el-input v-model="form.azureFilterId" autocomplete="off"/>
-          <ms-instructions-icon content="非必填项，用例关联需求时，可以只筛选出，所填的 workItem 下的选项" effect="light"/>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.repeatable')" prop="repeatable">
-          <el-switch v-model="form.repeatable"></el-switch>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.test_case_custom_id')" prop="customNum">
-          <el-switch v-model="form.customNum"></el-switch>
-        </el-form-item>
-        <el-form-item :label-width="labelWidth" :label="$t('project.scenario_custom_id')" prop="scenarioCustomNum">
-          <el-switch v-model="form.scenarioCustomNum"></el-switch>
-        </el-form-item>
-      </el-form>
-      <template v-slot:footer>
-        <div class="dialog-footer">
-          <ms-dialog-footer
-            @cancel="createVisible = false"
-            @confirm="submit('form')"/>
-        </div>
-      </template>
-    </el-dialog>
-
-    <ms-delete-confirm :title="$t('project.delete')" @delete="_handleDelete" ref="deleteConfirm"/>
-  </div>
-</template>
-
-<script>
-
-import {
-  getCurrentProjectID,
-  getCurrentUser, getCurrentUserId,
-  getCurrentWorkspaceId, hasLicense,
-  listenGoBack,
-  removeGoBackListener
-} from "@/common/js/utils";
-
-import {AZURE_DEVOPS, JIRA, PROJECT_ID, TAPD, ZEN_TAO} from "@/common/js/constants";
-import {PROJECT_CONFIGS} from "@/business/components/common/components/search/search-components";
-import MsInstructionsIcon from "@/business/components/common/components/MsInstructionsIcon";
-import TemplateSelect from "@/business/components/settings/workspace/template/TemplateSelect";
-import MsResourceFiles from "@/business/components/performance/test/components/ResourceFiles";
-import MsTableButton from "@/business/components/common/components/MsTableButton";
-import MsJarConfig from "@/business/components/api/test/components/jar/JarConfig";
-import TemplateComponent
-  from "@/business/components/track/plan/view/comonents/report/TemplateComponent/TemplateComponent";
-import ApiEnvironmentConfig from "@/business/components/api/test/components/ApiEnvironmentConfig";
-import MsTableOperatorButton from "@/business/components/common/components/MsTableOperatorButton";
-import MsDeleteConfirm from "@/business/components/common/components/MsDeleteConfirm";
-import MsMainContainer from "@/business/components/common/components/MsMainContainer";
-import MsContainer from "@/business/components/common/components/MsContainer";
-import MsTableOperator from "@/business/components/common/components/MsTableOperator";
-import MsTablePagination from "@/business/components/common/pagination/TablePagination";
-import MsTableHeader from "@/business/components/common/components/MsTableHeader";
-import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
-import {ISSUE_PLATFORM_OPTION} from "@/common/js/table-constants";
-
-export default {
-  name: "EditProject",
-  components: {
-    MsInstructionsIcon,
-    TemplateSelect,
-    MsResourceFiles,
-    MsTableButton,
-    MsJarConfig,
-    TemplateComponent,
-    ApiEnvironmentConfig,
-    MsTableOperatorButton,
-    MsDeleteConfirm,
-    MsMainContainer,
-    MsContainer, MsTableOperator, MsTablePagination, MsTableHeader, MsDialogFooter
-  },
-  data() {
-    return {
-      createVisible: false,
-      result: {},
-      btnTips: this.$t('project.create'),
-      title: this.$t('project.create'),
-      condition: {components: PROJECT_CONFIGS},
-      items: [],
-      form: {},
-      currentPage: 1,
-      pageSize: 10,
-      total: 0,
-      userFilters: [],
-      rules: {
-        name: [
-          {required: true, message: this.$t('project.input_name'), trigger: 'blur'},
-          {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'}
-        ],
-        description: [
-          {max: 250, message: this.$t('commons.input_limit', [0, 250]), trigger: 'blur'}
-        ],
-        // caseTemplateId: [{required: true}],
-        // issueTemplateId: [{required: true}],
-      },
-      screenHeight: 'calc(100vh - 195px)',
-      labelWidth: '150px',
-      platformOptions: [],
-      xpackEable: false
-    };
-  },
-  props: {
-    baseUrl: {
-      type: String
-    }
-  },
-  mounted() {
-    if (this.$route.path.split('/')[2] === 'project' &&
-      this.$route.path.split('/')[3] === 'create') {
-      this.create();
-      this.$router.replace('/setting/project/all');
-    }
-    this.xpackEable = hasLicense();
-  },
-  computed: {
-    currentUser: () => {
-      return getCurrentUser();
-    },
-    tapd() {
-      return this.form.platform === TAPD && this.platformOptions.map(i => i.value).indexOf(TAPD) > -1;
-    },
-    jira() {
-      return this.form.platform === JIRA && this.platformOptions.map(i => i.value).indexOf(JIRA) > -1;
-    },
-    zentao() {
-      return this.form.platform === ZEN_TAO && this.platformOptions.map(i => i.value).indexOf(ZEN_TAO) > -1;
-    },
-    azuredevops() {
-      return this.form.platform === AZURE_DEVOPS && this.platformOptions.map(i => i.value).indexOf(AZURE_DEVOPS) > -1;
-    },
-  },
-  inject: [
-    'reload'
-  ],
-  destroyed() {
-    this.createVisible = false;
-  },
-  methods: {
-    getOptions() {
-      if (this.$refs.issueTemplate) {
-        this.$refs.issueTemplate.getTemplateOptions();
-      }
-      if (this.$refs.caseTemplate) {
-        this.$refs.caseTemplate.getTemplateOptions();
-      }
-    },
-    edit(row) {
-      this.title = this.$t('project.edit');
-      this.getOptions();
-      this.createVisible = true;
-      listenGoBack(this.handleClose);
-      if (row) {
-        this.form = Object.assign({}, row);
-      } else {
-        this.form = {};
-      }
-      this.platformOptions = [];
-      this.platformOptions.push(...ISSUE_PLATFORM_OPTION);
-      this.$get("/service/integration/all/" + getCurrentUser().lastWorkspaceId, response => {
-        let data = response.data;
-        let platforms = data.map(d => d.platform);
-        this.filterPlatformOptions(platforms, TAPD);
-        this.filterPlatformOptions(platforms, JIRA);
-        this.filterPlatformOptions(platforms, ZEN_TAO);
-        this.filterPlatformOptions(platforms, AZURE_DEVOPS);
-      });
-    },
-    filterPlatformOptions(platforms, platform) {
-      if (platforms.indexOf(platform) === -1) {
-        for (let i = 0; i < this.platformOptions.length; i++) {
-          if (this.platformOptions[i].value === platform) {
-            this.platformOptions.splice(1, i);
-            break;
-          }
-        }
-      }
-    },
-    submit(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          let saveType = "add";
-          if (this.form.id) {
-            saveType = "update";
-          }
-          let protocol = document.location.protocol;
-          protocol = protocol.substring(0, protocol.indexOf(":"));
-          this.form.protocal = protocol;
-          this.form.workspaceId = getCurrentWorkspaceId();
-          this.form.createUser = getCurrentUserId();
-          this.result = this.$post("/project/" + saveType, this.form, () => {
-            this.createVisible = false;
-            this.reload();
-            this.$success(this.$t('commons.save_success'));
-          });
-        } else {
-          return false;
-        }
-      });
-    },
-    handleDelete(project) {
-      this.$refs.deleteConfirm.open(project);
-    },
-    _handleDelete(project) {
-      this.$confirm(this.$t('project.delete_tip'), '', {
-        confirmButtonText: this.$t('commons.confirm'),
-        cancelButtonText: this.$t('commons.cancel'),
-        type: 'warning'
-      }).then(() => {
-        this.$get('/project/delete/' + project.id, () => {
-          if (project.id === getCurrentProjectID()) {
-            localStorage.removeItem(PROJECT_ID);
-            this.$post("/user/update/current", {id: getCurrentUser().id, lastProjectId: ''});
-          }
-          this.$success(this.$t('commons.delete_success'));
-          this.list();
-        });
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: this.$t('commons.delete_cancelled')
-        });
-      });
-    },
-    handleClose() {
-      removeGoBackListener(this.handleClose);
-      this.createVisible = false;
-    },
-    chengeMockTcpSwitch(value) {
-      if (value && this.form.mockTcpPort === 0) {
-        this.result = this.$get('/project/genTcpMockPort/' + this.form.id, res => {
-          let port = res.data;
-          this.form.mockTcpPort = port;
-        })
-      }
-    }
-  },
-  created() {
-    document.addEventListener('keydown', this.handleEvent);
-  },
-  beforeDestroy() {
-    document.removeEventListener('keydown', this.handleEvent);
-  },
-};
-</script>
-
-<style scoped>
-pre {
-  margin: 0 0;
-  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
-}
-
-.el-input, .el-textarea {
-  width: 80%;
-}
-</style>
diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue
index 06d431ec11..ce6ad55f9a 100644
--- a/frontend/src/business/components/settings/workspace/MsProject.vue
+++ b/frontend/src/business/components/settings/workspace/MsProject.vue
@@ -209,7 +209,7 @@ import {PROJECT_CONFIGS} from "@/business/components/common/components/search/se
 import MsRolesTag from "@/business/components/common/components/MsRolesTag";
 import AddMember from "@/business/components/settings/common/AddMember";
 import MsInstructionsIcon from "@/business/components/common/components/MsInstructionsIcon";
-import EditProject from "@/business/components/settings/workspace/EditProject";
+import EditProject from "@/business/components/project/menu/EditProject";
 
 export default {
   name: "MsProject",
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index c20b465040..8ab60aa6fb 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1347,12 +1347,15 @@ export default {
       clone: "Copy",
       cant_reference: 'Historical test files, can be referenced after re-saving',
       share_cookie: 'share cookie',
-      module_id:'Scenario Module ID',
+      module_id: 'Scenario Module ID',
       level: 'Level',
-      version:"Scenario Version",
-      warning_context:"It is not currently supported to add all scenarios to the test plan in batches!",
-      jmx_file_set:"Scenario JMX file set",
-      error_report_jmx:"Failed to export JMX file",
+      version: "Scenario Version",
+      warning_context: "It is not currently supported to add all scenarios to the test plan in batches!",
+      jmx_file_set: "Scenario JMX file set",
+      error_report_jmx: "Failed to export JMX file",
+      scenario_warning: "No other steps can be added to the referenced scenario steps and sub-steps",
+      scenario_step_warning: "No other steps can be added under the current step",
+      scenario_error: "Cannot reference or copy itself！",
     },
     request: {
       debug: "Debug",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 5df1a32f2e..5a045c3d31 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1357,6 +1357,9 @@ export default {
       warning_context: "暂不支持批量添加所有场景到测试计划!",
       jmx_file_set: "场景JMX文件集",
       error_report_jmx: "导出JMX文件失败",
+      scenario_warning: "引用的场景步骤及子步骤都无法添加其他步骤",
+      scenario_step_warning: "当前步骤下不能添加其他步骤",
+      scenario_error: "不能引用或复制自身！",
     },
     request: {
       debug: "调试",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index c41bb21dbf..733955614f 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1357,6 +1357,9 @@ export default {
       warning_context: "暫不支持批量添加所有場景到測試計劃!",
       jmx_file_set: "場景JMX文件集",
       error_report_jmx: "導出JMX文件失敗",
+      scenario_warning: "引用的場景步驟及子步驟都無法添加其他步驟",
+      scenario_step_warning: "當前步驟下不能添加其他步驟",
+      scenario_error: "不能引用或複製自身！",
     },
     request: {
       debug: "調試",

From af3810c96ba8fb482ac48107b06c13c82cd9e2d2 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 20 Dec 2021 09:43:32 +0800
Subject: [PATCH 207/256] =?UTF-8?q?fix:=20=E7=BA=A7=E8=81=94=E7=9A=84?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E6=98=AFid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/js/tableUtils.js | 83 +++++++++++++++++-----------
 1 file changed, 50 insertions(+), 33 deletions(-)

diff --git a/frontend/src/common/js/tableUtils.js b/frontend/src/common/js/tableUtils.js
index effd955378..f5a1f6f222 100644
--- a/frontend/src/common/js/tableUtils.js
+++ b/frontend/src/common/js/tableUtils.js
@@ -437,6 +437,7 @@ export function getCustomFieldValue(row, field, members) {
     for (let i = 0; i < row.customFields.length; i++) {
       let item = row.customFields[i];
       if (item.name === field.name) {
+        if (!item.value) return '';
         if (field.type === 'member') {
           for (let j = 0; j < members.length; j++) {
             let member = members[j];
@@ -445,20 +446,18 @@ export function getCustomFieldValue(row, field, members) {
             }
           }
         } else if (field.type === 'multipleMember') {
-          if (item.value) {
-            let values = '';
-            item.value.forEach(v => {
-              for (let j = 0; j < members.length; j++) {
-                let member = members[j];
-                if (member.id === v) {
-                  values += member.name;
-                  values += " ";
-                  break;
-                }
+          let values = '';
+          item.value.forEach(v => {
+            for (let j = 0; j < members.length; j++) {
+              let member = members[j];
+              if (member.id === v) {
+                values += member.name;
+                values += " ";
+                break;
               }
-            });
-            return values;
-          }
+            }
+          });
+          return values;
         } else if (['radio', 'select'].indexOf(field.type) > -1) {
           if (field.options) {
             for (let j = 0; j < field.options.length; j++) {
@@ -470,29 +469,47 @@ export function getCustomFieldValue(row, field, members) {
           }
         }
         else if (['multipleSelect', 'checkbox'].indexOf(field.type) > -1) {
-          if (item.value) {
-            let values = '';
-            try {
-              if (field.type === 'multipleSelect') {
-                if (typeof (item.value) === 'string' || item.value instanceof String) {
-                  item.value = JSON.parse(item.value);
+          let values = '';
+          try {
+            if (field.type === 'multipleSelect') {
+              if (typeof (item.value) === 'string' || item.value instanceof String) {
+                item.value = JSON.parse(item.value);
+              }
+            }
+            item.value.forEach(v => {
+              for (let j = 0; j < field.options.length; j++) {
+                let option = field.options[j];
+                if (option.value === v) {
+                  values += (field.system ? i18n.t(option.text) : option.text);
+                  values += " ";
+                  break;
                 }
               }
-              item.value.forEach(v => {
-                for (let j = 0; j < field.options.length; j++) {
-                  let option = field.options[j];
-                  if (option.value === v) {
-                    values += (field.system ? i18n.t(option.text) : option.text);
-                    values += " ";
-                    break;
-                  }
-                }
-              });
-            } catch (e) {
-              values = '';
-            }
-            return values;
+            });
+          } catch (e) {
+            values = '';
           }
+          return values;
+        } else if (field.type === 'cascadingSelect') {
+          let val = '';
+          let options = field.options;
+          for (const v of item.value) {
+            if (!options) break;
+            for (const o of options) {
+              if (o.value === v) {
+                val = o.text;
+                options = o.children;
+                break;
+              }
+            }
+          }
+          return val;
+        }  else if (field.type === 'multipleInput') {
+          let val = '';
+          item.value.forEach(i => {
+            val += i + ' ';
+          });
+          return val;
         } else if (field.type === 'datetime') {
           return timestampFormatDate(item.value);
         }

From b9ccdddbf101cf02f61787b4543f11f255ee55ed Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Mon, 20 Dec 2021 17:54:39 +0800
Subject: [PATCH 208/256] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E8=AE=BE=E7=BD=AE=E6=8F=90=E7=A4=BA=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/en-US.js | 6 +++---
 frontend/src/i18n/zh-CN.js | 8 ++++----
 frontend/src/i18n/zh-TW.js | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 8ab60aa6fb..d9fdea0aa8 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -590,9 +590,9 @@ export default {
       nail_robot: 'Nail robot',
       enterprise_wechat_robot: 'WeCom robot',
       lark: "Lark Robot",
-      notes: '1. Nail and create a custom robot in the enterprise group, and then copy the webhook address on our platform;<br/>' +
-        '2. Robots are selected as swarm robots, and "custom keyword" is selected for security verification: "task notification";<br/>' +
-        '3. When selecting the receiver, it must be the person included in the group you created. The mobile phone number of the receiver is required and it is the mobile phone number used by the nailing enterprise',
+      notes: '1. In order to use WeChat Enterprise, Dingding and Feishu notifications, you need to create a custom robot and copy the webhook address;<br/>' +
+        '2. For robots that need security verification, you can choose "custom keyword" verification, and the keyword is "Message Notification";<br/>' +
+        '3. To use the @ feature, the selected recipient must be a user included in the group, the recipient’s phone number is required and should be the phone number used by Dingding.',
       message: 'Event, receiver and receiving method are required\n',
       message_webhook: 'Webhook is required when the receiving mode is nail or enterprise robot or lark',
       template: "Template",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 5a045c3d31..e444bc45d9 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -593,11 +593,11 @@ export default {
       nail_robot: '钉钉机器人',
       enterprise_wechat_robot: '企业微信机器人',
       lark: '飞书机器人',
-      notes: '1.钉钉和企业群里新建一个自定义机器人，然后复制 webhook 地址在我们平台上;<br/>' +
-        '       2.机器人选择为群机器人，安全验证选择“自定义关键词” ："任务通知";<br/>' +
-        '       3.选择接收人时必须是你所建的群里包含的人,接收人手机号为必填项且为钉钉企业所使用的手机号',
+      notes: '1.企业微信、钉钉及飞书通知需要新建一个自定义机器人，然后复制 webhook 地址在我们平台上;<br/>' +
+        '2.需要安全验证的机器人可以选择 “自定义关键词” 验证，关键词为 “消息通知”;<br/>' +
+        '3.如需在通知中使用@功能，选择的接收人必须是机器人所在群里包含的用户，接收人手机号为必填项且为钉钉企业所使用的手机号',
       message: '事件，接收人，接收方式为必填项',
-      message_webhook: '接收方式为钉钉和企业机器人,飞书时，webhook为必填项',
+      message_webhook: '接收方式为钉钉、企业机器人及飞书时，webhook为必填项',
       template: "模版",
       track: '测试跟踪任务通知',
       api: '接口测试任务通知',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 733955614f..49b1de81c3 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -593,11 +593,11 @@ export default {
       nail_robot: '釘釘機器人',
       enterprise_wechat_robot: '企業微信機器人',
       lark: '飛書機器人',
-      notes: '1.釘釘和企業群裏新建一個自定義機器人，然後復製 webhook 地址在我們平臺上;<br/>' +
-        '       2.機器人選擇為群機器人，安全驗證選擇「自定義關鍵詞」 ："任務通知";<br/>' +
-        '       3.選擇接收人時必須是你所建的群裏包含的人,接收人手機號為必填項且為釘釘企業所使用的手機號',
+      notes: '1.企業微信、釘釘及飛書通知需要新建一個自定義機器人，然後復制 webhook 地址在我們平台上;<br/>' +
+        '2.需要安全驗證的機器人可以選擇 “自定義關鍵詞” 驗證，關鍵詞為 “消息通知”;<br/>' +
+        '3.如需在通知中使用@功能，選擇的接收人必須是機器人所在群裡包含的用戶，接收人手機號為必填項且為釘釘企業所使用的手機號',
       message: '事件，接收人，接收方式為必填項',
-      message_webhook: '接收方式為釘釘和企業機器人,飛書時，webhook為必填項',
+      message_webhook: '接收方式為釘釘、企業機器人及飛書時，webhook為必填項',
       template: "模版",
       track: '測試跟蹤任務通知',
       api: '接口測試任務通知',

From a8bfdb18ca933445990e64ab6e553ab543d05e20 Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Mon, 20 Dec 2021 18:02:23 +0800
Subject: [PATCH 209/256] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E8=AE=BE=E7=BD=AE=E6=8F=90=E7=A4=BA=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/en-US.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index d9fdea0aa8..b37b8e9c6c 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -594,7 +594,7 @@ export default {
         '2. For robots that need security verification, you can choose "custom keyword" verification, and the keyword is "Message Notification";<br/>' +
         '3. To use the @ feature, the selected recipient must be a user included in the group, the recipient’s phone number is required and should be the phone number used by Dingding.',
       message: 'Event, receiver and receiving method are required\n',
-      message_webhook: 'Webhook is required when the receiving mode is nail or enterprise robot or lark',
+      message_webhook: 'Webhook is required when the receiving mode is WeChat Enterprise, Dingding or Feishu',
       template: "Template",
       track: 'Track notification',
       api: 'Api notification',

From 2e6b48d9bef4cce053d3aa98c89a333f18c216cd Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 20 Dec 2021 17:31:44 +0800
Subject: [PATCH 210/256] =?UTF-8?q?fix(=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5):=20=E6=A8=A1=E6=9D=BF=E5=A2=9E=E5=8A=A0=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=93=BE=E6=8E=A5=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 模板增加跳转链接字段
---
 .../components/api/ApiAutomationNotification.vue          | 4 ++++
 .../components/api/ApiDefinitionNotification.vue          | 8 ++++++++
 .../workspace/components/api/ApiReportNotification.vue    | 4 ++++
 .../performance/PerformanceReportNotification.vue         | 4 ++++
 .../components/track/TestPlanTaskNotification.vue         | 4 ++++
 .../components/track/TrackReportNotification.vue          | 4 ++++
 frontend/src/i18n/en-US.js                                | 4 +++-
 frontend/src/i18n/zh-CN.js                                | 4 +++-
 frontend/src/i18n/zh-TW.js                                | 4 +++-
 9 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue
index 7a95b32e21..9ed62909af 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue
@@ -290,6 +290,10 @@ export default {
           label:this.$t('api_test.environment.environment'),
           value:'environment',
         },
+        {
+          label:this.$t('report.plan_share_url'),
+          value:'planShareUrl',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue
index 4d28b2f600..72df488913 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue
@@ -282,6 +282,10 @@ export default {
           label:this.$t('api_test.definition.document.order'),
           value:'order',
         },
+        {
+          label:this.$t('report.plan_share_url'),
+          value:'planShareUrl',
+        },
       ],
       caseVariables: [
         {
@@ -360,6 +364,10 @@ export default {
           label:this.$t('api_test.definition.document.order'),
           value:'order',
         },
+        {
+          label:this.$t('report.plan_share_url'),
+          value:'planShareUrl',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue
index 385ac5055f..7a208ec3a5 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue
@@ -274,6 +274,10 @@ export default {
           label:this.$t('api_test.definition.document.order'),
           value:'order',
         },
+        {
+          label:this.$t('report.plan_share_url'),
+          value:'planShareUrl',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue b/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue
index 26c7fa1ea3..098f590a91 100644
--- a/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue
@@ -250,6 +250,10 @@ export default {
           label:this.$t('test_resource_pool.id'),
           value:'testResourcePoolId',
         },
+        {
+          label:this.$t('report.plan_share_url'),
+          value:'planShareUrl',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue
index ca7dc649c7..fd5cc14d85 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue
@@ -260,6 +260,10 @@ export default {
           label:this.$t('test_track.automatic_status_update'),
           value:'automaticStatusUpdate',
         },
+        {
+          label:this.$t('report.plan_share_url'),
+          value:'planShareUrl',
+        },
       ]
     };
   },
diff --git a/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue
index 3a09281b64..675bb28361 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue
@@ -242,6 +242,10 @@ export default {
           label:this.$t('commons.is_new'),
           value:'isNew',
         },
+        {
+          label:this.$t('report.plan_share_url'),
+          value:'planShareUrl',
+        },
       ]
     };
   },
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index b37b8e9c6c..952e76a670 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -879,7 +879,8 @@ export default {
     max_users: 'VUs',
     file_id:'Report File ID',
     avg_response_time:'Average Response Time',
-    tps:'Transactions Per Second'
+    tps:'Transactions Per Second',
+    plan_share_url:'Whether the link jump is logged in'
   },
   load_test: {
     id:'Load Test ID',
@@ -2199,6 +2200,7 @@ export default {
       status_in_progress: 'in_progress',
       status_rejected: 'rejected',
       status_upcoming:'upcoming',
+      status_reopened:'reopened',
       please_choose_current_owner: "Please choose current owner",
       tapd_current_owner: "Tapd Current Owner",
       zentao_bug_build: "Zentao Impact version",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index e444bc45d9..fb720a4d46 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -883,7 +883,8 @@ export default {
     max_users: '并发数',
     file_id: '文件ID',
     avg_response_time: '平均响应时间',
-    tps: '每秒传输的事物处理个数'
+    tps: '每秒传输的事物处理个数',
+    plan_share_url:'链接跳转是否登陆'
   },
   load_test: {
     id: '测试ID',
@@ -2204,6 +2205,7 @@ export default {
       status_in_progress: '接受/处理',
       status_rejected: '拒绝',
       status_upcoming:'待办',
+      status_reopened:'重新打开',
       please_choose_current_owner: "请选择处理人",
       tapd_current_owner: "Tapd 处理人",
       zentao_bug_build: "禅道 影响版本",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 49b1de81c3..1d90bf8a31 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -883,7 +883,8 @@ export default {
     max_users: '並發數',
     file_id: '文件ID',
     avg_response_time: '平均響應時間',
-    tps: '每秒傳輸的事物處理個數'
+    tps: '每秒傳輸的事物處理個數',
+    plan_share_url:'鏈接跳轉是否登陸'
   },
   load_test: {
     id: '測試ID',
@@ -2204,6 +2205,7 @@ export default {
       status_in_progress: '接受/處理',
       status_rejected: '拒絕',
       status_upcoming:'待辦',
+      status_reopened:'重新打開',
       please_choose_current_owner: "請選擇處理人",
       tapd_current_owner: "Tapd 處理人",
       zentao_bug_build: "禪道 影響版本",

From a4189a3cddf37b9091136cedb827f9fe49aeb21b Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 20 Dec 2021 19:47:42 +0800
Subject: [PATCH 211/256] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A):=20=E9=A1=B9=E7=9B=AE=E6=8A=A5=E5=91=8A=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E5=86=85=E5=AE=B9=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008935 --user=宋天阳 【报表管理】项目报告，邮件内容和预览不一致
https://www.tapd.cn/55049933/s/1083747
---
 .../reportstatistics/service/ReportStatisticsService.java     | 4 ++--
 .../reportstatistics/service/TestAnalysisService.java         | 2 +-
 .../reportstatistics/service/TestCaseCountService.java        | 4 ++--
 .../projectstatistics/casecount/table/TestCaseCountTable.vue  | 2 +-
 frontend/src/business/components/xpack                        | 2 +-
 frontend/src/i18n/en-US.js                                    | 1 +
 frontend/src/i18n/zh-CN.js                                    | 1 +
 frontend/src/i18n/zh-TW.js                                    | 1 +
 8 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java b/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
index b20462e173..eb70ee0687 100644
--- a/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
+++ b/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
@@ -146,7 +146,7 @@ public class ReportStatisticsService {
             yaxis = new ArrayList<>();
         }
         TestCaseCountTableDataDTO returnDTO = new TestCaseCountTableDataDTO();
-        String[] headers = new String[]{groupName, "总计", "testCase", "apiCase", "scenarioCase", "loadCaseCount"};
+        String[] headers = new String[]{groupName, "Count", "testCase", "apiCase", "scenarioCase", "loadCaseCount"};
 
         List<TestCaseCountTableItemDataDTO> heads = new ArrayList<>();
         boolean showTestCase = true;
@@ -155,7 +155,7 @@ public class ReportStatisticsService {
         boolean showLoad = true;
 
         for (String head : headers) {
-            if (StringUtils.equalsAnyIgnoreCase(head, groupName, "总计") || yaxis.contains(head)) {
+            if (StringUtils.equalsAnyIgnoreCase(head, groupName, "Count") || yaxis.contains(head)) {
                 TestCaseCountTableItemDataDTO headData = new TestCaseCountTableItemDataDTO();
                 headData.setId(UUID.randomUUID().toString());
                 headData.setValue(head);
diff --git a/backend/src/main/java/io/metersphere/reportstatistics/service/TestAnalysisService.java b/backend/src/main/java/io/metersphere/reportstatistics/service/TestAnalysisService.java
index aebd939897..7b5d6aa361 100644
--- a/backend/src/main/java/io/metersphere/reportstatistics/service/TestAnalysisService.java
+++ b/backend/src/main/java/io/metersphere/reportstatistics/service/TestAnalysisService.java
@@ -113,7 +113,7 @@ public class TestAnalysisService {
         List<Integer> upCollect = dtos.stream().map(item -> Integer.valueOf(item.getUpdateCount())).collect(Collectors.toList());
         // reduce求和
         Optional<Integer> updateCount = upCollect.stream().reduce(Integer::sum);
-        dtos.add(new TestAnalysisTableDTO("总计", createCount.get().toString(), updateCount.get().toString(), new LinkedList<>()));
+        dtos.add(new TestAnalysisTableDTO("Count", createCount.get().toString(), updateCount.get().toString(), new LinkedList<>()));
 
         TestAnalysisResult testAnalysisResult = new TestAnalysisResult();
         testAnalysisResult.setChartDTO(dto);
diff --git a/backend/src/main/java/io/metersphere/reportstatistics/service/TestCaseCountService.java b/backend/src/main/java/io/metersphere/reportstatistics/service/TestCaseCountService.java
index 1b1502c8ff..81f2d4a73a 100644
--- a/backend/src/main/java/io/metersphere/reportstatistics/service/TestCaseCountService.java
+++ b/backend/src/main/java/io/metersphere/reportstatistics/service/TestCaseCountService.java
@@ -338,7 +338,7 @@ public class TestCaseCountService {
 
     private TestCaseCountTableDataDTO countShowTable(String groupName, List<String> yaxis, List<TestCaseCountTableDTO> dtos) {
         TestCaseCountTableDataDTO returnDTO = new TestCaseCountTableDataDTO();
-        String[] headers = new String[]{groupName, "总计", "testCase", "apiCase", "scenarioCase", "loadCaseCount"};
+        String[] headers = new String[]{groupName, "Count", "testCase", "apiCase", "scenarioCase", "loadCaseCount"};
 
         List<TestCaseCountTableItemDataDTO> heads = new ArrayList<>();
         boolean showTestCase = true;
@@ -346,7 +346,7 @@ public class TestCaseCountService {
         boolean showScenario = true;
         boolean showLoad = true;
         for (String head : headers) {
-            if (StringUtils.equalsAnyIgnoreCase(head, groupName, "总计") || yaxis.contains(head)) {
+            if (StringUtils.equalsAnyIgnoreCase(head, groupName, "Count") || yaxis.contains(head)) {
                 TestCaseCountTableItemDataDTO headData = new TestCaseCountTableItemDataDTO();
                 headData.setId(UUID.randomUUID().toString());
                 headData.setValue(head);
diff --git a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/table/TestCaseCountTable.vue b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/table/TestCaseCountTable.vue
index cf058806a8..5b5d4b3fbc 100644
--- a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/table/TestCaseCountTable.vue
+++ b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/table/TestCaseCountTable.vue
@@ -18,7 +18,7 @@
           </el-table-column>
           <el-table-column
             prop="allCount"
-            label="总计">
+            :label="$t('commons.report_statistics.count')">
           </el-table-column>
           <el-table-column
               prop="testCaseCount"
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index ebae9a1706..15c9f3a9bc 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit ebae9a17065b354f9357edc023de7a0ce64e2cf5
+Subproject commit 15c9f3a9bc321f4efa609f83cbbb81df98720852
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 952e76a670..70791223ea 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -345,6 +345,7 @@ export default {
       bar: "Bar",
       desc: "Desc",
       asc: "Asc",
+      count: "Count",
       report_data: {
         all_report: "All report",
         my_report: "My report",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index fb720a4d46..93ffbd69a9 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -346,6 +346,7 @@ export default {
       bar: "柱状图",
       desc: "总数从高到低",
       asc: "总数从低到高",
+      count: "总计",
       report_data: {
         all_report: "全部报表",
         my_report: "我的报表",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 1d90bf8a31..d3395ce9dc 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -346,6 +346,7 @@ export default {
       bar: "柱狀圖",
       desc: "總數從高到低",
       asc: "總數從低到高",
+      count: "總計",
       report_data: {
         all_report: "全部報表",
         my_report: "我的報表",

From 955616f78a34893284655c8acb104bb9bed0660f Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 20 Dec 2021 20:19:28 +0800
Subject: [PATCH 212/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B):=20=E5=B0=86=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=81=9A=E6=88=90=E5=8F=AF=E9=85=8D=E7=BD=AE=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008924 --user=宋天阳 【测试跟踪】测试用例，最后结果显示在了最前面，并且没加到表头设置里
https://www.tapd.cn/55049933/s/1083789
---
 .../components/track/case/components/TestCaseList.vue | 11 ++++++-----
 frontend/src/common/js/default-table-header.js        |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 63ab4d96f3..25c377d223 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -46,10 +46,12 @@
         :label="$t('commons.delete_user')"
         min-width="120"/>
 
-      <ms-table-column
-        prop="lastExecuteResult"
-        min-width="100px"
-        :label="$t('test_track.plan_view.execute_result')">
+      <span v-for="item in fields" :key="item.key">
+        <ms-table-column
+          v-if="item.id === 'lastExecResult'"
+          prop="lastExecuteResult"
+          min-width="100px"
+          :label="$t('test_track.plan_view.execute_result')">
         <template v-slot:default="scope">
           <span @click.stop="clickt = 'stop'">
               <span class="el-dropdown-link">
@@ -59,7 +61,6 @@
         </template>
       </ms-table-column>
 
-      <span v-for="item in fields" :key="item.key">
         <ms-table-column
           v-if="!customNum"
           :field="item"
diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js
index 4f9a9322d9..4987592c93 100644
--- a/frontend/src/common/js/default-table-header.js
+++ b/frontend/src/common/js/default-table-header.js
@@ -189,6 +189,7 @@ export let CUSTOM_TABLE_HEADER = {
     {id: 'createUser', key: '7', label: 'commons.create_user'},
     {id: 'createTime', key: '8', label: 'commons.create_time'},
     {id: 'desc', key: '9', label: 'test_track.case.case_desc'},
+    {id: 'lastExecResult', key: '10', label: 'test_track.plan_view.execute_result'},
   ],
   //缺陷列表
   ISSUE_LIST: [

From 3ab559ef19a5e17cb92c0c3781f871283fb11ba1 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 20 Dec 2021 20:27:11 +0800
Subject: [PATCH 213/256] =?UTF-8?q?fix:=20=E8=84=91=E5=9B=BE=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/package.json                         |  2 +-
 .../common/components/MsModuleMinder.vue      |  7 +++-
 .../track/common/minder/TestCaseMinder.vue    | 32 ++++++++++++-------
 frontend/src/i18n/zh-CN.js                    |  2 +-
 frontend/src/i18n/zh-TW.js                    | 14 ++++----
 5 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 8b86f7c7ba..fd7b8780ed 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -54,7 +54,7 @@
     "vue-float-action-button": "^0.6.6",
     "vue-i18n": "^8.15.3",
     "vue-jsonpath-picker": "^1.1.5",
-    "vue-minder-editor-plus": "1.0.38",
+    "vue-minder-editor-plus": "1.0.39",
     "vue-papa-parse": "^2.0.0",
     "vue-pdf": "^4.2.0",
     "vue-router": "^3.1.3",
diff --git a/frontend/src/business/components/common/components/MsModuleMinder.vue b/frontend/src/business/components/common/components/MsModuleMinder.vue
index 7a301bd8c4..4f7ca24869 100644
--- a/frontend/src/business/components/common/components/MsModuleMinder.vue
+++ b/frontend/src/business/components/common/components/MsModuleMinder.vue
@@ -9,6 +9,7 @@
         :progress-enable="false"
         :tags="tags"
         :height="height"
+        :move-enable="moveEnable"
         :tag-edit-check="tagEditCheck"
         :priority-disable-check="priorityDisableCheck"
         :distinct-tags="distinctTags"
@@ -75,7 +76,11 @@ export default {
       default() {
         return true;
       }
-    }
+    },
+    moveEnable: {
+      type: Boolean,
+      default: true
+    },
   },
   data() {
     return {
diff --git a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index 56ec703a88..2a09238b9e 100644
--- a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -9,6 +9,7 @@
       :distinct-tags="tags"
       :module-disable="false"
       :show-module-tag="true"
+      :move-enable="moveEnable"
       :tag-edit-check="tagEditCheck()"
       @afterMount="handleAfterMount"
       :priority-disable-check="priorityDisableCheck()"
@@ -80,6 +81,10 @@ name: "TestCaseMinder",
     disabled() {
       return !hasPermission('PROJECT_TRACK_CASE:READ+EDIT');
     },
+    moveEnable() {
+      // 如果不是默认的排序条件不能调换位置
+      return !this.condition.orders || this.condition.orders.length < 1;
+    }
   },
   watch: {
     selectNode() {
@@ -366,17 +371,20 @@ name: "TestCaseMinder",
       if (isChange) {
 
         testCase.targetId = null; // 排序处理
-        if (this.isCaseNode(preNode)) {
-          let preId = preNode.data.id;
-          if (preId && preId.length > 15) {
-            testCase.targetId = preId;
-            testCase.moveMode = 'AFTER';
-          }
-        } else if (this.isCaseNode(nextNode)) {
-          let nextId = nextNode.data.id;
-          if (nextId && nextId.length > 15) {
-            testCase.targetId = nextId;
-            testCase.moveMode = 'BEFORE';
+
+        if (this.moveEnable) {
+          if (this.isCaseNode(preNode)) {
+            let preId = preNode.data.id;
+            if (preId && preId.length > 15) {
+              testCase.targetId = preId;
+              testCase.moveMode = 'AFTER';
+            }
+          } else if (this.isCaseNode(nextNode)) {
+            let nextId = nextNode.data.id;
+            if (nextId && nextId.length > 15) {
+              testCase.targetId = nextId;
+              testCase.moveMode = 'BEFORE';
+            }
           }
         }
 
@@ -403,7 +411,7 @@ name: "TestCaseMinder",
       data.id = "";
     },
     isCaseNode(node) {
-      if (node && node.resource && node.resource.indexOf(this.$t('api_test.definition.request.case')) > -1) {
+      if (node && node.data.resource && node.data.resource.indexOf(this.$t('api_test.definition.request.case')) > -1) {
         return true;
       }
       return false;
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 93ffbd69a9..a75a42e8d9 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -2212,7 +2212,7 @@ export default {
       zentao_bug_build: "禅道 影响版本",
       zentao_bug_assigned: "禅道 处理人",
       third_party_integrated: "集成第三方平台",
-      use_third_party: "使用第 Jira 缺陷模板",
+      use_third_party: "使用 Jira 缺陷模板",
       update_third_party_bugs: "更新第三方平台的缺陷",
       sync_bugs: "同步缺陷"
     },
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index d3395ce9dc..553bac419e 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1361,7 +1361,7 @@ export default {
       error_report_jmx: "導出JMX文件失敗",
       scenario_warning: "引用的場景步驟及子步驟都無法添加其他步驟",
       scenario_step_warning: "當前步驟下不能添加其他步驟",
-      scenario_error: "不能引用或複製自身！",
+      scenario_error: "不能引用或復製自身！",
     },
     request: {
       debug: "調試",
@@ -2171,8 +2171,8 @@ export default {
       export_report: "導出報告",
       no_case_relevance: "沒有關聯用例",
       automatically_update_status: "自動更新狀態",
-      allow_associated_repetitive_cases: "允許關聯重複用例",
       automatically_update_status_tip: "當功能用例關聯的接口或性能用例在測試計劃執行後，自動更新功能用例的狀態",
+      allow_associated_repetitive_cases: "允許關聯重復用例",
       allow_associated_repetitive_cases_tip: "是否允許同一個測試計劃中多次關聯相同用例"
     },
     issue: {
@@ -2211,6 +2211,8 @@ export default {
       tapd_current_owner: "Tapd 處理人",
       zentao_bug_build: "禪道 影響版本",
       zentao_bug_assigned: "禪道 處理人",
+      third_party_integrated: "集成第三方平臺",
+      use_third_party: "使用 Jira 缺陷模板",
       update_third_party_bugs: "更新第三方平臺的缺陷",
       sync_bugs: "同步缺陷"
     },
@@ -2713,10 +2715,6 @@ export default {
       upload_file: "上傳文件",
       delete_file: "刪除文件",
     },
-    project_app_manager: {
-      name: "應用設置",
-      edit: "編輯應用設置"
-    },
     project_track_case: {
       name: "測試用例",
       read: "查詢用例",
@@ -2739,6 +2737,10 @@ export default {
       relevance_or_cancel: "關聯/取消關聯用例",
 
     },
+    project_app_manager: {
+      name: "應用設置",
+      edit: "編輯應用設置"
+    },
     project_track_plan: {
       name: "測試計劃",
       read: "查詢測試計劃",

From 7152640161d070df7dbbf20921ab3879d451d129 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 20 Dec 2021 21:15:37 +0800
Subject: [PATCH 214/256] =?UTF-8?q?refactor:=20=E5=BC=80=E6=BA=90=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=8E=B7=E5=8F=96Jira=E6=A8=A1=E6=9D=BF=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ApiTestEnvironmentService.java    |   2 +-
 .../metersphere/service/ProjectService.java   |   4 +
 .../track/controller/IssuesController.java    |   6 +
 .../track/issue/AbstractIssuePlatform.java    |   2 +-
 .../metersphere/track/issue/JiraPlatform.java | 190 +++++++++++++++++-
 .../track/service/IssuesService.java          |  11 +
 backend/src/main/java/io/metersphere/xpack    |   2 +-
 .../components/project/menu/EditProject.vue   |  12 +-
 frontend/src/network/Issue.js                 |   4 +-
 9 files changed, 215 insertions(+), 18 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java
index 7880f07787..59f420576f 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java
@@ -160,7 +160,7 @@ public class ApiTestEnvironmentService {
         }
 
         String apiName = MockConfigStaticData.MOCK_EVN_NAME;
-        ApiTestEnvironmentWithBLOBs returnModel = null;
+        ApiTestEnvironmentWithBLOBs returnModel;
         ApiTestEnvironmentExample example = new ApiTestEnvironmentExample();
         example.createCriteria().andProjectIdEqualTo(projectId).andNameEqualTo(apiName);
         List<ApiTestEnvironmentWithBLOBs> list = this.selectByExampleWithBLOBs(example);
diff --git a/backend/src/main/java/io/metersphere/service/ProjectService.java b/backend/src/main/java/io/metersphere/service/ProjectService.java
index e34e96f8b9..3bb5b18185 100644
--- a/backend/src/main/java/io/metersphere/service/ProjectService.java
+++ b/backend/src/main/java/io/metersphere/service/ProjectService.java
@@ -12,6 +12,7 @@ import io.metersphere.base.mapper.*;
 import io.metersphere.base.mapper.ext.ExtProjectMapper;
 import io.metersphere.base.mapper.ext.ExtUserGroupMapper;
 import io.metersphere.base.mapper.ext.ExtUserMapper;
+import io.metersphere.commons.constants.IssuesManagePlatform;
 import io.metersphere.commons.constants.UserGroupConstants;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.CommonBeanFactory;
@@ -105,6 +106,9 @@ public class ProjectService {
         if (projectMapper.countByExample(example) > 0) {
             MSException.throwException(Translator.get("project_name_already_exists"));
         }
+        if (StringUtils.isBlank(project.getPlatform())) {
+            project.setPlatform(IssuesManagePlatform.Local.name());
+        }
         project.setId(UUID.randomUUID().toString());
 
         String systemId = this.genSystemId();
diff --git a/backend/src/main/java/io/metersphere/track/controller/IssuesController.java b/backend/src/main/java/io/metersphere/track/controller/IssuesController.java
index ccf89e1912..2b8bb3dd6f 100644
--- a/backend/src/main/java/io/metersphere/track/controller/IssuesController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/IssuesController.java
@@ -9,6 +9,7 @@ import io.metersphere.commons.constants.NoticeConstants;
 import io.metersphere.commons.constants.OperLogConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
+import io.metersphere.dto.IssueTemplateDao;
 import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.notice.annotation.SendNotice;
 import io.metersphere.track.issue.domain.PlatformUser;
@@ -144,4 +145,9 @@ public class IssuesController {
     public void saveFollows(@PathVariable String issueId,@RequestBody List<String> follows) {
         issuesService.saveFollows(issueId,follows);
     }
+
+    @GetMapping("/thirdpart/template/{projectId}")
+    public IssueTemplateDao getThirdPartTemplate(@PathVariable String projectId) {
+        return issuesService.getThirdPartTemplate(projectId);
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
index 4a3c9a2c65..1dee347300 100644
--- a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
@@ -492,7 +492,7 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
 
     public boolean isThirdPartTemplate() {
         Project project = projectService.getProjectById(projectId);
-        if (project.getThirdPartTemplate() != null && project.getThirdPartTemplate() && LicenseUtils.valid()) {
+        if (project.getThirdPartTemplate() != null && project.getThirdPartTemplate()) {
             return true;
         }
         return false;
diff --git a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
index 72256d1b08..f600a2a9ad 100644
--- a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
@@ -5,19 +5,20 @@ import com.alibaba.fastjson.JSONObject;
 import io.metersphere.base.domain.IssuesDao;
 import io.metersphere.base.domain.IssuesWithBLOBs;
 import io.metersphere.base.domain.Project;
+import io.metersphere.commons.constants.CustomFieldType;
 import io.metersphere.commons.constants.IssuesManagePlatform;
 import io.metersphere.commons.constants.IssuesStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.dto.CustomFieldDao;
 import io.metersphere.dto.CustomFieldItemDTO;
+import io.metersphere.dto.IssueTemplateDao;
 import io.metersphere.dto.UserDTO;
 import io.metersphere.service.CustomFieldService;
 import io.metersphere.track.dto.DemandDTO;
 import io.metersphere.track.issue.client.JiraClientV2;
 import io.metersphere.track.issue.domain.PlatformUser;
-import io.metersphere.track.issue.domain.jira.JiraAddIssueResponse;
-import io.metersphere.track.issue.domain.jira.JiraConfig;
-import io.metersphere.track.issue.domain.jira.JiraIssue;
+import io.metersphere.track.issue.domain.jira.*;
 import io.metersphere.track.request.testcase.IssuesRequest;
 import io.metersphere.track.request.testcase.IssuesUpdateRequest;
 import org.apache.commons.collections.CollectionUtils;
@@ -28,9 +29,11 @@ import org.commonmark.renderer.html.HtmlRenderer;
 import org.springframework.web.client.HttpClientErrorException;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class JiraPlatform extends AbstractIssuePlatform {
 
@@ -348,4 +351,179 @@ public class JiraPlatform extends AbstractIssuePlatform {
     public JiraConfig setUserConfig() {
         return setUserConfig(getUserPlatInfo(this.workspaceId));
     }
+
+    public IssueTemplateDao getThirdPartTemplate() {
+        Set<String> ignoreSet = new HashSet() {{
+            add("timetracking");
+            add("attachment");
+        }};
+        JiraConfig config = getConfig();
+        String projectKey = getProjectId(this.projectId);
+        Map<String, JiraCreateMetadataResponse.Field> createMetadata = jiraClientV2.getCreateMetadata(projectKey, config.getIssuetype());
+        String userOptions = getUserOptions(projectKey);
+        List<CustomFieldDao> fields = new ArrayList<>();
+        char filedKey = 'A';
+        for (String name : createMetadata.keySet()) {
+            JiraCreateMetadataResponse.Field item = createMetadata.get(name);
+            if (ignoreSet.contains(name)) continue;  // timetracking, attachment todo
+            JiraCreateMetadataResponse.Schema schema = item.getSchema();
+            CustomFieldDao customFieldDao = new CustomFieldDao();
+            customFieldDao.setKey(String.valueOf(filedKey++));
+            customFieldDao.setId(name);
+            customFieldDao.setCustomData(name);
+            customFieldDao.setName(item.getName());
+            customFieldDao.setRequired(item.isRequired());
+            setCustomFiledType(schema, customFieldDao, userOptions);
+            setCustomFiledDefaultValue(customFieldDao, item);
+            JSONArray options = getAllowedValuesOptions(item.getAllowedValues());
+            if (options != null)
+                customFieldDao.setOptions(options.toJSONString());
+            fields.add(customFieldDao);
+        }
+
+        fields = fields.stream().filter(i -> StringUtils.isNotBlank(i.getType()))
+                .collect(Collectors.toList());
+
+        // 按类型排序，富文本排最后，input 排最前面，summary 排第一个
+        fields.sort((a, b) -> {
+            if (a.getType().equals(CustomFieldType.RICH_TEXT.getValue())) return 1;
+            if (b.getType().equals(CustomFieldType.RICH_TEXT.getValue())) return -1;
+            if (a.getId().equals("summary")) return -1;
+            if (b.getId().equals("summary")) return 1;
+            if (a.getType().equals(CustomFieldType.INPUT.getValue())) return -1;
+            if (b.getType().equals(CustomFieldType.INPUT.getValue())) return 1;
+            return a.getType().compareTo(b.getType());
+        });
+        IssueTemplateDao issueTemplateDao = new IssueTemplateDao();
+        issueTemplateDao.setCustomFields(fields);
+        issueTemplateDao.setPlatform(this.key);
+        return issueTemplateDao;
+    }
+
+    private void setCustomFiledType(JiraCreateMetadataResponse.Schema schema, CustomFieldDao customFieldDao, String userOptions) {
+        Map<String, String> fieldTypeMap = new HashMap() {{
+            put("summary", CustomFieldType.INPUT.getValue());
+            put("description", CustomFieldType.RICH_TEXT.getValue());
+            put("components", CustomFieldType.MULTIPLE_SELECT.getValue());
+            put("fixVersions", CustomFieldType.MULTIPLE_SELECT.getValue());
+            put("versions", CustomFieldType.MULTIPLE_SELECT.getValue());
+            put("priority", CustomFieldType.SELECT.getValue());
+            put("environment", CustomFieldType.RICH_TEXT.getValue());
+            put("labels", CustomFieldType.MULTIPLE_INPUT.getValue());
+        }};
+        String customType = schema.getCustom();
+        String value = null;
+        if (StringUtils.isNotBlank(customType)) {
+            // 自定义字段
+            if (customType.contains("multiselect")) {
+                value = CustomFieldType.MULTIPLE_SELECT.getValue();
+            } else if (customType.contains("cascadingselect")) {
+                value = "cascadingSelect";
+            } else if (customType.contains("userpicker")) {
+                value = CustomFieldType.SELECT.getValue();
+                customFieldDao.setOptions(userOptions);
+            } else if (customType.contains("multicheckboxes")) {
+                value = CustomFieldType.CHECKBOX.getValue();
+                customFieldDao.setDefaultValue(JSONObject.toJSONString(new ArrayList<>()));
+            } else if (customType.contains("radiobuttons")) {
+                value = CustomFieldType.RADIO.getValue();
+            } else if (customType.contains("textfield")) {
+                value = CustomFieldType.INPUT.getValue();
+            } else if (customType.contains("datetime")) {
+                value = CustomFieldType.DATETIME.getValue();
+            } else if (customType.contains("datepicker")) {
+                value = CustomFieldType.DATE.getValue();
+            } else if (customType.contains("float")) {
+                value = CustomFieldType.FLOAT.getValue();
+            } else if (customType.contains("select")) {
+                value = CustomFieldType.SELECT.getValue();
+            } else if (customType.contains("url")) {
+                value = CustomFieldType.INPUT.getValue();
+            } else if (customType.contains("textarea")) {
+                value = CustomFieldType.TEXTAREA.getValue();
+            } else if (customType.contains("labels")) {
+                value = CustomFieldType.MULTIPLE_INPUT.getValue();
+            }
+        } else {
+            // 系统字段
+            value = fieldTypeMap.get(customFieldDao.getId());
+            String type = schema.getType();
+            if ("user".equals(type)) {
+                value = CustomFieldType.SELECT.getValue();
+                customFieldDao.setOptions(userOptions);
+            } else if ("date".equals(type)) {
+                value = CustomFieldType.DATE.getValue();
+            } else if ("datetime".equals(type)) {
+                value = CustomFieldType.DATETIME.getValue();
+            }
+        }
+        customFieldDao.setType(value);
+    }
+
+    private void setCustomFiledDefaultValue(CustomFieldDao customFieldDao, JiraCreateMetadataResponse.Field item) {
+        if (item.isHasDefaultValue()) {
+            Object defaultValue = item.getDefaultValue();
+            if (defaultValue != null) {
+                Object msDefaultValue;
+                if (defaultValue instanceof JSONObject) {
+                    msDefaultValue = ((JSONObject) defaultValue).get("id");
+                } else if (defaultValue instanceof JSONArray) {
+                    List defaultList = new ArrayList();
+                    ((JSONArray) defaultValue).forEach(i -> {
+                        if (i instanceof JSONObject) {
+                            JSONObject obj = (JSONObject) i;
+                            defaultList.add(obj.get("id"));
+                        } else {
+                            defaultList.add(i);
+                        }
+                    });
+
+                    msDefaultValue = defaultList;
+                } else {
+                    if (customFieldDao.getType().equals(CustomFieldType.DATE.getValue())) {
+                        msDefaultValue = Instant.ofEpochMilli((Long) defaultValue).atZone(ZoneId.systemDefault()).toLocalDate();
+                    } else if (customFieldDao.getType().equals(CustomFieldType.DATETIME.getValue())) {
+                        msDefaultValue = LocalDateTime.ofInstant(Instant.ofEpochMilli((Long) defaultValue), ZoneId.systemDefault()).toString();
+                    } else {
+                        msDefaultValue = defaultValue;
+                    }
+                }
+                customFieldDao.setDefaultValue(JSONObject.toJSONString(msDefaultValue));
+            }
+        }
+    }
+
+    private JSONArray getAllowedValuesOptions(List<JiraCreateMetadataResponse.AllowedValues> allowedValues) {
+        if (allowedValues != null) {
+            JSONArray options = new JSONArray();
+            allowedValues.forEach(val -> {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("value", val.getId());
+                if (StringUtils.isNotBlank(val.getName())) {
+                    jsonObject.put("text", val.getName());
+                } else {
+                    jsonObject.put("text", val.getValue());
+                }
+                JSONArray children = getAllowedValuesOptions(val.getChildren());
+                if (children != null) {
+                    jsonObject.put("children", children);
+                }
+                options.add(jsonObject);
+            });
+            return options;
+        }
+        return null;
+    }
+
+    private String getUserOptions(String projectKey) {
+        List<JiraUser> userOptions = jiraClientV2.getAssignableUser(projectKey);
+        JSONArray options = new JSONArray();
+        userOptions.forEach(val -> {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("value", val.getAccountId());
+            jsonObject.put("text", val.getDisplayName());
+            options.add(jsonObject);
+        });
+        return options.toJSONString();
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/IssuesService.java b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
index 0c15cd1dad..126bcaa910 100644
--- a/backend/src/main/java/io/metersphere/track/service/IssuesService.java
+++ b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
@@ -635,4 +635,15 @@ public class IssuesService {
         return issuesMapper.selectByExampleWithBLOBs(example);
     }
 
+    public IssueTemplateDao getThirdPartTemplate(String projectId) {
+        if (StringUtils.isNotBlank(projectId)) {
+            Project project = projectService.getProjectById(projectId);
+            IssuesRequest issuesRequest = new IssuesRequest();
+            issuesRequest.setProjectId(projectId);
+            issuesRequest.setWorkspaceId(project.getWorkspaceId());
+            return IssueFactory.createPlatform(IssuesManagePlatform.Jira.toString(), issuesRequest)
+                    .getThirdPartTemplate();
+        }
+        return new IssueTemplateDao();
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index b0c1379883..a618ef0fb1 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit b0c13798836a8bfbc1d415bc5a9610c56df61833
+Subproject commit a618ef0fb1ae45790e0c7de9805c8ff17c9df5be
diff --git a/frontend/src/business/components/project/menu/EditProject.vue b/frontend/src/business/components/project/menu/EditProject.vue
index 7e672c8200..862151e977 100644
--- a/frontend/src/business/components/project/menu/EditProject.vue
+++ b/frontend/src/business/components/project/menu/EditProject.vue
@@ -7,7 +7,7 @@
           <el-input v-model="form.name" autocomplete="off"></el-input>
         </el-form-item>
 
-        <el-form-item v-if="platformOptions.length > 1" :label-width="labelWidth" :label="$t('集成第三方平台')"
+        <el-form-item v-if="platformOptions.length > 1" :label-width="labelWidth" :label="$t('test_track.issue.third_party_integrated')"
                       prop="platform">
           <el-select filterable v-model="form.platform">
             <el-option v-for="item in platformOptions" :key="item.value" :label="item.text" :value="item.value">
@@ -19,11 +19,11 @@
           <template-select :data="form" scene="API_CASE" prop="caseTemplateId" ref="caseTemplate"/>
         </el-form-item>
 
-        <el-form-item v-if="xpackEable" :label-width="labelWidth" :label="$t('使用第三方平台模板')" prop="scenarioCustomNum">
+        <el-form-item v-if="form.platform == 'Jira'" :label-width="labelWidth" :label="$t('test_track.issue.use_third_party')" prop="scenarioCustomNum">
           <el-switch v-model="form.thirdPartTemplate"></el-switch>
         </el-form-item>
 
-        <el-form-item v-if="!xpackEable || !form.thirdPartTemplate" :label-width="labelWidth"
+        <el-form-item v-if="!form.thirdPartTemplate" :label-width="labelWidth"
                       :label="$t('workspace.issue_template_manage')" prop="issueTemplateId">
           <template-select :platform="form.platform" :data="form" scene="ISSUE" prop="issueTemplateId"
                            ref="issueTemplate"/>
@@ -164,8 +164,7 @@ export default {
       },
       screenHeight: 'calc(100vh - 195px)',
       labelWidth: '150px',
-      platformOptions: [],
-      xpackEable: false
+      platformOptions: []
     };
   },
   props: {
@@ -183,7 +182,6 @@ export default {
       this.create();
       this.$router.replace('/setting/project/all');
     }
-    this.xpackEable = hasLicense();
   },
   computed: {
     currentUser: () => {
@@ -242,7 +240,7 @@ export default {
       if (platforms.indexOf(platform) === -1) {
         for (let i = 0; i < this.platformOptions.length; i++) {
           if (this.platformOptions[i].value === platform) {
-            this.platformOptions.splice(1, i);
+            this.platformOptions.splice(i, 1);
             break;
           }
         }
diff --git a/frontend/src/network/Issue.js b/frontend/src/network/Issue.js
index f355b231b7..68c987a530 100644
--- a/frontend/src/network/Issue.js
+++ b/frontend/src/network/Issue.js
@@ -95,7 +95,7 @@ export function deleteIssueRelate(param, callback) {
 
 export function getIssueThirdPartTemplate() {
   return new Promise(resolve => {
-    baseGet('/xpack/issue/template/' + getCurrentProjectID(), (data) => {
+    baseGet('/issues/thirdpart/template/' + getCurrentProjectID(), (data) => {
       let template = data;
       if (template.customFields) {
         template.customFields.forEach(item => {
@@ -129,7 +129,7 @@ export function getIssuePartTemplateWithProject(callback) {
 }
 
 export function enableThirdPartTemplate(currentProject) {
-  return hasLicense() && currentProject && currentProject.thirdPartTemplate && currentProject.platform === JIRA;
+  return currentProject && currentProject.thirdPartTemplate && currentProject.platform === JIRA;
 }
 
 export function isThirdPartEnable(callback) {

From 20ea6619627503f61593c37300c1b2f7fb6b85ff Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Tue, 21 Dec 2021 10:47:41 +0800
Subject: [PATCH 215/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20order=20by?=
 =?UTF-8?q?=20sql=E6=B3=A8=E5=85=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #8651
---
 .../controller/request/OrderRequest.java      | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/request/OrderRequest.java b/backend/src/main/java/io/metersphere/controller/request/OrderRequest.java
index 8fd28aa275..c899ae6424 100644
--- a/backend/src/main/java/io/metersphere/controller/request/OrderRequest.java
+++ b/backend/src/main/java/io/metersphere/controller/request/OrderRequest.java
@@ -1,13 +1,48 @@
 package io.metersphere.controller.request;
 
-import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
-@Getter
 @Setter
 public class OrderRequest {
     private String name;
     private String type;
     // 表前缀
     private String prefix;
+
+
+    public String getName() {
+        if (checkSqlInjection(name)) {
+            return "1";
+        }
+        return name;
+    }
+
+    public String getType() {
+        if (StringUtils.equalsIgnoreCase(type, "asc")) {
+            return "ASC";
+        } else {
+            return "DESC";
+        }
+    }
+
+    public String getPrefix() {
+        if (checkSqlInjection(prefix)) {
+            return "";
+        }
+        return prefix;
+    }
+
+
+    public static boolean checkSqlInjection(String script) {
+        if (StringUtils.isEmpty(script)) {
+            return false;
+        }
+        Pattern pattern = Pattern.compile("^\\w+$");
+        Matcher matcher = pattern.matcher(script.toLowerCase());
+        return !matcher.find();
+    }
 }

From c71abc5c4d55df7520a03432ff346240ebd935c1 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 21 Dec 2021 10:56:29 +0800
Subject: [PATCH 216/256] =?UTF-8?q?fix(=E5=9C=BA=E6=99=AF=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1006717 --user=lyh 【测试跟踪】测试用例关联接口的高级搜索，根据创建人搜索没生效
https://www.tapd.cn/55049933/s/1084002
---
 .../metersphere/api/dto/automation/ApiScenarioDTO.java   | 1 +
 .../metersphere/base/mapper/ext/ExtApiScenarioMapper.xml | 9 ++++++++-
 .../api/automation/scenario/ApiScenarioList.vue          | 2 +-
 frontend/src/common/js/default-table-header.js           | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java
index 447d5d0368..68016597df 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java
@@ -30,4 +30,5 @@ public class ApiScenarioDTO extends ApiScenarioWithBLOBs {
      */
     private String env;
     private Map<String, String> environmentMap;
+    private String creator;
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index 4809a3b305..de4f303580 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -161,7 +161,8 @@
         api_scenario.status, api_scenario.principal, api_scenario.step_total,
         api_scenario.last_result,api_scenario.pass_rate,api_scenario.report_id,
         api_scenario.schedule, api_scenario.description, api_scenario.create_time, api_scenario.update_time,
-        project.name as project_name, user.name as user_name,deleteUser.name AS delete_user,api_scenario.delete_time ,u2.name as principal_name
+        project.name as project_name, user.name as user_name,deleteUser.name AS delete_user,api_scenario.delete_time ,u2.name as principal_name,
+        api_scenario.create_user as creator
         from api_scenario
         left join project on api_scenario.project_id = project.id
         left join user on api_scenario.user_id = user.id
@@ -279,6 +280,12 @@
                                     #{value}
                                 </foreach>
                             </when>
+                            <when test="key=='creator'">
+                                and api_scenario.create_user in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
 
                         </choose>
                     </if>
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 16197c4676..8b08f1dd2b 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -124,7 +124,7 @@
                            :field="item"
                            :fields-width="fieldsWidth"
                            sortable/>
-          <ms-table-column prop="userName" min-width="120px"
+          <ms-table-column prop="creator" min-width="120px"
                            :label="$t('api_test.automation.creator')"
                            :filters="userFilters"
                            :field="item"
diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js
index 4987592c93..298c80fb9f 100644
--- a/frontend/src/common/js/default-table-header.js
+++ b/frontend/src/common/js/default-table-header.js
@@ -70,7 +70,7 @@ export let CUSTOM_TABLE_HEADER = {
     {id: 'level', key: '3', label: 'api_test.automation.case_level'},
     {id: 'status', key: '4', label: 'test_track.plan.plan_status'},
     {id: 'tags', key: '5', label: 'commons.tag'},
-    {id: 'userName', key: '6', label: 'api_test.automation.creator'},
+    {id: 'creator', key: '6', label: 'api_test.automation.creator'},
     {id: 'principalName', key: '7', label: 'api_test.definition.api_principal'},
     {id: 'environmentMap', key: 'e', label: 'commons.environment'},
     {id: 'updateTime', key: '8', label: 'api_test.definition.api_last_time'},

From 2195752fbb59ea84ed43b0da1f656944bd5b8849 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 21 Dec 2021 11:14:32 +0800
Subject: [PATCH 217/256] =?UTF-8?q?fix(=E7=8E=AF=E5=A2=83=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86):=20i18n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008890 --user=lyh 【国际化】-Settiing-ENV manament-未翻译为英文
https://www.tapd.cn/55049933/s/1084032
---
 .../test/components/environment/EnvironmentHttpConfig.vue   | 6 +++---
 frontend/src/i18n/en-US.js                                  | 2 ++
 frontend/src/i18n/zh-CN.js                                  | 2 ++
 frontend/src/i18n/zh-TW.js                                  | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue b/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
index c6877c03da..a299273077 100644
--- a/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
+++ b/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
@@ -229,7 +229,7 @@ export default {
     typeChange() {
       if (this.condition.type === "NONE" && this.condition.id && this.checkNode(this.condition.id)) {
         this.condition.type = this.beforeCondition.type;
-        this.$warning("启用条件为 '无' 的域名已经存在！");
+        this.$warning(this.$t('api_test.environment.repeat_warning'));
         return;
       }
       switch (this.condition.type) {
@@ -307,7 +307,7 @@ export default {
     },
     add() {
       if (this.condition.type === "NONE" && this.checkNode()) {
-        this.$warning("启用条件为 '无' 的域名已经存在，请更新！");
+        this.$warning(this.$t('api_test.environment.repeat_warning'));
         return;
       }
       this.validateSocket();
@@ -330,7 +330,7 @@ export default {
     },
     copy(row) {
       if (row.type === "NONE") {
-        this.$warning("启用条件为 '无' 的域名不支持复制！");
+        this.$warning(this.$t('api_test.environment.copy_warning'));
         return;
       }
       const index = this.httpConfig.conditions.findIndex((d) => d.id === row.id);
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 70791223ea..bada484eff 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1322,6 +1322,8 @@ export default {
       import: "Import Environment",
       request_timeout: "Request Timeout",
       response_timeout: "Response Timeout",
+      repeat_warning: "The domain name whose activation condition is'None' already exists!",
+      copy_warning: "Domain names whose enabling conditions are'none' do not support copying!"
     },
     scenario: {
       id:"Scenario ID",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index a75a42e8d9..447bafb6ae 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1327,6 +1327,8 @@ export default {
       import: "导入环境",
       request_timeout: "链接超时",
       response_timeout: "响应超时",
+      repeat_warning: "启用条件为 '无' 的域名已经存在！",
+      copy_warning: "启用条件为 '无' 的域名不支持复制！"
     },
     scenario: {
       id: "场景ID",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 553bac419e..ac1a90a8e3 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1327,6 +1327,8 @@ export default {
       import: "導入環境",
       request_timeout: "鏈接超時",
       response_timeout: "響應超時",
+      repeat_warning: "啟用條件為 '無' 的域名已經存在！",
+      copy_warning: "啟用條件為 '無' 的域名不支持複製！"
     },
     scenario: {
       id: "場景ID",

From 5c5fd5102bceb05eb233c1d3c249edcfc665b8c2 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 21 Dec 2021 11:11:29 +0800
Subject: [PATCH 218/256] =?UTF-8?q?fix:=20markdown=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3=E5=8F=AF=E5=8C=BF=E5=90=8D?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=20(#8653)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/metersphere/commons/utils/ShiroUtils.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
index 3c9eb6fe97..c098e1766a 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
@@ -15,7 +15,7 @@ public class ShiroUtils {
 
     public static void loadBaseFilterChain(Map<String, String> filterChainDefinitionMap) {
 
-        filterChainDefinitionMap.put("/resource/**", "anon");
+        filterChainDefinitionMap.put("/resource/md/get/", "anon");
         filterChainDefinitionMap.put("/*.worker.js", "anon");
         filterChainDefinitionMap.put("/login", "anon");
         filterChainDefinitionMap.put("/signin", "anon");

From 6cdc67b33922604f054820a4f0c096d88250862f Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Tue, 21 Dec 2021 11:39:41 +0800
Subject: [PATCH 219/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E8=BD=AC=E6=8D=A2=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=97=B6=E5=90=8D=E7=A7=B0=E9=95=BF=E5=BA=A6=E8=BF=87=E9=95=BF?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009058 --user=刘瑞斌 【性能测试】场景名称很长，转性能测试保存报错 https://www.tapd.cn/55049933/s/1084069
---
 .../db/migration/V103__v1.16_release.sql       |  3 +++
 .../performance/test/EditPerformanceTest.vue   | 18 +-----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V103__v1.16_release.sql b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
index e07f9d8043..909a44ed2a 100644
--- a/backend/src/main/resources/db/migration/V103__v1.16_release.sql
+++ b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
@@ -69,3 +69,6 @@ CREATE TABLE IF NOT EXISTS `api_scenario_report_structure`
 
 INSERT INTO user_group_permission (id, group_id, permission_id, module_id)
 VALUES (UUID(), 'project_app_manager', 'PROJECT_APP_MANAGER:READ+EDIT', 'PROJECT_APP_MANAGER');
+
+ALTER TABLE load_test
+    MODIFY name VARCHAR(255) NOT NULL COMMENT 'Test name';
\ No newline at end of file
diff --git a/frontend/src/business/components/performance/test/EditPerformanceTest.vue b/frontend/src/business/components/performance/test/EditPerformanceTest.vue
index 3fe222ee84..03ebd35f1a 100644
--- a/frontend/src/business/components/performance/test/EditPerformanceTest.vue
+++ b/frontend/src/business/components/performance/test/EditPerformanceTest.vue
@@ -9,27 +9,11 @@
                 <el-input :disabled="isReadOnly" :placeholder="$t('load_test.input_name')" v-model="test.name"
                           class="input-with-select"
                           size="small"
-                          maxlength="30" show-word-limit/>
+                          maxlength="255" show-word-limit/>
               </el-form-item>
             </el-form>
           </el-col>
-<!--          <el-col :span="6">
-            <el-form>
-              <el-form-item :label="$t('api_test.automation.follow_people')">
-                <el-select v-model="test.follows"
-                           clearable
-                           :placeholder="$t('api_test.automation.follow_people')" multiple filterable size="small">
-                  <el-option
-                    v-for="item in maintainerOptions"
-                    :key="item.id"
-                    :label="item.id + ' (' + item.name + ')'"
-                    :value="item.id">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
 
-          </el-col>-->
           <el-col :span="12">
             <el-tooltip :content="$t('commons.follow')" placement="bottom"  effect="dark" v-if="!showFollow">
               <i class="el-icon-star-off" style="color: #783987; font-size: 25px; margin-right: 15px;cursor: pointer;position: relative; top: 5px; " @click="saveFollow" />

From 75c6378c6c1637d4f97cf6b57c1abe52cbc9773d Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 21 Dec 2021 11:34:42 +0800
Subject: [PATCH 220/256] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A):=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E7=9A=84=E6=8A=A5=E5=91=8A=E5=9B=BE=E5=83=8F=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=9B=BD=E9=99=85=E5=8C=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

定时任务发送的报告图像内容根据创建用户所选择的语言而进行国际化优化
---
 .../service/ReportStatisticsService.java      |  4 +--
 .../reportstatistics/utils/ChromeUtils.java   | 32 +++++++++++--------
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java b/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
index eb70ee0687..2c517c2031 100644
--- a/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
+++ b/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
@@ -250,7 +250,7 @@ public class ReportStatisticsService {
         return reportStatisticsMapper.selectByExample(example);
     }
 
-    public String getImageContentById(ReportStatisticsWithBLOBs reportRecordId) {
+    public String getImageContentById(ReportStatisticsWithBLOBs reportRecordId, String language) {
         ChromeUtils chromeUtils = ChromeUtils.getInstance();
         HeadlessRequest headlessRequest = new HeadlessRequest();
         BaseSystemConfigDTO baseInfo = CommonBeanFactory.getBean(SystemParameterService.class).getBaseInfo();
@@ -264,7 +264,7 @@ public class ReportStatisticsService {
         platformUrl += "/echartPic?shareId=" + reportRecordId.getId();
         headlessRequest.setUrl(platformUrl);
         headlessRequest.setRemoteDriverUrl(remoteDriverUrl);
-        String imageData = chromeUtils.getImageInfo(headlessRequest);
+        String imageData = chromeUtils.getImageInfo(headlessRequest, language);
         return imageData;
     }
 
diff --git a/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java b/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java
index 75bb773055..b117db965b 100644
--- a/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java
+++ b/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java
@@ -10,6 +10,8 @@ import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
 import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
 
 public class ChromeUtils {
     private static ChromeUtils chromeUtils = new ChromeUtils();
@@ -21,24 +23,26 @@ public class ChromeUtils {
         return chromeUtils;
     }
 
-    private synchronized WebDriver genWebDriver(HeadlessRequest headlessRequest) {
+    private synchronized WebDriver genWebDriver(HeadlessRequest headlessRequest, String language) {
         if (headlessRequest.isEmpty()) {
             LogUtil.error("Headless request is null! " + JSON.toJSONString(headlessRequest));
             return null;
         }
         //初始化一个chrome浏览器实例driver
         ChromeOptions options = new ChromeOptions();
-        options.addArguments("headless");
-        options.addArguments("no-sandbox");
-        options.addArguments("disable-gpu");
-        options.addArguments("disable-features=NetworkService");
-        options.addArguments("ignore-certificate-errors");
-        options.addArguments("silent-launch");
-        options.addArguments("disable-application-cache");
-        options.addArguments("disable-web-security");
-        options.addArguments("no-proxy-server");
-        options.addArguments("disable-dev-shm-usage");
-        options.addArguments("lang=zh_CN.UTF-8");
+
+        if (StringUtils.isEmpty(language)) {
+            language = "zh-cn";
+        }
+        if (StringUtils.equalsAnyIgnoreCase(language, "zh-cn")) {
+            Map<String, Object> optionMap = new HashMap<>();
+            optionMap.put("intl.accept_languages", "zh-CN,en,en_US");
+            options.setExperimentalOption("prefs", optionMap);
+        } else if (StringUtils.equalsAnyIgnoreCase(language, "zh_tw")) {
+            Map<String, Object> optionMap = new HashMap<>();
+            optionMap.put("intl.accept_languages", "zh-TW,en,en_US");
+            options.setExperimentalOption("prefs", optionMap);
+        }
 
         WebDriver driver = null;
         try {
@@ -55,8 +59,8 @@ public class ChromeUtils {
         return driver;
     }
 
-    public synchronized String getImageInfo(HeadlessRequest request) {
-        WebDriver driver = this.genWebDriver(request);
+    public synchronized String getImageInfo(HeadlessRequest request, String langurage) {
+        WebDriver driver = this.genWebDriver(request, langurage);
         String files = null;
         if (driver != null) {
             try {
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index a618ef0fb1..fcc6073110 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit a618ef0fb1ae45790e0c7de9805c8ff17c9df5be
+Subproject commit fcc6073110adde4f6a67833046a7346721602fd0

From 17a4ababeb5b9fa8e127a1cb2ff2c68f2ab4448e Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 20 Dec 2021 19:44:13 +0800
Subject: [PATCH 221/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=94=AF=E6=8C=81=E5=88=86=E5=B8=83=E5=BC=8F?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=EF=BC=8C=E6=89=A7=E8=A1=8C=E9=98=9F=E5=88=97?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                               |   2 +-
 .../api/cache/TestPlanExecuteInfo.java        |  13 -
 .../metersphere/api/dto/RunModeDataDTO.java   |   3 +-
 .../api/exec/api/ApiExecuteService.java       |   1 -
 .../exec/api/TestPlanApiExecuteService.java   | 228 ++----
 .../api/exec/queue/DBTestQueue.java           |  10 +
 .../metersphere/api/exec/queue/ExecTask.java  |   8 +-
 .../exec/queue/ExecThreadPoolExecutor.java    |   2 +
 .../exec/queue/SerialBlockingQueueUtil.java   |  53 --
 .../scenario/ApiScenarioExecuteService.java   |  75 +-
 .../scenario/ApiScenarioParallelService.java  |  12 +-
 .../scenario/ApiScenarioSerialService.java    | 264 ++++---
 .../utils/ApiDefinitionExecResultUtil.java    |   2 +-
 .../api/exec/utils/GenerateHashTreeUtil.java  |  18 +-
 .../api/jmeter/APIBackendListenerHandler.java |  33 -
 .../api/jmeter/APISingleResultListener.java   |   4 +
 .../io/metersphere/api/jmeter/FixedTask.java  |  57 +-
 .../metersphere/api/jmeter/JMeterService.java |  62 +-
 .../api/jmeter/JmeterThreadUtils.java         |   5 -
 .../metersphere/api/jmeter/MessageCache.java  |   4 +-
 .../api/jmeter/MsDebugListener.java           |   2 -
 .../api/jmeter/MsKafkaListener.java           |   7 +-
 .../ApiDefinitionExecResultService.java       |   5 -
 .../api/service/ApiExecutionQueueService.java | 222 ++++++
 .../api/service/ApiJmeterFileService.java     |   6 +-
 .../api/service/ApiScenarioReportService.java |  46 +-
 .../api/service/RemakeReportService.java      |  16 +-
 .../api/service/TestResultService.java        |   7 -
 .../base/domain/ApiExecutionQueue.java        |  21 +
 .../base/domain/ApiExecutionQueueDetail.java  |  25 +
 .../ApiExecutionQueueDetailExample.java       | 670 ++++++++++++++++++
 .../base/domain/ApiExecutionQueueExample.java | 610 ++++++++++++++++
 .../mapper/ApiExecutionQueueDetailMapper.java |  36 +
 .../mapper/ApiExecutionQueueDetailMapper.xml  | 304 ++++++++
 .../base/mapper/ApiExecutionQueueMapper.java  |  30 +
 .../base/mapper/ApiExecutionQueueMapper.xml   | 228 ++++++
 .../ext/ExtApiExecutionQueueMapper.java       |   5 +
 .../mapper/ext/ExtApiExecutionQueueMapper.xml |   7 +
 .../metersphere/task/service/TaskService.java |   1 -
 .../db/migration/V103__v1.16_release.sql      |  24 +
 40 files changed, 2540 insertions(+), 588 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/api/exec/queue/DBTestQueue.java
 delete mode 100644 backend/src/main/java/io/metersphere/api/exec/queue/SerialBlockingQueueUtil.java
 delete mode 100644 backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerHandler.java
 create mode 100644 backend/src/main/java/io/metersphere/api/service/ApiExecutionQueueService.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueue.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueueDetail.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueueDetailExample.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueueExample.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueDetailMapper.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueDetailMapper.xml
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueMapper.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueMapper.xml
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiExecutionQueueMapper.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiExecutionQueueMapper.xml

diff --git a/backend/pom.xml b/backend/pom.xml
index 547a2c7bab..f578f98367 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -148,7 +148,7 @@
         <dependency>
             <groupId>io.metersphere</groupId>
             <artifactId>ms-jmeter-core</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
         </dependency>
 
         <!--   排除jmeter中的 xstream 解决bug     -->
diff --git a/backend/src/main/java/io/metersphere/api/cache/TestPlanExecuteInfo.java b/backend/src/main/java/io/metersphere/api/cache/TestPlanExecuteInfo.java
index e6dce87fb5..295ca7ebdc 100644
--- a/backend/src/main/java/io/metersphere/api/cache/TestPlanExecuteInfo.java
+++ b/backend/src/main/java/io/metersphere/api/cache/TestPlanExecuteInfo.java
@@ -2,7 +2,6 @@ package io.metersphere.api.cache;
 
 
 import io.metersphere.api.exec.queue.ExecThreadPoolExecutor;
-import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.jmeter.JmeterThreadUtils;
 import io.metersphere.base.domain.ApiScenarioReport;
 import io.metersphere.base.domain.ApiScenarioReportExample;
@@ -192,10 +191,6 @@ public class TestPlanExecuteInfo {
                     JmeterThreadUtils.stop(apiCaseExecuteThreadMap.get(resourceId));
                 }
             }
-
-            if (apiCaseExecuteThreadMap.containsKey(resourceId)) {
-                SerialBlockingQueueUtil.remove(apiCaseExecuteThreadMap.get(resourceId));
-            }
         }
 
         List<String> updateScenarioReportList = new ArrayList<>();
@@ -209,10 +204,6 @@ public class TestPlanExecuteInfo {
                     JmeterThreadUtils.stop(apiScenarioThreadMap.get(resourceId));
                 }
             }
-
-            if (apiScenarioThreadMap.containsKey(resourceId)) {
-                SerialBlockingQueueUtil.remove(apiScenarioThreadMap.get(resourceId));
-            }
         }
         if (CollectionUtils.isNotEmpty(updateScenarioReportList)) {
             ApiScenarioReportMapper apiScenarioReportMapper = CommonBeanFactory.getBean(ApiScenarioReportMapper.class);
@@ -232,10 +223,6 @@ public class TestPlanExecuteInfo {
                 }
                 loadCaseExecInfo.put(resourceId, TestPlanApiExecuteStatus.FAILD.name());
             }
-
-            if (loadCaseReportIdMap.containsKey(resourceId)) {
-                SerialBlockingQueueUtil.remove(loadCaseReportIdMap.get(resourceId));
-            }
         }
 
         this.countUnFinishedNum();
diff --git a/backend/src/main/java/io/metersphere/api/dto/RunModeDataDTO.java b/backend/src/main/java/io/metersphere/api/dto/RunModeDataDTO.java
index 8122fc93c2..f594b62a8e 100644
--- a/backend/src/main/java/io/metersphere/api/dto/RunModeDataDTO.java
+++ b/backend/src/main/java/io/metersphere/api/dto/RunModeDataDTO.java
@@ -27,8 +27,7 @@ public class RunModeDataDTO {
 
     }
 
-    public RunModeDataDTO(HashTree hashTree, APIScenarioReportResult report, String testId) {
-        this.hashTree = hashTree;
+    public RunModeDataDTO(APIScenarioReportResult report, String testId) {
         this.report = report;
         this.testId = testId;
     }
diff --git a/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java b/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java
index 687fa06dad..be0d64fd50 100644
--- a/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java
+++ b/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java
@@ -213,7 +213,6 @@ public class ApiExecuteService {
                 CollectionUtils.isNotEmpty(request.getTestElement().getHashTree().get(0).getHashTree()) ?
                 request.getTestElement().getHashTree().get(0).getHashTree().get(0).getName() : request.getId();
         JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(testId, request.getId(), runMode, hashTree);
-        runRequest.setConfig(request.getConfig());
         runRequest.setDebug(request.isDebug());
         // 开始执行
         jMeterService.run(runRequest);
diff --git a/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java b/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java
index c9227087cb..8979a79e71 100644
--- a/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java
+++ b/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java
@@ -1,39 +1,26 @@
 package io.metersphere.api.exec.api;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import io.metersphere.api.cache.TestPlanReportExecuteCatch;
 import io.metersphere.api.dto.definition.BatchRunDefinitionRequest;
-import io.metersphere.api.dto.definition.request.ElementUtil;
-import io.metersphere.api.dto.definition.request.MsTestPlan;
-import io.metersphere.api.dto.definition.request.MsThreadGroup;
-import io.metersphere.api.dto.definition.request.ParameterConfig;
-import io.metersphere.api.dto.definition.request.sampler.MsDubboSampler;
-import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
-import io.metersphere.api.dto.definition.request.sampler.MsJDBCSampler;
-import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
-import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
+import io.metersphere.api.exec.queue.DBTestQueue;
+import io.metersphere.api.exec.scenario.ApiScenarioSerialService;
 import io.metersphere.api.exec.utils.ApiDefinitionExecResultUtil;
 import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
 import io.metersphere.api.jmeter.JMeterService;
 import io.metersphere.api.jmeter.MessageCache;
-import io.metersphere.api.service.RemakeReportService;
-import io.metersphere.base.domain.*;
+import io.metersphere.api.service.ApiExecutionQueueService;
+import io.metersphere.base.domain.ApiDefinitionExecResult;
+import io.metersphere.base.domain.ApiExecutionQueue;
+import io.metersphere.base.domain.TestPlanApiCase;
+import io.metersphere.base.domain.TestPlanApiCaseExample;
 import io.metersphere.base.mapper.ApiDefinitionExecResultMapper;
-import io.metersphere.base.mapper.ApiTestCaseMapper;
 import io.metersphere.base.mapper.TestPlanApiCaseMapper;
 import io.metersphere.commons.constants.APITestStatus;
 import io.metersphere.commons.constants.ApiRunMode;
-import io.metersphere.commons.exception.MSException;
-import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.constants.RunModeConstants;
 import io.metersphere.dto.JmeterRunRequestDTO;
 import io.metersphere.dto.MsExecResponseDTO;
-import io.metersphere.plugin.core.MsTestElement;
-import io.metersphere.utils.LoggerUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
@@ -52,18 +39,19 @@ public class TestPlanApiExecuteService {
     @Resource
     private TestPlanApiCaseMapper testPlanApiCaseMapper;
     @Resource
-    private ApiTestCaseMapper apiTestCaseMapper;
-    @Resource
     private JMeterService jMeterService;
     @Resource
-    private ApiDefinitionExecResultMapper apiDefinitionExecResultMapper;
-    @Resource
     private SqlSessionFactory sqlSessionFactory;
     @Resource
-    private RemakeReportService remakeReportService;
+    private ApiScenarioSerialService apiScenarioSerialService;
+    @Resource
+    private ApiExecutionQueueService apiExecutionQueueService;
 
     public List<MsExecResponseDTO> run(BatchRunDefinitionRequest request) {
         List<String> ids = request.getPlanIds();
+        if (CollectionUtils.isEmpty(ids)) {
+            return new LinkedList<>();
+        }
         TestPlanApiCaseExample example = new TestPlanApiCaseExample();
         example.createCriteria().andIdIn(ids);
         example.setOrderByClause("`order` DESC");
@@ -75,8 +63,6 @@ public class TestPlanApiExecuteService {
         }
 
         List<MsExecResponseDTO> responseDTOS = new LinkedList<>();
-        // 资源池
-        GenerateHashTreeUtil.setPoolResource(request.getConfig());
         // 开始选择执行模式
         if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
             Map<TestPlanApiCase, ApiDefinitionExecResult> executeQueue = new LinkedHashMap<>();
@@ -101,7 +87,13 @@ public class TestPlanApiExecuteService {
                 SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
             }
             // 开始串行执行
-            serial(executeQueue, request);
+            String runMode = request.getTriggerMode();
+            DBTestQueue executionQueue = apiExecutionQueueService.add(executeQueue, request.getConfig() != null ? request.getConfig().getResourcePoolId() : null, ApiRunMode.API_PLAN.name(), request.getPlanReportId(), null, runMode);
+            if (executionQueue != null) {
+                if (executionQueue.getQueue() != null) {
+                    apiScenarioSerialService.serial(executionQueue, executionQueue.getQueue());
+                }
+            }
         } else {
             Map<String, TestPlanApiCase> executeQueue = new HashMap<>();
             //记录案例线程结果以及执行失败的案例ID
@@ -130,169 +122,31 @@ public class TestPlanApiExecuteService {
         return responseDTOS;
     }
 
-    private void serial(Map<TestPlanApiCase, ApiDefinitionExecResult> executeQueue, BatchRunDefinitionRequest request) {
-        // 开始串行执行
-        Thread thread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    Thread.currentThread().setName("TestPlanCase串行执行线程");
-                    List<String> executeErrorList = new ArrayList<>();
-                    for (TestPlanApiCase testPlanApiCase : executeQueue.keySet()) {
-                        try {
-                            ApiDefinitionExecResult execResult = executeQueue.get(testPlanApiCase);
-                            execResult.setStatus(APITestStatus.Running.name());
-                            apiDefinitionExecResultMapper.updateByPrimaryKey(execResult);
-
-                            JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(testPlanApiCase.getId(), execResult.getId(), request.getTriggerMode(), null);
-                            runRequest.setConfig(request.getConfig());
-                            runRequest.setPool(GenerateHashTreeUtil.isResourcePool(request.getConfig()));
-                            runRequest.setTestPlanReportId(request.getPlanReportId());
-                            try {
-                                if (!GenerateHashTreeUtil.isResourcePool(request.getConfig()).isPool()) {
-                                    runRequest.setHashTree(generateHashTree(testPlanApiCase.getId()));
-                                }
-                            } catch (Exception e) {
-                                remakeReportService.remake(runRequest);
-                                continue;
-                            }
-                            LoggerUtil.info("TestPlan Serial run 【 " + runRequest.getReportId() + "】start");
-                            // 开始执行
-                            jMeterService.run(runRequest);
-
-                            Object reportObj = SerialBlockingQueueUtil.take(runRequest.getReportId());
-                            if (reportObj == null) {
-                                LoggerUtil.info("TestPlan Serial run-进入超时补偿处理：【 " + runRequest.getReportId() + " 】");
-                                ApiDefinitionExecResult apiDefinitionExecResult = apiDefinitionExecResultMapper.selectByPrimaryKey(runRequest.getReportId());
-                                if (apiDefinitionExecResult != null) {
-                                    apiDefinitionExecResult.setStatus("timeout");
-                                    apiDefinitionExecResultMapper.updateByPrimaryKey(apiDefinitionExecResult);
-                                }
-                            }
-                            LoggerUtil.info("TestPlan Serial run 【 " + runRequest.getReportId() + "】end");
-                            // 如果开启失败结束执行，则判断返回结果状态
-                            if (request.getConfig().isOnSampleError()) {
-                                if (reportObj != null && reportObj instanceof ApiDefinitionExecResult) {
-                                    ApiDefinitionExecResult result = (ApiDefinitionExecResult) reportObj;
-                                    if (result == null || !result.getStatus().equals("Success")) {
-                                        break;
-                                    }
-                                }
-                            }
-
-                        } catch (Exception e) {
-                            executeErrorList.add(testPlanApiCase.getId());
-                            LogUtil.error("执行终止：" + e.getMessage());
-                            break;
-                        }
-                    }
-                    //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
-                    TestPlanReportExecuteCatch.set(request.getPlanReportId(), executeErrorList);
-
-                } catch (Exception e) {
-                    LogUtil.error(e);
-                }
-            }
-        });
-        thread.start();
-    }
-
     private void parallel(Map<String, TestPlanApiCase> executeQueue, BatchRunDefinitionRequest request) {
         List<String> executeErrorList = new ArrayList<>();
-        for (String reportId : executeQueue.keySet()) {
-            TestPlanApiCase testPlanApiCase = executeQueue.get(reportId);
-            try {
-                HashTree hashTree = null;
-                if (!GenerateHashTreeUtil.isResourcePool(request.getConfig()).isPool()) {
-                    hashTree = generateHashTree(testPlanApiCase.getId());
-                }
-                JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(testPlanApiCase.getId(), reportId, request.getTriggerMode(), hashTree);
-                runRequest.setConfig(request.getConfig());
-                runRequest.setPool(GenerateHashTreeUtil.isResourcePool(request.getConfig()));
-                runRequest.setTestPlanReportId(request.getPlanReportId());
-                jMeterService.run(runRequest);
-            } catch (Exception e) {
-                executeErrorList.add(testPlanApiCase.getId());
-            }
-        }
-
-        //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
-        TestPlanReportExecuteCatch.set(request.getPlanReportId(), executeErrorList);
-    }
-
-    public HashTree generateHashTree(String testId) {
-        TestPlanApiCase apiCase = testPlanApiCaseMapper.selectByPrimaryKey(testId);
-        if (apiCase != null) {
-            ApiTestCaseWithBLOBs caseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(apiCase.getApiCaseId());
-            HashTree jmeterHashTree = new HashTree();
-            MsTestPlan testPlan = new MsTestPlan();
-            testPlan.setHashTree(new LinkedList<>());
-            if (caseWithBLOBs != null) {
+        String poolId = request.getConfig() != null ? request.getConfig().getResourcePoolId() : null;
+        String mode = request.getConfig() != null ? request.getConfig().getMode() : null;
+        ApiExecutionQueue executionQueue = apiExecutionQueueService.add(executeQueue, poolId, ApiRunMode.API_PLAN.name(), request.getPlanReportId(), mode, request.getTriggerMode());
+        if (executionQueue != null) {
+            for (String reportId : executeQueue.keySet()) {
+                TestPlanApiCase testPlanApiCase = executeQueue.get(reportId);
                 try {
-                    MsThreadGroup group = new MsThreadGroup();
-                    group.setLabel(caseWithBLOBs.getName());
-                    group.setName(caseWithBLOBs.getName());
-                    MsTestElement testElement = parse(caseWithBLOBs, testId);
-                    group.setHashTree(new LinkedList<>());
-                    group.getHashTree().add(testElement);
-                    testPlan.getHashTree().add(group);
-                } catch (Exception ex) {
-                    MSException.throwException(ex.getMessage());
+                    HashTree hashTree = null;
+                    if (request.getConfig() == null || !GenerateHashTreeUtil.isResourcePool(request.getConfig().getResourcePoolId()).isPool()) {
+                        hashTree = apiScenarioSerialService.generateHashTree(testPlanApiCase.getId());
+                    }
+                    JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(testPlanApiCase.getId(), reportId, request.getTriggerMode(), hashTree);
+                    if (request.getConfig() != null) {
+                        runRequest.setPool(GenerateHashTreeUtil.isResourcePool(request.getConfig().getResourcePoolId()));
+                    }
+                    runRequest.setTestPlanReportId(request.getPlanReportId());
+                    jMeterService.run(runRequest);
+                } catch (Exception e) {
+                    executeErrorList.add(testPlanApiCase.getId());
                 }
             }
-            testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), new ParameterConfig());
-            return jmeterHashTree;
+            //如果是测试计划生成报告的执行，则更新执行信息、执行线程信息。
+            TestPlanReportExecuteCatch.set(request.getPlanReportId(), executeErrorList);
         }
-        return null;
-    }
-
-    private MsTestElement parse(ApiTestCaseWithBLOBs caseWithBLOBs, String planId) {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        try {
-            String api = caseWithBLOBs.getRequest();
-            JSONObject element = JSON.parseObject(api);
-            ElementUtil.dataFormatting(element);
-
-            LinkedList<MsTestElement> list = new LinkedList<>();
-            if (element != null && StringUtils.isNotEmpty(element.getString("hashTree"))) {
-                LinkedList<MsTestElement> elements = mapper.readValue(element.getString("hashTree"),
-                        new TypeReference<LinkedList<MsTestElement>>() {
-                        });
-                list.addAll(elements);
-            }
-            TestPlanApiCase apiCase = testPlanApiCaseMapper.selectByPrimaryKey(planId);
-            if (element.getString("type").equals("HTTPSamplerProxy")) {
-                MsHTTPSamplerProxy httpSamplerProxy = JSON.parseObject(api, MsHTTPSamplerProxy.class);
-                httpSamplerProxy.setHashTree(list);
-                httpSamplerProxy.setName(planId);
-                httpSamplerProxy.setUseEnvironment(apiCase.getEnvironmentId());
-                return httpSamplerProxy;
-            }
-            if (element.getString("type").equals("TCPSampler")) {
-                MsTCPSampler msTCPSampler = JSON.parseObject(api, MsTCPSampler.class);
-                msTCPSampler.setUseEnvironment(apiCase.getEnvironmentId());
-                msTCPSampler.setHashTree(list);
-                msTCPSampler.setName(planId);
-                return msTCPSampler;
-            }
-            if (element.getString("type").equals("DubboSampler")) {
-                MsDubboSampler dubboSampler = JSON.parseObject(api, MsDubboSampler.class);
-                dubboSampler.setUseEnvironment(apiCase.getEnvironmentId());
-                dubboSampler.setHashTree(list);
-                dubboSampler.setName(planId);
-                return dubboSampler;
-            }
-            if (element.getString("type").equals("JDBCSampler")) {
-                MsJDBCSampler jDBCSampler = JSON.parseObject(api, MsJDBCSampler.class);
-                jDBCSampler.setUseEnvironment(apiCase.getEnvironmentId());
-                jDBCSampler.setHashTree(list);
-                jDBCSampler.setName(planId);
-                return jDBCSampler;
-            }
-        } catch (Exception e) {
-            LogUtil.error(e);
-        }
-        return null;
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/exec/queue/DBTestQueue.java b/backend/src/main/java/io/metersphere/api/exec/queue/DBTestQueue.java
new file mode 100644
index 0000000000..885573a3d1
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/exec/queue/DBTestQueue.java
@@ -0,0 +1,10 @@
+package io.metersphere.api.exec.queue;
+
+import io.metersphere.base.domain.ApiExecutionQueue;
+import io.metersphere.base.domain.ApiExecutionQueueDetail;
+import lombok.Data;
+
+@Data
+public class DBTestQueue extends ApiExecutionQueue {
+    private ApiExecutionQueueDetail queue;
+}
diff --git a/backend/src/main/java/io/metersphere/api/exec/queue/ExecTask.java b/backend/src/main/java/io/metersphere/api/exec/queue/ExecTask.java
index 5947234c15..95159107db 100644
--- a/backend/src/main/java/io/metersphere/api/exec/queue/ExecTask.java
+++ b/backend/src/main/java/io/metersphere/api/exec/queue/ExecTask.java
@@ -21,9 +21,11 @@ public class ExecTask implements Runnable {
         LoggerUtil.info("开始执行报告ID：【 " + request.getReportId() + " 】,资源ID【 " + request.getTestId() + " 】");
         JMeterService jMeterService = CommonBeanFactory.getBean(JMeterService.class);
         jMeterService.addQueue(request);
-        Object res = PoolExecBlockingQueueUtil.take(request.getReportId());
-        if (res == null) {
-            LoggerUtil.info("执行报告：【 " + request.getReportId() + " 】,资源ID【 " + request.getTestId() + " 】执行超时");
+        if (request.getPool() == null || !request.getPool().isPool()) {
+            Object res = PoolExecBlockingQueueUtil.take(request.getReportId());
+            if (res == null) {
+                LoggerUtil.info("执行报告：【 " + request.getReportId() + " 】,资源ID【 " + request.getTestId() + " 】执行超时");
+            }
         }
         LoggerUtil.info("任务：【 " + request.getReportId() + " 】执行完成");
     }
diff --git a/backend/src/main/java/io/metersphere/api/exec/queue/ExecThreadPoolExecutor.java b/backend/src/main/java/io/metersphere/api/exec/queue/ExecThreadPoolExecutor.java
index 89f51426e3..78081989ad 100644
--- a/backend/src/main/java/io/metersphere/api/exec/queue/ExecThreadPoolExecutor.java
+++ b/backend/src/main/java/io/metersphere/api/exec/queue/ExecThreadPoolExecutor.java
@@ -1,6 +1,7 @@
 package io.metersphere.api.exec.queue;
 
 import io.metersphere.api.exec.utils.NamedThreadFactory;
+import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.dto.JmeterRunRequestDTO;
 import io.metersphere.utils.LoggerUtil;
 import org.apache.commons.collections.CollectionUtils;
@@ -103,6 +104,7 @@ public class ExecThreadPoolExecutor {
 
     public void setCorePoolSize(int corePoolSize) {
         try {
+            MessageCache.corePoolSize = corePoolSize;
             threadPool.setCorePoolSize(corePoolSize);
             threadPool.setMaximumPoolSize(corePoolSize);
             threadPool.allowCoreThreadTimeOut(true);
diff --git a/backend/src/main/java/io/metersphere/api/exec/queue/SerialBlockingQueueUtil.java b/backend/src/main/java/io/metersphere/api/exec/queue/SerialBlockingQueueUtil.java
deleted file mode 100644
index 51ab0e1262..0000000000
--- a/backend/src/main/java/io/metersphere/api/exec/queue/SerialBlockingQueueUtil.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.metersphere.api.exec.queue;
-
-import io.metersphere.commons.utils.LogUtil;
-import io.metersphere.constants.RunModeConstants;
-import io.metersphere.dto.ResultDTO;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.Map;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-
-public class SerialBlockingQueueUtil {
-    // 只作用与串行任务
-    public static Map<String, BlockingQueue<Object>> queue = new ConcurrentHashMap<>();
-    public static final String END_SIGN = "RUN-END";
-    private static final int QUEUE_SIZE = 1;
-
-
-    public static void offer(ResultDTO dto, Object report) {
-        String key = dto != null && StringUtils.equals(dto.getReportType(), RunModeConstants.SET_REPORT.toString()) ? dto.getReportId() + "_" + dto.getTestId() : dto.getReportId();
-        if (StringUtils.isNotEmpty(key) && queue.containsKey(key)) {
-            try {
-                queue.get(key).offer(report);
-            } catch (Exception e) {
-                LogUtil.error(e);
-            } finally {
-                queue.remove(key);
-            }
-        }
-    }
-
-    public static Object take(String key) {
-        try {
-            if (StringUtils.isNotEmpty(key) && !queue.containsKey(key)) {
-                BlockingQueue<Object> blockingQueue = new ArrayBlockingQueue<>(QUEUE_SIZE);
-                queue.put(key, blockingQueue);
-                return blockingQueue.poll(3, TimeUnit.MINUTES);
-            }
-        } catch (Exception e) {
-            LogUtil.error("获取队列失败：" + e.getMessage());
-        }
-        return null;
-    }
-
-    public static void remove(String key) {
-        if (StringUtils.isNotEmpty(key) && queue.containsKey(key)) {
-            queue.get(key).offer(END_SIGN);
-            queue.remove(key);
-        }
-    }
-}
diff --git a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioExecuteService.java b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioExecuteService.java
index 9d28d86887..206bd79bda 100644
--- a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioExecuteService.java
+++ b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioExecuteService.java
@@ -9,14 +9,10 @@ import io.metersphere.api.dto.automation.ExecuteType;
 import io.metersphere.api.dto.automation.RunScenarioRequest;
 import io.metersphere.api.dto.definition.RunDefinitionRequest;
 import io.metersphere.api.dto.definition.request.ParameterConfig;
+import io.metersphere.api.exec.queue.DBTestQueue;
 import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
 import io.metersphere.api.jmeter.JMeterService;
-import io.metersphere.api.jmeter.MessageCache;
-import io.metersphere.api.jmeter.ReportCounter;
-import io.metersphere.api.service.ApiScenarioReportService;
-import io.metersphere.api.service.ApiScenarioReportStructureService;
-import io.metersphere.api.service.RemakeReportService;
-import io.metersphere.api.service.TcpApiParamService;
+import io.metersphere.api.service.*;
 import io.metersphere.base.domain.ApiScenarioExample;
 import io.metersphere.base.domain.ApiScenarioWithBLOBs;
 import io.metersphere.base.domain.TestPlanApiScenario;
@@ -24,6 +20,7 @@ import io.metersphere.base.mapper.ApiScenarioMapper;
 import io.metersphere.base.mapper.ApiScenarioReportMapper;
 import io.metersphere.base.mapper.TestPlanApiScenarioMapper;
 import io.metersphere.base.mapper.ext.ExtApiScenarioMapper;
+import io.metersphere.commons.constants.APITestStatus;
 import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.constants.ReportTriggerMode;
 import io.metersphere.commons.constants.TriggerMode;
@@ -44,7 +41,11 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections4.comparators.FixedOrderComparator;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.jorphan.collections.HashTree;
+import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -61,6 +62,8 @@ public class ApiScenarioExecuteService {
     @Resource
     private ApiScenarioMapper apiScenarioMapper;
     @Resource
+    private ApiExecutionQueueService apiExecutionQueueService;
+    @Resource
     private ExtApiScenarioMapper extApiScenarioMapper;
     @Resource
     private TestPlanApiScenarioMapper testPlanApiScenarioMapper;
@@ -85,6 +88,8 @@ public class ApiScenarioExecuteService {
     private TcpApiParamService tcpApiParamService;
     @Resource
     private JMeterService jMeterService;
+    @Resource
+    private SqlSessionFactory sqlSessionFactory;
 
     public List<MsExecResponseDTO> run(RunScenarioRequest request) {
         if (LoggerUtil.getLogger().isDebugEnabled()) {
@@ -101,9 +106,6 @@ public class ApiScenarioExecuteService {
         if (apiScenarios != null && apiScenarios.size() == 1 && (apiScenarios.get(0).getStepTotal() == null || apiScenarios.get(0).getStepTotal() == 0)) {
             MSException.throwException((apiScenarios.get(0).getName() + "，" + Translator.get("automation_exec_info")));
         }
-        // 资源池
-        LoggerUtil.info("Scenario run-执行脚本装载-开始检查是否需要加载资源池");
-        GenerateHashTreeUtil.setPoolResource(request.getConfig());
         // 环境检查
         LoggerUtil.info("Scenario run-执行脚本装载-开始针对所有执行场景进行环境检查");
         apiScenarioEnvService.checkEnv(request, apiScenarios);
@@ -145,33 +147,41 @@ public class ApiScenarioExecuteService {
             report.setId(serialReportId);
             request.getConfig().setAmassReport(serialReportId);
             apiScenarioReportMapper.insert(report);
-
             responseDTOS.add(new MsExecResponseDTO(JSON.toJSONString(scenarioIds), serialReportId, request.getRunMode()));
-
             // 增加并行集合报告
             if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.PARALLEL.toString())) {
-                List<String> testIds = executeQueue.entrySet().stream().map(reports -> reports.getValue().getTestId()).collect(Collectors.toList());
-                ReportCounter counter = new ReportCounter();
-                counter.setCompletedIds(new LinkedList<>());
-                if (CollectionUtils.isNotEmpty(request.getConfig().getTestResources())) {
-                    counter.setPoolUrls(request.getConfig().getTestResources());
-                }
-                counter.setTestIds(testIds);
-                MessageCache.concurrencyCounter.put(serialReportId, counter);
-
-                LoggerUtil.debug("Scenario run-执行脚本装载-初始化并行集成报告队列：" + JSON.toJSONString(counter));
                 apiScenarioReportStructureService.save(apiScenarios, serialReportId);
             }
         }
         // 开始执行
         if (executeQueue != null && executeQueue.size() > 0) {
+            String reportType = request.getConfig().getReportType();
+
+            DBTestQueue executionQueue = apiExecutionQueueService.add(executeQueue, request.getConfig().getResourcePoolId(), ApiRunMode.SCENARIO.name(), serialReportId, reportType, request.getRunMode());
             if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
                 if (StringUtils.isNotEmpty(serialReportId)) {
                     apiScenarioReportStructureService.save(apiScenarios, serialReportId);
                 }
-                apiScenarioSerialService.serial(executeQueue, request, serialReportId, responseDTOS);
+                SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+                ApiScenarioReportMapper batchMapper = sqlSession.getMapper(ApiScenarioReportMapper.class);
+                // 非集合报告，先生成执行队列
+                if (StringUtils.isEmpty(serialReportId)) {
+                    for (String reportId : executeQueue.keySet()) {
+                        APIScenarioReportResult report = executeQueue.get(reportId).getReport();
+                        report.setStatus(APITestStatus.Waiting.name());
+                        batchMapper.insert(report);
+                        responseDTOS.add(new MsExecResponseDTO(executeQueue.get(reportId).getTestId(), reportId, request.getRunMode()));
+                    }
+                    sqlSession.flushStatements();
+                    if (sqlSession != null && sqlSessionFactory != null) {
+                        SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+                    }
+                }
+                if (executionQueue.getQueue() != null) {
+                    apiScenarioSerialService.serial(executionQueue, executionQueue.getQueue());
+                }
             } else {
-                apiScenarioParallelService.parallel(executeQueue, request, serialReportId, responseDTOS);
+                apiScenarioParallelService.parallel(executeQueue, request, serialReportId, responseDTOS, executionQueue.getId());
             }
         }
         return responseDTOS;
@@ -254,9 +264,12 @@ public class ApiScenarioExecuteService {
                 executeQueue.put(report.getId(), runModeDataDTO);
             } else {
                 try {
-                    // 生成报告和HashTree
-                    HashTree hashTree = GenerateHashTreeUtil.generateHashTree(scenario, reportId, planEnvMap);
-                    executeQueue.put(report.getId(), new RunModeDataDTO(hashTree, report, testPlanScenarioId));
+                    // 生成并行报告和HashTree
+                    RunModeDataDTO runModeDataDTO = new RunModeDataDTO(report, testPlanScenarioId);
+                    if (request.getConfig() != null && !request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
+                        runModeDataDTO.setHashTree(GenerateHashTreeUtil.generateHashTree(scenario, reportId, planEnvMap));
+                    }
+                    executeQueue.put(report.getId(), runModeDataDTO);
                 } catch (Exception ex) {
                     scenarioIds.remove(scenario.getId());
                     if (StringUtils.equalsAny(request.getTriggerMode(), TriggerMode.BATCH.name(), TriggerMode.SCHEDULE.name())) {
@@ -302,8 +315,12 @@ public class ApiScenarioExecuteService {
             } else {
                 // 生成报告和HashTree
                 try {
-                    HashTree hashTree = GenerateHashTreeUtil.generateHashTree(item, StringUtils.isNotEmpty(serialReportId) ? serialReportId + "-" + i : reportId, new HashMap<>());
-                    executeQueue.put(report.getId(), new RunModeDataDTO(hashTree, report, item.getId()));
+                    RunModeDataDTO runModeDataDTO = new RunModeDataDTO(report, item.getId());
+                    if (request.getConfig() != null && !request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
+                        HashTree hashTree = GenerateHashTreeUtil.generateHashTree(item, StringUtils.isNotEmpty(serialReportId) ? serialReportId + "-" + i : reportId, new HashMap<>());
+                        runModeDataDTO.setHashTree(hashTree);
+                    }
+                    executeQueue.put(report.getId(), runModeDataDTO);
                 } catch (Exception ex) {
                     scenarioIds.remove(item.getId());
                     if (StringUtils.equalsAny(request.getTriggerMode(), TriggerMode.BATCH.name(), TriggerMode.SCHEDULE.name())) {
@@ -360,9 +377,7 @@ public class ApiScenarioExecuteService {
 
         // 调用执行方法
         JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(request.getId(), request.getId(), ApiRunMode.SCENARIO.name(), hashTree);
-        runRequest.setConfig(request.getConfig());
         runRequest.setDebug(true);
-
         jMeterService.run(runRequest);
         return request.getId();
     }
diff --git a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioParallelService.java b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioParallelService.java
index 709a7df5f8..371a7f1276 100644
--- a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioParallelService.java
+++ b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioParallelService.java
@@ -30,7 +30,7 @@ public class ApiScenarioParallelService {
     @Resource
     private JMeterService jMeterService;
 
-    public void parallel(Map<String, RunModeDataDTO> executeQueue, RunScenarioRequest request, String serialReportId, List<MsExecResponseDTO> responseDTOS) {
+    public void parallel(Map<String, RunModeDataDTO> executeQueue, RunScenarioRequest request, String serialReportId, List<MsExecResponseDTO> responseDTOS, String queueId) {
         if (StringUtils.isEmpty(serialReportId)) {
             SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
             ApiScenarioReportMapper batchMapper = sqlSession.getMapper(ApiScenarioReportMapper.class);
@@ -46,14 +46,16 @@ public class ApiScenarioParallelService {
                 SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
             }
         }
-
         for (String reportId : executeQueue.keySet()) {
             JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(executeQueue.get(reportId).getTestId(), StringUtils.isNotEmpty(serialReportId) ? serialReportId : reportId, request.getRunMode(), executeQueue.get(reportId).getHashTree());
-            runRequest.setConfig(request.getConfig());
             runRequest.setReportType(StringUtils.isNotEmpty(serialReportId) ? RunModeConstants.SET_REPORT.toString() : RunModeConstants.INDEPENDENCE.toString());
-            runRequest.setPool(GenerateHashTreeUtil.isResourcePool(request.getConfig()));
+            runRequest.setQueueId(queueId);
+            if (request.getConfig() != null) {
+                runRequest.setPool(GenerateHashTreeUtil.isResourcePool(request.getConfig().getResourcePoolId()));
+                runRequest.setPoolId(request.getConfig().getResourcePoolId());
+            }
             runRequest.setTestPlanReportId(request.getTestPlanReportId());
-
+            runRequest.setHashTree(executeQueue.get(reportId).getHashTree());
             if (LoggerUtil.getLogger().isDebugEnabled()) {
                 LoggerUtil.debug("Scenario run-开始并发执行：" + JSON.toJSONString(request));
             }
diff --git a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java
index dc34e5b59f..db4312c4fa 100644
--- a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java
+++ b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java
@@ -1,142 +1,196 @@
 package io.metersphere.api.exec.scenario;
 
-import io.metersphere.api.dto.RunModeDataDTO;
-import io.metersphere.api.dto.automation.APIScenarioReportResult;
-import io.metersphere.api.dto.automation.RunScenarioRequest;
-import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.metersphere.api.dto.definition.request.ElementUtil;
+import io.metersphere.api.dto.definition.request.MsTestPlan;
+import io.metersphere.api.dto.definition.request.MsThreadGroup;
+import io.metersphere.api.dto.definition.request.ParameterConfig;
+import io.metersphere.api.dto.definition.request.sampler.MsDubboSampler;
+import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
+import io.metersphere.api.dto.definition.request.sampler.MsJDBCSampler;
+import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
 import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
 import io.metersphere.api.jmeter.JMeterService;
-import io.metersphere.api.service.ApiScenarioReportService;
 import io.metersphere.api.service.ApiTestEnvironmentService;
-import io.metersphere.base.domain.ApiScenarioReport;
-import io.metersphere.base.mapper.ApiScenarioReportMapper;
+import io.metersphere.base.domain.*;
+import io.metersphere.base.mapper.*;
 import io.metersphere.commons.constants.APITestStatus;
+import io.metersphere.commons.constants.ApiRunMode;
+import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.HashTreeUtil;
 import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.constants.RunModeConstants;
 import io.metersphere.dto.JmeterRunRequestDTO;
-import io.metersphere.dto.MsExecResponseDTO;
+import io.metersphere.plugin.core.MsTestElement;
 import io.metersphere.utils.LoggerUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.session.ExecutorType;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.jorphan.collections.HashTree;
-import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.LinkedHashMap;
-import java.util.List;
+import java.util.LinkedList;
 import java.util.Map;
 
 @Service
 public class ApiScenarioSerialService {
-
-    @Resource
-    private SqlSessionFactory sqlSessionFactory;
     @Resource
     private ApiScenarioReportMapper apiScenarioReportMapper;
     @Resource
     private JMeterService jMeterService;
     @Resource
-    private ApiScenarioReportService apiScenarioReportService;
+    private ApiScenarioMapper apiScenarioMapper;
+    @Resource
+    private ApiDefinitionExecResultMapper apiDefinitionExecResultMapper;
+    @Resource
+    private TestPlanApiCaseMapper testPlanApiCaseMapper;
+    @Resource
+    private ApiTestCaseMapper apiTestCaseMapper;
 
-    public void serial(Map<String, RunModeDataDTO> executeQueue, RunScenarioRequest request, String serialReportId, List<MsExecResponseDTO> responseDTOS) {
+    public void serial(ApiExecutionQueue executionQueue, ApiExecutionQueueDetail queue) {
         LoggerUtil.debug("Scenario run-执行脚本装载-进入串行准备");
-
-        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
-        ApiScenarioReportMapper batchMapper = sqlSession.getMapper(ApiScenarioReportMapper.class);
-        // 非集合报告，先生成执行队列
-        if (StringUtils.isEmpty(serialReportId)) {
-            for (String reportId : executeQueue.keySet()) {
-                APIScenarioReportResult report = executeQueue.get(reportId).getReport();
-                report.setStatus(APITestStatus.Waiting.name());
-                batchMapper.insert(report);
-                responseDTOS.add(new MsExecResponseDTO(executeQueue.get(reportId).getTestId(), reportId, request.getRunMode()));
-            }
-            sqlSession.flushStatements();
-            if (sqlSession != null && sqlSessionFactory != null) {
-                SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        if (!StringUtils.equals(executionQueue.getReportType(), RunModeConstants.SET_REPORT.toString())) {
+            if (StringUtils.equalsAny(executionQueue.getRunMode(), ApiRunMode.SCENARIO.name(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
+                ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(queue.getReportId());
+                report.setStatus(APITestStatus.Running.name());
+                report.setCreateTime(System.currentTimeMillis());
+                report.setUpdateTime(System.currentTimeMillis());
+                apiScenarioReportMapper.updateByPrimaryKey(report);
+            } else {
+                ApiDefinitionExecResult execResult = apiDefinitionExecResultMapper.selectByPrimaryKey(queue.getReportId());
+                execResult.setStatus(APITestStatus.Running.name());
+                apiDefinitionExecResultMapper.updateByPrimaryKey(execResult);
             }
         }
-        // 开始串行执行
-        Thread thread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                Thread.currentThread().setName("Scenario串行执行线程");
-                try {
-                    //记录串行执行中的环境参数，供下一个场景执行时使用。 <envId,<key,data>>
-                    Map<String, Map<String, String>> executeEnvParams = new LinkedHashMap<>();
-                    ApiTestEnvironmentService apiTestEnvironmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
-                    HashTreeUtil hashTreeUtil = new HashTreeUtil();
-                    for (String key : executeQueue.keySet()) {
-                        APIScenarioReportResult report = executeQueue.get(key).getReport();
-                        if (StringUtils.isEmpty(serialReportId)) {
-                            report.setStatus(APITestStatus.Running.name());
-                            report.setCreateTime(System.currentTimeMillis());
-                            report.setUpdateTime(System.currentTimeMillis());
-                            apiScenarioReportMapper.updateByPrimaryKey(report);
-                        }
 
-                        String queueReportId = StringUtils.isNotEmpty(serialReportId) ? serialReportId + "_" + executeQueue.get(key).getTestId() : key;
-                        LoggerUtil.info("Scenario run-开始执行，队列ID：【 " + queueReportId + " 】");
-                        try {
-                            if (!executeEnvParams.isEmpty()) {
-                                HashTree hashTree = executeQueue.get(key).getHashTree();
-                                hashTreeUtil.setEnvParamsMapToHashTree(hashTree, executeEnvParams);
-                                executeQueue.get(key).setHashTree(hashTree);
-                            }
-                            String reportId = StringUtils.isNotEmpty(serialReportId) ? serialReportId : key;
-                            JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(executeQueue.get(key).getTestId(), reportId, request.getRunMode(), executeQueue.get(key).getHashTree());
-                            if (request.getConfig() != null) {
-                                runRequest.setConfig(request.getConfig());
-                            }
-                            runRequest.setReportType(StringUtils.isNotEmpty(serialReportId) ? RunModeConstants.SET_REPORT.toString() : RunModeConstants.INDEPENDENCE.toString());
-                            runRequest.setPool(GenerateHashTreeUtil.isResourcePool(request.getConfig()));
-                            runRequest.setTestPlanReportId(request.getTestPlanReportId());
-
-                            // 开始执行
-                            jMeterService.run(runRequest);
-
-                            Object reportObj = SerialBlockingQueueUtil.take(queueReportId);
-                            if (reportObj == null) {
-                                LoggerUtil.info("Scenario run-进入超时补偿处理：【 " + queueReportId + " 】");
-                                ApiScenarioReport scenarioReport = apiScenarioReportMapper.selectByPrimaryKey(reportId);
-                                if (scenarioReport != null) {
-                                    scenarioReport.setStatus("Timeout");
-                                    apiScenarioReportMapper.updateByPrimaryKey(scenarioReport);
-                                }
-                            }
-                            LoggerUtil.info("Scenario run-执行完成：【 " + queueReportId + " 】");
-                            // 如果开启失败结束执行，则判断返回结果状态
-                            if (request.getConfig().isOnSampleError()) {
-                                if (reportObj != null && reportObj instanceof ApiScenarioReport) {
-                                    ApiScenarioReport scenarioReport = (ApiScenarioReport) reportObj;
-                                    if (!scenarioReport.getStatus().equals("Success")) {
-                                        break;
-                                    }
-                                }
-                            }
-
-                            Map<String, Map<String, String>> envParamsMap = hashTreeUtil.getEnvParamsDataByHashTree(executeQueue.get(key).getHashTree(), apiTestEnvironmentService);
-                            executeEnvParams = hashTreeUtil.mergeParamDataMap(executeEnvParams, envParamsMap);
-                        } catch (Exception e) {
-                            SerialBlockingQueueUtil.remove(queueReportId);
-                            LogUtil.error("执行终止：" + e.getMessage());
-                            break;
-                        }
+        LoggerUtil.info("Scenario run-开始执行，队列ID：【 " + executionQueue.getReportId() + " 】");
+        try {
+            HashTree hashTree = null;
+            if (StringUtils.isEmpty(executionQueue.getPoolId())) {
+                if (StringUtils.equalsAny(executionQueue.getRunMode(), ApiRunMode.SCENARIO.name(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
+                    ApiScenarioWithBLOBs scenario = apiScenarioMapper.selectByPrimaryKey(queue.getTestId());
+                    Map<String, String> planEnvMap = new LinkedHashMap<>();
+                    if (StringUtils.isNotEmpty(queue.getEvnMap())) {
+                        planEnvMap = JSON.parseObject(queue.getEvnMap(), Map.class);
                     }
-                    // 更新集成报告
-                    if (StringUtils.isNotEmpty(serialReportId)) {
-                        apiScenarioReportService.margeReport(serialReportId);
-                    }
-                } catch (Exception e) {
-                    LogUtil.error(e);
+                    hashTree = GenerateHashTreeUtil.generateHashTree(scenario, queue.getReportId(), planEnvMap);
+                } else {
+                    hashTree = generateHashTree(queue.getTestId());
+                }
+                // 更新环境变量
+                this.initEnv(hashTree);
+            }
+            String reportId = StringUtils.isNotEmpty(executionQueue.getReportId()) ? executionQueue.getReportId() : queue.getReportId();
+            JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(queue.getTestId(), reportId, executionQueue.getRunMode(), hashTree);
+            runRequest.setReportType(executionQueue.getReportType());
+            runRequest.setPool(GenerateHashTreeUtil.isResourcePool(executionQueue.getPoolId()));
+            runRequest.setTestPlanReportId(executionQueue.getReportId());
+            runRequest.setRunType(RunModeConstants.SERIAL.toString());
+            runRequest.setQueueId(executionQueue.getId());
+            runRequest.setPoolId(executionQueue.getPoolId());
+            // 开始执行
+            jMeterService.run(runRequest);
+        } catch (Exception e) {
+            LogUtil.error("执行终止：" + e.getMessage());
+            if (StringUtils.equalsAny(executionQueue.getRunMode(), ApiRunMode.SCENARIO.name(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
+                ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(queue.getReportId());
+                report.setStatus(APITestStatus.Error.name());
+                apiScenarioReportMapper.updateByPrimaryKey(report);
+            } else {
+                ApiDefinitionExecResult apiDefinitionExecResult = apiDefinitionExecResultMapper.selectByPrimaryKey(queue.getReportId());
+                if (apiDefinitionExecResult != null) {
+                    apiDefinitionExecResult.setStatus("timeout");
+                    apiDefinitionExecResultMapper.updateByPrimaryKey(apiDefinitionExecResult);
                 }
             }
-        });
-        thread.start();
+        }
+    }
+
+    private void initEnv(HashTree hashTree) {
+        ApiTestEnvironmentService apiTestEnvironmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
+        HashTreeUtil hashTreeUtil = new HashTreeUtil();
+        Map<String, Map<String, String>> envParamsMap = hashTreeUtil.getEnvParamsDataByHashTree(hashTree, apiTestEnvironmentService);
+        hashTreeUtil.mergeParamDataMap(null, envParamsMap);
+    }
+
+    public HashTree generateHashTree(String testId) {
+        TestPlanApiCase apiCase = testPlanApiCaseMapper.selectByPrimaryKey(testId);
+        if (apiCase != null) {
+            ApiTestCaseWithBLOBs caseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(apiCase.getApiCaseId());
+            HashTree jmeterHashTree = new HashTree();
+            MsTestPlan testPlan = new MsTestPlan();
+            testPlan.setHashTree(new LinkedList<>());
+            if (caseWithBLOBs != null) {
+                try {
+                    MsThreadGroup group = new MsThreadGroup();
+                    group.setLabel(caseWithBLOBs.getName());
+                    group.setName(caseWithBLOBs.getName());
+                    MsTestElement testElement = parse(caseWithBLOBs, testId);
+                    group.setHashTree(new LinkedList<>());
+                    group.getHashTree().add(testElement);
+                    testPlan.getHashTree().add(group);
+                } catch (Exception ex) {
+                    MSException.throwException(ex.getMessage());
+                }
+            }
+            testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), new ParameterConfig());
+            return jmeterHashTree;
+        }
+        return null;
+    }
+
+    private MsTestElement parse(ApiTestCaseWithBLOBs caseWithBLOBs, String planId) {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        try {
+            String api = caseWithBLOBs.getRequest();
+            JSONObject element = JSON.parseObject(api);
+            ElementUtil.dataFormatting(element);
+
+            LinkedList<MsTestElement> list = new LinkedList<>();
+            if (element != null && StringUtils.isNotEmpty(element.getString("hashTree"))) {
+                LinkedList<MsTestElement> elements = mapper.readValue(element.getString("hashTree"),
+                        new TypeReference<LinkedList<MsTestElement>>() {
+                        });
+                list.addAll(elements);
+            }
+            TestPlanApiCase apiCase = testPlanApiCaseMapper.selectByPrimaryKey(planId);
+            if (element.getString("type").equals("HTTPSamplerProxy")) {
+                MsHTTPSamplerProxy httpSamplerProxy = JSON.parseObject(api, MsHTTPSamplerProxy.class);
+                httpSamplerProxy.setHashTree(list);
+                httpSamplerProxy.setName(planId);
+                httpSamplerProxy.setUseEnvironment(apiCase.getEnvironmentId());
+                return httpSamplerProxy;
+            }
+            if (element.getString("type").equals("TCPSampler")) {
+                MsTCPSampler msTCPSampler = JSON.parseObject(api, MsTCPSampler.class);
+                msTCPSampler.setUseEnvironment(apiCase.getEnvironmentId());
+                msTCPSampler.setHashTree(list);
+                msTCPSampler.setName(planId);
+                return msTCPSampler;
+            }
+            if (element.getString("type").equals("DubboSampler")) {
+                MsDubboSampler dubboSampler = JSON.parseObject(api, MsDubboSampler.class);
+                dubboSampler.setUseEnvironment(apiCase.getEnvironmentId());
+                dubboSampler.setHashTree(list);
+                dubboSampler.setName(planId);
+                return dubboSampler;
+            }
+            if (element.getString("type").equals("JDBCSampler")) {
+                MsJDBCSampler jDBCSampler = JSON.parseObject(api, MsJDBCSampler.class);
+                jDBCSampler.setUseEnvironment(apiCase.getEnvironmentId());
+                jDBCSampler.setHashTree(list);
+                jDBCSampler.setName(planId);
+                return jDBCSampler;
+            }
+        } catch (Exception e) {
+            LogUtil.error(e);
+        }
+        return null;
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/exec/utils/ApiDefinitionExecResultUtil.java b/backend/src/main/java/io/metersphere/api/exec/utils/ApiDefinitionExecResultUtil.java
index 356df02577..0fced9c750 100644
--- a/backend/src/main/java/io/metersphere/api/exec/utils/ApiDefinitionExecResultUtil.java
+++ b/backend/src/main/java/io/metersphere/api/exec/utils/ApiDefinitionExecResultUtil.java
@@ -54,7 +54,7 @@ public class ApiDefinitionExecResultUtil {
             apiResult.setTriggerMode(TriggerMode.BATCH.name());
         }
         apiResult.setActuator("LOCAL");
-        if (GenerateHashTreeUtil.isResourcePool(request.getConfig()).isPool()) {
+        if (request.getConfig() != null && GenerateHashTreeUtil.isResourcePool(request.getConfig().getResourcePoolId()).isPool()) {
             apiResult.setActuator(request.getConfig().getResourcePoolId());
         }
         if (StringUtils.isEmpty(request.getUserId())) {
diff --git a/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java b/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java
index 7871fc8c74..07737a9141 100644
--- a/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java
+++ b/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java
@@ -77,26 +77,26 @@ public class GenerateHashTreeUtil {
         return new LinkedList<>();
     }
 
-    public static BooleanPool isResourcePool(RunModeConfigDTO config) {
+    public static BooleanPool isResourcePool(String id) {
         BooleanPool pool = new BooleanPool();
-        pool.setPool(config != null && StringUtils.isNotEmpty(config.getResourcePoolId()));
+        pool.setPool(StringUtils.isNotEmpty(id));
         if (pool.isPool()) {
-            TestResourcePool resourcePool = CommonBeanFactory.getBean(TestResourcePoolMapper.class).selectByPrimaryKey(config.getResourcePoolId());
+            TestResourcePool resourcePool = CommonBeanFactory.getBean(TestResourcePoolMapper.class).selectByPrimaryKey(id);
             pool.setK8s(resourcePool != null && resourcePool.getApi() && resourcePool.getType().equals(ResourcePoolTypeEnum.K8S.name()));
         }
         return pool;
     }
 
-    public static void setPoolResource(RunModeConfigDTO config) {
-        if (GenerateHashTreeUtil.isResourcePool(config).isPool()) {
-            if (GenerateHashTreeUtil.isResourcePool(config).isK8s()) {
+    public static List<JvmInfoDTO> setPoolResource(String id) {
+        if (GenerateHashTreeUtil.isResourcePool(id).isPool()) {
+            if (GenerateHashTreeUtil.isResourcePool(id).isK8s()) {
                 LogUtil.info("K8S 暂时不做校验 ");
             } else {
                 ResourcePoolCalculation resourcePoolCalculation = CommonBeanFactory.getBean(ResourcePoolCalculation.class);
-                List<JvmInfoDTO> testResources = resourcePoolCalculation.getPools(config.getResourcePoolId());
-                config.setTestResources(testResources);
+                return resourcePoolCalculation.getPools(id);
             }
         }
+        return null;
     }
 
     public static HashTree generateHashTree(ApiScenarioWithBLOBs item, String reportId, Map<String, String> planEnvMap) {
@@ -109,7 +109,7 @@ public class GenerateHashTreeUtil {
             group.setName(reportId);
             MsScenario scenario = JSONObject.parseObject(item.getScenarioDefinition(), MsScenario.class);
             group.setOnSampleError(scenario.getOnSampleError());
-            if (planEnvMap.size() > 0) {
+            if (planEnvMap != null && planEnvMap.size() > 0) {
                 scenario.setEnvironmentMap(planEnvMap);
             }
             GenerateHashTreeUtil.parse(item.getScenarioDefinition(), scenario);
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerHandler.java b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerHandler.java
deleted file mode 100644
index 9d8b3af94a..0000000000
--- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerHandler.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.metersphere.api.jmeter;
-
-
-import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
-import io.metersphere.api.service.MsResultService;
-import io.metersphere.api.service.TestResultService;
-import io.metersphere.commons.utils.CommonBeanFactory;
-import io.metersphere.dto.ResultDTO;
-import io.metersphere.utils.LoggerUtil;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.Map;
-
-public class APIBackendListenerHandler {
-    public void handleTeardownTest(ResultDTO dto, Map<String, Object> kafkaConfig) {
-        LoggerUtil.info("开始处理执行结果报告【" + dto.getReportId() + " 】,资源【 " + dto.getTestId() + " 】");
-        TestResultService testResultService = CommonBeanFactory.getBean(TestResultService.class);
-        MsResultService resultService = CommonBeanFactory.getBean(MsResultService.class);
-
-        // 无结果返回直接结束队列
-        if (dto == null || CollectionUtils.isEmpty(dto.getRequestResults())) {
-            SerialBlockingQueueUtil.offer(dto, SerialBlockingQueueUtil.END_SIGN);
-        }
-        dto.setConsole(resultService.getJmeterLogger(dto.getReportId()));
-        // 存储结果
-        testResultService.saveResults(dto);
-
-        if (StringUtils.isNotEmpty(dto.getReportId())) {
-            SerialBlockingQueueUtil.remove(dto.getReportId());
-        }
-    }
-}
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java b/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java
index 9500579835..e43f3dc980 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APISingleResultListener.java
@@ -2,6 +2,7 @@ package io.metersphere.api.jmeter;
 
 
 import io.metersphere.api.exec.queue.PoolExecBlockingQueueUtil;
+import io.metersphere.api.service.ApiExecutionQueueService;
 import io.metersphere.api.service.MsResultService;
 import io.metersphere.api.service.TestResultService;
 import io.metersphere.commons.utils.CommonBeanFactory;
@@ -23,11 +24,14 @@ public class APISingleResultListener extends MsExecListener {
     public void testEnded(ResultDTO dto, Map<String, Object> kafkaConfig) {
         try {
             LoggerUtil.info("进入TEST-END处理报告【" + dto.getReportId() + " 】整体执行完成；" + dto.getRunMode());
+
             // 全局并发队列
             PoolExecBlockingQueueUtil.offer(dto.getReportId());
             dto.setConsole(CommonBeanFactory.getBean(MsResultService.class).getJmeterLogger(dto.getReportId()));
             // 整体执行结束更新资源状态
             CommonBeanFactory.getBean(TestResultService.class).testEnded(dto);
+            LoggerUtil.info("执行队列处理：" + dto.getQueueId());
+            CommonBeanFactory.getBean(ApiExecutionQueueService.class).queueNext(dto);
         } catch (Exception e) {
             LoggerUtil.error(e);
         }
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java b/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java
index 17add78c05..d2641d55ed 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java
@@ -1,67 +1,24 @@
 package io.metersphere.api.jmeter;
 
-import com.alibaba.fastjson.JSON;
-import io.metersphere.api.service.ApiScenarioReportService;
+import io.metersphere.api.service.ApiExecutionQueueService;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.utils.LoggerUtil;
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 @Component
 public class FixedTask {
-    public static Map<String, Integer> guardTask = new HashMap<>();
-    private ApiScenarioReportService scenarioReportService;
+    private ApiExecutionQueueService queueService;
 
-    @Scheduled(cron = "*/6 * * * * ?")
+    @Scheduled(cron = "0 */5 * * * ?")
     public void execute() {
         if (MessageCache.caseExecResourceLock.size() > 10000) {
             MessageCache.caseExecResourceLock.clear();
         }
-        if (scenarioReportService == null) {
-            scenarioReportService = CommonBeanFactory.getBean(ApiScenarioReportService.class);
-        }
-        if (MessageCache.concurrencyCounter != null && MessageCache.concurrencyCounter.size() > 0) {
-            for (String key : MessageCache.concurrencyCounter.keySet()) {
-                ReportCounter counter = MessageCache.concurrencyCounter.get(key);
-                LoggerUtil.info("集成报告：【" + key + "】总执行场景：【" + counter.getTestIds().size() + "】已经执行完成场景：【" + counter.getCompletedIds().size() + "】");
-                List<String> filterList = counter.getTestIds().stream().filter(t -> !counter.getCompletedIds().contains(t)).collect(Collectors.toList());
-
-                LoggerUtil.debug("剩余要执行的报告" + JSON.toJSONString(filterList));
-                // 合并
-                if (counter.getCompletedIds().size() >= counter.getTestIds().size()) {
-                    scenarioReportService.margeReport(key);
-                    guardTask.remove(key);
-                    MessageCache.concurrencyCounter.remove(key);
-                } else {
-                    try {
-                        if (guardTask.containsKey(key)) {
-                            int number = guardTask.get(key);
-                            number += 1;
-                            guardTask.put(key, number);
-                        } else {
-                            guardTask.put(key, 0);
-                        }
-                        if (CollectionUtils.isNotEmpty(counter.getPoolUrls()) && counter.getCompletedIds().size() > 0 && guardTask.get(key) > 200) {
-                            // 资源池中已经没有执行的请求了
-                            int runningCount = scenarioReportService.get(key, counter);
-                            if (runningCount == 0) {
-                                LoggerUtil.error("发生未知异常，进行资源合并，请检查资源池是否正常运行");
-                                scenarioReportService.margeReport(key);
-                                guardTask.remove(key);
-                                MessageCache.concurrencyCounter.remove(key);
-                            }
-                        }
-                    } catch (Exception ex) {
-                        LoggerUtil.error(ex.getMessage());
-                    }
-                }
-            }
+        if (queueService == null) {
+            queueService = CommonBeanFactory.getBean(ApiExecutionQueueService.class);
         }
+        LoggerUtil.info("进入超时处理");
+        queueService.timeOut();
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
index fdf3f3565e..54f1820483 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
@@ -3,6 +3,7 @@ package io.metersphere.api.jmeter;
 import com.alibaba.fastjson.JSON;
 import io.metersphere.api.dto.RunRequest;
 import io.metersphere.api.exec.queue.ExecThreadPoolExecutor;
+import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
 import io.metersphere.api.service.ApiScenarioReportService;
 import io.metersphere.api.service.RemakeReportService;
 import io.metersphere.commons.constants.ApiRunMode;
@@ -31,6 +32,7 @@ import org.springframework.web.client.RestTemplate;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.io.File;
+import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -83,14 +85,14 @@ public class JMeterService {
         LoggerUtil.debug("监听MessageCache.tasks当前容量：" + MessageCache.jmeterLogTask.size());
         if (request.isDebug() && !StringUtils.equalsAny(request.getRunMode(), ApiRunMode.DEFINITION.name())) {
             LoggerUtil.debug("为请求 [ " + request.getReportId() + " ] 添加同步接收结果 Listener");
-            JMeterBase.addSyncListener(request, APISingleResultListener.class.getCanonicalName());
+            JMeterBase.addSyncListener(request, request.getHashTree(), APISingleResultListener.class.getCanonicalName());
         }
         if (request.isDebug()) {
             LoggerUtil.debug("为请求 [ " + request.getReportId() + " ] 添加Debug Listener");
             addDebugListener(request.getReportId(), request.getHashTree());
         } else {
             LoggerUtil.debug("为请求 [ " + request.getReportId() + " ] 添加同步接收结果 Listener");
-            JMeterBase.addSyncListener(request, APISingleResultListener.class.getCanonicalName());
+            JMeterBase.addSyncListener(request, request.getHashTree(), APISingleResultListener.class.getCanonicalName());
         }
 
         LocalRunner runner = new LocalRunner(request.getHashTree());
@@ -99,45 +101,41 @@ public class JMeterService {
 
     private void runNode(JmeterRunRequestDTO request) {
         // 获取可以执行的资源池
-        if (request.getConfig() != null) {
-            BaseSystemConfigDTO baseInfo = request.getConfig().getBaseInfo();
-            if (baseInfo == null) {
-                baseInfo = CommonBeanFactory.getBean(SystemParameterService.class).getBaseInfo();
-            }
-            // 占位符
-            String platformUrl = "http://localhost:8081";
-            if (baseInfo != null) {
-                platformUrl = baseInfo.getUrl();
-            }
-            platformUrl += "/api/jmeter/download?testId=" + request.getTestId() + "&reportId=" + request.getReportId() + "&runMode=" + request.getRunMode();
+        BaseSystemConfigDTO baseInfo = CommonBeanFactory.getBean(SystemParameterService.class).getBaseInfo();
+        // 占位符
+        String platformUrl = "http://localhost:8081";
+        if (baseInfo != null) {
+            platformUrl = baseInfo.getUrl();
+        }
+        platformUrl += "/api/jmeter/download?testId=" + request.getTestId() + "&reportId=" + request.getReportId() + "&runMode=" + request.getRunMode();
 
-            request.setPlatformUrl(platformUrl);
-            request.setKafkaConfig(KafkaConfig.getKafka());
-            // 如果是K8S调用
-            if (request.getPool().isK8s()) {
-                try {
-                    LoggerUtil.error("开始发送请求[ " + request.getTestId() + " ] 到K8S节点执行");
-                    final Engine engine = EngineFactory.createApiEngine(request);
-                    engine.start();
-                } catch (Exception e) {
-                    LoggerUtil.error("调用K8S执行请求[ " + request.getTestId() + " ] 失败：" + e.getMessage());
-                    ApiScenarioReportService apiScenarioReportService = CommonBeanFactory.getBean(ApiScenarioReportService.class);
-                    apiScenarioReportService.delete(request.getReportId());
-                    MSException.throwException(e.getMessage());
-                }
-            } else {
-                this.send(request);
+        request.setPlatformUrl(platformUrl);
+        request.setKafkaConfig(KafkaConfig.getKafka());
+        // 如果是K8S调用
+        if (request.getPool().isK8s()) {
+            try {
+                LoggerUtil.error("开始发送请求[ " + request.getTestId() + " ] 到K8S节点执行");
+                final Engine engine = EngineFactory.createApiEngine(request);
+                engine.start();
+            } catch (Exception e) {
+                LoggerUtil.error("调用K8S执行请求[ " + request.getTestId() + " ] 失败：" + e.getMessage());
+                ApiScenarioReportService apiScenarioReportService = CommonBeanFactory.getBean(ApiScenarioReportService.class);
+                apiScenarioReportService.delete(request.getReportId());
+                MSException.throwException(e.getMessage());
             }
+        } else {
+            this.send(request);
         }
     }
 
     private synchronized void send(JmeterRunRequestDTO request) {
         try {
-            int index = (int) (Math.random() * request.getConfig().getTestResources().size());
-            JvmInfoDTO jvmInfoDTO = request.getConfig().getTestResources().get(index);
+            List<JvmInfoDTO> resources = GenerateHashTreeUtil.setPoolResource(request.getPoolId());
+            int index = (int) (Math.random() * resources.size());
+            JvmInfoDTO jvmInfoDTO = resources.get(index);
             TestResourceDTO testResource = jvmInfoDTO.getTestResource();
             String configuration = testResource.getConfiguration();
-
+            request.setCorePoolSize(MessageCache.corePoolSize);
             NodeDTO node = JSON.parseObject(configuration, NodeDTO.class);
             String nodeIp = node.getIp();
             Integer port = node.getPort();
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/JmeterThreadUtils.java b/backend/src/main/java/io/metersphere/api/jmeter/JmeterThreadUtils.java
index 8830be02da..84eac7d47e 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/JmeterThreadUtils.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/JmeterThreadUtils.java
@@ -1,6 +1,5 @@
 package io.metersphere.api.jmeter;
 
-import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.commons.utils.LogUtil;
 import org.apache.commons.lang3.StringUtils;
 
@@ -17,10 +16,6 @@ public class JmeterThreadUtils {
         StringBuilder threadNames = new StringBuilder();
         for (int i = 0; i < noThreads; i++) {
             if (StringUtils.isNotEmpty(lstThreads[i].getName()) && lstThreads[i].getName().startsWith(name)) {
-                String threadName = StringUtils.substringBeforeLast(lstThreads[i].getName(), THREAD_SPLIT);
-                if (StringUtils.isNotEmpty(threadName)) {
-                    SerialBlockingQueueUtil.remove(threadName);
-                }
                 System.out.println("异常强制处理线程编号：" + i + " = " + lstThreads[i].getName());
                 LogUtil.error("异常强制处理线程编号：" + i + " = " + lstThreads[i].getName());
                 threadNames.append(lstThreads[i].getName()).append("；");
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java b/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java
index 2c3ec1a09c..1f7edd8acb 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java
@@ -10,8 +10,6 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class MessageCache {
-    public final static Map<String, ReportCounter> concurrencyCounter = new HashMap<>();
-
     public final static ConcurrentHashMap<String, Session> reportCache = new ConcurrentHashMap<>();
     // 用例并发锁
     public final static ConcurrentHashMap<String, ApiDefinitionExecResult> caseExecResourceLock = new ConcurrentHashMap<>();
@@ -20,4 +18,6 @@ public class MessageCache {
 
     // 定时任务报告
     public final static List<String> jobReportCache = new LinkedList<>();
+
+    public static int corePoolSize = 10;
 }
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java b/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java
index 07a3f863db..10c21bd9e4 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/MsDebugListener.java
@@ -19,7 +19,6 @@ package io.metersphere.api.jmeter;
 
 import com.alibaba.fastjson.JSON;
 import io.metersphere.api.dto.RunningParamKeys;
-import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.service.MsResultService;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.LogUtil;
@@ -105,7 +104,6 @@ public class MsDebugListener extends AbstractListenerElement implements SampleLi
         result.setResponseCode(TEST_END);
         ResultDTO dto = new ResultDTO();
         dto.setReportId(this.getName());
-        SerialBlockingQueueUtil.offer(dto, SerialBlockingQueueUtil.END_SIGN);
         try {
             if (client != null) {
                 client.close();
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java b/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java
index 405c67fa97..104b07b6e9 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/MsKafkaListener.java
@@ -4,9 +4,10 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.metersphere.api.exec.queue.PoolExecBlockingQueueUtil;
-import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.service.ApiEnvironmentRunningParamService;
+import io.metersphere.api.service.ApiExecutionQueueService;
 import io.metersphere.api.service.TestResultService;
+import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.config.KafkaConfig;
 import io.metersphere.dto.ResultDTO;
 import io.metersphere.utils.LoggerUtil;
@@ -28,8 +29,8 @@ public class MsKafkaListener {
         if (testResult != null && testResult.getArbitraryData() != null && testResult.getArbitraryData().containsKey("TEST_END") && (Boolean) testResult.getArbitraryData().get("TEST_END")) {
             LoggerUtil.info("报告 【 " + testResult.getReportId() + " 】资源 " + testResult.getTestId() + " 整体执行完成");
             testResultService.testEnded(testResult);
-            // 串行队列
-            SerialBlockingQueueUtil.offer(testResult, SerialBlockingQueueUtil.END_SIGN);
+            LoggerUtil.info("执行队列处理：" + testResult.getQueueId());
+            CommonBeanFactory.getBean(ApiExecutionQueueService.class).queueNext(testResult);
             // 全局并发队列
             PoolExecBlockingQueueUtil.offer(testResult.getReportId());
         } else {
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index 4c2a33202f..9b29e08195 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import io.metersphere.api.cache.TestPlanReportExecuteCatch;
 import io.metersphere.api.dto.datacount.ExecutedCaseInfoResult;
-import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiDefinitionExecResultMapper;
@@ -82,8 +81,6 @@ public class ApiDefinitionExecResultService {
             }
             if (!StringUtils.startsWithAny(item.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
                 ApiDefinitionExecResult result = this.save(item, dto.getReportId(), dto.getConsole(), count, dto.getRunMode(), dto.getTestId(), isFirst);
-                // 串行队列
-                SerialBlockingQueueUtil.offer(dto, result != null ? result : SerialBlockingQueueUtil.END_SIGN);
                 if (result != null) {
                     // 发送通知
                     sendNotice(result);
@@ -224,8 +221,6 @@ public class ApiDefinitionExecResultService {
                     //更新报告ID
                     caseReportMap.put(dto.getTestId(), saveResult.getId());
                     isFirst = false;
-                    // 串行队列
-                    SerialBlockingQueueUtil.offer(dto, SerialBlockingQueueUtil.END_SIGN);
                 }
             }
         }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiExecutionQueueService.java b/backend/src/main/java/io/metersphere/api/service/ApiExecutionQueueService.java
new file mode 100644
index 0000000000..530a668fd7
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/service/ApiExecutionQueueService.java
@@ -0,0 +1,222 @@
+package io.metersphere.api.service;
+
+import com.alibaba.fastjson.JSON;
+import io.metersphere.api.dto.RunModeDataDTO;
+import io.metersphere.api.exec.queue.DBTestQueue;
+import io.metersphere.api.exec.scenario.ApiScenarioSerialService;
+import io.metersphere.base.domain.*;
+import io.metersphere.base.mapper.ApiDefinitionExecResultMapper;
+import io.metersphere.base.mapper.ApiExecutionQueueDetailMapper;
+import io.metersphere.base.mapper.ApiExecutionQueueMapper;
+import io.metersphere.base.mapper.ApiScenarioReportMapper;
+import io.metersphere.base.mapper.ext.ExtApiExecutionQueueMapper;
+import io.metersphere.commons.constants.ApiRunMode;
+import io.metersphere.commons.utils.BeanUtils;
+import io.metersphere.constants.RunModeConstants;
+import io.metersphere.dto.ResultDTO;
+import io.metersphere.utils.LoggerUtil;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@Service
+public class ApiExecutionQueueService {
+    @Resource
+    private ApiExecutionQueueMapper queueMapper;
+    @Resource
+    private SqlSessionFactory sqlSessionFactory;
+    @Resource
+    private ApiExecutionQueueDetailMapper executionQueueDetailMapper;
+    @Resource
+    private ApiScenarioSerialService apiScenarioSerialService;
+    @Resource
+    private ApiScenarioReportService apiScenarioReportService;
+    @Resource
+    private ApiScenarioReportMapper apiScenarioReportMapper;
+    @Resource
+    private ApiDefinitionExecResultMapper apiDefinitionExecResultMapper;
+    @Resource
+    private ExtApiExecutionQueueMapper extApiExecutionQueueMapper;
+
+    public DBTestQueue add(Object runObj, String poolId, String type, String reportId, String reportType, String runMode) {
+        ApiExecutionQueue executionQueue = new ApiExecutionQueue();
+        executionQueue.setId(UUID.randomUUID().toString());
+        executionQueue.setCreateTime(System.currentTimeMillis());
+        executionQueue.setPoolId(poolId);
+        executionQueue.setReportId(reportId);
+        executionQueue.setReportType(StringUtils.isNotEmpty(reportType) ? reportType : RunModeConstants.INDEPENDENCE.toString());
+        executionQueue.setRunMode(runMode);
+        queueMapper.insert(executionQueue);
+        DBTestQueue resQueue = new DBTestQueue();
+        BeanUtils.copyBean(resQueue, executionQueue);
+
+        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+        ApiExecutionQueueDetailMapper batchMapper = sqlSession.getMapper(ApiExecutionQueueDetailMapper.class);
+        if (StringUtils.equals(type, ApiRunMode.API_PLAN.name())) {
+            final int[] sort = {0};
+            if (StringUtils.equals(reportType, RunModeConstants.PARALLEL.toString())) {
+                Map<String, TestPlanApiCase> runMap = (Map<String, TestPlanApiCase>) runObj;
+                runMap.forEach((k, v) -> {
+                    ApiExecutionQueueDetail queue = detail(k, v.getId(), type, sort[0], executionQueue.getId(), null);
+                    if (sort[0] == 0) {
+                        resQueue.setQueue(queue);
+                    }
+                    sort[0]++;
+                    batchMapper.insert(queue);
+                });
+            } else {
+                Map<TestPlanApiCase, ApiDefinitionExecResult> runMap = (Map<TestPlanApiCase, ApiDefinitionExecResult>) runObj;
+                runMap.forEach((k, v) -> {
+                    ApiExecutionQueueDetail queue = detail(v.getId(), k.getId(), type, sort[0], executionQueue.getId(), null);
+                    if (sort[0] == 0) {
+                        resQueue.setQueue(queue);
+                    }
+                    sort[0]++;
+                    batchMapper.insert(queue);
+                });
+            }
+
+        } else {
+            Map<String, RunModeDataDTO> runMap = (Map<String, RunModeDataDTO>) runObj;
+            final int[] sort = {0};
+            runMap.forEach((k, v) -> {
+                ApiExecutionQueueDetail queue = detail(k, v.getTestId(), type, sort[0], executionQueue.getId(), JSON.toJSONString(v.getPlanEnvMap()));
+                queue.setSort(sort[0]);
+                if (sort[0] == 0) {
+                    resQueue.setQueue(queue);
+                }
+                sort[0]++;
+                batchMapper.insert(queue);
+            });
+        }
+        sqlSession.flushStatements();
+        if (sqlSession != null && sqlSessionFactory != null) {
+            SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
+        }
+        return resQueue;
+    }
+
+    private ApiExecutionQueueDetail detail(String reportId, String testId, String type, int sort, String queueId, String envMap) {
+        ApiExecutionQueueDetail queue = new ApiExecutionQueueDetail();
+        queue.setCreateTime(System.currentTimeMillis());
+        queue.setId(UUID.randomUUID().toString());
+        queue.setEvnMap(envMap);
+        queue.setReportId(reportId);
+        queue.setTestId(testId);
+        queue.setType(type);
+        queue.setSort(sort);
+        queue.setQueueId(queueId);
+        return queue;
+    }
+
+    public DBTestQueue edit(String id, String testId) {
+        ApiExecutionQueue executionQueue = queueMapper.selectByPrimaryKey(id);
+        if (executionQueue != null) {
+            DBTestQueue queue = new DBTestQueue();
+            BeanUtils.copyBean(queue, executionQueue);
+            if (executionQueue != null) {
+                ApiExecutionQueueDetailExample example = new ApiExecutionQueueDetailExample();
+                example.setOrderByClause("sort asc");
+                example.createCriteria().andQueueIdEqualTo(id);
+                List<ApiExecutionQueueDetail> queues = executionQueueDetailMapper.selectByExample(example);
+                if (CollectionUtils.isNotEmpty(queues)) {
+                    List<ApiExecutionQueueDetail> list = queues.stream().filter(item -> StringUtils.equals(item.getTestId(), testId)).collect(Collectors.toList());
+                    if (CollectionUtils.isNotEmpty(list)) {
+                        executionQueueDetailMapper.deleteByPrimaryKey(list.get(0).getId());
+                        queues.remove(list.get(0));
+                        BeanUtils.copyBean(queue, executionQueue);
+                        if (CollectionUtils.isNotEmpty(queues)) {
+                            queue.setQueue(queues.get(0));
+                        }
+                    }
+                    if (CollectionUtils.isEmpty(queues)) {
+                        queueMapper.deleteByPrimaryKey(id);
+                    }
+                } else {
+                    queueMapper.deleteByPrimaryKey(id);
+                }
+            }
+            return queue;
+        }
+        return null;
+    }
+
+    public void queueNext(ResultDTO dto) {
+        DBTestQueue executionQueue = this.edit(dto.getQueueId(), dto.getTestId());
+        if (executionQueue != null) {
+            LoggerUtil.info("开始处理执行队列：" + executionQueue.getId());
+            if (executionQueue.getQueue() != null && StringUtils.isNotEmpty(executionQueue.getQueue().getTestId())) {
+                if (StringUtils.equals(dto.getRunType(), RunModeConstants.SERIAL.toString())) {
+                    LoggerUtil.info("当前执行队列是：" + JSON.toJSONString(executionQueue.getQueue()));
+                    apiScenarioSerialService.serial(executionQueue, executionQueue.getQueue());
+                }
+            } else {
+                if (StringUtils.equals(dto.getReportType(), RunModeConstants.SET_REPORT.toString())) {
+                    apiScenarioReportService.margeReport(dto.getReportId());
+                }
+                queueMapper.deleteByPrimaryKey(executionQueue.getId());
+                LoggerUtil.info("队列：" + dto.getQueueId() + " 执行结束");
+            }
+
+            ApiExecutionQueueDetailExample example = new ApiExecutionQueueDetailExample();
+            example.createCriteria().andQueueIdEqualTo(dto.getQueueId()).andTestIdEqualTo(dto.getTestId());
+            executionQueueDetailMapper.deleteByExample(example);
+        }
+    }
+
+
+    public void timeOut() {
+        final int SECOND_MILLIS = 1000;
+        final int MINUTE_MILLIS = 60 * SECOND_MILLIS;
+        long now = System.currentTimeMillis();
+        // 五分钟前的数据
+        now = now - 5 * MINUTE_MILLIS;
+        ApiExecutionQueueDetailExample example = new ApiExecutionQueueDetailExample();
+        example.createCriteria().andCreateTimeLessThan(now);
+        List<ApiExecutionQueueDetail> queueDetails = executionQueueDetailMapper.selectByExample(example);
+
+        if (CollectionUtils.isNotEmpty(queueDetails)) {
+            queueDetails.forEach(item -> {
+                if (StringUtils.equalsAny(item.getType(), ApiRunMode.SCENARIO.name(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
+                    ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(item.getReportId());
+                    if (report != null) {
+                        report.setStatus("timeout");
+                        apiScenarioReportMapper.updateByPrimaryKeySelective(report);
+                    }
+                } else {
+                    ApiDefinitionExecResult result = apiDefinitionExecResultMapper.selectByPrimaryKey(item.getReportId());
+                    if (result != null) {
+                        result.setStatus("timeout");
+                        apiDefinitionExecResultMapper.updateByPrimaryKeySelective(result);
+                    }
+                }
+                executionQueueDetailMapper.deleteByPrimaryKey(item.getId());
+            });
+        }
+
+        ApiExecutionQueueExample queueDetailExample = new ApiExecutionQueueExample();
+        queueDetailExample.createCriteria().andReportTypeEqualTo(RunModeConstants.SET_REPORT.toString()).andCreateTimeLessThan(now);
+        List<ApiExecutionQueue> executionQueues = queueMapper.selectByExample(queueDetailExample);
+        if (CollectionUtils.isNotEmpty(executionQueues)) {
+            executionQueues.forEach(item -> {
+                ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(item.getReportId());
+                if (report != null) {
+                    report.setStatus("timeout");
+                    apiScenarioReportMapper.updateByPrimaryKeySelective(report);
+                }
+            });
+        }
+        // 清除异常队列/一般是服务突然停止产生
+        extApiExecutionQueueMapper.delete();
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java b/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java
index e030a0bea8..139af4ed96 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import io.metersphere.api.dto.EnvironmentType;
 import io.metersphere.api.dto.definition.request.MsTestPlan;
 import io.metersphere.api.dto.scenario.request.BodyFile;
-import io.metersphere.api.exec.api.TestPlanApiExecuteService;
+import io.metersphere.api.exec.scenario.ApiScenarioSerialService;
 import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
 import io.metersphere.base.domain.ApiScenarioWithBLOBs;
 import io.metersphere.base.domain.JarConfig;
@@ -38,7 +38,7 @@ import java.util.zip.ZipOutputStream;
 public class ApiJmeterFileService {
 
     @Resource
-    private TestPlanApiExecuteService testPlanApiExecuteService;
+    private ApiScenarioSerialService apiScenarioSerialService;
     @Resource
     private TestPlanApiScenarioMapper testPlanApiScenarioMapper;
     @Resource
@@ -78,7 +78,7 @@ public class ApiJmeterFileService {
         }
         HashTree hashTree;
         if (StringUtils.equalsAnyIgnoreCase(runMode, ApiRunMode.DEFINITION.name(), ApiRunMode.JENKINS_API_PLAN.name(), ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.MANUAL_PLAN.name())) {
-            hashTree = testPlanApiExecuteService.generateHashTree(remoteTestId);
+            hashTree = apiScenarioSerialService.generateHashTree(remoteTestId);
         } else {
             if (scenario == null) {
                 scenario = apiScenarioMapper.selectByPrimaryKey(remoteTestId);
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
index 0d961705e0..af249440e9 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
@@ -12,8 +12,6 @@ import io.metersphere.api.dto.automation.APIScenarioReportResult;
 import io.metersphere.api.dto.automation.ExecuteType;
 import io.metersphere.api.dto.automation.ScenarioStatus;
 import io.metersphere.api.dto.datacount.ApiDataCountResult;
-import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
-import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.api.jmeter.ReportCounter;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
@@ -90,16 +88,7 @@ public class ApiScenarioReportService {
     }
 
     public ApiScenarioReport testEnded(ResultDTO dto) {
-        // 并发集成报告计数
-        if (StringUtils.equals(dto.getReportType(), RunModeConstants.SET_REPORT.toString())) {
-            LoggerUtil.info("接收到集合报告【" + dto.getReportId() + "】部分结果【" + dto.getTestId() + "】");
-            Object obj = MessageCache.concurrencyCounter.get(dto.getReportId());
-            if (obj != null) {
-                ReportCounter counter = (ReportCounter) obj;
-                counter.getCompletedIds().add(dto.getTestId());
-                MessageCache.concurrencyCounter.put(dto.getReportId(), counter);
-            }
-        } else {
+        if (!StringUtils.equals(dto.getReportType(), RunModeConstants.SET_REPORT.toString())) {
             // 更新控制台信息
             apiScenarioReportStructureService.update(dto.getReportId(), dto.getConsole());
         }
@@ -116,7 +105,6 @@ public class ApiScenarioReportService {
             scenarioReport = updateScenario(requestResults, dto);
         }
         // 串行队列
-        SerialBlockingQueueUtil.offer(dto, scenarioReport != null ? scenarioReport : SerialBlockingQueueUtil.END_SIGN);
         return scenarioReport;
     }
 
@@ -268,7 +256,12 @@ public class ApiScenarioReportService {
                 apiScenarioMapper.updateByPrimaryKey(scenario);
             }
         }
-        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), errorSize > 0 || requestResults.isEmpty() ? "Error" : "Success", dto.getRunMode());
+        String status = errorSize > 0 || requestResults.isEmpty() ? "Error" : "Success";
+        if (dto != null && dto.getArbitraryData() != null && dto.getArbitraryData().containsKey("TIMEOUT") && (Boolean) dto.getArbitraryData().get("TIMEOUT")) {
+            LoggerUtil.info("报告 【 " + dto.getReportId() + " 】资源 " + dto.getTestId() + " 执行超时");
+            status = "Timeout";
+        }
+        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), status, dto.getRunMode());
         return report;
     }
 
@@ -278,9 +271,14 @@ public class ApiScenarioReportService {
 
         Map<String, String> scenarioAndErrorMap = new HashMap<>();
         Map<String, String> planScenarioReportMap = new HashMap<>();
-
         long errorSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), "Error")).count();
-        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), errorSize > 0 || requestResults.isEmpty() ? "Error" : "Success", dto.getRunMode());
+
+        String status = errorSize > 0 || requestResults.isEmpty() ? "Error" : "Success";
+        if (dto != null && dto.getArbitraryData() != null && dto.getArbitraryData().containsKey("TIMEOUT") && (Boolean) dto.getArbitraryData().get("TIMEOUT")) {
+            LoggerUtil.info("报告 【 " + dto.getReportId() + " 】资源 " + dto.getTestId() + " 执行超时");
+            status = "Timeout";
+        }
+        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), status, dto.getRunMode());
         if (report != null) {
             if (StringUtils.isNotEmpty(dto.getTestPlanReportId()) && !testPlanReportIdList.contains(dto.getTestPlanReportId())) {
                 testPlanReportIdList.add(dto.getTestPlanReportId());
@@ -338,10 +336,7 @@ public class ApiScenarioReportService {
 
     public void margeReport(String reportId) {
         ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(reportId);
-        // 要合并的报告已经被删除
-        if (report == null) {
-            MessageCache.concurrencyCounter.remove(reportId);
-        } else {
+        if (report != null) {
             // 更新场景状态
             ApiScenarioReportResultExample example = new ApiScenarioReportResultExample();
             example.createCriteria().andReportIdEqualTo(reportId).andStatusEqualTo("Error");
@@ -358,7 +353,12 @@ public class ApiScenarioReportService {
     public ApiScenarioReport updateScenario(List<ApiScenarioReportResult> requestResults, ResultDTO dto) {
         long errorSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), "Error")).count();
         // 更新报告状态
-        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), errorSize > 0 || requestResults.isEmpty() ? "Error" : "Success", dto.getRunMode());
+        String status = errorSize > 0 || requestResults.isEmpty() ? "Error" : "Success";
+        if (dto != null && dto.getArbitraryData() != null && dto.getArbitraryData().containsKey("TIMEOUT") && (Boolean) dto.getArbitraryData().get("TIMEOUT")) {
+            LoggerUtil.info("报告 【 " + dto.getReportId() + " 】资源 " + dto.getTestId() + " 执行超时");
+            status = "Timeout";
+        }
+        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), status, dto.getRunMode());
         // 更新场景状态
         ApiScenarioWithBLOBs scenario = apiScenarioMapper.selectByPrimaryKey(dto.getTestId());
         if (scenario == null) {
@@ -478,7 +478,6 @@ public class ApiScenarioReportService {
         apiScenarioReportDetailMapper.deleteByPrimaryKey(request.getId());
         // 补充逻辑，如果是集成报告则把零时报告全部删除
         ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(request.getId());
-        MessageCache.concurrencyCounter.remove(request.getId());
         if (report != null && StringUtils.isNotEmpty(report.getScenarioId())) {
             List<String> list = getReportIds(report.getScenarioId());
             if (CollectionUtils.isNotEmpty(list)) {
@@ -506,9 +505,6 @@ public class ApiScenarioReportService {
 
     public void deleteAPIReportBatch(APIReportBatchRequest reportRequest) {
         List<String> ids = reportRequest.getIds();
-        ids.forEach(item -> {
-            MessageCache.concurrencyCounter.remove(item);
-        });
         if (reportRequest.isSelectAllDate()) {
             ids = this.idList(reportRequest);
             if (reportRequest.getUnSelectIds() != null) {
diff --git a/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java b/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java
index 4a55bb5a32..6ce25d299d 100644
--- a/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java
@@ -1,13 +1,12 @@
 package io.metersphere.api.service;
 
 import io.metersphere.api.dto.automation.ScenarioStatus;
-import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.jmeter.MessageCache;
-import io.metersphere.api.jmeter.ReportCounter;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
 import io.metersphere.commons.constants.APITestStatus;
 import io.metersphere.commons.constants.ApiRunMode;
+import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.constants.RunModeConstants;
 import io.metersphere.dto.JmeterRunRequestDTO;
@@ -36,12 +35,11 @@ public class RemakeReportService {
     public void remake(JmeterRunRequestDTO request) {
         try {
             if (StringUtils.equals(request.getReportType(), RunModeConstants.SET_REPORT.toString())) {
-                Object obj = MessageCache.concurrencyCounter.get(request.getReportId());
-                if (obj != null) {
-                    ReportCounter counter = (ReportCounter) obj;
-                    counter.getCompletedIds().add(request.getTestId());
-                    MessageCache.concurrencyCounter.put(request.getReportId(), counter);
-                }
+                ApiExecutionQueueDetailExample example = new ApiExecutionQueueDetailExample();
+                example.createCriteria().andQueueIdEqualTo(request.getQueueId()).andTestIdEqualTo(request.getTestId());
+                CommonBeanFactory.getBean(ApiExecutionQueueDetailMapper.class).deleteByExample(example);
+
+                CommonBeanFactory.getBean(ApiExecutionQueueService.class).edit(request.getQueueId(), request.getTestId());
             }
             // 清理零时报告
             if (StringUtils.equalsAnyIgnoreCase(request.getRunMode(), ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name(), ApiRunMode.JENKINS_API_PLAN.name())) {
@@ -117,7 +115,6 @@ public class RemakeReportService {
                 }
             }
             MessageCache.caseExecResourceLock.remove(request.getReportId());
-            SerialBlockingQueueUtil.remove(request.getReportId());
         } catch (Exception e) {
             LogUtil.error(e);
         }
@@ -147,6 +144,5 @@ public class RemakeReportService {
         report.setStatus(APITestStatus.Error.name());
         apiScenarioReportMapper.insert(report);
         MessageCache.caseExecResourceLock.remove(report.getId());
-        SerialBlockingQueueUtil.remove(report.getId());
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/TestResultService.java b/backend/src/main/java/io/metersphere/api/service/TestResultService.java
index d0237d1868..8bf1da1f51 100644
--- a/backend/src/main/java/io/metersphere/api/service/TestResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/TestResultService.java
@@ -1,7 +1,6 @@
 package io.metersphere.api.service;
 
 import io.metersphere.api.dto.automation.ApiTestReportVariable;
-import io.metersphere.api.exec.queue.SerialBlockingQueueUtil;
 import io.metersphere.api.jmeter.ExecutedHandleSingleton;
 import io.metersphere.base.domain.*;
 import io.metersphere.commons.constants.ApiRunMode;
@@ -97,7 +96,6 @@ public class TestResultService {
                 reportTask.setPrincipal(principal);
                 reportTask.setExecutionTime(DateUtils.getTimeString(scenarioReport.getUpdateTime()));
                 reportTask.setEnvironment(environment);
-                dto.setTestId(scenarioReport.getScenarioId());
 
                 updateScenarioTestCaseStates(dto.getTestId(), dto.getRunMode());
                 if (reportTask != null) {
@@ -107,11 +105,6 @@ public class TestResultService {
                     }
                 }
             }
-        } else {
-            // 串行队列
-            if (dto != null && org.apache.commons.collections.CollectionUtils.isEmpty(dto.getRequestResults())) {
-                SerialBlockingQueueUtil.offer(dto, SerialBlockingQueueUtil.END_SIGN);
-            }
         }
     }
 
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueue.java b/backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueue.java
new file mode 100644
index 0000000000..8c62136d80
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueue.java
@@ -0,0 +1,21 @@
+package io.metersphere.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class ApiExecutionQueue implements Serializable {
+    private String id;
+
+    private String reportId;
+
+    private String reportType;
+
+    private String runMode;
+
+    private String poolId;
+
+    private Long createTime;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueueDetail.java b/backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueueDetail.java
new file mode 100644
index 0000000000..68e242a48f
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueueDetail.java
@@ -0,0 +1,25 @@
+package io.metersphere.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class ApiExecutionQueueDetail implements Serializable {
+    private String id;
+
+    private String queueId;
+
+    private Integer sort;
+
+    private String reportId;
+
+    private String testId;
+
+    private String type;
+
+    private Long createTime;
+
+    private String evnMap;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueueDetailExample.java b/backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueueDetailExample.java
new file mode 100644
index 0000000000..0de8451b8b
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueueDetailExample.java
@@ -0,0 +1,670 @@
+package io.metersphere.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ApiExecutionQueueDetailExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public ApiExecutionQueueDetailExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueIdIsNull() {
+            addCriterion("queue_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueIdIsNotNull() {
+            addCriterion("queue_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueIdEqualTo(String value) {
+            addCriterion("queue_id =", value, "queueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueIdNotEqualTo(String value) {
+            addCriterion("queue_id <>", value, "queueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueIdGreaterThan(String value) {
+            addCriterion("queue_id >", value, "queueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueIdGreaterThanOrEqualTo(String value) {
+            addCriterion("queue_id >=", value, "queueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueIdLessThan(String value) {
+            addCriterion("queue_id <", value, "queueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueIdLessThanOrEqualTo(String value) {
+            addCriterion("queue_id <=", value, "queueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueIdLike(String value) {
+            addCriterion("queue_id like", value, "queueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueIdNotLike(String value) {
+            addCriterion("queue_id not like", value, "queueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueIdIn(List<String> values) {
+            addCriterion("queue_id in", values, "queueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueIdNotIn(List<String> values) {
+            addCriterion("queue_id not in", values, "queueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueIdBetween(String value1, String value2) {
+            addCriterion("queue_id between", value1, value2, "queueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueIdNotBetween(String value1, String value2) {
+            addCriterion("queue_id not between", value1, value2, "queueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortIsNull() {
+            addCriterion("sort is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortIsNotNull() {
+            addCriterion("sort is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortEqualTo(Integer value) {
+            addCriterion("sort =", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotEqualTo(Integer value) {
+            addCriterion("sort <>", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortGreaterThan(Integer value) {
+            addCriterion("sort >", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortGreaterThanOrEqualTo(Integer value) {
+            addCriterion("sort >=", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortLessThan(Integer value) {
+            addCriterion("sort <", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortLessThanOrEqualTo(Integer value) {
+            addCriterion("sort <=", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortIn(List<Integer> values) {
+            addCriterion("sort in", values, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotIn(List<Integer> values) {
+            addCriterion("sort not in", values, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortBetween(Integer value1, Integer value2) {
+            addCriterion("sort between", value1, value2, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotBetween(Integer value1, Integer value2) {
+            addCriterion("sort not between", value1, value2, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNull() {
+            addCriterion("report_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNotNull() {
+            addCriterion("report_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdEqualTo(String value) {
+            addCriterion("report_id =", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotEqualTo(String value) {
+            addCriterion("report_id <>", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThan(String value) {
+            addCriterion("report_id >", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThanOrEqualTo(String value) {
+            addCriterion("report_id >=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThan(String value) {
+            addCriterion("report_id <", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThanOrEqualTo(String value) {
+            addCriterion("report_id <=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLike(String value) {
+            addCriterion("report_id like", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotLike(String value) {
+            addCriterion("report_id not like", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIn(List<String> values) {
+            addCriterion("report_id in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotIn(List<String> values) {
+            addCriterion("report_id not in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdBetween(String value1, String value2) {
+            addCriterion("report_id between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotBetween(String value1, String value2) {
+            addCriterion("report_id not between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdIsNull() {
+            addCriterion("test_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdIsNotNull() {
+            addCriterion("test_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdEqualTo(String value) {
+            addCriterion("test_id =", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdNotEqualTo(String value) {
+            addCriterion("test_id <>", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdGreaterThan(String value) {
+            addCriterion("test_id >", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdGreaterThanOrEqualTo(String value) {
+            addCriterion("test_id >=", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdLessThan(String value) {
+            addCriterion("test_id <", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdLessThanOrEqualTo(String value) {
+            addCriterion("test_id <=", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdLike(String value) {
+            addCriterion("test_id like", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdNotLike(String value) {
+            addCriterion("test_id not like", value, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdIn(List<String> values) {
+            addCriterion("test_id in", values, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdNotIn(List<String> values) {
+            addCriterion("test_id not in", values, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdBetween(String value1, String value2) {
+            addCriterion("test_id between", value1, value2, "testId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTestIdNotBetween(String value1, String value2) {
+            addCriterion("test_id not between", value1, value2, "testId");
+            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 Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Long value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Long value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Long value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Long value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Long value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Long> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Long> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Long value1, Long value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Long value1, Long value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueueExample.java b/backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueueExample.java
new file mode 100644
index 0000000000..dbcd79af0c
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiExecutionQueueExample.java
@@ -0,0 +1,610 @@
+package io.metersphere.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ApiExecutionQueueExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public ApiExecutionQueueExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNull() {
+            addCriterion("report_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNotNull() {
+            addCriterion("report_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdEqualTo(String value) {
+            addCriterion("report_id =", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotEqualTo(String value) {
+            addCriterion("report_id <>", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThan(String value) {
+            addCriterion("report_id >", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThanOrEqualTo(String value) {
+            addCriterion("report_id >=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThan(String value) {
+            addCriterion("report_id <", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThanOrEqualTo(String value) {
+            addCriterion("report_id <=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLike(String value) {
+            addCriterion("report_id like", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotLike(String value) {
+            addCriterion("report_id not like", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIn(List<String> values) {
+            addCriterion("report_id in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotIn(List<String> values) {
+            addCriterion("report_id not in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdBetween(String value1, String value2) {
+            addCriterion("report_id between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotBetween(String value1, String value2) {
+            addCriterion("report_id not between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeIsNull() {
+            addCriterion("report_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeIsNotNull() {
+            addCriterion("report_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeEqualTo(String value) {
+            addCriterion("report_type =", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeNotEqualTo(String value) {
+            addCriterion("report_type <>", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeGreaterThan(String value) {
+            addCriterion("report_type >", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("report_type >=", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeLessThan(String value) {
+            addCriterion("report_type <", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeLessThanOrEqualTo(String value) {
+            addCriterion("report_type <=", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeLike(String value) {
+            addCriterion("report_type like", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeNotLike(String value) {
+            addCriterion("report_type not like", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeIn(List<String> values) {
+            addCriterion("report_type in", values, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeNotIn(List<String> values) {
+            addCriterion("report_type not in", values, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeBetween(String value1, String value2) {
+            addCriterion("report_type between", value1, value2, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeNotBetween(String value1, String value2) {
+            addCriterion("report_type not between", value1, value2, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRunModeIsNull() {
+            addCriterion("run_mode is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRunModeIsNotNull() {
+            addCriterion("run_mode is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRunModeEqualTo(String value) {
+            addCriterion("run_mode =", value, "runMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRunModeNotEqualTo(String value) {
+            addCriterion("run_mode <>", value, "runMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRunModeGreaterThan(String value) {
+            addCriterion("run_mode >", value, "runMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRunModeGreaterThanOrEqualTo(String value) {
+            addCriterion("run_mode >=", value, "runMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRunModeLessThan(String value) {
+            addCriterion("run_mode <", value, "runMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRunModeLessThanOrEqualTo(String value) {
+            addCriterion("run_mode <=", value, "runMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRunModeLike(String value) {
+            addCriterion("run_mode like", value, "runMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRunModeNotLike(String value) {
+            addCriterion("run_mode not like", value, "runMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRunModeIn(List<String> values) {
+            addCriterion("run_mode in", values, "runMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRunModeNotIn(List<String> values) {
+            addCriterion("run_mode not in", values, "runMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRunModeBetween(String value1, String value2) {
+            addCriterion("run_mode between", value1, value2, "runMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRunModeNotBetween(String value1, String value2) {
+            addCriterion("run_mode not between", value1, value2, "runMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoolIdIsNull() {
+            addCriterion("pool_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoolIdIsNotNull() {
+            addCriterion("pool_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoolIdEqualTo(String value) {
+            addCriterion("pool_id =", value, "poolId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoolIdNotEqualTo(String value) {
+            addCriterion("pool_id <>", value, "poolId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoolIdGreaterThan(String value) {
+            addCriterion("pool_id >", value, "poolId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoolIdGreaterThanOrEqualTo(String value) {
+            addCriterion("pool_id >=", value, "poolId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoolIdLessThan(String value) {
+            addCriterion("pool_id <", value, "poolId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoolIdLessThanOrEqualTo(String value) {
+            addCriterion("pool_id <=", value, "poolId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoolIdLike(String value) {
+            addCriterion("pool_id like", value, "poolId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoolIdNotLike(String value) {
+            addCriterion("pool_id not like", value, "poolId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoolIdIn(List<String> values) {
+            addCriterion("pool_id in", values, "poolId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoolIdNotIn(List<String> values) {
+            addCriterion("pool_id not in", values, "poolId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoolIdBetween(String value1, String value2) {
+            addCriterion("pool_id between", value1, value2, "poolId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoolIdNotBetween(String value1, String value2) {
+            addCriterion("pool_id not between", value1, value2, "poolId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Long value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Long value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Long value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Long value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Long value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Long> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Long> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Long value1, Long value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Long value1, Long value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueDetailMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueDetailMapper.java
new file mode 100644
index 0000000000..f239d7940a
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueDetailMapper.java
@@ -0,0 +1,36 @@
+package io.metersphere.base.mapper;
+
+import io.metersphere.base.domain.ApiExecutionQueueDetail;
+import io.metersphere.base.domain.ApiExecutionQueueDetailExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ApiExecutionQueueDetailMapper {
+    long countByExample(ApiExecutionQueueDetailExample example);
+
+    int deleteByExample(ApiExecutionQueueDetailExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(ApiExecutionQueueDetail record);
+
+    int insertSelective(ApiExecutionQueueDetail record);
+
+    List<ApiExecutionQueueDetail> selectByExampleWithBLOBs(ApiExecutionQueueDetailExample example);
+
+    List<ApiExecutionQueueDetail> selectByExample(ApiExecutionQueueDetailExample example);
+
+    ApiExecutionQueueDetail selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") ApiExecutionQueueDetail record, @Param("example") ApiExecutionQueueDetailExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") ApiExecutionQueueDetail record, @Param("example") ApiExecutionQueueDetailExample example);
+
+    int updateByExample(@Param("record") ApiExecutionQueueDetail record, @Param("example") ApiExecutionQueueDetailExample example);
+
+    int updateByPrimaryKeySelective(ApiExecutionQueueDetail record);
+
+    int updateByPrimaryKeyWithBLOBs(ApiExecutionQueueDetail record);
+
+    int updateByPrimaryKey(ApiExecutionQueueDetail record);
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueDetailMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueDetailMapper.xml
new file mode 100644
index 0000000000..47fc27fc86
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueDetailMapper.xml
@@ -0,0 +1,304 @@
+<?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.base.mapper.ApiExecutionQueueDetailMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.base.domain.ApiExecutionQueueDetail">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="queue_id" jdbcType="VARCHAR" property="queueId" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
+    <result column="report_id" jdbcType="VARCHAR" property="reportId" />
+    <result column="test_id" jdbcType="VARCHAR" property="testId" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="create_time" jdbcType="BIGINT" property="createTime" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.ApiExecutionQueueDetail">
+    <result column="evn_map" jdbcType="LONGVARCHAR" property="evnMap" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, queue_id, sort, report_id, test_id, `type`, create_time
+  </sql>
+  <sql id="Blob_Column_List">
+    evn_map
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.base.domain.ApiExecutionQueueDetailExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from api_execution_queue_detail
+    <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.base.domain.ApiExecutionQueueDetailExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from api_execution_queue_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from api_execution_queue_detail
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from api_execution_queue_detail
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.metersphere.base.domain.ApiExecutionQueueDetailExample">
+    delete from api_execution_queue_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.metersphere.base.domain.ApiExecutionQueueDetail">
+    insert into api_execution_queue_detail (id, queue_id, sort, 
+      report_id, test_id, `type`, 
+      create_time, evn_map)
+    values (#{id,jdbcType=VARCHAR}, #{queueId,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, 
+      #{reportId,jdbcType=VARCHAR}, #{testId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=BIGINT}, #{evnMap,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="io.metersphere.base.domain.ApiExecutionQueueDetail">
+    insert into api_execution_queue_detail
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="queueId != null">
+        queue_id,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
+      <if test="reportId != null">
+        report_id,
+      </if>
+      <if test="testId != null">
+        test_id,
+      </if>
+      <if test="type != null">
+        `type`,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="evnMap != null">
+        evn_map,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="queueId != null">
+        #{queueId,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="reportId != null">
+        #{reportId,jdbcType=VARCHAR},
+      </if>
+      <if test="testId != null">
+        #{testId,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="evnMap != null">
+        #{evnMap,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.metersphere.base.domain.ApiExecutionQueueDetailExample" resultType="java.lang.Long">
+    select count(*) from api_execution_queue_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update api_execution_queue_detail
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.queueId != null">
+        queue_id = #{record.queueId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sort != null">
+        sort = #{record.sort,jdbcType=INTEGER},
+      </if>
+      <if test="record.reportId != null">
+        report_id = #{record.reportId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.testId != null">
+        test_id = #{record.testId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null">
+        `type` = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.evnMap != null">
+        evn_map = #{record.evnMap,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update api_execution_queue_detail
+    set id = #{record.id,jdbcType=VARCHAR},
+      queue_id = #{record.queueId,jdbcType=VARCHAR},
+      sort = #{record.sort,jdbcType=INTEGER},
+      report_id = #{record.reportId,jdbcType=VARCHAR},
+      test_id = #{record.testId,jdbcType=VARCHAR},
+      `type` = #{record.type,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT},
+      evn_map = #{record.evnMap,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update api_execution_queue_detail
+    set id = #{record.id,jdbcType=VARCHAR},
+      queue_id = #{record.queueId,jdbcType=VARCHAR},
+      sort = #{record.sort,jdbcType=INTEGER},
+      report_id = #{record.reportId,jdbcType=VARCHAR},
+      test_id = #{record.testId,jdbcType=VARCHAR},
+      `type` = #{record.type,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.ApiExecutionQueueDetail">
+    update api_execution_queue_detail
+    <set>
+      <if test="queueId != null">
+        queue_id = #{queueId,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="reportId != null">
+        report_id = #{reportId,jdbcType=VARCHAR},
+      </if>
+      <if test="testId != null">
+        test_id = #{testId,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        `type` = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="evnMap != null">
+        evn_map = #{evnMap,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.ApiExecutionQueueDetail">
+    update api_execution_queue_detail
+    set queue_id = #{queueId,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=INTEGER},
+      report_id = #{reportId,jdbcType=VARCHAR},
+      test_id = #{testId,jdbcType=VARCHAR},
+      `type` = #{type,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT},
+      evn_map = #{evnMap,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.ApiExecutionQueueDetail">
+    update api_execution_queue_detail
+    set queue_id = #{queueId,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=INTEGER},
+      report_id = #{reportId,jdbcType=VARCHAR},
+      test_id = #{testId,jdbcType=VARCHAR},
+      `type` = #{type,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueMapper.java
new file mode 100644
index 0000000000..44e4f3d5b2
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueMapper.java
@@ -0,0 +1,30 @@
+package io.metersphere.base.mapper;
+
+import io.metersphere.base.domain.ApiExecutionQueue;
+import io.metersphere.base.domain.ApiExecutionQueueExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ApiExecutionQueueMapper {
+    long countByExample(ApiExecutionQueueExample example);
+
+    int deleteByExample(ApiExecutionQueueExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(ApiExecutionQueue record);
+
+    int insertSelective(ApiExecutionQueue record);
+
+    List<ApiExecutionQueue> selectByExample(ApiExecutionQueueExample example);
+
+    ApiExecutionQueue selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") ApiExecutionQueue record, @Param("example") ApiExecutionQueueExample example);
+
+    int updateByExample(@Param("record") ApiExecutionQueue record, @Param("example") ApiExecutionQueueExample example);
+
+    int updateByPrimaryKeySelective(ApiExecutionQueue record);
+
+    int updateByPrimaryKey(ApiExecutionQueue record);
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueMapper.xml
new file mode 100644
index 0000000000..9fc157c7f0
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiExecutionQueueMapper.xml
@@ -0,0 +1,228 @@
+<?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.base.mapper.ApiExecutionQueueMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.base.domain.ApiExecutionQueue">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="report_id" jdbcType="VARCHAR" property="reportId" />
+    <result column="report_type" jdbcType="VARCHAR" property="reportType" />
+    <result column="run_mode" jdbcType="VARCHAR" property="runMode" />
+    <result column="pool_id" jdbcType="VARCHAR" property="poolId" />
+    <result column="create_time" jdbcType="BIGINT" property="createTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, report_id, report_type, run_mode, pool_id, create_time
+  </sql>
+  <select id="selectByExample" parameterType="io.metersphere.base.domain.ApiExecutionQueueExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from api_execution_queue
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from api_execution_queue
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from api_execution_queue
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.metersphere.base.domain.ApiExecutionQueueExample">
+    delete from api_execution_queue
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.metersphere.base.domain.ApiExecutionQueue">
+    insert into api_execution_queue (id, report_id, report_type, 
+      run_mode, pool_id, create_time
+      )
+    values (#{id,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, #{reportType,jdbcType=VARCHAR}, 
+      #{runMode,jdbcType=VARCHAR}, #{poolId,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="io.metersphere.base.domain.ApiExecutionQueue">
+    insert into api_execution_queue
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="reportId != null">
+        report_id,
+      </if>
+      <if test="reportType != null">
+        report_type,
+      </if>
+      <if test="runMode != null">
+        run_mode,
+      </if>
+      <if test="poolId != null">
+        pool_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="reportId != null">
+        #{reportId,jdbcType=VARCHAR},
+      </if>
+      <if test="reportType != null">
+        #{reportType,jdbcType=VARCHAR},
+      </if>
+      <if test="runMode != null">
+        #{runMode,jdbcType=VARCHAR},
+      </if>
+      <if test="poolId != null">
+        #{poolId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.metersphere.base.domain.ApiExecutionQueueExample" resultType="java.lang.Long">
+    select count(*) from api_execution_queue
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update api_execution_queue
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reportId != null">
+        report_id = #{record.reportId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reportType != null">
+        report_type = #{record.reportType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.runMode != null">
+        run_mode = #{record.runMode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.poolId != null">
+        pool_id = #{record.poolId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=BIGINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update api_execution_queue
+    set id = #{record.id,jdbcType=VARCHAR},
+      report_id = #{record.reportId,jdbcType=VARCHAR},
+      report_type = #{record.reportType,jdbcType=VARCHAR},
+      run_mode = #{record.runMode,jdbcType=VARCHAR},
+      pool_id = #{record.poolId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.ApiExecutionQueue">
+    update api_execution_queue
+    <set>
+      <if test="reportId != null">
+        report_id = #{reportId,jdbcType=VARCHAR},
+      </if>
+      <if test="reportType != null">
+        report_type = #{reportType,jdbcType=VARCHAR},
+      </if>
+      <if test="runMode != null">
+        run_mode = #{runMode,jdbcType=VARCHAR},
+      </if>
+      <if test="poolId != null">
+        pool_id = #{poolId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.ApiExecutionQueue">
+    update api_execution_queue
+    set report_id = #{reportId,jdbcType=VARCHAR},
+      report_type = #{reportType,jdbcType=VARCHAR},
+      run_mode = #{runMode,jdbcType=VARCHAR},
+      pool_id = #{poolId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiExecutionQueueMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiExecutionQueueMapper.java
new file mode 100644
index 0000000000..00540f5fb9
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiExecutionQueueMapper.java
@@ -0,0 +1,5 @@
+package io.metersphere.base.mapper.ext;
+
+public interface ExtApiExecutionQueueMapper {
+    void delete();
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiExecutionQueueMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiExecutionQueueMapper.xml
new file mode 100644
index 0000000000..8c210a8ea6
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiExecutionQueueMapper.xml
@@ -0,0 +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.base.mapper.ext.ExtApiExecutionQueueMapper">
+    <delete id="delete">
+        DELETE from api_execution_queue where id not IN (SELECT t1.queue_id from api_execution_queue_detail t1);
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/task/service/TaskService.java b/backend/src/main/java/io/metersphere/task/service/TaskService.java
index 82e733debb..4c43048517 100644
--- a/backend/src/main/java/io/metersphere/task/service/TaskService.java
+++ b/backend/src/main/java/io/metersphere/task/service/TaskService.java
@@ -192,6 +192,5 @@ public class TaskService {
         } else {
             new LocalRunner().stop(request.getReportId());
         }
-        MessageCache.concurrencyCounter.remove(request.getReportId());
     }
 }
diff --git a/backend/src/main/resources/db/migration/V103__v1.16_release.sql b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
index 909a44ed2a..c279de3b7d 100644
--- a/backend/src/main/resources/db/migration/V103__v1.16_release.sql
+++ b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
@@ -70,5 +70,29 @@ CREATE TABLE IF NOT EXISTS `api_scenario_report_structure`
 INSERT INTO user_group_permission (id, group_id, permission_id, module_id)
 VALUES (UUID(), 'project_app_manager', 'PROJECT_APP_MANAGER:READ+EDIT', 'PROJECT_APP_MANAGER');
 
+CREATE TABLE IF NOT EXISTS `api_execution_queue`
+(
+   `id` varchar(50) NOT NULL COMMENT 'ID',
+   `test_queue` LONGTEXT COMMENT '执行资源Id队列fifo',
+	 `report_id` varchar(100) COMMENT '集合报告/测试计划报告',
+	 `report_type` varchar(100) COMMENT '报告类型/计划报告/单独报告',
+	 `run_mode` varchar(100) COMMENT '执行模式/scenario/api/test_paln_api/test_pan_scenario',
+	 `pool_id` varchar(100) DEFAULT NULL  COMMENT '执行资源池',
+    create_time bigint(13)  NULL COMMENT '创建时间',
+	PRIMARY KEY (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
+
+
+CREATE TABLE IF NOT EXISTS `api_execution_queue_detail`
+(
+   `id` varchar(50) NOT NULL COMMENT 'ID',
+   `queue_id` LONGTEXT COMMENT '队列id',
+     `report_id` varchar(100) COMMENT '报告id',
+     `test_id` varchar(100) COMMENT '资源id',
+     `evn_map` varchar(100) COMMENT '环境',
+     `type` varchar(100) DEFAULT NULL  COMMENT '资源类型',
+    create_time bigint(13)  NULL COMMENT '创建时间',
+	PRIMARY KEY (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
 ALTER TABLE load_test
     MODIFY name VARCHAR(255) NOT NULL COMMENT 'Test name';
\ No newline at end of file

From 463fa89850b8133138d4157c9a9f82202b5e6277 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Tue, 21 Dec 2021 13:12:59 +0800
Subject: [PATCH 222/256] =?UTF-8?q?style:=20flyway=20=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V103__v1.16_release.sql      | 69 +++++++++----------
 1 file changed, 32 insertions(+), 37 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V103__v1.16_release.sql b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
index c279de3b7d..21b509d37c 100644
--- a/backend/src/main/resources/db/migration/V103__v1.16_release.sql
+++ b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
@@ -9,9 +9,14 @@ ALTER TABLE project
     ADD third_part_template tinyint(1) DEFAULT 0 NULL COMMENT '是否使用第三方平台缺陷模板';
 
 -- 处理历史数据
-UPDATE issue_template SET platform = 'Local' WHERE platform = 'metersphere';
-UPDATE project p JOIN issue_template it on p.issue_template_id = it.id SET p.platform = it.platform;
-UPDATE custom_field SET `type` = 'date' WHERE `type` = 'data';
+UPDATE issue_template
+SET platform = 'Local'
+WHERE platform = 'metersphere';
+UPDATE project p JOIN issue_template it ON p.issue_template_id = it.id
+SET p.platform = it.platform;
+UPDATE custom_field
+SET `type` = 'date'
+WHERE `type` = 'data';
 
 -- 公共用例库
 ALTER TABLE project
@@ -23,48 +28,38 @@ ALTER TABLE test_case
     ADD case_public tinyint(1) DEFAULT NULL COMMENT '是否是公共用例';
 
 -- 执行结果优化
-alter table api_scenario_report add report_version int null;
+ALTER TABLE api_scenario_report
+    ADD report_version int NULL;
 
 CREATE TABLE IF NOT EXISTS `api_scenario_report_result`
 (
-    `id` varchar(50) NOT NULL COMMENT 'ID',
-    `resource_id` VARCHAR(200) DEFAULT NULL COMMENT '请求资源 id',
-    `report_id` VARCHAR(50) DEFAULT NULL COMMENT '报告 id',
-    `create_time` bigint(13)  NULL COMMENT '创建时间',
-    `status` varchar(100) null COMMENT '结果状态',
-    `request_time` bigint(13) null COMMENT '请求时间',
-	`total_assertions` bigint(13) null COMMENT '总断言数',
-    `pass_assertions` bigint(13) null COMMENT '失败断言数',
-    `content` longblob  COMMENT '执行结果',
+    `id`               varchar(50)  NOT NULL COMMENT 'ID',
+    `resource_id`      VARCHAR(200) DEFAULT NULL COMMENT '请求资源 id',
+    `report_id`        VARCHAR(50)  DEFAULT NULL COMMENT '报告 id',
+    `create_time`      bigint(13)   NULL COMMENT '创建时间',
+    `status`           varchar(100) NULL COMMENT '结果状态',
+    `request_time`     bigint(13)   NULL COMMENT '请求时间',
+    `total_assertions` bigint(13)   NULL COMMENT '总断言数',
+    `pass_assertions`  bigint(13)   NULL COMMENT '失败断言数',
+    `content`          longblob COMMENT '执行结果',
     PRIMARY KEY (`id`),
     KEY `index_resource_id` (`resource_id`) USING BTREE
-) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci;
 
 CREATE TABLE IF NOT EXISTS `api_scenario_report_structure`
 (
-    `id` varchar
-(
-    50
-) NOT NULL COMMENT 'ID',
-    `report_id` VARCHAR
-(
-    50
-) DEFAULT NULL COMMENT '请求资源 id',
-    `create_time` bigint
-(
-    13
-) NULL COMMENT '创建时间',
-    `resource_tree` longblob DEFAULT NULL COMMENT '资源步骤结构树',
-    `console` LONGTEXT DEFAULT NULL COMMENT '执行日志',
-    PRIMARY KEY
-(
-    `id`
-),
-    KEY `index_report_id`
-(
-    `report_id`
-) USING BTREE
-    ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
+    `id`            varchar(50) NOT NULL COMMENT 'ID',
+    `report_id`     VARCHAR(50) DEFAULT NULL COMMENT '请求资源 id',
+    `create_time`   bigint(13)  NULL COMMENT '创建时间',
+    `resource_tree` longblob    DEFAULT NULL COMMENT '资源步骤结构树',
+    `console`       LONGTEXT    DEFAULT NULL COMMENT '执行日志',
+    PRIMARY KEY (`id`),
+    KEY `index_report_id` (`report_id`) USING BTREE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci;
 
 
 INSERT INTO user_group_permission (id, group_id, permission_id, module_id)

From 3d2e0362c823a159d92e17634704296138d9225e Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 21 Dec 2021 12:56:40 +0800
Subject: [PATCH 223/256] =?UTF-8?q?fix(Mock=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3Mock=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=97=B6=E9=83=A8=E5=88=86rest=E5=8F=82=E6=95=B0=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=8C=B9=E9=85=8D=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009070 --user=宋天阳 【接口测试】mock测试，rest参数匹配失败
https://www.tapd.cn/55049933/s/1084084
---
 .../java/io/metersphere/api/dto/mock/MockApiUtils.java   | 9 +--------
 .../io/metersphere/api/service/MockConfigService.java    | 6 ++++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/mock/MockApiUtils.java b/backend/src/main/java/io/metersphere/api/dto/mock/MockApiUtils.java
index 8c75206225..fc73959566 100644
--- a/backend/src/main/java/io/metersphere/api/dto/mock/MockApiUtils.java
+++ b/backend/src/main/java/io/metersphere/api/dto/mock/MockApiUtils.java
@@ -489,14 +489,7 @@ public class MockApiUtils {
             return returnJson;
         } else if (StringUtils.startsWithIgnoreCase(request.getContentType(), "text/xml")) {
             String xmlString = readXml(request);
-
-            org.json.JSONObject xmlJSONObj = XML.toJSONObject(xmlString);
-            String jsonStr = xmlJSONObj.toString();
-            JSONObject object = null;
-            try {
-                object = JSONObject.parseObject(jsonStr);
-            } catch (Exception e) {
-            }
+            JSONObject object = XMLUtils.XmlToJson(xmlString);
             return object;
         } else if (StringUtils.startsWithIgnoreCase(request.getContentType(), "application/x-www-form-urlencoded")) {
             JSONObject object = new JSONObject();
diff --git a/backend/src/main/java/io/metersphere/api/service/MockConfigService.java b/backend/src/main/java/io/metersphere/api/service/MockConfigService.java
index ab46220191..7c7790d764 100644
--- a/backend/src/main/java/io/metersphere/api/service/MockConfigService.java
+++ b/backend/src/main/java/io/metersphere/api/service/MockConfigService.java
@@ -365,8 +365,10 @@ public class MockConfigService {
                 if (jsonObject.containsKey("name") && jsonObject.containsKey("value")) {
                     String headerName = jsonObject.getString("name");
                     String headerValue = jsonObject.getString("value");
-                    if (!requestHeaderMap.containsKey(headerName) || !StringUtils.equals(requestHeaderMap.get(headerName), headerValue)) {
-                        return false;
+                    if(StringUtils.isNotEmpty(headerName)){
+                        if (!requestHeaderMap.containsKey(headerName) || !StringUtils.equals(requestHeaderMap.get(headerName), headerValue)) {
+                            return false;
+                        }
                     }
                 }
             }

From 19a61665de47453e42db139b0a7c1ea257841ab9 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 21 Dec 2021 14:33:13 +0800
Subject: [PATCH 224/256] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A):=20=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E7=9A=84=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加项目报告的操作日志记录
---
 .../EnterpriseTestReportReference.java           | 16 ++++++++++++++++
 backend/src/main/java/io/metersphere/xpack       |  2 +-
 .../resources/i18n/messages_en_US.properties     |  2 ++
 .../resources/i18n/messages_zh_CN.properties     |  2 ++
 .../resources/i18n/messages_zh_TW.properties     |  2 ++
 frontend/src/business/components/xpack           |  2 +-
 6 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/log/vo/reportstatistics/EnterpriseTestReportReference.java

diff --git a/backend/src/main/java/io/metersphere/log/vo/reportstatistics/EnterpriseTestReportReference.java b/backend/src/main/java/io/metersphere/log/vo/reportstatistics/EnterpriseTestReportReference.java
new file mode 100644
index 0000000000..415259f08e
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/log/vo/reportstatistics/EnterpriseTestReportReference.java
@@ -0,0 +1,16 @@
+package io.metersphere.log.vo.reportstatistics;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class EnterpriseTestReportReference {
+    public static Map<String, String> enterpriseTestReportColumns = new LinkedHashMap<>();
+
+    static {
+        enterpriseTestReportColumns.clear();
+        enterpriseTestReportColumns.put("name", "报告名称");
+        enterpriseTestReportColumns.put("createUser", "创建人");
+        enterpriseTestReportColumns.put("updateUser", "修改人");
+        enterpriseTestReportColumns.put("status", "报告状态");
+    }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index fcc6073110..8e54dfc4cd 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit fcc6073110adde4f6a67833046a7346721602fd0
+Subproject commit 8e54dfc4cd510f2d676787dad1599067ac02f2d9
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index acea013e9e..d9ef3221d3 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -284,3 +284,5 @@ test_case_status=Case status
 id_not_rightful=ID is not rightful
 # mock
 mock_warning=No matching Mock expectation was found
+#项目报告
+enterprise_test_report=Enterprise report
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index 5f24c862cb..9f11a35f49 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -283,3 +283,5 @@ test_case_status=用例状态
 id_not_rightful=ID 不合法
 # mock
 mock_warning=未找到匹配的Mock期望
+#项目报告
+enterprise_test_report=项目报告
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 8e22d67225..a233421645 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -284,3 +284,5 @@ test_case_status=用例狀態
 id_not_rightful=ID 不合法
 # mock
 mock_warning=未找到匹配的Mock期望
+#项目报告
+enterprise_test_report=項目報告
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 15c9f3a9bc..a598375541 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 15c9f3a9bc321f4efa609f83cbbb81df98720852
+Subproject commit a598375541a45898616db5085fd38c192bd6df4b

From 94f610181d8ee56ead2cbd0fee971795053402ec Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 21 Dec 2021 14:51:32 +0800
Subject: [PATCH 225/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E8=B6=85=E6=97=B6=E6=8A=A5=E5=91=8A=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TestPlanReportListenerScheduled.java      |  2 +-
 .../api/service/ApiExecutionQueueService.java | 11 +++++-----
 .../db/migration/V103__v1.16_release.sql      | 20 +++++++++----------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/exec/schedule/TestPlanReportListenerScheduled.java b/backend/src/main/java/io/metersphere/api/exec/schedule/TestPlanReportListenerScheduled.java
index 25d2e1946b..610505dc4e 100644
--- a/backend/src/main/java/io/metersphere/api/exec/schedule/TestPlanReportListenerScheduled.java
+++ b/backend/src/main/java/io/metersphere/api/exec/schedule/TestPlanReportListenerScheduled.java
@@ -26,9 +26,9 @@ public class TestPlanReportListenerScheduled {
     }
 
     private void listener(String planReportId) {
-        LoggerUtil.info("检查测试计划执行报告：【" + planReportId + "】");
         if (TestPlanReportExecuteCatch.getTestPlanExecuteInfo(planReportId) != null) {
             if (!CommonBeanFactory.getBean(ExecThreadPoolExecutor.class).checkPlanReport(planReportId)) {
+                LoggerUtil.info("检查测试计划执行报告：【" + planReportId + "】");
                 CommonBeanFactory.getBean(TestPlanReportService.class).countReport(planReportId);
             }
         } else {
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiExecutionQueueService.java b/backend/src/main/java/io/metersphere/api/service/ApiExecutionQueueService.java
index 530a668fd7..d53877f287 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiExecutionQueueService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiExecutionQueueService.java
@@ -11,6 +11,7 @@ import io.metersphere.base.mapper.ApiExecutionQueueMapper;
 import io.metersphere.base.mapper.ApiScenarioReportMapper;
 import io.metersphere.base.mapper.ext.ExtApiExecutionQueueMapper;
 import io.metersphere.commons.constants.ApiRunMode;
+import io.metersphere.commons.constants.TestPlanReportStatus;
 import io.metersphere.commons.utils.BeanUtils;
 import io.metersphere.constants.RunModeConstants;
 import io.metersphere.dto.ResultDTO;
@@ -179,8 +180,8 @@ public class ApiExecutionQueueService {
         final int SECOND_MILLIS = 1000;
         final int MINUTE_MILLIS = 60 * SECOND_MILLIS;
         long now = System.currentTimeMillis();
-        // 五分钟前的数据
-        now = now - 5 * MINUTE_MILLIS;
+        // 八分钟前的数据
+        now = now - 8 * MINUTE_MILLIS;
         ApiExecutionQueueDetailExample example = new ApiExecutionQueueDetailExample();
         example.createCriteria().andCreateTimeLessThan(now);
         List<ApiExecutionQueueDetail> queueDetails = executionQueueDetailMapper.selectByExample(example);
@@ -189,13 +190,13 @@ public class ApiExecutionQueueService {
             queueDetails.forEach(item -> {
                 if (StringUtils.equalsAny(item.getType(), ApiRunMode.SCENARIO.name(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
                     ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(item.getReportId());
-                    if (report != null) {
+                    if (report != null && StringUtils.equalsAny(report.getStatus(), TestPlanReportStatus.RUNNING.name())) {
                         report.setStatus("timeout");
                         apiScenarioReportMapper.updateByPrimaryKeySelective(report);
                     }
                 } else {
                     ApiDefinitionExecResult result = apiDefinitionExecResultMapper.selectByPrimaryKey(item.getReportId());
-                    if (result != null) {
+                    if (result != null && StringUtils.equalsAny(result.getStatus(), TestPlanReportStatus.RUNNING.name())) {
                         result.setStatus("timeout");
                         apiDefinitionExecResultMapper.updateByPrimaryKeySelective(result);
                     }
@@ -210,7 +211,7 @@ public class ApiExecutionQueueService {
         if (CollectionUtils.isNotEmpty(executionQueues)) {
             executionQueues.forEach(item -> {
                 ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(item.getReportId());
-                if (report != null) {
+                if (report != null && StringUtils.equalsAny(report.getStatus(), TestPlanReportStatus.RUNNING.name())) {
                     report.setStatus("timeout");
                     apiScenarioReportMapper.updateByPrimaryKeySelective(report);
                 }
diff --git a/backend/src/main/resources/db/migration/V103__v1.16_release.sql b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
index 21b509d37c..4be971e034 100644
--- a/backend/src/main/resources/db/migration/V103__v1.16_release.sql
+++ b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
@@ -67,27 +67,27 @@ VALUES (UUID(), 'project_app_manager', 'PROJECT_APP_MANAGER:READ+EDIT', 'PROJECT
 
 CREATE TABLE IF NOT EXISTS `api_execution_queue`
 (
-   `id` varchar(50) NOT NULL COMMENT 'ID',
-   `test_queue` LONGTEXT COMMENT '执行资源Id队列fifo',
+     `id` varchar(50) NOT NULL COMMENT 'ID',
 	 `report_id` varchar(100) COMMENT '集合报告/测试计划报告',
 	 `report_type` varchar(100) COMMENT '报告类型/计划报告/单独报告',
 	 `run_mode` varchar(100) COMMENT '执行模式/scenario/api/test_paln_api/test_pan_scenario',
 	 `pool_id` varchar(100) DEFAULT NULL  COMMENT '执行资源池',
-    create_time bigint(13)  NULL COMMENT '创建时间',
+      create_time bigint(13)  NULL COMMENT '创建时间',
 	PRIMARY KEY (`id`)
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
 
-
 CREATE TABLE IF NOT EXISTS `api_execution_queue_detail`
 (
-   `id` varchar(50) NOT NULL COMMENT 'ID',
-   `queue_id` LONGTEXT COMMENT '队列id',
-     `report_id` varchar(100) COMMENT '报告id',
-     `test_id` varchar(100) COMMENT '资源id',
-     `evn_map` varchar(100) COMMENT '环境',
-     `type` varchar(100) DEFAULT NULL  COMMENT '资源类型',
+    `id` varchar(50) NOT NULL COMMENT 'ID',
+    `queue_id` varchar(100) COMMENT '队列id',
+	`sort` int COMMENT '排序',
+	`report_id` varchar(100) COMMENT '报告id',
+	`test_id` varchar(100) COMMENT '资源id',
+	`evn_map` LONGTEXT COMMENT '环境',
+	`type` varchar(100) DEFAULT NULL  COMMENT '资源类型',
     create_time bigint(13)  NULL COMMENT '创建时间',
 	PRIMARY KEY (`id`)
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
+
 ALTER TABLE load_test
     MODIFY name VARCHAR(255) NOT NULL COMMENT 'Test name';
\ No newline at end of file

From cf2ae41dd2062b44c536cc0c4435b27f9c0281d6 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 21 Dec 2021 15:20:11 +0800
Subject: [PATCH 226/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=96=B0=E5=BB=BA=E7=94=A8=E4=BE=8B=E6=9C=AA?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=85=AC=E7=94=A8=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009054 --user=lyh
【github#8623】接口用例测试时，如果这个用例没选择过环境，右上角上面选择了没用
https://www.tapd.cn/55049933/s/1084231

Closes #8623
---
 .../components/api/definition/components/case/ApiCaseList.vue  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
index 051e6721fd..edaceef674 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -267,7 +267,8 @@ export default {
     },
     getTestCase() {
       return new Promise((resolve) => {
-        this.environment = "";
+        let commonUseEnvironment = this.$store.state.useEnvironment;
+        this.environment = commonUseEnvironment ? commonUseEnvironment : "";
         this.result = this.$get("/api/testcase/findById/" + this.testCaseId, response => {
           let apiCase = response.data;
           if (apiCase) {

From d74e02cdff47cdf7524d305d098db6ffb7f61b47 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 21 Dec 2021 14:29:44 +0800
Subject: [PATCH 227/256] =?UTF-8?q?fix:=20csv=E4=B8=8B=E8=BD=BD=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=AF=E4=BB=A5=E8=AE=BF=E9=97=AE=E5=88=B0=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=9B=AE=E5=BD=95=20close=20#8652?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/ApiAutomationService.java     |   2 +
 .../metersphere/service/ResourceService.java  |   4 +
 .../main/resources/i18n/messages.properties   |   2 +
 .../resources/i18n/messages_en_US.properties  |   1 +
 .../resources/i18n/messages_zh_CN.properties  |   1 +
 .../resources/i18n/messages_zh_TW.properties  | 498 +++++++++---------
 6 files changed, 259 insertions(+), 249 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 34e067dda5..3fa56fb398 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -690,6 +690,8 @@ public class ApiAutomationService {
     }
 
     public byte[] loadFileAsBytes(FileOperationRequest fileOperationRequest) {
+        if (fileOperationRequest.getId().contains("/") || fileOperationRequest.getName().contains("/"))
+            MSException.throwException(Translator.get("invalid_parameter"));
         File file = new File(FileUtils.BODY_FILE_DIR + "/" + fileOperationRequest.getId() + "_" + fileOperationRequest.getName());
         try (FileInputStream fis = new FileInputStream(file);
              ByteArrayOutputStream bos = new ByteArrayOutputStream(1000);) {
diff --git a/backend/src/main/java/io/metersphere/service/ResourceService.java b/backend/src/main/java/io/metersphere/service/ResourceService.java
index ebe96360dd..749dd7c9a6 100644
--- a/backend/src/main/java/io/metersphere/service/ResourceService.java
+++ b/backend/src/main/java/io/metersphere/service/ResourceService.java
@@ -1,7 +1,9 @@
 package io.metersphere.service;
 
+import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.FileUtils;
 import io.metersphere.controller.request.MdUploadRequest;
+import io.metersphere.i18n.Translator;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -24,6 +26,8 @@ public class ResourceService {
     }
 
     public ResponseEntity<FileSystemResource> getMdImage(String name) {
+        if (name.contains("/"))
+            MSException.throwException(Translator.get("invalid_parameter"));
         File file = new File(FileUtils.MD_IMAGE_DIR + "/" + name);
         HttpHeaders headers = new HttpHeaders();
         String fileName = "";
diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 0f0dec8c9b..e646bc44c3 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -69,3 +69,5 @@ id_repeat_in_table=
 template_already=
 expect_name_exists=
 id_not_rightful=
+mock_warning=
+invalid_parameter=
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index d9ef3221d3..62b948d15e 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -9,6 +9,7 @@ connection_failed=Connection failed
 delete_fail=Delete fail
 start_engine_fail=Start fail
 upload_fail=Upload fail
+invalid_parameter=Invalid parameter!
 #user related
 user_email_already_exists=User email already exists
 user_id_is_null=User ID cannot be null
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index 9f11a35f49..70c9ec2030 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -8,6 +8,7 @@ error=出错
 delete_fail=删除失败
 start_engine_fail=启动失败
 upload_fail=文件上传失败
+invalid_parameter=非法的参数
 #user related
 user_email_already_exists=用户邮箱已存在
 user_id_is_null=用户ID不能为空
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index a233421645..2784ba10a7 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -1,286 +1,286 @@
 #commons
-error_lang_invalid=語言參數錯誤
-file_cannot_be_null=文件不能為空！
-cannot_be_null=不能為空
+error_lang_invalid=语言参数错误
+file_cannot_be_null=文件不能为空！
+cannot_be_null=不能为空
 number=第
 row=行
-error=出錯
-connection_failed=連接失敗
-delete_fail=刪除失敗
-start_engine_fail=啟動失敗
-upload_fail=文件上傳失敗
+error=出错
+delete_fail=删除失败
+start_engine_fail=启动失败
+upload_fail=文件上传失败
+invalid_parameter=非法的参数
 #user related
-user_email_already_exists=用戶郵箱已存在
-user_id_is_null=用戶ID不能為空
-user_name_is_null=用戶名不能為空
-user_email_is_null=用戶郵箱不能為空
-password_is_null=密碼不能為空
-user_id_already_exists=用戶id已存在
-password_modification_failed=舊密碼輸入錯誤，請重新輸入
-cannot_delete_current_user=無法刪除當前登錄用戶
-user_already_exists=該用戶已存在於當前成員列表中
-cannot_remove_current=無法移除當前登錄用戶
-password_is_incorrect=用戶名或密碼不正確
-user_not_exist=用戶不存在：
-user_has_been_disabled=用戶已被禁用
-excessive_attempts=操作頻繁
-user_locked=用戶被鎖定
-user_expires=用戶過期
-not_authorized=未經授權。
-login_fail=登入失敗
-user_apikey_limit=最多能有5個Api key
-please_logout_current_user=請先登出當前用戶
+user_email_already_exists=用户邮箱已存在
+user_id_is_null=用户ID不能为空
+user_name_is_null=用户名不能为空
+user_email_is_null=用户邮箱不能为空
+password_is_null=密码不能为空
+user_id_already_exists=用户id已存在
+password_modification_failed=旧密码输入错误，请重新输入
+cannot_delete_current_user=无法删除当前登录用户
+connection_failed=连接失败
+user_already_exists=该用户已存在于当前成员列表中
+cannot_remove_current=无法移除当前登录用户
+login_fail=登录失败
+password_is_incorrect=用户名或密码不正确
+user_not_exist=用户不存在：
+user_has_been_disabled=用户已被禁用
+excessive_attempts=操作频繁
+user_locked=用户被锁定
+user_expires=用户过期
+not_authorized=未经授权
+user_apikey_limit=最多能有5个Api key
+please_logout_current_user=请先登出当前用户
 #load test
-edit_load_test_not_found=無法編輯測試，未找到測試：
-run_load_test_not_found=無法運行測試，未找到測試：
-run_load_test_file_not_found=無法運行測試，無法獲取測試文件元信息，測試ID：
-run_load_test_file_content_not_found=無法運行測試，請前往 [系統設置-系統-系統參數設置] 檢查當前站點配置，詳情見 https://metersphere.io/docs/faq/load_test/#url
-run_load_test_file_init_error=無法運行測試，請檢查當前站點配置
-load_test_is_running=測試正在運行, 請等待
-load_test_kafka_invalid=Kafka 不可用，請檢查配置
-cannot_edit_load_test_running=不能修改正在運行的測試
-test_not_found=測試不存在:
-test_not_running=測試未運行
-load_test_already_exists=測試名稱不能重復
-load_test_name_length=測試名稱長度超過限制
-no_nodes_message=沒有節點信息
-duplicate_node_ip=節點 IP 重復
-duplicate_node_port=節點 Port 重復
-duplicate_node_ip_port=節點 IP、Port 重復
-max_thread_insufficient=並發用戶數超額
-related_case_del_fail_prefix=已關聯到
-related_case_del_fail_suffix=測試用例，請先解除關聯
-jmx_content_valid=JMX 內容無效，請檢查
-container_delete_fail=容器由於網絡原因停止失敗，請重試
-load_test_report_file_not_exist=當前報告沒有JTL文件，請等待或重新執行以便獲取
+edit_load_test_not_found=无法编辑测试，未找到测试：
+run_load_test_not_found=无法运行测试，未找到测试：
+run_load_test_file_not_found=无法运行测试，无法获取测试文件元信息，测试ID：
+run_load_test_file_content_not_found=无法运行测试，无法获取测试文件内容，测试ID：
+run_load_test_file_init_error=无法运行测试，请前往 [系统设置-系统-系统参数设置] 检查当前站点配置，详情见 https://metersphere.io/docs/faq/load_test/#url
+load_test_is_running=测试正在运行, 请等待
+load_test_kafka_invalid=Kafka 不可用，请检查配置
+cannot_edit_load_test_running=不能修改正在运行的测试
+test_not_found=测试不存在:
+test_not_running=测试未运行
+load_test_already_exists=测试名称不能重复
+load_test_name_length=测试名称长度超过限制
+no_nodes_message=没有节点信息
+duplicate_node_ip=节点 IP 重复
+duplicate_node_port=节点 Port 重复
+duplicate_node_ip_port=节点 IP、Port 重复
+max_thread_insufficient=并发用户数超额
+related_case_del_fail_prefix=已关联到
+related_case_del_fail_suffix=测试用例，请先解除关联
+jmx_content_valid=JMX 内容无效，请检查
+container_delete_fail=容器由于网络原因停止失败，请重试
+load_test_report_file_not_exist=当前报告没有JTL文件，请等待或重新执行以便获取
 #workspace
-workspace_name_is_null=工作空間名不能為空
-workspace_name_already_exists=工作空間名已存在
-workspace_does_not_belong_to_user=當前工作空間不屬於當前用戶
-workspace_not_exists=工作空間不存在
+workspace_name_is_null=工作空间名不能为空
+workspace_name_already_exists=工作空间名已存在
+workspace_does_not_belong_to_user=当前工作空间不属于当前用户
+workspace_not_exists=工作空间不存在
 #test resource pool
-test_resource_pool_id_is_null=資源池ID不能為空
-test_resource_pool_name_is_null=資源池名稱不能為空
-test_resource_pool_name_already_exists=資源池名稱已存在
-load_test=性能測試
-test_resource_pool_is_use=正在使用此資源池，無法刪除
-only_one_k8s=只能添加一個 K8S
-test_resource_pool_not_exists=測試資源池不存在
-test_resource_pool_invalid=當前測試使用的資源池處於禁用狀態
+test_resource_pool_id_is_null=资源池ID不能为空
+test_resource_pool_name_is_null=资源池名称不能为空
+test_resource_pool_name_already_exists=资源池名称已存在
+load_test=性能测试
+test_resource_pool_is_use=正在使用此资源池，无法删除
+only_one_k8s=只能添加一个 K8S
+test_resource_pool_not_exists=测试资源池不存在
+test_resource_pool_invalid=当前测试使用的资源池处于禁用状态
 #project
-project_name_is_null=項目名稱不能為空
-project_name_already_exists=項目名稱已存在
-project_file_already_exists=項目下文件已存在
-project_file_in_use=佔用文件，無法刪除。
+project_name_is_null=项目名称不能为空
+project_name_already_exists=项目名称已存在
+project_file_already_exists=项目下该文件已经存在
+project_file_in_use=占用文件，无法删除。
 #organization
-organization_name_is_null=組織名不能為空
-organization_name_already_exists=組織名已存在
-organization_does_not_belong_to_user=當前組織不屬於當前用戶
-organization_id_is_null=組織 ID 不能為空
+organization_name_is_null=组织名不能为空
+organization_name_already_exists=组织名已存在
+organization_does_not_belong_to_user=当前组织不属于当前用户
+organization_id_is_null=组织 ID 不能为空
 #api
-api_load_script_error=讀取腳本失敗
+api_load_script_error=读取脚本失败
 illegal_xml_format=不合法的 XML 格式
-api_report_is_null="測試報告是未生成，無法更新"
-api_test_environment_already_exists="已存在該名稱的環境配置"
-api_test=接口測試
+api_report_is_null="测试报告是未生成，无法更新"
+api_test_environment_already_exists="已存在该名称的环境配置"
+api_test=接口测试
 #test case
-test_case_node_level=層
-test_case_node_level_tip=模塊樹最大深度為
-test_case_module_not_null=所屬模塊不能為空
-test_case_create_module_fail=創建模塊失敗
-test_case_import_template_name=測試用例模版
+test_case_node_level=层
+test_case_node_level_tip=模块树最大深度为
+test_case_module_not_null=所属模块不能为空
+test_case_create_module_fail=创建模块失败
+test_case_import_template_name=测试用例模版
 test_case_import_template_sheet=模版
-module_not_null=所屬模塊不能為空格
-user_not_exists=該項目下無該用戶
-test_case_already_exists=該項目下已存在該測試用例
-parse_data_error=解析數據出錯
-missing_header_information=缺少頭部信息
-test_case_exist=該項目下已存在用例：
-node_deep_limit=節點深度不超過8層！
-before_delete_plan=該計劃下存在關聯測試用例，請先取消關聯！
-incorrect_format=格式錯誤
-test_case_type_validate=必須為functional、performance、api
-test_case_step_model_validate=必須為TEXT、STEP
-test_case_priority_validate=必須為P0、P1、P2、P3
-test_case_method_validate=必須為manual、auto
-test_case_name=用例名稱
-test_case_type=用例類型
-test_case_maintainer=維護人
-test_case_priority=用例等級
-test_case_method=測試方式
-test_case_prerequisite=前置條件
-test_case_remark=備註
-test_case_step_desc=步驟描述
-test_case_step_result=預期結果
-test_case_module=所屬模塊
+module_not_null=所属模块不能为空格
+user_not_exists=该项目下无该用户
+test_case_already_exists=该项目下已存在该测试用例
+parse_data_error=解析数据出错
+missing_header_information=缺少头部信息
+test_case_exist=该项目下已存在用例：
+node_deep_limit=节点深度不超过8层！
+before_delete_plan=该计划下存在关联测试用例，请先取消关联！
+incorrect_format=格式错误
+test_case_type_validate=必须为functional、performance、api
+test_case_step_model_validate=必须为TEXT、STEP
+test_case_priority_validate=必须为P0、P1、P2、P3
+test_case_method_validate=必须为manual、auto
+test_case_name=用例名称
+test_case_type=用例类型
+test_case_maintainer=维护人
+test_case_priority=用例等级
+test_case_method=测试方式
+test_case_prerequisite=前置条件
+test_case_remark=备注
+test_case_step_desc=步骤描述
+test_case_step_result=预期结果
+test_case_module=所属模块
 test_case=功能用例
-user=用戶
-user_import_template_name=用戶導入模板
-user_import_template_sheet=模板
-user_import_format_wrong=格式錯誤
-user_import_id_is_repeat=ID重複
-user_import_email_is_repeat=E-mail重複
-user_import_password_format_wrong=密碼格式錯誤
-user_import_phone_format_wrong=手機號碼格式錯誤
-user_import_email_format_wrong=電子郵箱格式錯誤
-user_import_organization_not_fond=組織未找到
-user_import_workspace_not_fond=工作空間未找到
-org_admin=組織管理員
-org_member=組織成員
-test_manager=測試經理
-tester=測試成員
-read_only_user=只讀用戶
-module=模塊
-num_needed_modify_testcase=修改用例時ID必填
-num_needless_create_testcase=創建用例時無需ID
-tag_tip_pattern=標籤之間以分號或者逗號隔開
-preconditions_optional=前置條件選填
-step_tip_separate=每個步驟以換行分隔
-step_tip_order=步驟前需標序號
-step_tip_optional=測試步驟和結果選填
-result_tip_separate=每條結果以換行分隔
-result_tip_order=結果前需標序號
-result_tip_optional=測試步驟和結果選填
-remark_optional=備註選填
-do_not_modify_header_order=請勿修改表頭順序
-module_created_automatically=若無該模塊將自動創建
-options=選項
+user=用户
+user_import_template_name=用户导入模板
+user_import_template_sheet=模版
+user_import_format_wrong=格式错误
+user_import_id_is_repeat=ID重复
+user_import_email_is_repeat=E-mail重复
+user_import_password_format_wrong=密码格式错误
+user_import_phone_format_wrong=手机号码格式错误
+user_import_email_format_wrong=电子邮箱格式错误
+user_import_organization_not_fond=组织未找到
+user_import_workspace_not_fond=工作空间未找到
+org_admin=组织管理员
+org_member=组织成员
+test_manager=测试经理
+tester=测试成员
+read_only_user=只读用户
+module=模块
+num_needed_modify_testcase=修改用例时ID必填
+num_needless_create_testcase=创建用例时无需ID
+tag_tip_pattern=标签之间以分号或者逗号隔开
+preconditions_optional=前置条件选填
+step_tip_separate=每个步骤以换行分隔
+step_tip_order=步骤前需标序号
+step_tip_optional=测试步骤和结果选填
+result_tip_separate=每条结果以换行分隔
+result_tip_order=结果前需标序号
+result_tip_optional=测试步骤和结果选填
+remark_optional=备注选填
+do_not_modify_header_order=请勿修改表头顺序
+module_created_automatically=若无该模块将自动创建
+options=选项
 options_yes=是
 options_no=否
 required=必填
-password_format_is_incorrect=有效密碼：8-30位，英文大小寫字母+數字+特殊字符（可選）
-please_input_project_member=請填寫該項目的相關人員ID
-test_case_report_template_repeat=同壹工作空間下不能存在同名模版
-plan_name_already_exists=測試計劃名稱已存在
-test_case_already_exists_excel=文件中存在多條相同用例
-test_case_module_already_exists=同層級下已存在該模塊名稱
-api_test_name_already_exists=測試名稱已經存在
-functional_method_tip=功能測試不支持自動方式
-custom_num_is_exist=用例自定義ID已存在
-custom_num_is_not_exist=用例自定義ID不存在
+password_format_is_incorrect=有效密码：8-30位，英文大小写字母+数字+特殊字符（可选）
+please_input_project_member=请填写该项目下的相关人员ID
+test_case_report_template_repeat=同一工作空间下不能存在同名模版
+plan_name_already_exists=测试计划名称已存在
+test_case_already_exists_excel=文件中存在多条相同用例
+test_case_module_already_exists=同层级下已存在该模块名称
+api_test_name_already_exists=测试名称已经存在
+functional_method_tip=功能测试不支持自动方式
+custom_num_is_exist=用例自定义ID已存在
+custom_num_is_not_exist=用例自定义ID不存在
 id_required=ID必填
-id_repeat_in_table=表格內ID重複
-step_model_tip=步驟描述填寫 STEP,文本描述請填寫 TEXT (非必填)
+id_repeat_in_table=表格内ID重复
+step_model_tip=步骤描述填写 STEP,文本描述请填写 TEXT (非必填)
 #ldap
-ldap_url_is_null=LDAP地址為空
-ldap_dn_is_null=LDAP綁定DN為空
-ldap_ou_is_null=LDAP參數OU為空
-ldap_password_is_null=LDAP密碼為空
-ldap_connect_fail=連接LDAP失敗
-ldap_connect_fail_user=連接LDAP失敗，綁定的DN或密碼錯誤
-ldap_user_filter_is_null=LDAP用戶過濾器為空
-ldap_user_mapping_is_null=LDAP用戶屬性映射為空
-authentication_failed=用戶認證失敗,用戶名或密碼錯誤
-user_not_found_or_not_unique=用戶不存在或者不唯一
-find_more_user=查找到多個用戶
-ldap_authentication_not_enabled=LDAP認證未啟用
-login_fail_email_null=登錄失敗，用戶郵箱為空
-login_fail_ou_error=登錄失敗，請檢查用戶OU
-login_fail_filter_error=登錄失敗，請檢查用戶過濾器
-check_ldap_mapping=檢查LDAP屬性映射
-ldap_mapping_value_null=LDAP用戶屬性映射預設為空值
+ldap_url_is_null=LDAP地址为空
+ldap_dn_is_null=LDAP绑定DN为空
+ldap_ou_is_null=LDAP参数OU为空
+ldap_password_is_null=LDAP密码为空
+ldap_connect_fail=连接LDAP失败
+ldap_connect_fail_user=连接LDAP失败，绑定的DN或密码错误
+ldap_user_filter_is_null=LDAP用户过滤器为空
+ldap_user_mapping_is_null=LDAP用户属性映射为空
+authentication_failed=用户认证失败,用户名或密码错误
+user_not_found_or_not_unique=用户不存在或者不唯一
+find_more_user=查找到多个用户
+ldap_authentication_not_enabled=LDAP认证未启用
+login_fail_email_null=登录失败，用户邮箱为空
+login_fail_ou_error=登录失败，请检查用户OU
+login_fail_filter_error=登录失败，请检查用户过滤器
+check_ldap_mapping=检查LDAP属性映射
+ldap_mapping_value_null=LDAP用户属性映射字段为空值
 #quota
-quota_workspace_excess_org_api=工作空間的接口測試數量總和不能超過組織的配額
-quota_workspace_excess_org_performance=工作空間的性能測試數量總和不能超過組織的配額
-quota_workspace_excess_org_max_threads=工作空間的最大並發數不能超過組織的配額
-quota_workspace_excess_org_max_duration=工作空間的壓測時長不能超過組織的配額
-quota_workspace_excess_org_resource_pool=工作空間的資源池不能超過組織的資源池範圍
-quota_api_excess_workspace=接口測試數量超過工作空間限額
-quota_api_excess_organization=接口測試數量超過組織限額
-quota_performance_excess_workspace=性能測試數量超過工作空間限額
-quota_performance_excess_organization=性能測試數量超過組織限額
-quota_max_threads_excess_workspace=最大並發數超過工作空間限額
-quota_max_threads_excess_organization=最大並發數超過組織限額
-quota_duration_excess_workspace=壓測時長超過工作空間限額
-quota_duration_excess_organization=壓測時長超過組織限額
-license_valid_license_error=授權驗證失敗
-license_valid_license_code=授權碼已經存在
-import_xmind_count_error=思維導圖導入用例數量不能超過 800 條
+quota_workspace_excess_org_api=工作空间的接口测试数量总和不能超过组织的配额
+quota_workspace_excess_org_performance=工作空间的性能测试数量总和不能超过组织的配额
+quota_workspace_excess_org_max_threads=工作空间的最大并发数不能超过组织的配额
+quota_workspace_excess_org_max_duration=工作空间的压测时长不能超过组织的配额
+quota_workspace_excess_org_resource_pool=工作空间的资源池不能超过组织的资源池范围
+quota_api_excess_workspace=接口测试数量超过工作空间限额
+quota_api_excess_organization=接口测试数量超过组织限额
+quota_performance_excess_workspace=性能测试数量超过工作空间限额
+quota_performance_excess_organization=性能测试数量超过组织限额
+quota_max_threads_excess_workspace=最大并发数超过工作空间限额
+quota_max_threads_excess_organization=最大并发数超过组织限额
+quota_duration_excess_workspace=压测时长超过工作空间限额
+quota_duration_excess_organization=压测时长超过组织限额
+import_xmind_count_error=思维导图导入用例数量不能超过 800 条
+license_valid_license_error=授权认证失败
 import_xmind_not_found=未找到测试用例
-test_review_task_notice=測試評審任務通知
-swagger_url_scheduled_import_notification=swagger_url定時導入通知
-test_track.length_less_than=標題過長，字數必須小於
+test_review_task_notice=测试评审任务通知
+swagger_url_scheduled_import_notification=swagger_url定时导入通知
+test_track.length_less_than=标题过长，字数必须小于
 # check owner
-check_owner_project=當前用戶沒有操作此項目的權限
-check_owner_test=當前用戶沒有操作此測試的權限
-check_owner_case=當前用戶沒有操作此用例的權限
-check_owner_plan=當前用戶沒有操作此計劃的權限
-check_owner_review=當前用戶沒有操作此評審的權限
-check_owner_comment=當前用戶沒有操作此評論的權限
-check_owner_read_only=當前用戶在此工作空間為只讀用戶
-upload_content_is_null=導入內容為空
-test_plan_notification=測試計畫通知
-task_defect_notification=缺陷任務通知
-task_notification_jenkins=jenkins任務通知
-task_notification=任務通知
-task_notification_=定時任務通知
-api_definition_url_not_repeating=接口請求地址已經存在
-message_task_already_exists=任務接收人已經存在
+check_owner_project=当前用户没有操作此项目的权限
+check_owner_test=当前用户没有操作此测试的权限
+check_owner_case=当前用户没有操作此用例的权限
+check_owner_plan=当前用户没有操作此计划的权限
+check_owner_review=当前用户没有操作此评审的权限
+check_owner_comment=当前用户没有操作此评论的权限
+check_owner_read_only=当前用户在此工作空间为只读用户
+upload_content_is_null=导入内容为空
+test_plan_notification=测试计划通知
+task_defect_notification=缺陷任务通知
+task_notification_=定时任务结果通知
+api_definition_url_not_repeating=接口请求地址已经存在
+task_notification_jenkins=jenkins任务通知
+task_notification=任务通知
+message_task_already_exists=任务接收人已经存在
 #automation
-automation_name_already_exists=同一個項目下，場景名稱不能重複
-automation_exec_info=沒有測試步驟，無法執行
-delete_check_reference_by=被場景引用
-not_execute=未執行
-execute_not_pass=未通過
-execute_pass=通過
+automation_name_already_exists=同一个项目下，场景名称不能重复
+automation_exec_info=没有测试步骤，无法执行
+delete_check_reference_by=被场景引用
+not_execute=未执行
+execute_not_pass=未通过
+execute_pass=通过
 #authsource
-authsource_name_already_exists=認證源名稱已經存在
-authsource_name_is_null=認證源名稱不能為空
-authsource_configuration_is_null=認證源配置不能為空
-custom_field_already=工作空間下已存在該字段：
-template_already=工作空間下已存在該模板：
-expect_name_exists=預期名稱已存在
-ssl_password_error=認證密碼錯誤，請重新輸入密碼
-ssl_file_error=認證文件加載失敗，請檢查認證文件
+authsource_name_already_exists=认证源名称已经存在
+authsource_name_is_null=认证源名称不能为空
+authsource_configuration_is_null=认证源配置不能为空
+custom_field_already=工作空间下已存在该字段：
+template_already=工作空间下已存在该模板：
+expect_name_exists=预期名称已存在
+ssl_password_error=认证密码错误，请重新输入密码
+ssl_file_error=认证文件加载失败，请检查认证文件
 #log
-api_definition=接口定義
-api_definition_case=接口定義用例
-api_automation=接口自動化
-api_automation_report=測試報告
-track_test_case=測試用例
-track_test_case_review=用例評審
-track_test_plan=測試計劃
+api_definition=接口定义
+api_definition_case=接口定义用例
+api_automation=接口自动化
+api_automation_report=测试报告
+track_test_case=测试用例
+track_test_case_review=用例评审
+track_test_plan=测试计划
 track_bug=缺陷管理
-track_report=報告
-performance_test=性能測試
-performance_test_report=性能測試報告
+track_report=报告
+performance_test=性能测试
+performance_test_report=性能测试报告
 system_user=系统-用户
-system_organization=系統-組織
-system_workspace=系统-工作空间
-system_test_resource=系统-測試資源池
-system_parameter_setting=系统-系統參數設置
-system_quota_management=系统-配額管理
-system_authorization_management=系统-授權管理
-organization_member=組織-成員
-organization_workspace=組織-工作空間
-workspace_service_integration=工作空間-服務集成
-workspace_message_settings=工作空間-消息設置
-workspace_member=工作空間-成員
-workspace_template_settings_field=工作空間-模版設置-自定義字段
-workspace_template_settings_case=工作空間-模版設置-用例模版
-workspace_template_settings_issue=工作空間-模版設置-缺陷模版
-project_project_manager=項目-項目管理
-project_project_member=項目-成員
+system_organization=系统-组织
+system_workspace=工作空间
+system_test_resource=系统-测试资源池
+system_parameter_setting=系统-系统参数设置
+system_quota_management=系统-配额管理
+system_authorization_management=系统-授权管理
+organization_member=组织-成员
+organization_workspace=组织-工作空间
+workspace_service_integration=工作空间-服务集成
+workspace_message_settings=工作空间-消息设置
+workspace_member=工作空间-成员
+workspace_template_settings_field=工作空间-模版设置-自定义字段
+workspace_template_settings_case=工作空间-模版设置-用例模版
+workspace_template_settings_issue=工作空间-模版设置-缺陷模版
+project_project_manager=项目-项目管理
+project_project_member=项目-成员
 project_project_jar=項目-JAR包管理
-project_environment_setting=項目-環境設置
-project_file_management=項目-文件管理
-personal_information_personal_settings=個人信息-個人設置
-personal_information_apikeys=個人信息-API Keys
+project_environment_setting=项目-环境设置
+project_file_management=项目-文件管理
+personal_information_personal_settings=个人信息-个人设置
+personal_information_apikeys=个人信息-API Keys
 auth_title=系统认证
-group_permission=用戶組與權限
+group_permission=用户组与权限
+test_case_status_prepare=未开始
+test_case_status_running=进行中
+test_case_status_finished=已完成
 # track home
 api_case=接口用例
 performance_case=性能用例
-scenario_case=場景用例
-test_case_status_prepare=未開始
-test_case_status_running=進行中
-test_case_status_finished=已完成
-test_case_status_error=失敗
+scenario_case=场景用例
+test_case_status_error=失败
 test_case_status_success=成功
-test_case_status_trash=廢棄
+test_case_status_trash=废弃
 test_case_status_saved=已保存
-create_user=創建人
-test_case_status=用例狀態
+create_user=创建人
+test_case_status=用例状态
 id_not_rightful=ID 不合法
 # mock
 mock_warning=未找到匹配的Mock期望

From 3700947f0f842f68e4cf77961de14075932ad630 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 21 Dec 2021 14:38:29 +0800
Subject: [PATCH 228/256] =?UTF-8?q?fix:=20=E5=90=8E=E7=AB=AF=E7=B9=81?=
 =?UTF-8?q?=E4=BD=93=E7=BF=BB=E8=AF=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/i18n/messages_zh_TW.properties  | 500 +++++++++---------
 1 file changed, 250 insertions(+), 250 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 2784ba10a7..d46121abf8 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -1,286 +1,286 @@
 #commons
-error_lang_invalid=语言参数错误
-file_cannot_be_null=文件不能为空！
-cannot_be_null=不能为空
+error_lang_invalid=語言參數錯誤
+file_cannot_be_null=文件不能為空！
+cannot_be_null=不能為空
 number=第
 row=行
-error=出错
-delete_fail=删除失败
-start_engine_fail=启动失败
-upload_fail=文件上传失败
-invalid_parameter=非法的参数
+error=出錯
+delete_fail=刪除失敗
+start_engine_fail=啟動失敗
+upload_fail=文件上傳失敗
+invalid_parameter=非法的參數
 #user related
-user_email_already_exists=用户邮箱已存在
-user_id_is_null=用户ID不能为空
-user_name_is_null=用户名不能为空
-user_email_is_null=用户邮箱不能为空
-password_is_null=密码不能为空
-user_id_already_exists=用户id已存在
-password_modification_failed=旧密码输入错误，请重新输入
-cannot_delete_current_user=无法删除当前登录用户
-connection_failed=连接失败
-user_already_exists=该用户已存在于当前成员列表中
-cannot_remove_current=无法移除当前登录用户
-login_fail=登录失败
-password_is_incorrect=用户名或密码不正确
-user_not_exist=用户不存在：
-user_has_been_disabled=用户已被禁用
-excessive_attempts=操作频繁
-user_locked=用户被锁定
-user_expires=用户过期
-not_authorized=未经授权
-user_apikey_limit=最多能有5个Api key
-please_logout_current_user=请先登出当前用户
+user_email_already_exists=用戶郵箱已存在
+user_id_is_null=用戶ID不能為空
+user_name_is_null=用戶名不能為空
+user_email_is_null=用戶郵箱不能為空
+password_is_null=密碼不能為空
+user_id_already_exists=用戶id已存在
+password_modification_failed=舊密碼輸入錯誤，請重新輸入
+cannot_delete_current_user=無法刪除當前登錄用戶
+connection_failed=連接失敗
+user_already_exists=該用戶已存在於當前成員列表中
+cannot_remove_current=無法移除當前登錄用戶
+login_fail=登錄失敗
+password_is_incorrect=用戶名或密碼不正確
+user_not_exist=用戶不存在：
+user_has_been_disabled=用戶已被禁用
+excessive_attempts=操作頻繁
+user_locked=用戶被鎖定
+user_expires=用戶過期
+not_authorized=未經授權
+user_apikey_limit=最多能有5個Api key
+please_logout_current_user=請先登出當前用戶
 #load test
-edit_load_test_not_found=无法编辑测试，未找到测试：
-run_load_test_not_found=无法运行测试，未找到测试：
-run_load_test_file_not_found=无法运行测试，无法获取测试文件元信息，测试ID：
-run_load_test_file_content_not_found=无法运行测试，无法获取测试文件内容，测试ID：
-run_load_test_file_init_error=无法运行测试，请前往 [系统设置-系统-系统参数设置] 检查当前站点配置，详情见 https://metersphere.io/docs/faq/load_test/#url
-load_test_is_running=测试正在运行, 请等待
-load_test_kafka_invalid=Kafka 不可用，请检查配置
-cannot_edit_load_test_running=不能修改正在运行的测试
-test_not_found=测试不存在:
-test_not_running=测试未运行
-load_test_already_exists=测试名称不能重复
-load_test_name_length=测试名称长度超过限制
-no_nodes_message=没有节点信息
-duplicate_node_ip=节点 IP 重复
-duplicate_node_port=节点 Port 重复
-duplicate_node_ip_port=节点 IP、Port 重复
-max_thread_insufficient=并发用户数超额
-related_case_del_fail_prefix=已关联到
-related_case_del_fail_suffix=测试用例，请先解除关联
-jmx_content_valid=JMX 内容无效，请检查
-container_delete_fail=容器由于网络原因停止失败，请重试
-load_test_report_file_not_exist=当前报告没有JTL文件，请等待或重新执行以便获取
+edit_load_test_not_found=無法編輯測試，未找到測試：
+run_load_test_not_found=無法運行測試，未找到測試：
+run_load_test_file_not_found=無法運行測試，無法獲取測試文件元信息，測試ID：
+run_load_test_file_content_not_found=無法運行測試，無法獲取測試文件內容，測試ID：
+run_load_test_file_init_error=無法運行測試，請前往 [系統設置-系統-系統參數設置] 檢查當前站點配置，詳情見 https://metersphere.io/docs/faq/load_test/#url
+load_test_is_running=測試正在運行, 請等待
+load_test_kafka_invalid=Kafka 不可用，請檢查配置
+cannot_edit_load_test_running=不能修改正在運行的測試
+test_not_found=測試不存在:
+test_not_running=測試未運行
+load_test_already_exists=測試名稱不能重復
+load_test_name_length=測試名稱長度超過限製
+no_nodes_message=沒有節點信息
+duplicate_node_ip=節點 IP 重復
+duplicate_node_port=節點 Port 重復
+duplicate_node_ip_port=節點 IP、Port 重復
+max_thread_insufficient=並發用戶數超額
+related_case_del_fail_prefix=已關聯到
+related_case_del_fail_suffix=測試用例，請先解除關聯
+jmx_content_valid=JMX 內容無效，請檢查
+container_delete_fail=容器由於網絡原因停止失敗，請重試
+load_test_report_file_not_exist=當前報告沒有JTL文件，請等待或重新執行以便獲取
 #workspace
-workspace_name_is_null=工作空间名不能为空
-workspace_name_already_exists=工作空间名已存在
-workspace_does_not_belong_to_user=当前工作空间不属于当前用户
-workspace_not_exists=工作空间不存在
+workspace_name_is_null=工作空間名不能為空
+workspace_name_already_exists=工作空間名已存在
+workspace_does_not_belong_to_user=當前工作空間不屬於當前用戶
+workspace_not_exists=工作空間不存在
 #test resource pool
-test_resource_pool_id_is_null=资源池ID不能为空
-test_resource_pool_name_is_null=资源池名称不能为空
-test_resource_pool_name_already_exists=资源池名称已存在
-load_test=性能测试
-test_resource_pool_is_use=正在使用此资源池，无法删除
-only_one_k8s=只能添加一个 K8S
-test_resource_pool_not_exists=测试资源池不存在
-test_resource_pool_invalid=当前测试使用的资源池处于禁用状态
+test_resource_pool_id_is_null=資源池ID不能為空
+test_resource_pool_name_is_null=資源池名稱不能為空
+test_resource_pool_name_already_exists=資源池名稱已存在
+load_test=性能測試
+test_resource_pool_is_use=正在使用此資源池，無法刪除
+only_one_k8s=只能添加一個 K8S
+test_resource_pool_not_exists=測試資源池不存在
+test_resource_pool_invalid=當前測試使用的資源池處於禁用狀態
 #project
-project_name_is_null=项目名称不能为空
-project_name_already_exists=项目名称已存在
-project_file_already_exists=项目下该文件已经存在
-project_file_in_use=占用文件，无法删除。
+project_name_is_null=項目名稱不能為空
+project_name_already_exists=項目名稱已存在
+project_file_already_exists=項目下該文件已經存在
+project_file_in_use=占用文件，無法刪除。
 #organization
-organization_name_is_null=组织名不能为空
-organization_name_already_exists=组织名已存在
-organization_does_not_belong_to_user=当前组织不属于当前用户
-organization_id_is_null=组织 ID 不能为空
+organization_name_is_null=組織名不能為空
+organization_name_already_exists=組織名已存在
+organization_does_not_belong_to_user=當前組織不屬於當前用戶
+organization_id_is_null=組織 ID 不能為空
 #api
-api_load_script_error=读取脚本失败
+api_load_script_error=讀取腳本失敗
 illegal_xml_format=不合法的 XML 格式
-api_report_is_null="测试报告是未生成，无法更新"
-api_test_environment_already_exists="已存在该名称的环境配置"
-api_test=接口测试
+api_report_is_null="測試報告是未生成，無法更新"
+api_test_environment_already_exists="已存在該名稱的環境配置"
+api_test=接口測試
 #test case
-test_case_node_level=层
-test_case_node_level_tip=模块树最大深度为
-test_case_module_not_null=所属模块不能为空
-test_case_create_module_fail=创建模块失败
-test_case_import_template_name=测试用例模版
+test_case_node_level=層
+test_case_node_level_tip=模塊樹最大深度為
+test_case_module_not_null=所屬模塊不能為空
+test_case_create_module_fail=創建模塊失敗
+test_case_import_template_name=測試用例模版
 test_case_import_template_sheet=模版
-module_not_null=所属模块不能为空格
-user_not_exists=该项目下无该用户
-test_case_already_exists=该项目下已存在该测试用例
-parse_data_error=解析数据出错
-missing_header_information=缺少头部信息
-test_case_exist=该项目下已存在用例：
-node_deep_limit=节点深度不超过8层！
-before_delete_plan=该计划下存在关联测试用例，请先取消关联！
-incorrect_format=格式错误
-test_case_type_validate=必须为functional、performance、api
-test_case_step_model_validate=必须为TEXT、STEP
-test_case_priority_validate=必须为P0、P1、P2、P3
-test_case_method_validate=必须为manual、auto
-test_case_name=用例名称
-test_case_type=用例类型
-test_case_maintainer=维护人
-test_case_priority=用例等级
-test_case_method=测试方式
-test_case_prerequisite=前置条件
-test_case_remark=备注
-test_case_step_desc=步骤描述
-test_case_step_result=预期结果
-test_case_module=所属模块
+module_not_null=所屬模塊不能為空格
+user_not_exists=該項目下無該用戶
+test_case_already_exists=該項目下已存在該測試用例
+parse_data_error=解析數據出錯
+missing_header_information=缺少頭部信息
+test_case_exist=該項目下已存在用例：
+node_deep_limit=節點深度不超過8層！
+before_delete_plan=該計劃下存在關聯測試用例，請先取消關聯！
+incorrect_format=格式錯誤
+test_case_type_validate=必須為functional、performance、api
+test_case_step_model_validate=必須為TEXT、STEP
+test_case_priority_validate=必須為P0、P1、P2、P3
+test_case_method_validate=必須為manual、auto
+test_case_name=用例名稱
+test_case_type=用例類型
+test_case_maintainer=維護人
+test_case_priority=用例等級
+test_case_method=測試方式
+test_case_prerequisite=前置條件
+test_case_remark=備註
+test_case_step_desc=步驟描述
+test_case_step_result=預期結果
+test_case_module=所屬模塊
 test_case=功能用例
-user=用户
-user_import_template_name=用户导入模板
+user=用戶
+user_import_template_name=用戶導入模板
 user_import_template_sheet=模版
-user_import_format_wrong=格式错误
-user_import_id_is_repeat=ID重复
-user_import_email_is_repeat=E-mail重复
-user_import_password_format_wrong=密码格式错误
-user_import_phone_format_wrong=手机号码格式错误
-user_import_email_format_wrong=电子邮箱格式错误
-user_import_organization_not_fond=组织未找到
-user_import_workspace_not_fond=工作空间未找到
-org_admin=组织管理员
-org_member=组织成员
-test_manager=测试经理
-tester=测试成员
-read_only_user=只读用户
-module=模块
-num_needed_modify_testcase=修改用例时ID必填
-num_needless_create_testcase=创建用例时无需ID
-tag_tip_pattern=标签之间以分号或者逗号隔开
-preconditions_optional=前置条件选填
-step_tip_separate=每个步骤以换行分隔
-step_tip_order=步骤前需标序号
-step_tip_optional=测试步骤和结果选填
-result_tip_separate=每条结果以换行分隔
-result_tip_order=结果前需标序号
-result_tip_optional=测试步骤和结果选填
-remark_optional=备注选填
-do_not_modify_header_order=请勿修改表头顺序
-module_created_automatically=若无该模块将自动创建
-options=选项
+user_import_format_wrong=格式錯誤
+user_import_id_is_repeat=ID重復
+user_import_email_is_repeat=E-mail重復
+user_import_password_format_wrong=密碼格式錯誤
+user_import_phone_format_wrong=手機號碼格式錯誤
+user_import_email_format_wrong=電子郵箱格式錯誤
+user_import_organization_not_fond=組織未找到
+user_import_workspace_not_fond=工作空間未找到
+org_admin=組織管理員
+org_member=組織成員
+test_manager=測試經理
+tester=測試成員
+read_only_user=只讀用戶
+module=模塊
+num_needed_modify_testcase=修改用例時ID必填
+num_needless_create_testcase=創建用例時無需ID
+tag_tip_pattern=標簽之間以分號或者逗號隔開
+preconditions_optional=前置條件選填
+step_tip_separate=每個步驟以換行分隔
+step_tip_order=步驟前需標序號
+step_tip_optional=測試步驟和結果選填
+result_tip_separate=每條結果以換行分隔
+result_tip_order=結果前需標序號
+result_tip_optional=測試步驟和結果選填
+remark_optional=備註選填
+do_not_modify_header_order=請勿修改表頭順序
+module_created_automatically=若無該模塊將自動創建
+options=選項
 options_yes=是
 options_no=否
 required=必填
-password_format_is_incorrect=有效密码：8-30位，英文大小写字母+数字+特殊字符（可选）
-please_input_project_member=请填写该项目下的相关人员ID
-test_case_report_template_repeat=同一工作空间下不能存在同名模版
-plan_name_already_exists=测试计划名称已存在
-test_case_already_exists_excel=文件中存在多条相同用例
-test_case_module_already_exists=同层级下已存在该模块名称
-api_test_name_already_exists=测试名称已经存在
-functional_method_tip=功能测试不支持自动方式
-custom_num_is_exist=用例自定义ID已存在
-custom_num_is_not_exist=用例自定义ID不存在
+password_format_is_incorrect=有效密碼：8-30位，英文大小寫字母+數字+特殊字符（可選）
+please_input_project_member=請填寫該項目下的相關人員ID
+test_case_report_template_repeat=同一工作空間下不能存在同名模版
+plan_name_already_exists=測試計劃名稱已存在
+test_case_already_exists_excel=文件中存在多條相同用例
+test_case_module_already_exists=同層級下已存在該模塊名稱
+api_test_name_already_exists=測試名稱已經存在
+functional_method_tip=功能測試不支持自動方式
+custom_num_is_exist=用例自定義ID已存在
+custom_num_is_not_exist=用例自定義ID不存在
 id_required=ID必填
-id_repeat_in_table=表格内ID重复
-step_model_tip=步骤描述填写 STEP,文本描述请填写 TEXT (非必填)
+id_repeat_in_table=表格內ID重復
+step_model_tip=步驟描述填寫 STEP,文本描述請填寫 TEXT (非必填)
 #ldap
-ldap_url_is_null=LDAP地址为空
-ldap_dn_is_null=LDAP绑定DN为空
-ldap_ou_is_null=LDAP参数OU为空
-ldap_password_is_null=LDAP密码为空
-ldap_connect_fail=连接LDAP失败
-ldap_connect_fail_user=连接LDAP失败，绑定的DN或密码错误
-ldap_user_filter_is_null=LDAP用户过滤器为空
-ldap_user_mapping_is_null=LDAP用户属性映射为空
-authentication_failed=用户认证失败,用户名或密码错误
-user_not_found_or_not_unique=用户不存在或者不唯一
-find_more_user=查找到多个用户
-ldap_authentication_not_enabled=LDAP认证未启用
-login_fail_email_null=登录失败，用户邮箱为空
-login_fail_ou_error=登录失败，请检查用户OU
-login_fail_filter_error=登录失败，请检查用户过滤器
-check_ldap_mapping=检查LDAP属性映射
-ldap_mapping_value_null=LDAP用户属性映射字段为空值
+ldap_url_is_null=LDAP地址為空
+ldap_dn_is_null=LDAP綁定DN為空
+ldap_ou_is_null=LDAP參數OU為空
+ldap_password_is_null=LDAP密碼為空
+ldap_connect_fail=連接LDAP失敗
+ldap_connect_fail_user=連接LDAP失敗，綁定的DN或密碼錯誤
+ldap_user_filter_is_null=LDAP用戶過濾器為空
+ldap_user_mapping_is_null=LDAP用戶屬性映射為空
+authentication_failed=用戶認證失敗,用戶名或密碼錯誤
+user_not_found_or_not_unique=用戶不存在或者不唯一
+find_more_user=查找到多個用戶
+ldap_authentication_not_enabled=LDAP認證未啟用
+login_fail_email_null=登錄失敗，用戶郵箱為空
+login_fail_ou_error=登錄失敗，請檢查用戶OU
+login_fail_filter_error=登錄失敗，請檢查用戶過濾器
+check_ldap_mapping=檢查LDAP屬性映射
+ldap_mapping_value_null=LDAP用戶屬性映射字段為空值
 #quota
-quota_workspace_excess_org_api=工作空间的接口测试数量总和不能超过组织的配额
-quota_workspace_excess_org_performance=工作空间的性能测试数量总和不能超过组织的配额
-quota_workspace_excess_org_max_threads=工作空间的最大并发数不能超过组织的配额
-quota_workspace_excess_org_max_duration=工作空间的压测时长不能超过组织的配额
-quota_workspace_excess_org_resource_pool=工作空间的资源池不能超过组织的资源池范围
-quota_api_excess_workspace=接口测试数量超过工作空间限额
-quota_api_excess_organization=接口测试数量超过组织限额
-quota_performance_excess_workspace=性能测试数量超过工作空间限额
-quota_performance_excess_organization=性能测试数量超过组织限额
-quota_max_threads_excess_workspace=最大并发数超过工作空间限额
-quota_max_threads_excess_organization=最大并发数超过组织限额
-quota_duration_excess_workspace=压测时长超过工作空间限额
-quota_duration_excess_organization=压测时长超过组织限额
-import_xmind_count_error=思维导图导入用例数量不能超过 800 条
-license_valid_license_error=授权认证失败
-import_xmind_not_found=未找到测试用例
-test_review_task_notice=测试评审任务通知
-swagger_url_scheduled_import_notification=swagger_url定时导入通知
-test_track.length_less_than=标题过长，字数必须小于
+quota_workspace_excess_org_api=工作空間的接口測試數量總和不能超過組織的配額
+quota_workspace_excess_org_performance=工作空間的性能測試數量總和不能超過組織的配額
+quota_workspace_excess_org_max_threads=工作空間的最大並發數不能超過組織的配額
+quota_workspace_excess_org_max_duration=工作空間的壓測時長不能超過組織的配額
+quota_workspace_excess_org_resource_pool=工作空間的資源池不能超過組織的資源池範圍
+quota_api_excess_workspace=接口測試數量超過工作空間限額
+quota_api_excess_organization=接口測試數量超過組織限額
+quota_performance_excess_workspace=性能測試數量超過工作空間限額
+quota_performance_excess_organization=性能測試數量超過組織限額
+quota_max_threads_excess_workspace=最大並發數超過工作空間限額
+quota_max_threads_excess_organization=最大並發數超過組織限額
+quota_duration_excess_workspace=壓測時長超過工作空間限額
+quota_duration_excess_organization=壓測時長超過組織限額
+import_xmind_count_error=思維導圖導入用例數量不能超過 800 條
+license_valid_license_error=授權認證失敗
+import_xmind_not_found=未找到測試用例
+test_review_task_notice=測試評審任務通知
+swagger_url_scheduled_import_notification=swagger_url定時導入通知
+test_track.length_less_than=標題過長，字數必須小於
 # check owner
-check_owner_project=当前用户没有操作此项目的权限
-check_owner_test=当前用户没有操作此测试的权限
-check_owner_case=当前用户没有操作此用例的权限
-check_owner_plan=当前用户没有操作此计划的权限
-check_owner_review=当前用户没有操作此评审的权限
-check_owner_comment=当前用户没有操作此评论的权限
-check_owner_read_only=当前用户在此工作空间为只读用户
-upload_content_is_null=导入内容为空
-test_plan_notification=测试计划通知
-task_defect_notification=缺陷任务通知
-task_notification_=定时任务结果通知
-api_definition_url_not_repeating=接口请求地址已经存在
-task_notification_jenkins=jenkins任务通知
-task_notification=任务通知
-message_task_already_exists=任务接收人已经存在
+check_owner_project=當前用戶沒有操作此項目的權限
+check_owner_test=當前用戶沒有操作此測試的權限
+check_owner_case=當前用戶沒有操作此用例的權限
+check_owner_plan=當前用戶沒有操作此計劃的權限
+check_owner_review=當前用戶沒有操作此評審的權限
+check_owner_comment=當前用戶沒有操作此評論的權限
+check_owner_read_only=當前用戶在此工作空間為只讀用戶
+upload_content_is_null=導入內容為空
+test_plan_notification=測試計劃通知
+task_defect_notification=缺陷任務通知
+task_notification_=定時任務結果通知
+api_definition_url_not_repeating=接口請求地址已經存在
+task_notification_jenkins=jenkins任務通知
+task_notification=任務通知
+message_task_already_exists=任務接收人已經存在
 #automation
-automation_name_already_exists=同一个项目下，场景名称不能重复
-automation_exec_info=没有测试步骤，无法执行
-delete_check_reference_by=被场景引用
-not_execute=未执行
-execute_not_pass=未通过
-execute_pass=通过
+automation_name_already_exists=同一個項目下，場景名稱不能重復
+automation_exec_info=沒有測試步驟，無法執行
+delete_check_reference_by=被場景引用
+not_execute=未執行
+execute_not_pass=未通過
+execute_pass=通過
 #authsource
-authsource_name_already_exists=认证源名称已经存在
-authsource_name_is_null=认证源名称不能为空
-authsource_configuration_is_null=认证源配置不能为空
-custom_field_already=工作空间下已存在该字段：
-template_already=工作空间下已存在该模板：
-expect_name_exists=预期名称已存在
-ssl_password_error=认证密码错误，请重新输入密码
-ssl_file_error=认证文件加载失败，请检查认证文件
+authsource_name_already_exists=認證源名稱已經存在
+authsource_name_is_null=認證源名稱不能為空
+authsource_configuration_is_null=認證源配置不能為空
+custom_field_already=工作空間下已存在該字段：
+template_already=工作空間下已存在該模板：
+expect_name_exists=預期名稱已存在
+ssl_password_error=認證密碼錯誤，請重新輸入密碼
+ssl_file_error=認證文件加載失敗，請檢查認證文件
 #log
-api_definition=接口定义
-api_definition_case=接口定义用例
-api_automation=接口自动化
-api_automation_report=测试报告
-track_test_case=测试用例
-track_test_case_review=用例评审
-track_test_plan=测试计划
+api_definition=接口定義
+api_definition_case=接口定義用例
+api_automation=接口自動化
+api_automation_report=測試報告
+track_test_case=測試用例
+track_test_case_review=用例評審
+track_test_plan=測試計劃
 track_bug=缺陷管理
-track_report=报告
-performance_test=性能测试
-performance_test_report=性能测试报告
-system_user=系统-用户
-system_organization=系统-组织
-system_workspace=工作空间
-system_test_resource=系统-测试资源池
-system_parameter_setting=系统-系统参数设置
-system_quota_management=系统-配额管理
-system_authorization_management=系统-授权管理
-organization_member=组织-成员
-organization_workspace=组织-工作空间
-workspace_service_integration=工作空间-服务集成
-workspace_message_settings=工作空间-消息设置
-workspace_member=工作空间-成员
-workspace_template_settings_field=工作空间-模版设置-自定义字段
-workspace_template_settings_case=工作空间-模版设置-用例模版
-workspace_template_settings_issue=工作空间-模版设置-缺陷模版
-project_project_manager=项目-项目管理
-project_project_member=项目-成员
+track_report=報告
+performance_test=性能測試
+performance_test_report=性能測試報告
+system_user=系統-用戶
+system_organization=系統-組織
+system_workspace=工作空間
+system_test_resource=系統-測試資源池
+system_parameter_setting=系統-系統參數設置
+system_quota_management=系統-配額管理
+system_authorization_management=系統-授權管理
+organization_member=組織-成員
+organization_workspace=組織-工作空間
+workspace_service_integration=工作空間-服務集成
+workspace_message_settings=工作空間-消息設置
+workspace_member=工作空間-成員
+workspace_template_settings_field=工作空間-模版設置-自定義字段
+workspace_template_settings_case=工作空間-模版設置-用例模版
+workspace_template_settings_issue=工作空間-模版設置-缺陷模版
+project_project_manager=項目-項目管理
+project_project_member=項目-成員
 project_project_jar=項目-JAR包管理
-project_environment_setting=项目-环境设置
-project_file_management=项目-文件管理
-personal_information_personal_settings=个人信息-个人设置
-personal_information_apikeys=个人信息-API Keys
-auth_title=系统认证
-group_permission=用户组与权限
-test_case_status_prepare=未开始
-test_case_status_running=进行中
+project_environment_setting=項目-環境設置
+project_file_management=項目-文件管理
+personal_information_personal_settings=個人信息-個人設置
+personal_information_apikeys=個人信息-API Keys
+auth_title=系統認證
+group_permission=用戶組與權限
+test_case_status_prepare=未開始
+test_case_status_running=進行中
 test_case_status_finished=已完成
 # track home
 api_case=接口用例
 performance_case=性能用例
-scenario_case=场景用例
-test_case_status_error=失败
+scenario_case=場景用例
+test_case_status_error=失敗
 test_case_status_success=成功
-test_case_status_trash=废弃
+test_case_status_trash=廢棄
 test_case_status_saved=已保存
-create_user=创建人
-test_case_status=用例状态
+create_user=創建人
+test_case_status=用例狀態
 id_not_rightful=ID 不合法
 # mock
 mock_warning=未找到匹配的Mock期望

From 26186a2ee08cd395dfdecbf8910468eff0ab2c41 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 21 Dec 2021 11:57:34 +0800
Subject: [PATCH 229/256] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E6=97=A0=E6=B3=95=E5=B1=95=E7=A4=BA=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E7=9A=84=E7=BC=BA=E9=99=B7=20--bug=3D1009049=20--user=3D?=
 =?UTF-8?q?=E9=99=88=E5=BB=BA=E6=98=9F=20=E3=80=90=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E3=80=91=E8=84=91=E5=9B=BE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E3=80=81=E5=85=B3=E8=81=94=E7=9A=84=E7=BC=BA=E9=99=B7=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E5=88=97=E8=A1=A8-=E7=94=A8=E4=BE=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=87=8C=E6=B2=A1=E6=98=BE=E7=A4=BA=20https://www.tap?=
 =?UTF-8?q?d.cn/55049933/s/10840777?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/case/components/TestCaseEditOtherInfo.vue           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue b/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
index fda4596f81..e2c546db5b 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
@@ -119,9 +119,9 @@ export default {
       if (this.tabActiveName === 'demand') {
         this.getDemandOptions();
       } else if (this.tabActiveName === 'bug') {
-        if (this.$refs.issue) {
+        this.$nextTick(() => {
           this.$refs.issue.getIssues();
-        }
+        });
       } else if (this.tabActiveName === 'relationship') {
         this.$refs.relationship.open();
       } else if (this.tabActiveName === 'attachment') {

From fbeb09e44c85b0e4ecdd61d5b9cf2c4b0a17c11e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 21 Dec 2021 11:42:47 +0800
Subject: [PATCH 230/256] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E9=85=8D=E7=BD=AE=E7=AC=AC=E4=B8=89=E6=96=B9=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/project/menu/EditProject.vue      | 16 +++++++++++-----
 .../workspace/template/TemplateSelect.vue        |  2 ++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/project/menu/EditProject.vue b/frontend/src/business/components/project/menu/EditProject.vue
index 862151e977..6b0482c604 100644
--- a/frontend/src/business/components/project/menu/EditProject.vue
+++ b/frontend/src/business/components/project/menu/EditProject.vue
@@ -19,14 +19,16 @@
           <template-select :data="form" scene="API_CASE" prop="caseTemplateId" ref="caseTemplate"/>
         </el-form-item>
 
-        <el-form-item v-if="form.platform == 'Jira'" :label-width="labelWidth" :label="$t('test_track.issue.use_third_party')" prop="scenarioCustomNum">
-          <el-switch v-model="form.thirdPartTemplate"></el-switch>
-        </el-form-item>
-
-        <el-form-item v-if="!form.thirdPartTemplate" :label-width="labelWidth"
+        <el-form-item :label-width="labelWidth"
                       :label="$t('workspace.issue_template_manage')" prop="issueTemplateId">
           <template-select :platform="form.platform" :data="form" scene="ISSUE" prop="issueTemplateId"
+                           :disabled="form.platform === 'Jira' && form.thirdPartTemplate"
                            ref="issueTemplate"/>
+
+          <el-checkbox @change="thirdPartTemplateChange" v-if="form.platform === 'Jira'" v-model="form.thirdPartTemplate" style="margin-left: 10px">
+            {{ $t('test_track.issue.use_third_party') }}
+          </el-checkbox>
+
         </el-form-item>
 
         <el-form-item :label-width="labelWidth" label="TCP Mock Port">
@@ -215,6 +217,10 @@ export default {
         this.$refs.caseTemplate.getTemplateOptions();
       }
     },
+    thirdPartTemplateChange(val) {
+      if (val)
+        this.form.issueTemplateId = '';
+    },
     edit(row) {
       this.title = this.$t('project.edit');
       this.getOptions();
diff --git a/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue b/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
index 21b13bb180..ddefb18bd3 100644
--- a/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
+++ b/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
@@ -1,6 +1,7 @@
 <template>
   <el-select filterable v-model="data[prop]">
     <el-option
+      :disabled="disabled"
       v-for="(item, index) in templateFilterOptions"
       :key="index"
       :label="item.name"
@@ -19,6 +20,7 @@ export default {
     scene: String,
     prop: String,
     platform: String,
+    disabled: Boolean,
     data: {
       type: Object,
       default() {

From 7f89082e72df4ff952478c7dc2694d82d821bde7 Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Tue, 21 Dec 2021 10:24:09 +0800
Subject: [PATCH 231/256] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=89=8D=E5=90=8E=E7=BD=AE=E8=84=9A=E6=9C=AC=E7=9A=84?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008864 --user=王振 【环境配置】全局前置脚本，提示的文字错误 https://www.tapd.cn/55049933/s/1083908
---
 .../components/environment/EnvironmentGlobalScript.vue | 10 ++++++++--
 frontend/src/i18n/en-US.js                             |  6 ++++--
 frontend/src/i18n/zh-CN.js                             |  6 ++++--
 frontend/src/i18n/zh-TW.js                             |  6 ++++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/environment/EnvironmentGlobalScript.vue b/frontend/src/business/components/api/test/components/environment/EnvironmentGlobalScript.vue
index a37bd1fd59..db59fe3b14 100644
--- a/frontend/src/business/components/api/test/components/environment/EnvironmentGlobalScript.vue
+++ b/frontend/src/business/components/api/test/components/environment/EnvironmentGlobalScript.vue
@@ -4,7 +4,7 @@
       <el-collapse-item name="1">
         <template slot="title">
           <span class="span-style">{{title}}</span>
-          <el-tooltip class="item" effect="dark" :content="$t('api_test.script.tip_1')" placement="right">
+          <el-tooltip class="item" effect="dark" :content="runEveryTimeTip" placement="right">
             <i class="el-icon-info"/>
           </el-tooltip>
 
@@ -39,7 +39,7 @@
       <el-collapse-item name="2">
         <template slot="title">
           {{ stepTitle }}
-          <el-tooltip class="item" effect="dark" :content="$t('api_test.script.tip_2')" placement="right">
+          <el-tooltip class="item" effect="dark" :content="runOnceTip" placement="right">
             <i class="el-icon-info"/>
           </el-tooltip>
           <div class="header-right" style="margin: 5px 5px 5px 50px;" @click.stop>
@@ -81,6 +81,8 @@ export default {
   data() {
     return {
       title: "",
+      runEveryTimeTip: "",
+      runOnceTip: "",
       preTitle: this.$t('api_test.script.execute_before_step'),
       postTitle: this.$t('api_test.script.execute_post_step'),
       stepTitle: "",
@@ -112,10 +114,14 @@ export default {
       this.scriptExecSort = this.scriptPreExecSort;
       this.title = this.preTitle;
       this.stepTitle = this.preStepTitle;
+      this.runEveryTimeTip = this.$t('api_test.script.execute_before_step_tip')
+      this.runOnceTip = this.$t('api_test.script.execute_before_all_steps_tip')
     } else {
       this.scriptExecSort = this.scriptPostExecSort;
       this.title = this.postTitle;
       this.stepTitle = this.postStepTitle;
+      this.runEveryTimeTip = this.$t('api_test.script.execute_post_step_tip')
+      this.runOnceTip = this.$t('api_test.script.execute_post_all_steps_tip')
     }
     this.isConnScenario = this.connScenario;
     this.isExecAfterPrivateScript = this.execAfterPrivateScript;
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index bada484eff..c1fea703f4 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1743,16 +1743,18 @@ export default {
       }
     },
     script: {
-      tip_1: "Execute once after each API step, such as encryption and decryption",
-      tip_2: "Execute once after all API process ends, such as token acquisition and scene initialization",
       tip_3: "Script steps will be counted in the execution result of the scene, and the final execution result of the scene will be affected when an execution error is reported",
       filter_request_type: "Filter request type",
       execution_order: "Script execution order",
       associated_scene_results: "Associated scene results",
       execute_before_step: "Execute before a single request step",
+      execute_before_step_tip: "Execute every time before each API step, such as request encryption",
       execute_post_step: "Execute after a single request step",
+      execute_post_step_tip: "Execute every time after each API step, such as response decryption",
       execute_before_all_steps: "Execute before all requested steps",
+      execute_before_all_steps_tip: "Execute once before the start of all API steps, such as token acquisition and scene initialization",
       execute_post_all_steps: "Execute after all requested steps",
+      execute_post_all_steps_tip: "Execute once after the end of all API steps, such as data destruction and scene reset",
       after_the_pre_script_step: "After the pre-script in the step",
       before_the_pre_script_step: "Before pre-script in step",
       after_the_post_script_step: "After the script is placed in the step",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 447bafb6ae..cdb804f02b 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1749,16 +1749,18 @@ export default {
       }
     },
     script: {
-      tip_1: "每一个API步骤后执行一次 如加解密",
-      tip_2: "全部API流程结束后执行一次 如token获取，场景初始化",
       tip_3: "脚本步骤会统计到场景执行结果中，执行报错时会影响场景的最终执行结果",
       filter_request_type: "过滤请求类型",
       execution_order: "脚本执行顺序",
       associated_scene_results: "关联场景结果",
       execute_before_step: "单个请求步骤前执行",
+      execute_before_step_tip: "每一个API步骤执行前均执行一次，如请求内容加密",
       execute_post_step: "单个请求步骤后执行",
+      execute_post_step_tip: "每一个API步骤执行后均执行一次，如响应内容解密",
       execute_before_all_steps: "所有请求步骤前执行",
+      execute_before_all_steps_tip: "全部API流程开始前执行一次，如token获取及场景初始化",
       execute_post_all_steps: "所有请求步骤后执行",
+      execute_post_all_steps_tip: "全部API流程结束后执行一次，如数据销毁及环境重置",
       after_the_pre_script_step: "步骤内前置脚本后",
       before_the_pre_script_step: "步骤内前置脚本前",
       after_the_post_script_step: "步骤内后置脚本后",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index ac1a90a8e3..15c8b380a7 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1749,16 +1749,18 @@ export default {
       }
     },
     script: {
-      tip_1: "每一個API步驟後執行一次 如加解密",
-      tip_2: "全部API流程結束後執行一次 如token獲取，場景初始化",
       tip_3: "腳本步驟會統計到場景執行結果中，執行報錯時會影響場景的最終執行結果",
       filter_request_type: "過濾請求類型",
       execution_order: "腳本執行順序",
       associated_scene_results: "關聯場景結果",
       execute_before_step: "單個請求步驟前執行",
+      execute_before_step_tip: "每一個API步驟執行前均執行一次，如請求內容加密",
       execute_post_step: "單個請求步驟後執行",
+      execute_post_step_tip: "每一個API步驟執行後均執行一次，如響應內容解密",
       execute_before_all_steps: "所有請求步驟前執行",
+      execute_before_all_steps_tip: "全部API流程開始前執行一次，如token獲取及場景初始化",
       execute_post_all_steps: "所有請求步驟後執行",
+      execute_post_all_steps_tip: "全部API流程結束後執行一次，如數據銷毀及環境重置",
       after_the_pre_script_step: "步驟內前置腳本後",
       before_the_pre_script_step: "步驟內前置腳本前",
       after_the_post_script_step: "步驟內後置腳本後",

From 0d0608dab027baacfedfc875ef16d2fade25a2bd Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Tue, 21 Dec 2021 15:11:30 +0800
Subject: [PATCH 232/256] =?UTF-8?q?fix(=E5=9B=BD=E9=99=85=E5=8C=96):=20?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008894 --user=郭雨琦 【ID1008894】【国际化】系统设置 模块，未翻译的地方汇总
---
 .../business/components/project/menu/Log.vue  |   4 +-
 .../settings/operatinglog/OperatingLog.vue    |   4 +-
 .../settings/operatinglog/config.js           | 103 +++++++++---------
 .../components/settings/plugin/JarConfig.vue  |   2 +-
 .../components/settings/plugin/ScriptView.vue |   6 +-
 .../settings/system/components/UserImport.vue |   5 +-
 .../workspace/components/ZentaoSetting.vue    |   4 +-
 frontend/src/i18n/en-US.js                    |  15 ++-
 frontend/src/i18n/zh-CN.js                    |  13 ++-
 frontend/src/i18n/zh-TW.js                    |  13 ++-
 10 files changed, 105 insertions(+), 64 deletions(-)

diff --git a/frontend/src/business/components/project/menu/Log.vue b/frontend/src/business/components/project/menu/Log.vue
index cda91ffc82..995d41cb3d 100644
--- a/frontend/src/business/components/project/menu/Log.vue
+++ b/frontend/src/business/components/project/menu/Log.vue
@@ -127,7 +127,7 @@
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import MsTableOperator from "@/business/components/common/components/MsTableOperator";
 import {getCurrentProjectID} from "@/common/js/utils";
-import {getUrl, LOG_TYPE, LOG_TYPE_MAP, sysList} from "@/business/components/settings/operatinglog/config";
+import {getUrl, LOG_TYPE, LOG_TYPE_MAP, SYSLIST} from "@/business/components/settings/operatinglog/config";
 import MsLogDetail from "@/business/components/settings/operatinglog/LogDetail";
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
 import MsContainer from "@/business/components/common/components/MsContainer";
@@ -156,7 +156,7 @@ export default {
       screenHeight: 'calc(100vh - 215px)',
       LOG_TYPE: new LOG_TYPE(this),
       LOG_TYPE_MAP: new LOG_TYPE_MAP(this),
-      sysList: sysList,
+      sysList: new SYSLIST(),
     }
   },
   mounted() {
diff --git a/frontend/src/business/components/settings/operatinglog/OperatingLog.vue b/frontend/src/business/components/settings/operatinglog/OperatingLog.vue
index 29e96f1b50..6a2fc83a16 100644
--- a/frontend/src/business/components/settings/operatinglog/OperatingLog.vue
+++ b/frontend/src/business/components/settings/operatinglog/OperatingLog.vue
@@ -126,7 +126,7 @@
 import MsTablePagination from "../../common/pagination/TablePagination";
 import MsTableOperator from "../../common/components/MsTableOperator";
 import {getCurrentProjectID, getCurrentWorkspaceId} from "@/common/js/utils";
-import {getUrl, LOG_TYPE, LOG_TYPE_MAP, sysList} from "./config";
+import {getUrl, LOG_TYPE, LOG_TYPE_MAP, SYSLIST} from "./config";
 import MsLogDetail from "./LogDetail";
 
 export default {
@@ -153,7 +153,7 @@ export default {
         screenHeight: 'calc(100vh - 270px)',
         LOG_TYPE: new LOG_TYPE(this),
         LOG_TYPE_MAP: new LOG_TYPE_MAP(this),
-        sysList: sysList,
+        sysList:new SYSLIST(),
       }
     },
     mounted() {
diff --git a/frontend/src/business/components/settings/operatinglog/config.js b/frontend/src/business/components/settings/operatinglog/config.js
index ec6ac78628..6e8785ae6e 100644
--- a/frontend/src/business/components/settings/operatinglog/config.js
+++ b/frontend/src/business/components/settings/operatinglog/config.js
@@ -1,3 +1,5 @@
+import i18n from "@/i18n/i18n";
+
 export function LOG_TYPE(_this) {
   let LOG_TYPE = [
     {id: 'CREATE', label: _this.$t('api_test.definition.request.create_info')},
@@ -20,8 +22,8 @@ export function LOG_TYPE(_this) {
     {id: 'BATCH_DEL', label: _this.$t('api_test.definition.request.batch_delete')},
     {id: 'BATCH_UPDATE', label: _this.$t('api_test.definition.request.batch_edit')},
     {id: 'BATCH_ADD', label: _this.$t('commons.batch_add')},
-    {id: 'BATCH_RESTORE', label: "批量恢复"},
-    {id: 'BATCH_GC', label: "批量回收"}
+    {id: 'BATCH_RESTORE', label: _this.$t('commons.batch_restore')},
+    {id: 'BATCH_GC', label: _this.$t('commons.batch_gc')}
   ];
   return LOG_TYPE;
 }
@@ -48,59 +50,62 @@ export function LOG_TYPE_MAP(_this) {
     ['BATCH_DEL', _this.$t('api_test.definition.request.batch_delete')],
     ['BATCH_UPDATE', _this.$t('api_test.definition.request.batch_edit')],
     ['BATCH_ADD', _this.$t('commons.batch_add')],
-    ['BATCH_RESTORE', "批量恢复"],
-    ['BATCH_GC', "批量回收"],
+    ['BATCH_RESTORE', _this.$t('commons.batch_restore')],
+    ['BATCH_GC', _this.$t('commons.batch_gc')],
   ]);
   return LOG_TYPE_MAP;
 }
 
-export const sysList = [
-  {
-    label: "测试跟踪", value: "测试跟踪", children: [
-      {label: "测试用例", value: "测试用例", leaf: true},
-      {label: "用例评审", value: "用例评审", leaf: true},
-      {label: "测试计划", value: "测试计划", leaf: true},
-      {label: "缺陷管理", value: "缺陷管理", leaf: true},
-      {label: "报告", value: "报告", leaf: true}]
-  },
-  {
-    label: "接口测试", value: "api", children: [
-      {label: "接口定义", value: "接口定义", leaf: true},
-      {label: "接口自动化", value: "接口自动化", leaf: true},
-      {label: "测试报告", value: "测试报告", leaf: true}]
-  },
-  {
-    label: "性能测试", value: "性能测试", children: [
-      {label: "性能测试", value: "性能测试", leaf: true},
-      {label: "性能测试报告", value: "性能测试报告", leaf: true}]
-  },
-  {
-    label: "系统设置", value: "系统设置", children: [
-      {label: "系统-用户", value: "系统-用户", leaf: true},
-      {label: "工作空间", value: "工作空间", leaf: true},
-      {label: "系统-测试资源池", value: "系统-测试资源池", leaf: true},
-      {label: "系统-系统参数设置", value: "系统-系统参数设置", leaf: true},
-      {label: "系统-配额管理", value: "系统-配额管理", leaf: true},
-      {label: "系统-授权管理", value: "系统-授权管理", leaf: true},
-      {label: "工作空间-服务集成", value: "工作空间-服务集成", leaf: true},
-      {label: "工作空间-消息设置", value: "工作空间-消息设置", leaf: true},
+export function SYSLIST(){
+  let sysList = [
+    {
+      label: i18n.t('test_track.test_track'), value: i18n.t('test_track.test_track'), children: [
+        {label: i18n.t('permission.project_track_case.name'), value: i18n.t('permission.project_track_case.name'), leaf: true},
+        {label: i18n.t('test_track.review.test_review'), value: i18n.t('test_track.review.test_review'), leaf: true},
+        {label: i18n.t('test_track.plan.test_plan'), value: i18n.t('test_track.plan.test_plan'), leaf: true},
+        {label: i18n.t('test_track.issue.issue_management'), value: i18n.t('test_track.issue.issue_management'), leaf: true},
+        {label: i18n.t('commons.report'), value: i18n.t('commons.report'), leaf: true}]
+    },
+    {
+      label: i18n.t('commons.api'), value: i18n.t('commons.api'), children: [
+        {label: i18n.t('workstation.table_name.api_definition'), value: i18n.t('workstation.table_name.api_definition'), leaf: true},
+        {label: i18n.t('workstation.table_name.api_automation'), value: i18n.t('workstation.table_name.api_automation'), leaf: true},
+        {label: i18n.t('permission.project_api_report.name'), value: i18n.t('permission.project_api_report.name'), leaf: true}]
+    },
+    {
+      label: i18n.t('workstation.table_name.performance'), value: i18n.t('workstation.table_name.performance'), children: [
+        {label: i18n.t('workstation.table_name.performance'), value: i18n.t('workstation.table_name.performance'), leaf: true},
+        {label: i18n.t('report.load_test_report'), value: i18n.t('report.load_test_report'), leaf: true}]
+    },
+    {
+      label: i18n.t('commons.system_setting'), value: i18n.t('commons.system_setting'), children: [
+        {label: i18n.t('commons.system')+"-"+i18n.t('commons.user'), value: i18n.t('commons.system')+"-"+i18n.t('commons.user'), leaf: true},
+        {label: i18n.t('commons.system')+"-"+i18n.t('commons.test_resource_pool'), value: i18n.t('commons.system')+"-"+i18n.t('commons.test_resource_pool'), leaf: true},
+        {label: i18n.t('commons.system')+"-"+i18n.t('commons.system_parameter_setting'), value: i18n.t('commons.system')+"-"+i18n.t('commons.system_parameter_setting'), leaf: true},
+        {label: i18n.t('commons.system')+"-"+i18n.t('commons.quota'), value: i18n.t('commons.system')+"-"+i18n.t('commons.quota'), leaf: true},
+        {label: i18n.t('commons.system')+"-"+i18n.t('license.title'), value: i18n.t('commons.system')+"-"+i18n.t('license.title'), leaf: true},
 
-      {label: "工作空间-成员", value: "工作空间-成员", leaf: true},
-      {label: "项目-项目管理", value: "项目-项目管理", leaf: true},
-      {label: "工作空间-模版设置", value: "工作空间-模版设置", leaf: true},
-      {label: "工作空间-项目管理", value: "工作空间-项目管理", leaf: true},
-      {label: "项目-项目管理", value: "项目-项目管理", leaf: true},
-      {label: "项目-成员", value: "项目-成员", leaf: true},
-      {label: "工作空间-成员", value: "工作空间-成员", leaf: true},
+        {label: i18n.t('commons.workspace'), value: i18n.t('commons.workspace'), leaf: true},
+        {label: i18n.t('commons.workspace')+"-"+i18n.t('permission.workspace_service.name'), value: i18n.t('commons.workspace')+"-"+i18n.t('permission.workspace_service.name'), leaf: true},
+        {label: i18n.t('commons.workspace')+"-"+i18n.t('permission.workspace_message.name'), value: i18n.t('commons.workspace')+"-"+i18n.t('permission.workspace_message.name'), leaf: true},
+        {label: i18n.t('commons.workspace')+"-"+i18n.t('permission.project_user.name'), value: i18n.t('commons.workspace')+"-"+i18n.t('permission.project_user.name'), leaf: true},
+        {label: i18n.t('commons.workspace')+"-"+i18n.t('permission.workspace_template.name'), value: i18n.t('commons.workspace')+"-"+i18n.t('permission.workspace_template.name'), leaf: true},
+        {label: i18n.t('commons.workspace')+"-"+i18n.t('permission.workspace_project_manager.name'), value: i18n.t('commons.workspace')+"-"+i18n.t('permission.workspace_project_manager.name'), leaf: true},
+
+        {label: i18n.t('commons.project')+"-"+i18n.t('project.manager'), value: i18n.t('commons.project')+"-"+i18n.t('project.manager'), leaf: true},
+        {label: i18n.t('commons.project')+"-"+i18n.t('permission.project_user.name'), value: i18n.t('commons.project')+"-"+i18n.t('permission.project_user.name'), leaf: true},
+        {label: i18n.t('commons.project')+"-"+i18n.t('api_test.jar_config.jar_manage'), value: i18n.t('commons.project')+"-"+i18n.t('api_test.jar_config.jar_manage'), leaf: true},
+        {label: i18n.t('commons.project')+"-"+i18n.t('permission.workspace_project_environment.name'), value: i18n.t('commons.project')+"-"+i18n.t('permission.workspace_project_environment.name'), leaf: true},
+        {label: i18n.t('commons.project')+"-"+i18n.t('permission.project_file.name'), value: i18n.t('commons.project')+"-"+i18n.t('permission.project_file.name'), leaf: true},
+
+        {label: i18n.t('commons.personal_information')+"-"+i18n.t('commons.personal_setting'), value: i18n.t('commons.personal_information')+"-"+i18n.t('commons.personal_setting'), leaf: true},
+        {label: i18n.t('commons.personal_information')+"-API Keys", value: i18n.t('commons.personal_information')+"-API Keys", leaf: true}
+      ]
+    },
+  ];
+  return sysList;
+}
 
-      {label: "項目-JAR包管理", value: "項目-JAR包管理", leaf: true},
-      {label: "项目-环境设置", value: "项目-环境设置", leaf: true},
-      {label: "项目-文件管理", value: "项目-文件管理", leaf: true},
-      {label: "个人信息-个人设置", value: "个人信息-个人设置", leaf: true},
-      {label: "个人信息-API Keys", value: "个人信息-API Keys", leaf: true}
-    ]
-  },
-];
 
 export function getUrl(d) {
   let url = "/#";
diff --git a/frontend/src/business/components/settings/plugin/JarConfig.vue b/frontend/src/business/components/settings/plugin/JarConfig.vue
index 075323b378..93ea240c8e 100644
--- a/frontend/src/business/components/settings/plugin/JarConfig.vue
+++ b/frontend/src/business/components/settings/plugin/JarConfig.vue
@@ -14,7 +14,7 @@
         ref="fileUpload">
         <i class="el-icon-upload"></i>
         <div class="el-upload__text" v-html="$t('load_test.upload_tips')"></div>
-        <div class="el-upload__tip" slot="tip">只能上传JAR包</div>
+        <div class="el-upload__tip" slot="tip">{{ $t('api_test.jar_config.upload_tip') }}</div>
       </el-upload>
 
       <el-col>
diff --git a/frontend/src/business/components/settings/plugin/ScriptView.vue b/frontend/src/business/components/settings/plugin/ScriptView.vue
index bbdcea86b6..41e369d829 100644
--- a/frontend/src/business/components/settings/plugin/ScriptView.vue
+++ b/frontend/src/business/components/settings/plugin/ScriptView.vue
@@ -2,7 +2,7 @@
   <div v-if="!loading">
     <el-dialog :title="$t('plugin.script_view')" :visible.sync="dialogVisible" @close="close">
       <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="表单配置" name="formOption">
+        <el-tab-pane :label="$t('commons.form_config')" name="formOption">
           <ms-code-edit
             height="400px"
             :data.sync="plugin.formOption"
@@ -10,7 +10,7 @@
             :mode="'json'"
             ref="codeEdit"/>
         </el-tab-pane>
-        <el-tab-pane label="表单内容" name="formScript">
+        <el-tab-pane :label="$t('commons.form_content')" name="formScript">
           <ms-code-edit
             height="400px"
             :data.sync="plugin.formScript"
@@ -49,7 +49,7 @@ export default {
             this.plugin = response.data;
             this.reload();
           } else {
-            this.$warning("未找到脚本内容");
+            this.$warning(this.$t('plugin.warning_tip'));
           }
         });
       }
diff --git a/frontend/src/business/components/settings/system/components/UserImport.vue b/frontend/src/business/components/settings/system/components/UserImport.vue
index 1553ce3cea..c1dc554e58 100644
--- a/frontend/src/business/components/settings/system/components/UserImport.vue
+++ b/frontend/src/business/components/settings/system/components/UserImport.vue
@@ -3,7 +3,7 @@
              @close="close">
         <el-row>
           <el-alert
-            title="用户组只支持系统默认用户组"
+            :title="$t('user.import_user_tip')"
             type="info"
             show-icon
             :closable="false"
@@ -145,5 +145,8 @@ export default {
   padding: 5px 20px;
 }
 
+.user-import >>> .el-alert__content {
+  padding:0 0 0 8px
 
+}
 </style>
diff --git a/frontend/src/business/components/settings/workspace/components/ZentaoSetting.vue b/frontend/src/business/components/settings/workspace/components/ZentaoSetting.vue
index a9184fc92b..ed3ca2f7e7 100644
--- a/frontend/src/business/components/settings/workspace/components/ZentaoSetting.vue
+++ b/frontend/src/business/components/settings/workspace/components/ZentaoSetting.vue
@@ -17,8 +17,8 @@
           <el-radio v-model="form.request" label="PATH_INFO" size="small" border> PATH_INFO</el-radio>
           <el-radio v-model="form.request" label="GET" size="small" border>GET</el-radio>
           <ms-instructions-icon effect="light" style="margin-left: -20px;">
-            参考禅道配置文件中 $config->requestType 的值 <br/><br/>
-            配置文件参考路径：/opt/zbox/app/zentao/config/my.php
+            {{ $t('organization.integration.zentao_config_tip')}} <br/><br/>
+            {{ $t('organization.integration.zentao_config_path')}}
           </ms-instructions-icon>
         </el-form-item>
       </el-form>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index c1fea703f4..45487a824d 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -66,6 +66,7 @@ export default {
     input_limit: 'Within {0} and {1} characters',
     login: 'Sign In',
     welcome: 'One-stop open source continuous testing platform',
+    theme_color:'Theme color',
     username: 'Username',
     password: 'Password',
     input_username: 'Please enter username',
@@ -180,6 +181,8 @@ export default {
     modifier: 'Modifier',
     validate: "Validate",
     batch_add: "Batch add",
+    batch_restore: "Batch restore",
+    batch_gc: "Batch gc",
     check_project_tip: "Create or select the project first",
     auth_redirect_tip: 'Jump to the authentication source page for authentication',
     tag_tip: "Enter to Add Label",
@@ -397,7 +400,9 @@ export default {
     original_state:'Original State',
     custom_num:'CustomNum',
     version:'Version',
-    is_new:"Is new"
+    is_new:"Is new",
+    form_config:"Form config",
+    form_content:"Form content"
   },
   login: {
     normal_Login: "Normal Login",
@@ -627,6 +632,8 @@ export default {
       zentao_account:'Zentao Account',
       zentao_password:'Zentao Password',
       zentao_prompt_information:'This information is the username and password of the user who submitted the defect through ZenTao. If not filled in, the default information configured in the workspace will be used',
+      zentao_config_tip:"Refer to the value of $config->requestType in the ZenTao configuration file",
+      zentao_config_path:"Configuration file reference path: /opt/zbox/app/zentao/config/my.php",
       use_tip: 'Usage guidelines:',
       use_tip_tapd: 'Basic Auth account information is queried in "Company Management-Security and Integration-Open Platform"',
       use_tip_jira: 'Jira software server authentication information is account password, Jira software cloud authentication information is account + token (account settings-security-create API token)',
@@ -680,7 +687,7 @@ export default {
     azureDevops_filter_id: 'AzureDevops Filter ID',
     azureDevops_info: 'AzureDevops Information',
     azureDevops_tip: 'This information is the user token information for submitting defects through Azure Devops. If not filled in, the default information configured in the workspace will be used',
-    manager: 'Project Manager',
+    manager: 'Project Manage',
     no_data: 'No Data',
     select: 'Select',
     repeatable: 'API URL Repeatable',
@@ -787,6 +794,7 @@ export default {
     add_project_batch: 'Batch Add User To Project',
     add_workspace_batch: "Batch Add User To Workspace",
     add_project_batch_tip: 'Add a read-only user group for members by default (system)',
+    import_user_tip:'User group only supports system default user group',
   },
   group: {
     add: 'Add User Group',
@@ -1045,11 +1053,13 @@ export default {
     jar_config: {
       title: "Upload jar package",
       jar_file: "Jar package",
+      jar_manage: "JAR package management",
       delete_tip: "The deletion takes effect after the service is restarted",
       file_exist: "The name already exists in the project",
       upload_limit_size: "Upload file size cannot exceed 30MB!",
       upload_limit_size_warn: "Upload file size cannot exceed {0} MB!",
       upload_limit: "Upload file size cannot exceed",
+      upload_tip:"Only upload JAR packages"
     },
     batch_menus: {
       select_all_data: "Select all datas({0})",
@@ -2518,6 +2528,7 @@ export default {
     script_entry: "Script execution entry",
     plugin_id: "Plug-in id",
     script_view: "View script",
+    warning_tip:'Script content not found'
   },
   mail: {
     input_mail_subject: "Please input subject",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index cdb804f02b..080f17dbd0 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -67,6 +67,7 @@ export default {
     input_limit: '长度在 {0} 到 {1} 个字符',
     login: '登录',
     welcome: '一站式开源持续测试平台',
+    theme_color:'主题色',
     username: '姓名',
     password: '密码',
     input_username: '请输入用户姓名',
@@ -181,6 +182,8 @@ export default {
     modifier: '修改人',
     validate: "校验",
     batch_add: "批量添加",
+    batch_restore: "批量恢复",
+    batch_gc: "批量回收",
     check_project_tip: "请先创建或选择项目",
     auth_redirect_tip: '即将跳转到认证源页面进行认证',
     tag_tip: "输入回车添加标签",
@@ -399,7 +402,9 @@ export default {
     original_state: '原始状态',
     custom_num: '自定义编号',
     version: '版本',
-    is_new: "是否新建"
+    is_new: "是否新建",
+    form_config:"表单配置",
+    form_content:"表单内容"
   },
   login: {
     normal_Login: "普通登录",
@@ -630,6 +635,8 @@ export default {
       zentao_account: '禅道账户',
       zentao_password: '禅道密码',
       zentao_prompt_information: '该信息为通过禅道提交缺陷的的用户名、密码，若未填写，则使用工作空间中配置的默认信息',
+      zentao_config_tip:"参考禅道配置文件中 $config->requestType 的值 ",
+      zentao_config_path:"配置文件参考路径：/opt/zbox/app/zentao/config/my.php",
       use_tip: '使用指引：',
       use_tip_tapd: 'Tapd Basic Auth 账号信息在"公司管理-安全与集成-开放平台"中查询',
       use_tip_jira: 'Jira software server 认证信息为 账号密码，Jira software cloud 认证信息为 账号+令牌(账户设置-安全-创建API令牌)',
@@ -791,6 +798,7 @@ export default {
     add_project_batch: '批量添加到项目',
     add_workspace_batch: "批量添加到工作空间",
     add_project_batch_tip: '默认为成员添加只读用户组(系统)',
+    import_user_tip:'用户组只支持系统默认用户组',
   },
   group: {
     add: '添加用户组',
@@ -1051,11 +1059,13 @@ export default {
     jar_config: {
       title: "上传jar包",
       jar_file: "jar包",
+      jar_manage:"JAR包管理",
       delete_tip: "删除需重启服务后生效",
       file_exist: "该项目下已存在该jar包",
       upload_limit_size: "上传文件大小不能超过 30MB!",
       upload_limit_size_warn: "上传文件大小不能超过 {0} MB!",
       upload_limit: "上传文件大小不能超过",
+      upload_tip:"只能上传JAR包"
     },
     batch_menus: {
       select_all_data: "选择所有数据(共{0}条)",
@@ -2522,6 +2532,7 @@ export default {
     script_entry: "脚本执行入口",
     plugin_id: "插件ID",
     script_view: "查看脚本",
+    warning_tip:'未找到脚本内容'
   },
   mail: {
     input_mail_subject: "请输入邮件主题",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 15c8b380a7..5c2b574a30 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -67,6 +67,7 @@ export default {
     input_limit: '長度在 {0} 到 {1} 個字符',
     login: '登錄',
     welcome: '一站式開源持續測試平臺',
+    theme_color:'主題色',
     username: '姓名',
     password: '密碼',
     input_username: '請輸入用戶姓名',
@@ -181,6 +182,8 @@ export default {
     modifier: '修改人',
     validate: "校驗",
     batch_add: "批量添加",
+    batch_restore: "批量恢復",
+    batch_gc: "批量回收",
     check_project_tip: "請先創建或選擇項目",
     auth_redirect_tip: '即將跳轉到認證源頁面進行認證',
     tag_tip: "輸入回車添加標簽",
@@ -399,7 +402,9 @@ export default {
     original_state: '原始狀態',
     custom_num: '自定義編號',
     version: '版本',
-    is_new: "是否新建"
+    is_new: "是否新建",
+    form_config:"表單配置",
+    form_content:"表單內容"
   },
   login: {
     normal_Login: "普通登錄",
@@ -630,6 +635,8 @@ export default {
       zentao_account: '禪道賬戶',
       zentao_password: '禪道密碼',
       zentao_prompt_information: '該信息為通過禪道提交缺陷的的用戶名、密碼，若未填寫，則使用工作空間中配置的默認信息',
+      zentao_config_tip:"參考禪道配置文件中 $config->requestType 的值 ",
+      zentao_config_path:"配置文件參考路徑：/opt/zbox/app/zentao/config/my.php",
       use_tip: '使用指引：',
       use_tip_tapd: 'Tapd Basic Auth 賬號信息在"公司管理-安全與集成-開放平臺"中查詢',
       use_tip_jira: 'Jira software server 認證信息為 賬號密碼，Jira software cloud 認證信息為 賬號+令牌(賬戶設置-安全-創建API令牌)',
@@ -791,6 +798,7 @@ export default {
     add_project_batch: '批量添加到項目',
     add_workspace_batch: "批量添加到工作空間",
     add_project_batch_tip: '默認為成員添加只讀用戶組(系統)',
+    import_user_tip:'用戶組只支持系統默認用戶組'
   },
   group: {
     add: '添加用戶組',
@@ -1051,11 +1059,13 @@ export default {
     jar_config: {
       title: "上傳jar包",
       jar_file: "jar包",
+      jar_manage:"JAR包管理",
       delete_tip: "刪除需重啟服務後生效",
       file_exist: "該項目下已存在該jar包",
       upload_limit_size: "上傳文件大小不能超過 30MB!",
       upload_limit_size_warn: "上傳文件大小不能超過 {0} MB!",
       upload_limit: "上傳文件大小不能超過",
+      upload_tip:"只能上傳JAR包"
     },
     batch_menus: {
       select_all_data: "選擇所有數據(共{0}條)",
@@ -2522,6 +2532,7 @@ export default {
     script_entry: "腳本執行入口",
     plugin_id: "插件ID",
     script_view: "查看腳本",
+    warning_tip:'未找到腳本內容'
   },
   mail: {
     input_mail_subject: "請輸入郵件主題",

From 7c8b114af25e6f64a016f526d13e2cade23b5c20 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Tue, 21 Dec 2021 15:17:26 +0800
Subject: [PATCH 233/256] chore(xpack): sync
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008894 --user=郭雨琦 【ID1008894】【国际化】系统设置 模块，未翻译的地方汇总
---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index a598375541..a821f89c14 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit a598375541a45898616db5085fd38c192bd6df4b
+Subproject commit a821f89c1409b4a4713442a79a7964e61f30355b

From c96ff48464aeabe16e275a76bd23602e65f6e344 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 21 Dec 2021 15:58:31 +0800
Subject: [PATCH 234/256] =?UTF-8?q?fix(=E5=9C=BA=E6=99=AF=E8=BD=AC?=
 =?UTF-8?q?=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):=20=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E8=BD=AC=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E6=97=B6=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4debugSampler?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

场景转性能测试时去除debugSampler
---
 .../io/metersphere/api/service/APITestService.java    | 11 ++++++++++-
 .../controller/PerformanceTestController.java         |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java
index 934826919a..71a9dce003 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -1,7 +1,6 @@
 package io.metersphere.api.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.client.utils.StringUtils;
 import io.github.ningyu.jmeter.plugin.dubbo.sample.ProviderService;
 import io.metersphere.api.dto.*;
 import io.metersphere.api.dto.definition.RunDefinitionRequest;
@@ -34,6 +33,7 @@ import io.metersphere.job.sechedule.ApiTestJob;
 import io.metersphere.service.FileService;
 import io.metersphere.service.ScheduleService;
 import io.metersphere.track.service.TestCaseService;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.jorphan.collections.HashTree;
@@ -504,6 +504,15 @@ public class APITestService {
 
                     //HTTPSamplerProxy， 进行附件转化： 1.elementProp里去掉路径； 2。elementProp->filePath获取路径并读出来
                     attachmentFilePathList.addAll(this.parseAttachmentFileInfo(element));
+
+                    //查看是否含有RunningDebugSampler,转jmx的时候去掉
+                    List<Element> debugSamplerElementList = element.elements("DebugSampler");
+                    for (Element debugSampler : debugSamplerElementList) {
+                        String testname = debugSampler.attributeValue("testname");
+                        if (StringUtils.equalsAnyIgnoreCase(testname, RunningParamKeys.RUNNING_DEBUG_SAMPLER_NAME)) {
+                            element.remove(debugSampler);
+                        }
+                    }
                 }
                 //如果存在证书文件，也要匹配出来
                 attachmentFilePathList.addAll(this.parseAttachmentFileInfo(innerHashTreeElement));
diff --git a/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java b/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
index c5cf78e316..005b6304b7 100644
--- a/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
+++ b/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
@@ -198,7 +198,7 @@ public class PerformanceTestController {
         byte[] bytes = fileService.loadFileAsBytes(fileOperationRequest.getId());
         return ResponseEntity.ok()
                 .contentType(MediaType.parseMediaType("application/octet-stream"))
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + fileOperationRequest.getName() + "\"")
+                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + fileOperationRequest.getId()+".jmx" + "\"")
                 .body(bytes);
     }
 

From 4142a2a8d09b7a6ed017649e2bf11b9610bc4f02 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 21 Dec 2021 16:17:42 +0800
Subject: [PATCH 235/256] =?UTF-8?q?fix(Mock=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DMock=E6=B5=8B=E8=AF=95=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=87=BD=E6=95=B0=E5=A4=84=E7=90=86=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=B9query=E5=8F=82=E6=95=B0=E4=B8=AD=E7=9A=84json=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=94=AF=E6=8C=81=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复Mock测试自定义函数处理时，对query参数中的json格式数据不支持的问题
---
 .../src/main/java/io/metersphere/api/dto/mock/MockApiUtils.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/api/dto/mock/MockApiUtils.java b/backend/src/main/java/io/metersphere/api/dto/mock/MockApiUtils.java
index fc73959566..9c281ecc39 100644
--- a/backend/src/main/java/io/metersphere/api/dto/mock/MockApiUtils.java
+++ b/backend/src/main/java/io/metersphere/api/dto/mock/MockApiUtils.java
@@ -407,6 +407,8 @@ public class MockApiUtils {
             JSONObject queryParamsObj = requestMockParams.getQueryParamsObj();
             for (String key : queryParamsObj.keySet()) {
                 String value = String.valueOf(queryParamsObj.get(key));
+                value = StringUtils.replace(value, "\\", "\\\\");
+                value = StringUtils.replace(value, "\"", "\\\"");
                 scriptStringBuffer.append("requestParams.put(\"query." + key + "\",\"" + value + "\");\n");
             }
         }

From 083bc8f9e9e28452de1bfa47a1fc58e9fbb40eff Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Tue, 21 Dec 2021 16:35:57 +0800
Subject: [PATCH 236/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=80=9A=E7=9F=A5=E6=97=B6=E6=B2=A1=E6=9C=89=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=88=B0=E8=A1=A8=E9=87=8C=E6=9C=80=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008988 --user=刘瑞斌 【消息通知】删除接口用例无删除时间删除人ID，以及创建人ID，标签 https://www.tapd.cn/55049933/s/1084364
---
 .../notice/sender/SendNoticeAspect.java       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/notice/sender/SendNoticeAspect.java b/backend/src/main/java/io/metersphere/notice/sender/SendNoticeAspect.java
index c634e20a80..dd62d85463 100644
--- a/backend/src/main/java/io/metersphere/notice/sender/SendNoticeAspect.java
+++ b/backend/src/main/java/io/metersphere/notice/sender/SendNoticeAspect.java
@@ -101,6 +101,28 @@ public class SendNoticeAspect {
             String[] params = discoverer.getParameterNames(method);
             //获取操作
             SendNotice sendNotice = method.getAnnotation(SendNotice.class);
+            // 再次从数据库查询一次内容，方便获取最新参数
+            InvocationHandler invocationHandler = Proxy.getInvocationHandler(sendNotice);
+            Field value = invocationHandler.getClass().getDeclaredField("memberValues");
+            value.setAccessible(true);
+
+            if (StringUtils.isNotEmpty(sendNotice.target())) {
+                //将参数纳入Spring管理
+                EvaluationContext context = new StandardEvaluationContext();
+                for (int len = 0; len < params.length; len++) {
+                    context.setVariable(params[len], args[len]);
+                }
+                context.setVariable("targetClass", CommonBeanFactory.getBean(sendNotice.targetClass()));
+
+                String target = sendNotice.target();
+                Expression titleExp = parser.parseExpression(target);
+                Object v = titleExp.getValue(context, Object.class);
+                if (v != null) {
+                    Map<String, Object> memberValues = (Map<String, Object>) value.get(invocationHandler);
+                    memberValues.put("source", JSON.toJSONString(v));
+                }
+            }
+
             EvaluationContext context = new StandardEvaluationContext();
             for (int len = 0; len < params.length; len++) {
                 context.setVariable(params[len], args[len]);

From 5f4ef84553a36d6817b17af84e13396238cb4e18 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 21 Dec 2021 17:00:02 +0800
Subject: [PATCH 237/256] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE):=20=E5=89=8D=E7=BD=AE=E5=92=8C=E5=90=8E=E7=BD=AE?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E7=BB=84=E4=BB=B6=E8=8B=B1=E6=96=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009100 --user=lyh [项目设置]-环境配置-前置和后置脚本 小屏幕显示不全
https://www.tapd.cn/55049933/s/1084415
---
 frontend/src/i18n/en-US.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 45487a824d..2aa9582735 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1754,16 +1754,16 @@ export default {
     },
     script: {
       tip_3: "Script steps will be counted in the execution result of the scene, and the final execution result of the scene will be affected when an execution error is reported",
-      filter_request_type: "Filter request type",
-      execution_order: "Script execution order",
+      filter_request_type: "Request type",
+      execution_order: "Order",
       associated_scene_results: "Associated scene results",
-      execute_before_step: "Execute before a single request step",
+      execute_before_step: "Execute before single",
       execute_before_step_tip: "Execute every time before each API step, such as request encryption",
-      execute_post_step: "Execute after a single request step",
+      execute_post_step: "Execute after single",
       execute_post_step_tip: "Execute every time after each API step, such as response decryption",
-      execute_before_all_steps: "Execute before all requested steps",
+      execute_before_all_steps: "Execute before all",
       execute_before_all_steps_tip: "Execute once before the start of all API steps, such as token acquisition and scene initialization",
-      execute_post_all_steps: "Execute after all requested steps",
+      execute_post_all_steps: "Execute after all",
       execute_post_all_steps_tip: "Execute once after the end of all API steps, such as data destruction and scene reset",
       after_the_pre_script_step: "After the pre-script in the step",
       before_the_pre_script_step: "Before pre-script in step",

From c30ee3ccd6ac382e94a04fcdd85251dec84ccc59 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 21 Dec 2021 17:02:41 +0800
Subject: [PATCH 238/256] chore: sync

---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index a821f89c14..a598375541 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit a821f89c1409b4a4713442a79a7964e61f30355b
+Subproject commit a598375541a45898616db5085fd38c192bd6df4b

From bb7d3bd7bfce48f55aa4102ebdbe1f667d2b808c Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 21 Dec 2021 17:44:06 +0800
Subject: [PATCH 239/256] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE):=20=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=A4=B4=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008889 --user=lyh 【国际化】-所有表头格式例如“ Api Name” ，单词首字母大写，现在所有页面都不一致
https://www.tapd.cn/55049933/s/1084486
---
 frontend/src/i18n/en-US.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 2aa9582735..527dcf59ed 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -409,17 +409,17 @@ export default {
   },
   license: {
     title: 'Authorization management',
-    corporation: 'corporation',
-    time: 'Authorization time',
-    product: 'product',
-    edition: 'edition',
-    licenseVersion: 'licenseVersion',
-    count: 'count',
-    valid_license: 'valid license',
+    corporation: 'Corporation',
+    time: 'Authorization Time',
+    product: 'Product',
+    edition: 'Edition',
+    licenseVersion: 'LicenseVersion',
+    count: 'Count',
+    valid_license: 'Valid License',
     show_license: 'show license',
     valid_license_error: 'validate license error',
-    status: 'valid state',
-    valid: 'valid',
+    status: 'Valid State',
+    valid: 'Valid',
     invalid: 'invalid',
     expired: 'expired',
   },
@@ -1052,7 +1052,7 @@ export default {
     batch_add_parameter: "Format: parameter name: parameter value <br/> like：Accept-Encoding:utf-8",
     jar_config: {
       title: "Upload jar package",
-      jar_file: "Jar package",
+      jar_file: "Jar Package",
       jar_manage: "JAR package management",
       delete_tip: "The deletion takes effect after the service is restarted",
       file_exist: "The name already exists in the project",
@@ -2267,7 +2267,7 @@ export default {
   test_resource_pool: {
     id:'Resource Pool ID',
     type: 'type',
-    enable_disable: 'Enable / disable',
+    enable_disable: 'Enable / Disable',
     search_by_name: 'Search by name',
     create_resource_pool: 'Create resource pool',
     update_resource_pool: 'Create resource pool',
@@ -2408,7 +2408,7 @@ export default {
     resource_pool: "Available test resource pool",
     max_threads: "Maximum Concurrency",
     duration: "Stress test duration(seconds)",
-    use_default: "Use default quota",
+    use_default: "Default Quota",
     yes: "Yes",
     no: "No",
     edit: "Edit",
@@ -2509,12 +2509,12 @@ export default {
     run_with_resource_pool: "Run Within Resource pool",
   },
   operating_log: {
-    title: "Operating log",
-    time: "Operating time",
-    user: "Operating user",
-    type: "Operating type",
-    object: "Operating object",
-    name: "Operating title",
+    title: "Operating Log",
+    time: "Operating Time",
+    user: "Operating User",
+    type: "Operating Type",
+    object: "Operating Object",
+    name: "Operating Title",
     info: "Detail",
     change_field: "Change field",
     before_change: "Before change",
@@ -2526,7 +2526,7 @@ export default {
   plugin: {
     title: "Plug-in management",
     script_entry: "Script execution entry",
-    plugin_id: "Plug-in id",
+    plugin_id: "Plug-in Id",
     script_view: "View script",
     warning_tip:'Script content not found'
   },

From 1ced090be8bc6c89313f7cd9258c34621a7f743c Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Tue, 21 Dec 2021 17:35:50 +0800
Subject: [PATCH 240/256] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=8E=A5=E5=8F=A3=E6=97=B6=E9=80=9A=E7=9F=A5=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=8D=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008982 --user=刘瑞斌 【消息通知】接口更新没有接口ID没有创建人没有创建时间 https://www.tapd.cn/55049933/s/1084444
---
 .../java/io/metersphere/api/service/ApiDefinitionService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index 15dc218b46..d6bf975adc 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -280,7 +280,7 @@ public class ApiDefinitionService {
         MockConfigService mockConfigService = CommonBeanFactory.getBean(MockConfigService.class);
         mockConfigService.updateMockReturnMsgByApi(returnModel);
         FileUtils.createBodyFiles(request.getRequest().getId(), bodyFiles);
-        return returnModel;
+        return getBLOBs(request.getId());
     }
 
     private void checkQuota() {

From e71eb1351c664d9f9aeb8e6fa6d5f280e2905b00 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 21 Dec 2021 17:53:39 +0800
Subject: [PATCH 241/256] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A):=20=E9=A1=B9=E7=9B=AE=E6=8A=A5=E5=91=8A=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009029 --user=宋天阳 【项目报告】-报告内容选择报表-内容中报表显示不全
https://www.tapd.cn/55049933/s/1084468
---
 .../base/mapper/ext/ExtUserGroupMapper.xml    |   3 +-
 .../notice/sender/NoticeModel.java            |   4 +++
 .../notice/sender/impl/MailNoticeSender.java  |  17 ++++++++++++
 backend/src/main/java/io/metersphere/xpack    |   2 +-
 .../src/assets/enterpriseReportExample.png    | Bin 0 -> 359805 bytes
 frontend/src/business/components/xpack        |   2 +-
 frontend/src/i18n/en-US.js                    |   2 ++
 frontend/src/i18n/zh-CN.js                    |  26 ++++++++++--------
 frontend/src/i18n/zh-TW.js                    |  26 ++++++++++--------
 9 files changed, 55 insertions(+), 27 deletions(-)
 create mode 100644 frontend/src/assets/enterpriseReportExample.png

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserGroupMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserGroupMapper.xml
index 42d52e0183..ef23fddcfa 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserGroupMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserGroupMapper.xml
@@ -74,7 +74,8 @@
     <select id="getUserGroupInfo" resultType="io.metersphere.dto.UserGroupInfoDTO">
         select distinct user.id AS userId, user.name AS userName, user.email AS userEmail, g.`name` AS groupName, g.id AS groupId
         from user INNER JOIN user_group ug on user.id = ug.user_id
-                  INNER JOIN `group` g ON ug.group_id = g.id;
+                  INNER JOIN `group` g ON ug.group_id = g.id
+        order by ug.create_time ASC;
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/notice/sender/NoticeModel.java b/backend/src/main/java/io/metersphere/notice/sender/NoticeModel.java
index 557e004c31..b9bc183e46 100644
--- a/backend/src/main/java/io/metersphere/notice/sender/NoticeModel.java
+++ b/backend/src/main/java/io/metersphere/notice/sender/NoticeModel.java
@@ -58,6 +58,10 @@ public class NoticeModel implements Serializable {
      * 接收人
      */
     private List<Receiver> receivers;
+    /**
+     * 抄送人
+     */
+    private List<Receiver> recipients;
     /**
      *
      */
diff --git a/backend/src/main/java/io/metersphere/notice/sender/impl/MailNoticeSender.java b/backend/src/main/java/io/metersphere/notice/sender/impl/MailNoticeSender.java
index 82fa231127..51249df4e9 100644
--- a/backend/src/main/java/io/metersphere/notice/sender/impl/MailNoticeSender.java
+++ b/backend/src/main/java/io/metersphere/notice/sender/impl/MailNoticeSender.java
@@ -15,6 +15,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -81,6 +82,14 @@ public class MailNoticeSender extends AbstractNoticeSender {
             return;
         }
 
+        List<String> recipients = new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(noticeModel.getRecipients())){
+            recipients = noticeModel.getRecipients().stream()
+                    .map(Receiver::getUserId)
+                    .distinct()
+                    .collect(Collectors.toList());
+        }
+
         String[] users = userIds.stream()
                 .distinct()
                 .toArray(String[]::new);
@@ -88,6 +97,14 @@ public class MailNoticeSender extends AbstractNoticeSender {
         LogUtil.info("收件人地址: {}", userIds);
         helper.setText(context, true);
         helper.setTo(users);
+
+        if(CollectionUtils.isNotEmpty(recipients)){
+            String[] ccArr = recipients.stream()
+                    .distinct()
+                    .toArray(String[]::new);
+            helper.setCc(ccArr);
+        }
+
         javaMailSender.send(mimeMessage);
     }
 
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 8e54dfc4cd..25fa8fc0d7 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 8e54dfc4cd510f2d676787dad1599067ac02f2d9
+Subproject commit 25fa8fc0d7972b56f86fb466417ec55588a4812d
diff --git a/frontend/src/assets/enterpriseReportExample.png b/frontend/src/assets/enterpriseReportExample.png
new file mode 100644
index 0000000000000000000000000000000000000000..08f2611476b344add1fad41a81d3e4c9b816a70d
GIT binary patch
literal 359805
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
S!&s1qdm$X$xa(0u(*FZ$>s^Zg

literal 0
HcmV?d00001

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index a598375541..4ab83e897b 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit a598375541a45898616db5085fd38c192bd6df4b
+Subproject commit 4ab83e897bdbc55729fd7418b6a77e73e39b1df9
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 527dcf59ed..5bd950a3ba 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -6,6 +6,7 @@ export default {
     trash: "Trash",
     yes: "yes",
     no: "no",
+    example: "Demo",
     excelFile: "Excel",
     xmindFile: "Xmind",
     default: "default",
@@ -50,6 +51,7 @@ export default {
     save_as: 'Save as',
     update: 'Update',
     save_success: 'Saved successfully',
+    send_success: 'Send successfully',
     delete_success: 'Deleted successfully',
     modify_success: 'Modify Success',
     copy_success: 'Copy Success',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 080f17dbd0..351a0e6162 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -6,6 +6,7 @@ export default {
     trash: "回收站",
     yes: "是",
     no: "否",
+    example: "示例",
     excelFile: "表格文件.xls",
     xmindFile: "思维导图.xmind",
     default: "默认值",
@@ -49,6 +50,7 @@ export default {
     save_as: '另存为',
     update: '更新',
     save_success: '保存成功',
+    send_success: '发送成功',
     delete_success: '删除成功',
     copy_success: '复制成功',
     modify_success: '修改成功',
@@ -67,7 +69,7 @@ export default {
     input_limit: '长度在 {0} 到 {1} 个字符',
     login: '登录',
     welcome: '一站式开源持续测试平台',
-    theme_color:'主题色',
+    theme_color: '主题色',
     username: '姓名',
     password: '密码',
     input_username: '请输入用户姓名',
@@ -403,8 +405,8 @@ export default {
     custom_num: '自定义编号',
     version: '版本',
     is_new: "是否新建",
-    form_config:"表单配置",
-    form_content:"表单内容"
+    form_config: "表单配置",
+    form_content: "表单内容"
   },
   login: {
     normal_Login: "普通登录",
@@ -635,8 +637,8 @@ export default {
       zentao_account: '禅道账户',
       zentao_password: '禅道密码',
       zentao_prompt_information: '该信息为通过禅道提交缺陷的的用户名、密码，若未填写，则使用工作空间中配置的默认信息',
-      zentao_config_tip:"参考禅道配置文件中 $config->requestType 的值 ",
-      zentao_config_path:"配置文件参考路径：/opt/zbox/app/zentao/config/my.php",
+      zentao_config_tip: "参考禅道配置文件中 $config->requestType 的值 ",
+      zentao_config_path: "配置文件参考路径：/opt/zbox/app/zentao/config/my.php",
       use_tip: '使用指引：',
       use_tip_tapd: 'Tapd Basic Auth 账号信息在"公司管理-安全与集成-开放平台"中查询',
       use_tip_jira: 'Jira software server 认证信息为 账号密码，Jira software cloud 认证信息为 账号+令牌(账户设置-安全-创建API令牌)',
@@ -798,7 +800,7 @@ export default {
     add_project_batch: '批量添加到项目',
     add_workspace_batch: "批量添加到工作空间",
     add_project_batch_tip: '默认为成员添加只读用户组(系统)',
-    import_user_tip:'用户组只支持系统默认用户组',
+    import_user_tip: '用户组只支持系统默认用户组',
   },
   group: {
     add: '添加用户组',
@@ -893,7 +895,7 @@ export default {
     file_id: '文件ID',
     avg_response_time: '平均响应时间',
     tps: '每秒传输的事物处理个数',
-    plan_share_url:'链接跳转是否登陆'
+    plan_share_url: '链接跳转是否登陆'
   },
   load_test: {
     id: '测试ID',
@@ -1059,13 +1061,13 @@ export default {
     jar_config: {
       title: "上传jar包",
       jar_file: "jar包",
-      jar_manage:"JAR包管理",
+      jar_manage: "JAR包管理",
       delete_tip: "删除需重启服务后生效",
       file_exist: "该项目下已存在该jar包",
       upload_limit_size: "上传文件大小不能超过 30MB!",
       upload_limit_size_warn: "上传文件大小不能超过 {0} MB!",
       upload_limit: "上传文件大小不能超过",
-      upload_tip:"只能上传JAR包"
+      upload_tip: "只能上传JAR包"
     },
     batch_menus: {
       select_all_data: "选择所有数据(共{0}条)",
@@ -2219,8 +2221,8 @@ export default {
       status_delete: '删除',
       status_in_progress: '接受/处理',
       status_rejected: '拒绝',
-      status_upcoming:'待办',
-      status_reopened:'重新打开',
+      status_upcoming: '待办',
+      status_reopened: '重新打开',
       please_choose_current_owner: "请选择处理人",
       tapd_current_owner: "Tapd 处理人",
       zentao_bug_build: "禅道 影响版本",
@@ -2532,7 +2534,7 @@ export default {
     script_entry: "脚本执行入口",
     plugin_id: "插件ID",
     script_view: "查看脚本",
-    warning_tip:'未找到脚本内容'
+    warning_tip: '未找到脚本内容'
   },
   mail: {
     input_mail_subject: "请输入邮件主题",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 5c2b574a30..6b5dc78703 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -6,6 +6,7 @@ export default {
     trash: "回收站",
     yes: "是",
     no: "否",
+    example: "示例",
     excelFile: "表格文件.xls",
     xmindFile: "思維導圖.xmind",
     default: "默認值",
@@ -49,6 +50,7 @@ export default {
     save_as: '另存為',
     update: '更新',
     save_success: '保存成功',
+    send_success: '發送成功',
     delete_success: '刪除成功',
     copy_success: '復製成功',
     modify_success: '修改成功',
@@ -67,7 +69,7 @@ export default {
     input_limit: '長度在 {0} 到 {1} 個字符',
     login: '登錄',
     welcome: '一站式開源持續測試平臺',
-    theme_color:'主題色',
+    theme_color: '主題色',
     username: '姓名',
     password: '密碼',
     input_username: '請輸入用戶姓名',
@@ -403,8 +405,8 @@ export default {
     custom_num: '自定義編號',
     version: '版本',
     is_new: "是否新建",
-    form_config:"表單配置",
-    form_content:"表單內容"
+    form_config: "表單配置",
+    form_content: "表單內容"
   },
   login: {
     normal_Login: "普通登錄",
@@ -635,8 +637,8 @@ export default {
       zentao_account: '禪道賬戶',
       zentao_password: '禪道密碼',
       zentao_prompt_information: '該信息為通過禪道提交缺陷的的用戶名、密碼，若未填寫，則使用工作空間中配置的默認信息',
-      zentao_config_tip:"參考禪道配置文件中 $config->requestType 的值 ",
-      zentao_config_path:"配置文件參考路徑：/opt/zbox/app/zentao/config/my.php",
+      zentao_config_tip: "參考禪道配置文件中 $config->requestType 的值 ",
+      zentao_config_path: "配置文件參考路徑：/opt/zbox/app/zentao/config/my.php",
       use_tip: '使用指引：',
       use_tip_tapd: 'Tapd Basic Auth 賬號信息在"公司管理-安全與集成-開放平臺"中查詢',
       use_tip_jira: 'Jira software server 認證信息為 賬號密碼，Jira software cloud 認證信息為 賬號+令牌(賬戶設置-安全-創建API令牌)',
@@ -798,7 +800,7 @@ export default {
     add_project_batch: '批量添加到項目',
     add_workspace_batch: "批量添加到工作空間",
     add_project_batch_tip: '默認為成員添加只讀用戶組(系統)',
-    import_user_tip:'用戶組只支持系統默認用戶組'
+    import_user_tip: '用戶組只支持系統默認用戶組'
   },
   group: {
     add: '添加用戶組',
@@ -893,7 +895,7 @@ export default {
     file_id: '文件ID',
     avg_response_time: '平均響應時間',
     tps: '每秒傳輸的事物處理個數',
-    plan_share_url:'鏈接跳轉是否登陸'
+    plan_share_url: '鏈接跳轉是否登陸'
   },
   load_test: {
     id: '測試ID',
@@ -1059,13 +1061,13 @@ export default {
     jar_config: {
       title: "上傳jar包",
       jar_file: "jar包",
-      jar_manage:"JAR包管理",
+      jar_manage: "JAR包管理",
       delete_tip: "刪除需重啟服務後生效",
       file_exist: "該項目下已存在該jar包",
       upload_limit_size: "上傳文件大小不能超過 30MB!",
       upload_limit_size_warn: "上傳文件大小不能超過 {0} MB!",
       upload_limit: "上傳文件大小不能超過",
-      upload_tip:"只能上傳JAR包"
+      upload_tip: "只能上傳JAR包"
     },
     batch_menus: {
       select_all_data: "選擇所有數據(共{0}條)",
@@ -2219,8 +2221,8 @@ export default {
       status_delete: '刪除',
       status_in_progress: '接受/處理',
       status_rejected: '拒絕',
-      status_upcoming:'待辦',
-      status_reopened:'重新打開',
+      status_upcoming: '待辦',
+      status_reopened: '重新打開',
       please_choose_current_owner: "請選擇處理人",
       tapd_current_owner: "Tapd 處理人",
       zentao_bug_build: "禪道 影響版本",
@@ -2532,7 +2534,7 @@ export default {
     script_entry: "腳本執行入口",
     plugin_id: "插件ID",
     script_view: "查看腳本",
-    warning_tip:'未找到腳本內容'
+    warning_tip: '未找到腳本內容'
   },
   mail: {
     input_mail_subject: "請輸入郵件主題",

From cfd327a066c42e3f2eb44b456d90426c17dbdae5 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 21 Dec 2021 18:25:50 +0800
Subject: [PATCH 242/256] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE):=20=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE=E5=90=8E?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B9=E7=9B=AE=EF=BC=8C=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8F=AA=E6=98=BE=E7=A4=BA=E4=BA=86home?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009026 --user=lyh 【系统设置】新建项目后查看项目，用例模块只显示了home页
https://www.tapd.cn/55049933/s/1084530
---
 .../src/business/components/settings/workspace/MsProject.vue   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue
index ce6ad55f9a..74c2a04eca 100644
--- a/frontend/src/business/components/settings/workspace/MsProject.vue
+++ b/frontend/src/business/components/settings/workspace/MsProject.vue
@@ -229,6 +229,7 @@ export default {
     AddMember
   },
   inject: [
+    'reload',
     'reloadTopMenus'
   ],
   data() {
@@ -306,6 +307,8 @@ export default {
         if (arr.length > 0) {
           window.sessionStorage.setItem(PROJECT_ID, row.id);
           this.$router.push('/track/home').then(() => {
+            this.reload();
+            this.reloadTopMenus();
             if (!getCurrentUser().lastProjectId) {
               window.location.reload();
             }

From 78e23135df385bcf3c60e7a33d2540511cb2adc0 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 21 Dec 2021 18:48:51 +0800
Subject: [PATCH 243/256] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86):=20jar=E5=8C=85=E4=B8=8A=E4=BC=A0=EF=BC=8C=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E5=A4=AA=E9=95=BF=E4=B8=8A=E4=BC=A0=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009111 --user=lyh 【项目管理】jar包上传，文件名太长上传报错
https://www.tapd.cn/55049933/s/1084555
---
 .../components/api/test/components/jar/JarConfigFrom.vue      | 4 ++++
 frontend/src/i18n/en-US.js                                    | 1 +
 frontend/src/i18n/zh-CN.js                                    | 1 +
 frontend/src/i18n/zh-TW.js                                    | 1 +
 4 files changed, 7 insertions(+)

diff --git a/frontend/src/business/components/api/test/components/jar/JarConfigFrom.vue b/frontend/src/business/components/api/test/components/jar/JarConfigFrom.vue
index 149306cbeb..db85bb08da 100644
--- a/frontend/src/business/components/api/test/components/jar/JarConfigFrom.vue
+++ b/frontend/src/business/components/api/test/components/jar/JarConfigFrom.vue
@@ -144,6 +144,10 @@
             this.$warning(this.$t('api_test.jar_config.upload_limit_size_warn', [this.limitSize]));
             return false;
           }
+          if (file.name.length > 60) {
+            this.$warning(this.$t('api_test.api_import.file_name_to_long'));
+            return false;
+          }
           return true;
         },
         clickEdit() {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 5bd950a3ba..d607081224 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1624,6 +1624,7 @@ export default {
       ms_env_import_file_limit: "It only supports JSON format files exported through metersphere",
       file_exceed_limit: "The number of files exceeds the limit",
       import_cover_tip: "Import mode: Overwrite mode description",
+      file_name_to_long: "File name is too long",
       cover_tip_1: "1. Add if the interface path does not exist",
       cover_tip_2: "2. The interface path is consistent with the original interface, if the content is inconsistent, the original interface will be overwritten",
       cover_tip_3: "3. If the interface path and content are consistent with the original interface, no change will be made",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 351a0e6162..56daf9947e 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1622,6 +1622,7 @@ export default {
       jmeter_export_tip: "通过 JMeter 生成JMX文件",
       jmeter_tip: "支持 JMeter5.2-5.4版本的JMX文件",
       suffixFormatErr: "文件格式不符合要求",
+      file_name_to_long: "文件名称过长",
       swagger_url_import: "使用URL导入",
       add_request_params: "添加请求参数",
       optional: "（可选）",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 6b5dc78703..97ae9eff0c 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1622,6 +1622,7 @@ export default {
       jmeter_export_tip: "通過 JMeter 生成JMX文件",
       jmeter_tip: "支持 JMeter5.2-5.4版本的JMX文件",
       suffixFormatErr: "文件格式不符合要求",
+      file_name_to_long: "文件名稱過長",
       swagger_url_import: "使用URL導入",
       add_request_params: "添加請求參數",
       optional: "（可選）",

From eb80bb6f1e1cee7a4e47c1574424ecc2a368bccf Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 21 Dec 2021 19:53:21 +0800
Subject: [PATCH 244/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BF=AE=E5=A4=8D=E5=88=86=E5=B8=83=E5=BC=8F?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=9B=B8=E5=85=B3=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApiAutomationController.java   |  2 -
 .../controller/ApiJmeterFileController.java   |  4 +-
 .../dto/definition/request/ElementUtil.java   | 54 +++++++++++++++++++
 .../api/exec/api/ApiExecuteService.java       | 17 +++---
 .../exec/api/TestPlanApiExecuteService.java   |  2 -
 .../exec/scenario/ApiScenarioEnvService.java  | 16 +++++-
 .../scenario/ApiScenarioExecuteService.java   | 14 ++---
 .../scenario/ApiScenarioSerialService.java    | 39 +++++++++++---
 .../api/exec/utils/GenerateHashTreeUtil.java  | 10 ++--
 .../io/metersphere/api/jmeter/FixedTask.java  |  3 --
 .../metersphere/api/jmeter/JMeterService.java |  6 ++-
 .../metersphere/api/jmeter/MessageCache.java  |  6 +--
 .../api/service/ApiAutomationService.java     |  2 +-
 .../ApiDefinitionExecResultService.java       | 52 ++++++------------
 .../api/service/ApiJmeterFileService.java     |  4 +-
 .../ApiScenarioReportResultService.java       |  7 ++-
 .../ApiScenarioReportStructureService.java    | 44 ++++++++++-----
 .../api/service/RemakeReportService.java      |  2 -
 .../metersphere/task/service/TaskService.java |  3 --
 .../api/automation/report/ApiReportDetail.vue |  9 +++-
 20 files changed, 191 insertions(+), 105 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
index ac60bcbc9f..8a4dbebbb3 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
@@ -7,7 +7,6 @@ import io.metersphere.api.dto.automation.*;
 import io.metersphere.api.dto.automation.parse.ScenarioImport;
 import io.metersphere.api.dto.definition.RunDefinitionRequest;
 import io.metersphere.api.exec.queue.ExecThreadPoolExecutor;
-import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.api.service.ApiAutomationService;
 import io.metersphere.base.domain.ApiScenario;
 import io.metersphere.base.domain.ApiScenarioWithBLOBs;
@@ -330,7 +329,6 @@ public class ApiAutomationController {
     @GetMapping(value = "/stop/{reportId}")
     public void stop(@PathVariable String reportId) {
         if (StringUtils.isNotEmpty(reportId)) {
-            MessageCache.caseExecResourceLock.remove(reportId);
             execThreadPoolExecutor.removeQueue(reportId);
             new LocalRunner().stop(reportId);
         }
diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiJmeterFileController.java b/backend/src/main/java/io/metersphere/api/controller/ApiJmeterFileController.java
index c6ee61370a..f50e415443 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiJmeterFileController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiJmeterFileController.java
@@ -47,8 +47,8 @@ public class ApiJmeterFileController {
     }
 
     @GetMapping("download")
-    public ResponseEntity<byte[]> downloadJmeterFiles(@RequestParam("testId") String testId, @RequestParam("reportId") String reportId, @RequestParam("runMode") String runMode) {
-        byte[] bytes = apiJmeterFileService.downloadJmeterFiles(runMode, testId, reportId);
+    public ResponseEntity<byte[]> downloadJmeterFiles(@RequestParam("testId") String testId, @RequestParam("reportId") String reportId, @RequestParam("runMode") String runMode, @RequestParam("reportType") String reportType) {
+        byte[] bytes = apiJmeterFileService.downloadJmeterFiles(runMode, testId, reportId, reportType);
         return ResponseEntity.ok()
                 .contentType(MediaType.parseMediaType("application/octet-stream"))
                 .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + reportId + "_" + testId + ".zip\"")
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
index ef8259ad12..d329e60c5a 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
@@ -24,6 +24,7 @@ import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.FileUtils;
 import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.constants.RunModeConstants;
 import io.metersphere.plugin.core.MsParameter;
 import io.metersphere.plugin.core.MsTestElement;
 import io.metersphere.service.EnvironmentGroupProjectService;
@@ -270,6 +271,24 @@ public class ElementUtil {
         }
     };
 
+    public final static List<String> requests = new ArrayList<String>() {{
+        this.add("HTTPSamplerProxy");
+        this.add("DubboSampler");
+        this.add("JDBCSampler");
+        this.add("TCPSampler");
+        this.add("JSR223Processor");
+        this.add("JSR223PreProcessor");
+        this.add("JSR223PostProcessor");
+        this.add("JDBCPreProcessor");
+        this.add("JDBCPostProcessor");
+        this.add("JmeterElement");
+        this.add("TestPlan");
+        this.add("ThreadGroup");
+        this.add("DNSCacheManager");
+        this.add("DebugSampler");
+        this.add("AuthManager");
+    }};
+
     private static void formatSampler(JSONObject element) {
         if (element == null || StringUtils.isEmpty(element.getString("type"))) {
             return;
@@ -340,6 +359,41 @@ public class ElementUtil {
         }
     }
 
+    public static void dataFormatting(JSONArray hashTree, String id, String reportType) {
+        for (int i = 0; i < hashTree.size(); i++) {
+            JSONObject element = hashTree.getJSONObject(i);
+            formatSampler(element);
+            if (element != null && element.get("clazzName") == null && clazzMap.containsKey(element.getString("type"))) {
+                element.fluentPut("clazzName", clazzMap.get(element.getString("type")));
+            }
+            if (StringUtils.equals(reportType, RunModeConstants.SET_REPORT.toString())) {
+                if (element != null && requests.contains(element.getString("type")) && !element.getString("resourceId").contains(id)) {
+                    element.fluentPut("resourceId", id + "=" + element.getString("resourceId"));
+                }
+            }
+            if (element.containsKey("hashTree")) {
+                JSONArray elementJSONArray = element.getJSONArray("hashTree");
+                dataFormatting(elementJSONArray, id, reportType);
+            }
+        }
+    }
+
+    public static void dataFormatting(JSONObject element, String id, String reportType) {
+        if (element != null && element.get("clazzName") == null && clazzMap.containsKey(element.getString("type"))) {
+            element.fluentPut("clazzName", clazzMap.get(element.getString("type")));
+        }
+        if (StringUtils.equals(reportType, RunModeConstants.SET_REPORT.toString())) {
+            if (element != null && requests.contains(element.getString("type")) && !element.getString("resourceId").contains(id)) {
+                element.fluentPut("resourceId", id + "=" + element.getString("resourceId"));
+            }
+        }
+        formatSampler(element);
+        if (element != null && element.containsKey("hashTree")) {
+            JSONArray elementJSONArray = element.getJSONArray("hashTree");
+            dataFormatting(elementJSONArray, id, reportType);
+        }
+    }
+
     public static void dataSetDomain(JSONArray hashTree, MsParameter msParameter) {
         try {
             ObjectMapper mapper = new ObjectMapper();
diff --git a/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java b/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java
index be0d64fd50..835e528bca 100644
--- a/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java
+++ b/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java
@@ -18,7 +18,6 @@ import io.metersphere.api.dto.scenario.Body;
 import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
 import io.metersphere.api.exec.utils.ApiDefinitionExecResultUtil;
 import io.metersphere.api.jmeter.JMeterService;
-import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.api.service.ApiTestEnvironmentService;
 import io.metersphere.api.service.TcpApiParamService;
 import io.metersphere.base.domain.*;
@@ -120,7 +119,6 @@ public class ApiExecuteService {
         }
         List<MsExecResponseDTO> responseDTOS = new LinkedList<>();
         for (RunCaseRequest runCaseRequest : executeQueue) {
-            MessageCache.caseExecResourceLock.put(runCaseRequest.getReportId(), runCaseRequest.getReport());
             responseDTOS.add(exec(runCaseRequest));
         }
         return responseDTOS;
@@ -153,13 +151,14 @@ public class ApiExecuteService {
                 JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(testCaseWithBLOBs.getId(), StringUtils.isEmpty(request.getReportId()) ? request.getId() : request.getReportId(), request.getRunMode(), jmeterHashTree);
                 jMeterService.run(runRequest);
             } catch (Exception ex) {
-                ApiDefinitionExecResult result = MessageCache.caseExecResourceLock.get(request.getReportId());
-                result.setStatus("error");
-                apiDefinitionExecResultMapper.updateByPrimaryKey(result);
-                ApiTestCaseWithBLOBs caseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(request.getCaseId());
-                caseWithBLOBs.setStatus("error");
-                apiTestCaseMapper.updateByPrimaryKey(caseWithBLOBs);
-                MessageCache.caseExecResourceLock.remove(request.getReportId());
+                ApiDefinitionExecResult result = apiDefinitionExecResultMapper.selectByPrimaryKey(request.getReportId());
+                if (result != null) {
+                    result.setStatus("error");
+                    apiDefinitionExecResultMapper.updateByPrimaryKey(result);
+                    ApiTestCaseWithBLOBs caseWithBLOBs = apiTestCaseMapper.selectByPrimaryKey(request.getCaseId());
+                    caseWithBLOBs.setStatus("error");
+                    apiTestCaseMapper.updateByPrimaryKey(caseWithBLOBs);
+                }
                 LogUtil.error(ex.getMessage(), ex);
             }
         }
diff --git a/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java b/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java
index 8979a79e71..a1ec72b6b0 100644
--- a/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java
+++ b/backend/src/main/java/io/metersphere/api/exec/api/TestPlanApiExecuteService.java
@@ -7,7 +7,6 @@ import io.metersphere.api.exec.scenario.ApiScenarioSerialService;
 import io.metersphere.api.exec.utils.ApiDefinitionExecResultUtil;
 import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
 import io.metersphere.api.jmeter.JMeterService;
-import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.api.service.ApiExecutionQueueService;
 import io.metersphere.base.domain.ApiDefinitionExecResult;
 import io.metersphere.base.domain.ApiExecutionQueue;
@@ -102,7 +101,6 @@ public class TestPlanApiExecuteService {
                 ApiDefinitionExecResult report = ApiDefinitionExecResultUtil.addResult(request, testPlanApiCase, APITestStatus.Running.name(), batchMapper);
                 executeQueue.put(report.getId(), testPlanApiCase);
                 executeThreadIdMap.put(testPlanApiCase.getId(), report.getId());
-                MessageCache.caseExecResourceLock.put(report.getId(), report);
                 responseDTOS.add(new MsExecResponseDTO(testPlanApiCase.getId(), report.getId(), request.getTriggerMode()));
             });
             sqlSession.flushStatements();
diff --git a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java
index 3cc2cdd296..bf5219081d 100644
--- a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java
+++ b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java
@@ -225,7 +225,7 @@ public class ApiScenarioEnvService {
         }
         String definition = apiScenarioWithBLOBs.getScenarioDefinition();
         MsScenario scenario = JSONObject.parseObject(definition, MsScenario.class);
-        GenerateHashTreeUtil.parse(definition, scenario);
+        GenerateHashTreeUtil.parse(definition, scenario, apiScenarioWithBLOBs.getId(), null);
         if (StringUtils.equals(environmentType, EnvironmentType.JSON.toString())) {
             scenario.setEnvironmentMap(JSON.parseObject(environmentJson, Map.class));
         } else if (StringUtils.equals(environmentType, EnvironmentType.GROUP.toString())) {
@@ -428,4 +428,18 @@ public class ApiScenarioEnvService {
             config.setConfig(envConfig);
         }
     }
+
+    public Map<String, String> planEnvMap(String testPlanScenarioId) {
+        Map<String, String> planEnvMap = new HashMap<>();
+        TestPlanApiScenario planApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(testPlanScenarioId);
+        String envJson = planApiScenario.getEnvironment();
+        String envType = planApiScenario.getEnvironmentType();
+        String envGroupId = planApiScenario.getEnvironmentGroupId();
+        if (StringUtils.equals(envType, EnvironmentType.JSON.toString()) && StringUtils.isNotBlank(envJson)) {
+            planEnvMap = JSON.parseObject(envJson, Map.class);
+        } else if (StringUtils.equals(envType, EnvironmentType.GROUP.toString()) && StringUtils.isNotBlank(envGroupId)) {
+            planEnvMap = environmentGroupProjectService.getEnvMap(envGroupId);
+        }
+        return planEnvMap;
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioExecuteService.java b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioExecuteService.java
index 206bd79bda..f993372ce8 100644
--- a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioExecuteService.java
+++ b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioExecuteService.java
@@ -150,7 +150,7 @@ public class ApiScenarioExecuteService {
             responseDTOS.add(new MsExecResponseDTO(JSON.toJSONString(scenarioIds), serialReportId, request.getRunMode()));
             // 增加并行集合报告
             if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.PARALLEL.toString())) {
-                apiScenarioReportStructureService.save(apiScenarios, serialReportId);
+                apiScenarioReportStructureService.save(apiScenarios, serialReportId, request.getConfig() != null ? request.getConfig().getReportType() : null);
             }
         }
         // 开始执行
@@ -160,7 +160,7 @@ public class ApiScenarioExecuteService {
             DBTestQueue executionQueue = apiExecutionQueueService.add(executeQueue, request.getConfig().getResourcePoolId(), ApiRunMode.SCENARIO.name(), serialReportId, reportType, request.getRunMode());
             if (request.getConfig() != null && request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
                 if (StringUtils.isNotEmpty(serialReportId)) {
-                    apiScenarioReportStructureService.save(apiScenarios, serialReportId);
+                    apiScenarioReportStructureService.save(apiScenarios, serialReportId, request.getConfig() != null ? request.getConfig().getReportType() : null);
                 }
                 SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
                 ApiScenarioReportMapper batchMapper = sqlSession.getMapper(ApiScenarioReportMapper.class);
@@ -267,7 +267,7 @@ public class ApiScenarioExecuteService {
                     // 生成并行报告和HashTree
                     RunModeDataDTO runModeDataDTO = new RunModeDataDTO(report, testPlanScenarioId);
                     if (request.getConfig() != null && !request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
-                        runModeDataDTO.setHashTree(GenerateHashTreeUtil.generateHashTree(scenario, reportId, planEnvMap));
+                        runModeDataDTO.setHashTree(GenerateHashTreeUtil.generateHashTree(scenario, reportId, planEnvMap, request.getConfig().getReportType()));
                     }
                     executeQueue.put(report.getId(), runModeDataDTO);
                 } catch (Exception ex) {
@@ -284,7 +284,7 @@ public class ApiScenarioExecuteService {
 
             // 生成文档结构
             if (request.getConfig() == null || !StringUtils.equals(request.getConfig().getReportType(), RunModeConstants.SET_REPORT.toString())) {
-                apiScenarioReportStructureService.save(scenario, report.getId());
+                apiScenarioReportStructureService.save(scenario, report.getId(), request.getConfig() != null ? request.getConfig().getReportType() : null);
             }
             // 重置报告ID
             reportId = UUID.randomUUID().toString();
@@ -317,7 +317,7 @@ public class ApiScenarioExecuteService {
                 try {
                     RunModeDataDTO runModeDataDTO = new RunModeDataDTO(report, item.getId());
                     if (request.getConfig() != null && !request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString())) {
-                        HashTree hashTree = GenerateHashTreeUtil.generateHashTree(item, StringUtils.isNotEmpty(serialReportId) ? serialReportId + "-" + i : reportId, new HashMap<>());
+                        HashTree hashTree = GenerateHashTreeUtil.generateHashTree(item, StringUtils.isNotEmpty(serialReportId) ? serialReportId + "-" + i : reportId, new HashMap<>(), request.getConfig().getReportType());
                         runModeDataDTO.setHashTree(hashTree);
                     }
                     executeQueue.put(report.getId(), runModeDataDTO);
@@ -332,7 +332,7 @@ public class ApiScenarioExecuteService {
             }
             // 生成报告结构
             if (request.getConfig() == null || !StringUtils.equals(request.getConfig().getReportType(), RunModeConstants.SET_REPORT.toString())) {
-                apiScenarioReportStructureService.save(item, report.getId());
+                apiScenarioReportStructureService.save(item, report.getId(), request.getConfig() != null ? request.getConfig().getReportType() : null);
             }
             // 重置报告ID
             reportId = UUID.randomUUID().toString();
@@ -370,7 +370,7 @@ public class ApiScenarioExecuteService {
         apiScenarioReportMapper.insert(report);
         if (request.isSaved()) {
             ApiScenarioWithBLOBs scenario = apiScenarioMapper.selectByPrimaryKey(request.getScenarioId());
-            apiScenarioReportStructureService.save(scenario, report.getId());
+            apiScenarioReportStructureService.save(scenario, report.getId(), request.getConfig() != null ? request.getConfig().getReportType() : null);
         }
         uploadBodyFiles(request.getBodyFileRequestIds(), bodyFiles);
         FileUtils.createBodyFiles(request.getScenarioFileIds(), scenarioFiles);
diff --git a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java
index db4312c4fa..c0d75599a9 100644
--- a/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java
+++ b/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java
@@ -15,17 +15,21 @@ import io.metersphere.api.dto.definition.request.sampler.MsJDBCSampler;
 import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
 import io.metersphere.api.exec.utils.GenerateHashTreeUtil;
 import io.metersphere.api.jmeter.JMeterService;
+import io.metersphere.api.service.ApiExecutionQueueService;
 import io.metersphere.api.service.ApiTestEnvironmentService;
+import io.metersphere.api.service.TestResultService;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
 import io.metersphere.commons.constants.APITestStatus;
 import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.BeanUtils;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.HashTreeUtil;
 import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.constants.RunModeConstants;
 import io.metersphere.dto.JmeterRunRequestDTO;
+import io.metersphere.dto.ResultDTO;
 import io.metersphere.plugin.core.MsTestElement;
 import io.metersphere.utils.LoggerUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -51,6 +55,10 @@ public class ApiScenarioSerialService {
     private TestPlanApiCaseMapper testPlanApiCaseMapper;
     @Resource
     private ApiTestCaseMapper apiTestCaseMapper;
+    @Resource
+    private TestPlanApiScenarioMapper testPlanApiScenarioMapper;
+    @Resource
+    private ApiScenarioEnvService apiScenarioEnvService;
 
     public void serial(ApiExecutionQueue executionQueue, ApiExecutionQueueDetail queue) {
         LoggerUtil.debug("Scenario run-执行脚本装载-进入串行准备");
@@ -73,12 +81,22 @@ public class ApiScenarioSerialService {
             HashTree hashTree = null;
             if (StringUtils.isEmpty(executionQueue.getPoolId())) {
                 if (StringUtils.equalsAny(executionQueue.getRunMode(), ApiRunMode.SCENARIO.name(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
-                    ApiScenarioWithBLOBs scenario = apiScenarioMapper.selectByPrimaryKey(queue.getTestId());
+                    ApiScenarioWithBLOBs scenario = null;
                     Map<String, String> planEnvMap = new LinkedHashMap<>();
-                    if (StringUtils.isNotEmpty(queue.getEvnMap())) {
+                    if (StringUtils.equalsAny(executionQueue.getRunMode(), ApiRunMode.SCENARIO.name())) {
+                        scenario = apiScenarioMapper.selectByPrimaryKey(queue.getTestId());
+                    } else {
+                        TestPlanApiScenario planApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(queue.getTestId());
+                        if (planApiScenario != null) {
+                            planEnvMap = apiScenarioEnvService.planEnvMap(queue.getTestId());
+                            queue.setEvnMap(JSON.toJSONString(planEnvMap));
+                            scenario = apiScenarioMapper.selectByPrimaryKey(planApiScenario.getApiScenarioId());
+                        }
+                    }
+                    if ((planEnvMap == null || planEnvMap.isEmpty()) && StringUtils.isNotEmpty(queue.getEvnMap())) {
                         planEnvMap = JSON.parseObject(queue.getEvnMap(), Map.class);
                     }
-                    hashTree = GenerateHashTreeUtil.generateHashTree(scenario, queue.getReportId(), planEnvMap);
+                    hashTree = GenerateHashTreeUtil.generateHashTree(scenario, queue.getReportId(), planEnvMap, executionQueue.getReportType());
                 } else {
                     hashTree = generateHashTree(queue.getTestId());
                 }
@@ -86,6 +104,9 @@ public class ApiScenarioSerialService {
                 this.initEnv(hashTree);
             }
             String reportId = StringUtils.isNotEmpty(executionQueue.getReportId()) ? executionQueue.getReportId() : queue.getReportId();
+            if (!StringUtils.equals(executionQueue.getRunMode(), ApiRunMode.SCENARIO.name())) {
+                reportId = queue.getReportId();
+            }
             JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(queue.getTestId(), reportId, executionQueue.getRunMode(), hashTree);
             runRequest.setReportType(executionQueue.getReportType());
             runRequest.setPool(GenerateHashTreeUtil.isResourcePool(executionQueue.getPoolId()));
@@ -96,11 +117,14 @@ public class ApiScenarioSerialService {
             // 开始执行
             jMeterService.run(runRequest);
         } catch (Exception e) {
-            LogUtil.error("执行终止：" + e.getMessage());
+            LoggerUtil.error("执行终止：" + e.getMessage());
+            ResultDTO dto = new ResultDTO();
+            BeanUtils.copyBean(dto, queue);
+            dto.setRunType(RunModeConstants.SERIAL.toString());
+            dto.setReportType(executionQueue.getReportType());
+            dto.setRunMode(executionQueue.getRunMode());
             if (StringUtils.equalsAny(executionQueue.getRunMode(), ApiRunMode.SCENARIO.name(), ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) {
-                ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(queue.getReportId());
-                report.setStatus(APITestStatus.Error.name());
-                apiScenarioReportMapper.updateByPrimaryKey(report);
+                CommonBeanFactory.getBean(TestResultService.class).testEnded(dto);
             } else {
                 ApiDefinitionExecResult apiDefinitionExecResult = apiDefinitionExecResultMapper.selectByPrimaryKey(queue.getReportId());
                 if (apiDefinitionExecResult != null) {
@@ -108,6 +132,7 @@ public class ApiScenarioSerialService {
                     apiDefinitionExecResultMapper.updateByPrimaryKey(apiDefinitionExecResult);
                 }
             }
+            CommonBeanFactory.getBean(ApiExecutionQueueService.class).queueNext(dto);
         }
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java b/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java
index 07737a9141..8d1dd393b0 100644
--- a/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java
+++ b/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java
@@ -32,16 +32,16 @@ public class GenerateHashTreeUtil {
 
     public static MsScenario parseScenarioDefinition(String scenarioDefinition) {
         MsScenario scenario = JSONObject.parseObject(scenarioDefinition, MsScenario.class);
-        parse(scenarioDefinition, scenario);
+        parse(scenarioDefinition, scenario, scenario.getId(), null);
         return scenario;
     }
 
-    public static void parse(String scenarioDefinition, MsScenario scenario) {
+    public static void parse(String scenarioDefinition, MsScenario scenario, String id, String reportType) {
         ObjectMapper mapper = new ObjectMapper();
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         try {
             JSONObject element = JSON.parseObject(scenarioDefinition);
-            ElementUtil.dataFormatting(element);
+            ElementUtil.dataFormatting(element, id, reportType);
             // 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取
             if (element != null && StringUtils.isNotEmpty(element.getString("hashTree"))) {
                 LinkedList<MsTestElement> elements = mapper.readValue(element.getString("hashTree"),
@@ -99,7 +99,7 @@ public class GenerateHashTreeUtil {
         return null;
     }
 
-    public static HashTree generateHashTree(ApiScenarioWithBLOBs item, String reportId, Map<String, String> planEnvMap) {
+    public static HashTree generateHashTree(ApiScenarioWithBLOBs item, String reportId, Map<String, String> planEnvMap, String reportType) {
         HashTree jmeterHashTree = new HashTree();
         MsTestPlan testPlan = new MsTestPlan();
         testPlan.setHashTree(new LinkedList<>());
@@ -112,7 +112,7 @@ public class GenerateHashTreeUtil {
             if (planEnvMap != null && planEnvMap.size() > 0) {
                 scenario.setEnvironmentMap(planEnvMap);
             }
-            GenerateHashTreeUtil.parse(item.getScenarioDefinition(), scenario);
+            GenerateHashTreeUtil.parse(item.getScenarioDefinition(), scenario, item.getId(), reportType);
 
             group.setEnableCookieShare(scenario.isEnableCookieShare());
             LinkedList<MsTestElement> scenarios = new LinkedList<>();
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java b/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java
index d2641d55ed..b6eb280650 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/FixedTask.java
@@ -12,9 +12,6 @@ public class FixedTask {
 
     @Scheduled(cron = "0 */5 * * * ?")
     public void execute() {
-        if (MessageCache.caseExecResourceLock.size() > 10000) {
-            MessageCache.caseExecResourceLock.clear();
-        }
         if (queueService == null) {
             queueService = CommonBeanFactory.getBean(ApiExecutionQueueService.class);
         }
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
index 54f1820483..c085e13a3c 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
@@ -107,7 +107,11 @@ public class JMeterService {
         if (baseInfo != null) {
             platformUrl = baseInfo.getUrl();
         }
-        platformUrl += "/api/jmeter/download?testId=" + request.getTestId() + "&reportId=" + request.getReportId() + "&runMode=" + request.getRunMode();
+        platformUrl += "/api/jmeter/download?testId="
+                + request.getTestId()
+                + "&reportId=" + request.getReportId()
+                + "&runMode=" + request.getRunMode()
+                + "&reportType=" + request.getReportType();
 
         request.setPlatformUrl(platformUrl);
         request.setKafkaConfig(KafkaConfig.getKafka());
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java b/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java
index 1f7edd8acb..235f84d6c0 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/MessageCache.java
@@ -1,7 +1,5 @@
 package io.metersphere.api.jmeter;
 
-import io.metersphere.base.domain.ApiDefinitionExecResult;
-
 import javax.websocket.Session;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -11,9 +9,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class MessageCache {
     public final static ConcurrentHashMap<String, Session> reportCache = new ConcurrentHashMap<>();
-    // 用例并发锁
-    public final static ConcurrentHashMap<String, ApiDefinitionExecResult> caseExecResourceLock = new ConcurrentHashMap<>();
-
+    
     public final static Map<String, Long> jmeterLogTask = new HashMap<>();
 
     // 定时任务报告
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 3fa56fb398..79129c721d 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -721,7 +721,7 @@ public class ApiAutomationService {
             if (scenario == null) {
                 return null;
             }
-            GenerateHashTreeUtil.parse(apiScenario.getScenarioDefinition(), scenario);
+            GenerateHashTreeUtil.parse(apiScenario.getScenarioDefinition(), scenario, apiScenario.getId(), null);
             String environmentType = apiScenario.getEnvironmentType();
             String environmentJson = apiScenario.getEnvironmentJson();
             String environmentGroupId = apiScenario.getEnvironmentGroupId();
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index 9b29e08195..b4607c0f08 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import io.metersphere.api.cache.TestPlanReportExecuteCatch;
 import io.metersphere.api.dto.datacount.ExecutedCaseInfoResult;
-import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiDefinitionExecResultMapper;
 import io.metersphere.base.mapper.ApiDefinitionMapper;
@@ -320,34 +319,22 @@ public class ApiDefinitionExecResultService {
 
     private ApiDefinitionExecResult save(RequestResult item, String reportId, String console, int expectProcessResultCount, String type, String testId, boolean isFirst) {
         if (!StringUtils.startsWithAny(item.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) {
-            ApiDefinitionExecResult saveResult = MessageCache.caseExecResourceLock.get(reportId);
-            if (saveResult == null) {
-                saveResult = apiDefinitionExecResultMapper.selectByPrimaryKey(reportId);
-            }
+            ApiDefinitionExecResult saveResult = new ApiDefinitionExecResult();
             item.getResponseResult().setConsole(console);
-            boolean saved = true;
-            if (saveResult == null || expectProcessResultCount > 1) {
-                saveResult = new ApiDefinitionExecResult();
-                if (isFirst) {
-                    saveResult.setId(reportId);
-                } else {
-                    saveResult.setId(UUID.randomUUID().toString());
-                }
-                saveResult.setActuator("LOCAL");
-                saveResult.setName(item.getName());
-                if (StringUtils.equals(type, ApiRunMode.JENKINS_API_PLAN.name())) {
-                    saveResult.setTriggerMode(TriggerMode.API.name());
-                } else if (StringUtils.equals(type, ApiRunMode.MANUAL_PLAN.name())) {
-                    saveResult.setTriggerMode(TriggerMode.MANUAL.name());
-                } else {
-                    saveResult.setTriggerMode(TriggerMode.SCHEDULE.name());
-                }
-                saveResult.setType(type);
-                saveResult.setCreateTime(item.getStartTime());
-                if (SessionUtils.getUser() != null) {
-                    saveResult.setUserId(SessionUtils.getUser().getId());
-                }
-                saved = false;
+            saveResult.setId(reportId);
+            saveResult.setActuator("LOCAL");
+            saveResult.setName(item.getName());
+            if (StringUtils.equals(type, ApiRunMode.JENKINS_API_PLAN.name())) {
+                saveResult.setTriggerMode(TriggerMode.API.name());
+            } else if (StringUtils.equals(type, ApiRunMode.MANUAL_PLAN.name())) {
+                saveResult.setTriggerMode(TriggerMode.MANUAL.name());
+            } else {
+                saveResult.setTriggerMode(TriggerMode.SCHEDULE.name());
+            }
+            saveResult.setType(type);
+            saveResult.setCreateTime(item.getStartTime());
+            if (SessionUtils.getUser() != null) {
+                saveResult.setUserId(SessionUtils.getUser().getId());
             }
 
             String status = item.isSuccess() ? "success" : "error";
@@ -367,14 +354,7 @@ public class ApiDefinitionExecResultService {
             if (StringUtils.isNotEmpty(saveResult.getTriggerMode()) && saveResult.getTriggerMode().equals("CASE")) {
                 saveResult.setTriggerMode(TriggerMode.MANUAL.name());
             }
-            if (!saved) {
-                apiDefinitionExecResultMapper.insert(saveResult);
-            } else {
-                apiDefinitionExecResultMapper.updateByPrimaryKeyWithBLOBs(saveResult);
-            }
-            if (StringUtils.isNotEmpty(reportId)) {
-                MessageCache.caseExecResourceLock.remove(reportId);
-            }
+            apiDefinitionExecResultMapper.updateByPrimaryKeyWithBLOBs(saveResult);
             return saveResult;
         }
         return null;
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java b/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java
index 139af4ed96..a03fd1074f 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java
@@ -58,7 +58,7 @@ public class ApiJmeterFileService {
         return listBytesToZip(files);
     }
 
-    public byte[] downloadJmeterFiles(String runMode, String remoteTestId, String reportId) {
+    public byte[] downloadJmeterFiles(String runMode, String remoteTestId, String reportId, String reportType) {
         Map<String, String> planEnvMap = new HashMap<>();
         ApiScenarioWithBLOBs scenario = null;
         if (StringUtils.equalsAny(runMode, ApiRunMode.SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name())) {
@@ -96,7 +96,7 @@ public class ApiJmeterFileService {
                     planEnvMap = environmentGroupProjectService.getEnvMap(envGroupId);
                 }
             }
-            hashTree = GenerateHashTreeUtil.generateHashTree(scenario, reportId, planEnvMap);
+            hashTree = GenerateHashTreeUtil.generateHashTree(scenario, reportId, planEnvMap, reportType);
         }
         return zipFilesToByteArray((reportId + "_" + remoteTestId), hashTree);
     }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
index 2b8488fd42..f287a38d7f 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java
@@ -43,7 +43,12 @@ public class ApiScenarioReportResultService {
         report.setId(UUID.randomUUID().toString());
         result.setEndTime(System.currentTimeMillis());
         if (result.getResponseResult() != null) {
-            result.getResponseResult().setResponseTime((result.getEndTime() - result.getStartTime()));
+            long time = result.getEndTime() - result.getStartTime();
+            if (time > 0) {
+                result.getResponseResult().setResponseTime(time);
+            } else {
+                result.setEndTime(result.getEndTime());
+            }
         }
         String resourceId = result.getResourceId();
         if (StringUtils.isNotEmpty(resourceId) && resourceId.contains("_")) {
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java
index 55a4172a4e..550d74473b 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java
@@ -8,6 +8,7 @@ import io.metersphere.api.dto.StepTreeDTO;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiScenarioReportResultMapper;
 import io.metersphere.base.mapper.ApiScenarioReportStructureMapper;
+import io.metersphere.constants.RunModeConstants;
 import io.metersphere.dto.RequestResult;
 import io.metersphere.utils.LoggerUtil;
 import org.apache.commons.collections.CollectionUtils;
@@ -32,10 +33,10 @@ public class ApiScenarioReportStructureService {
 
     private static final List<String> requests = Arrays.asList("HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "JSR223Processor", "AbstractSampler");
 
-    public void save(List<ApiScenarioWithBLOBs> apiScenarios, String reportId) {
+    public void save(List<ApiScenarioWithBLOBs> apiScenarios, String reportId, String reportType) {
         List<StepTreeDTO> dtoList = new LinkedList<>();
         for (ApiScenarioWithBLOBs bos : apiScenarios) {
-            StepTreeDTO dto = dataFormatting(bos);
+            StepTreeDTO dto = dataFormatting(bos, reportType);
             dtoList.add(dto);
         }
         if (LoggerUtil.getLogger().isDebugEnabled()) {
@@ -44,9 +45,9 @@ public class ApiScenarioReportStructureService {
         this.save(reportId, dtoList);
     }
 
-    public void save(ApiScenarioWithBLOBs apiScenario, String reportId) {
+    public void save(ApiScenarioWithBLOBs apiScenario, String reportId, String reportType) {
         List<StepTreeDTO> dtoList = new LinkedList<>();
-        StepTreeDTO dto = dataFormatting(apiScenario);
+        StepTreeDTO dto = dataFormatting(apiScenario, reportType);
         dtoList.add(dto);
         this.save(reportId, dtoList);
     }
@@ -70,28 +71,40 @@ public class ApiScenarioReportStructureService {
         }
     }
 
-    public static StepTreeDTO dataFormatting(ApiScenarioWithBLOBs apiScenario) {
+    public static StepTreeDTO dataFormatting(ApiScenarioWithBLOBs apiScenario, String reportType) {
         JSONObject element = JSON.parseObject(apiScenario.getScenarioDefinition());
         StepTreeDTO dto = null;
         if (element != null && element.getBoolean("enable")) {
-            dto = new StepTreeDTO(apiScenario.getName(), element.getString("resourceId"), element.getString("type"), element.getIntValue("index"));
+            String resourceId = element.getString("resourceId");
+            if (StringUtils.equals(reportType, RunModeConstants.SET_REPORT.toString())) {
+                if (StringUtils.isNotEmpty(resourceId) && StringUtils.isNotEmpty(apiScenario.getId()) && !resourceId.contains(apiScenario.getId())) {
+                    resourceId = apiScenario.getId() + "=" + element.getString("resourceId");
+                }
+            }
+            dto = new StepTreeDTO(apiScenario.getName(), resourceId, element.getString("type"), element.getIntValue("index"));
             if (element.containsKey("hashTree") && !requests.contains(dto.getType())) {
                 JSONArray elementJSONArray = element.getJSONArray("hashTree");
-                dataFormatting(elementJSONArray, dto);
+                dataFormatting(elementJSONArray, dto, apiScenario.getId(), reportType);
             }
         }
         return dto;
     }
 
-    public static void dataFormatting(JSONArray hashTree, StepTreeDTO dto) {
+    public static void dataFormatting(JSONArray hashTree, StepTreeDTO dto, String id, String reportType) {
         for (int i = 0; i < hashTree.size(); i++) {
             JSONObject element = hashTree.getJSONObject(i);
             if (element != null && element.getBoolean("enable")) {
-                StepTreeDTO children = new StepTreeDTO(element.getString("name"), element.getString("resourceId"), element.getString("type"), element.getIntValue("index"));
+                String resourceId = element.getString("resourceId");
+                if (StringUtils.equals(reportType, RunModeConstants.SET_REPORT.toString())) {
+                    if (StringUtils.isNotEmpty(resourceId) && StringUtils.isNotEmpty(id) && !resourceId.contains(id)) {
+                        resourceId = id + "=" + element.getString("resourceId");
+                    }
+                }
+                StepTreeDTO children = new StepTreeDTO(element.getString("name"), resourceId, element.getString("type"), element.getIntValue("index"));
                 dto.getChildren().add(children);
                 if (element.containsKey("hashTree") && !requests.contains(children.getType())) {
                     JSONArray elementJSONArray = element.getJSONArray("hashTree");
-                    dataFormatting(elementJSONArray, children);
+                    dataFormatting(elementJSONArray, children, id, reportType);
                 }
             }
         }
@@ -127,7 +140,7 @@ public class ApiScenarioReportStructureService {
         }
     }
 
-    private void calculateStep(List<StepTreeDTO> dtoList, AtomicLong stepError) {
+    private void calculateStep(List<StepTreeDTO> dtoList, AtomicLong stepError, AtomicLong stepTotal) {
         for (StepTreeDTO step : dtoList) {
             // 失败结果数量
             AtomicLong error = new AtomicLong();
@@ -135,6 +148,9 @@ public class ApiScenarioReportStructureService {
             if (error.longValue() > 0) {
                 stepError.set((stepError.longValue() + 1));
             }
+            if (CollectionUtils.isNotEmpty(step.getChildren())) {
+                stepTotal.set((stepTotal.longValue() + step.getChildren().size()));
+            }
         }
     }
 
@@ -194,8 +210,6 @@ public class ApiScenarioReportStructureService {
             ApiScenarioReportStructureWithBLOBs scenarioReportStructure = reportStructureWithBLOBs.get(0);
             List<StepTreeDTO> stepList = JSONArray.parseArray(new String(scenarioReportStructure.getResourceTree(), StandardCharsets.UTF_8), StepTreeDTO.class);
 
-            reportDTO.setScenarioStepTotal(stepList.size());
-
             // 匹配结果
             Map<String, List<ApiScenarioReportResult>> maps = reportResults.stream().collect(Collectors.groupingBy(ApiScenarioReportResult::getResourceId));
             this.reportFormatting(stepList, maps);
@@ -213,7 +227,9 @@ public class ApiScenarioReportStructureService {
             reportDTO.setScenarioSuccess((totalScenario.longValue() - scenarioError.longValue()));
 
             AtomicLong stepError = new AtomicLong();
-            calculateStep(stepList, stepError);
+            AtomicLong stepTotal = new AtomicLong();
+            calculateStep(stepList, stepError, stepTotal);
+            reportDTO.setScenarioStepTotal(stepTotal.longValue());
             reportDTO.setScenarioStepError(stepError.longValue());
             reportDTO.setScenarioStepSuccess((stepList.size() - stepError.longValue()));
 
diff --git a/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java b/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java
index 6ce25d299d..9d65b19161 100644
--- a/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/RemakeReportService.java
@@ -114,7 +114,6 @@ public class RemakeReportService {
                     }
                 }
             }
-            MessageCache.caseExecResourceLock.remove(request.getReportId());
         } catch (Exception e) {
             LogUtil.error(e);
         }
@@ -143,6 +142,5 @@ public class RemakeReportService {
         }
         report.setStatus(APITestStatus.Error.name());
         apiScenarioReportMapper.insert(report);
-        MessageCache.caseExecResourceLock.remove(report.getId());
     }
 }
diff --git a/backend/src/main/java/io/metersphere/task/service/TaskService.java b/backend/src/main/java/io/metersphere/task/service/TaskService.java
index 4c43048517..ab213addee 100644
--- a/backend/src/main/java/io/metersphere/task/service/TaskService.java
+++ b/backend/src/main/java/io/metersphere/task/service/TaskService.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import io.metersphere.api.dto.automation.TaskRequest;
 import io.metersphere.api.exec.queue.ExecThreadPoolExecutor;
 import io.metersphere.api.jmeter.JMeterService;
-import io.metersphere.api.jmeter.MessageCache;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiDefinitionExecResultMapper;
 import io.metersphere.base.mapper.ApiScenarioReportMapper;
@@ -124,7 +123,6 @@ public class TaskService {
                             result.setStatus("STOP");
                             apiDefinitionExecResultMapper.updateByPrimaryKeySelective(result);
                             actuator = result.getActuator();
-                            MessageCache.caseExecResourceLock.remove(result.getId());
                         }
                     } else if (StringUtils.equals(request.getType(), "SCENARIO")) {
                         ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(request.getReportId());
@@ -145,7 +143,6 @@ public class TaskService {
                                 item.setStatus("STOP");
                                 apiDefinitionExecResultMapper.updateByPrimaryKeySelective(item);
                                 actuator = item.getActuator();
-                                MessageCache.caseExecResourceLock.remove(item.getId());
                                 request.setReportId(item.getId());
                                 extracted(poolMap, request, actuator);
                             }
diff --git a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
index 85d3dbb8e9..34b41f173c 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue
@@ -21,7 +21,7 @@
                   <template slot="label">
                     <span class="console">{{ $t('api_test.definition.request.console') }}</span>
                   </template>
-                  <pre>{{ content.console }}</pre>
+                  <ms-code-edit :mode="'text'" :read-only="true" :data.sync="content.console" height="calc(100vh - 500px)"/>
                 </el-tab-pane>
 
               </el-tabs>
@@ -50,6 +50,7 @@ import {RequestFactory} from "../../definition/model/ApiTestModel";
 import {windowPrint, getUUID, getCurrentProjectID} from "@/common/js/utils";
 import {getScenarioReport, getShareScenarioReport} from "@/network/api";
 import {STEP} from "@/business/components/api/automation/scenario/Setting";
+import MsCodeEdit from "@/business/components/common/components/MsCodeEdit";
 
 export default {
   name: "MsApiReport",
@@ -57,6 +58,7 @@ export default {
     MsApiReportViewHeader,
     MsApiReportExport,
     MsMainContainer,
+    MsCodeEdit,
     MsContainer, MsScenarioResults, MsRequestResultTail, MsMetricChart, MsScenarioResult, MsRequestResult
   },
   data() {
@@ -526,7 +528,10 @@ export default {
 .report-container .is-active .fail {
   color: inherit;
 }
-
+.report-console {
+  height: calc(100vh - 270px);
+  overflow-y: auto;
+}
 .export-button {
   float: right;
 }

From c66473b16fa5c58ad4bda28992fce4534364cdb9 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 21 Dec 2021 17:07:58 +0800
Subject: [PATCH 245/256] =?UTF-8?q?fix:=20=E7=A6=85=E9=81=93path=5Finfo?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=90=8C=E6=AD=A5=E7=BC=BA=E9=99=B7=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=20=E3=80=90=E7=BC=BA=E9=99=B7=E5=8F=8C=E5=90=91?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=9C=A8=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E6=96=B9=E5=BC=8F=E9=BB=98=E8=AE=A4=E4=B8=BAPATH=5FIN?=
 =?UTF-8?q?FO=E6=97=B6=EF=BC=8C=E6=97=A0=E6=B3=95=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E7=A6=85=E9=81=93=E7=9A=84=E7=BC=BA=E9=99=B7=E8=87=B3MS?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=AD=A5=E6=8A=A5=E9=94=99=EF=BC=8C=E8=AF=B7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91https://www.tapd.cn/33805590/bugtrac?=
 =?UTF-8?q?e/bugs/view=3Fbug=5Fid=3D11338055900010086377?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/track/issue/ZentaoPlatform.java  | 6 +++++-
 .../io/metersphere/track/issue/client/ZentaoClient.java  | 9 +++++----
 .../metersphere/track/issue/client/ZentaoGetClient.java  | 3 +++
 .../track/issue/client/ZentaoPathInfoClient.java         | 3 +++
 .../track/issue/domain/zentao/RequestUrl.java            | 1 +
 backend/src/main/resources/i18n/messages.properties      | 2 ++
 .../src/main/resources/i18n/messages_en_US.properties    | 1 +
 .../src/main/resources/i18n/messages_zh_CN.properties    | 1 +
 .../src/main/resources/i18n/messages_zh_TW.properties    | 1 +
 9 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java b/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
index d066f2c4ca..631045b1f4 100644
--- a/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
@@ -140,7 +140,11 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
             issuesMapper.updateByPrimaryKeySelective(issue);
         }
         issue.setTitle(bugObj.getTitle());
-        issue.setDescription(steps);
+
+        // 保留之前上传的图片
+        String images = getImages(issue.getDescription());
+        issue.setDescription(steps + "\n" + images);
+
         issue.setReporter(bugObj.getOpenedBy());
         issue.setPlatform(key);
         try {
diff --git a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java
index b692af0e88..34fc122dca 100644
--- a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java
+++ b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java
@@ -1,9 +1,11 @@
 package io.metersphere.track.issue.client;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.i18n.Translator;
 import io.metersphere.track.issue.domain.zentao.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpEntity;
@@ -29,9 +31,6 @@ public abstract class ZentaoClient extends BaseClient {
         ENDPOINT = url;
     }
 
-    // 注意 recTotal={1}&recPerPage={2}&pageID={3} 顺序不能调换，实在恶心
-    private static final String BUG_LIST_URL = "?m=bug&f=browse&productID={0}&branch=&browseType=&param=0&orderBy=&recTotal={1}&recPerPage={2}&pageID={3}&t=json&zentaosid={4}";
-
     public String login() {
         GetUserResponse getUserResponse = new GetUserResponse();
         String sessionId = "";
@@ -46,6 +45,8 @@ public abstract class ZentaoClient extends BaseClient {
             getUserResponse = (GetUserResponse) getResultForObject(GetUserResponse.class, response);
         } catch (Exception e) {
             LogUtil.error(e);
+            if (e instanceof JSONException)
+                MSException.throwException(Translator.get("zentao_test_type_error"));
             MSException.throwException(e.getMessage());
         }
         GetUserResponse.User user = getUserResponse.getUser();
@@ -121,7 +122,7 @@ public abstract class ZentaoClient extends BaseClient {
 
     public JSONArray getBugsByProjectId(String projectId, int pageNum, int pageSize) {
         String sessionId = login();
-        ResponseEntity<String> response = restTemplate.exchange(getBaseUrl() + BUG_LIST_URL,
+        ResponseEntity<String> response = restTemplate.exchange(requestUrl.getBugList(),
                 HttpMethod.GET, null, String.class, projectId, 9999999, pageSize, pageNum, sessionId);
         return JSONObject.parseObject(response.getBody()).getJSONObject("data").getJSONArray("bugs");
     }
diff --git a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoGetClient.java b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoGetClient.java
index 52cd5b27ef..d7d0579a79 100644
--- a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoGetClient.java
+++ b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoGetClient.java
@@ -18,6 +18,8 @@ public class ZentaoGetClient extends ZentaoClient {
     private static final String FILE_UPLOAD="&module=file&methodName=saveUpload&t=json&zentaosid=";
     private static final String REPLACE_IMG_URL="<img src=\"%s/index.php?m=file&f=read&fileID=$1\"/>";
     private static final Pattern IMG_PATTERN = Pattern.compile("m=file&f=read&fileID=(.*?)\"/>");
+    // 注意 recTotal={1}&recPerPage={2}&pageID={3} 顺序不能调换，有点恶心
+    private static final String BUG_LIST_URL = "/?m=bug&f=browse&productID={0}&branch=&browseType=&param=0&orderBy=&recTotal={1}&recPerPage={2}&pageID={3}&t=json&zentaosid={4}";
 
     RequestUrl request = new RequestUrl();
 
@@ -38,6 +40,7 @@ public class ZentaoGetClient extends ZentaoClient {
         request.setImgPattern(IMG_PATTERN);
         request.setBugUpdate(getUrl(BUG_UPDATE));
         request.setBugDelete(getNotSuperModelUrl(BUG_DELETE));
+        request.setBugList(getNotSuperModelUrl(BUG_LIST_URL));
         requestUrl = request;
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoPathInfoClient.java b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoPathInfoClient.java
index 2df7babf23..90c3e8d88b 100644
--- a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoPathInfoClient.java
+++ b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoPathInfoClient.java
@@ -19,6 +19,8 @@ public class ZentaoPathInfoClient extends ZentaoClient {
     private static final String FILE_UPLOAD = "/api-getModel-file-saveUpload.json?zentaosid=";
     private static final String REPLACE_IMG_URL = "<img src=\"%s/file-read-$1\"/>";
     private static final Pattern IMG_PATTERN = Pattern.compile("file-read-(.*?)\"/>");
+    private static final String BUG_LIST_URL = "/bug-browse-{1}---0--{2}-{3}-{4}.json?zentaosid={5}";
+
 
     public ZentaoPathInfoClient(String url) {
         super(url);
@@ -39,6 +41,7 @@ public class ZentaoPathInfoClient extends ZentaoClient {
         request.setImgPattern(IMG_PATTERN);
         request.setBugUpdate(getUrl(BUG_UPDATE));
         request.setBugDelete(getUrl(BUG_DELETE));
+        request.setBugList(getUrl(BUG_LIST_URL));
         requestUrl = request;
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/issue/domain/zentao/RequestUrl.java b/backend/src/main/java/io/metersphere/track/issue/domain/zentao/RequestUrl.java
index 8cff455854..850cdba221 100644
--- a/backend/src/main/java/io/metersphere/track/issue/domain/zentao/RequestUrl.java
+++ b/backend/src/main/java/io/metersphere/track/issue/domain/zentao/RequestUrl.java
@@ -12,6 +12,7 @@ public class RequestUrl {
     private String sessionGet;
     private String bugCreate;
     private String bugUpdate;
+    private String bugList;
     private String bugDelete;
     private String bugGet;
     private String storyGet;
diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index e646bc44c3..00b7868732 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -71,3 +71,5 @@ expect_name_exists=
 id_not_rightful=
 mock_warning=
 invalid_parameter=
+workspace_template_settings_issue=
+zentao_test_type_error=
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index 62b948d15e..9f48995a84 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -285,5 +285,6 @@ test_case_status=Case status
 id_not_rightful=ID is not rightful
 # mock
 mock_warning=No matching Mock expectation was found
+zentao_test_type_error=请求方式错误
 #项目报告
 enterprise_test_report=Enterprise report
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index 70c9ec2030..dc06fd2460 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -284,5 +284,6 @@ test_case_status=用例状态
 id_not_rightful=ID 不合法
 # mock
 mock_warning=未找到匹配的Mock期望
+zentao_test_type_error=invalid Zentao request 
 #项目报告
 enterprise_test_report=项目报告
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index d46121abf8..86c613adfc 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -284,5 +284,6 @@ test_case_status=用例狀態
 id_not_rightful=ID 不合法
 # mock
 mock_warning=未找到匹配的Mock期望
+zentao_test_type_error=請求方式錯誤
 #项目报告
 enterprise_test_report=項目報告

From 21e15276bd534f45ff0337bba6c3ef602a7111bb Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 21 Dec 2021 18:01:06 +0800
Subject: [PATCH 246/256] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/track/issue/client/ZentaoClient.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java
index 34fc122dca..e917949ae5 100644
--- a/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java
+++ b/backend/src/main/java/io/metersphere/track/issue/client/ZentaoClient.java
@@ -43,10 +43,10 @@ public abstract class ZentaoClient extends BaseClient {
             HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(paramMap, new HttpHeaders());
             ResponseEntity<String> response = restTemplate.exchange(loginUrl + sessionId, HttpMethod.POST, requestEntity, String.class);
             getUserResponse = (GetUserResponse) getResultForObject(GetUserResponse.class, response);
+        } catch (JSONException e) {
+            MSException.throwException(Translator.get("zentao_test_type_error"));
         } catch (Exception e) {
             LogUtil.error(e);
-            if (e instanceof JSONException)
-                MSException.throwException(Translator.get("zentao_test_type_error"));
             MSException.throwException(e.getMessage());
         }
         GetUserResponse.User user = getUserResponse.getUser();

From ca39c24911ef20ad8d169763ff4f55859d2c0bc7 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 21 Dec 2021 20:11:19 +0800
Subject: [PATCH 247/256] =?UTF-8?q?fix:=20=E9=83=A8=E5=88=86=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9(?=
 =?UTF-8?q?=E6=89=A9=E5=85=85xss=E7=99=BD=E5=90=8D=E5=8D=95)=20--bug=3D100?=
 =?UTF-8?q?8133=20--user=3D=E9=99=88=E5=BB=BA=E6=98=9F=20[github#7877]?=
 =?UTF-8?q?=E2=80=9C=E5=90=8C=E6=AD=A5=E7=BC=BA=E9=99=B7=E2=80=9D=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4bug=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1=20https://www.?=
 =?UTF-8?q?tapd.cn/55049933/s/1084518?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 .../track/case/components/MsMarkDownText.vue  | 35 ++++++++++++++++++-
 frontend/src/business/components/xpack        |  2 +-
 frontend/src/common/js/constants.js           |  2 +-
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 25fa8fc0d7..8e54dfc4cd 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 25fa8fc0d7972b56f86fb466417ec55588a4812d
+Subproject commit 8e54dfc4cd510f2d676787dad1599067ac02f2d9
diff --git a/frontend/src/business/components/track/case/components/MsMarkDownText.vue b/frontend/src/business/components/track/case/components/MsMarkDownText.vue
index 3a66dc0011..da7f1838f1 100644
--- a/frontend/src/business/components/track/case/components/MsMarkDownText.vue
+++ b/frontend/src/business/components/track/case/components/MsMarkDownText.vue
@@ -8,6 +8,7 @@
 <script>
 import {getCurrentUser, getUUID} from "@/common/js/utils";
 import {deleteMarkDownImg, uploadMarkDownImg} from "@/network/image";
+import {DEFAULT_XSS_ATTR} from "@/common/js/constants";
 export default {
   name: "MsMarkDownText",
   components: {},
@@ -68,7 +69,39 @@ export default {
       id: getUUID(),
       xssOptions: {
         whiteList: {
-          img: ["src", "alt", "width", "height"],
+          div: DEFAULT_XSS_ATTR,
+          p: DEFAULT_XSS_ATTR,
+          br: [],
+          h1: DEFAULT_XSS_ATTR,
+          h2: DEFAULT_XSS_ATTR,
+          h3: DEFAULT_XSS_ATTR,
+          h4: DEFAULT_XSS_ATTR,
+          h5: DEFAULT_XSS_ATTR,
+          h6: DEFAULT_XSS_ATTR,
+          hr: DEFAULT_XSS_ATTR,
+          span: DEFAULT_XSS_ATTR,
+          strong: DEFAULT_XSS_ATTR,
+          b: DEFAULT_XSS_ATTR,
+          i: DEFAULT_XSS_ATTR,
+          pre: DEFAULT_XSS_ATTR,
+          code: DEFAULT_XSS_ATTR,
+          tr: DEFAULT_XSS_ATTR,
+          table: [...DEFAULT_XSS_ATTR, 'width', 'border'],
+          td: [...DEFAULT_XSS_ATTR, 'width', 'colspan'],
+          th: [...DEFAULT_XSS_ATTR, 'width', 'colspan'],
+          a: [...DEFAULT_XSS_ATTR, 'target', 'href', 'title', 'rel'],
+          img: [...DEFAULT_XSS_ATTR, "src", "alt", "width", "height"],
+          tbody: DEFAULT_XSS_ATTR,
+          ul: DEFAULT_XSS_ATTR,
+          li: DEFAULT_XSS_ATTR,
+          ol: DEFAULT_XSS_ATTR,
+          dl: DEFAULT_XSS_ATTR,
+          dt: DEFAULT_XSS_ATTR,
+          em: DEFAULT_XSS_ATTR,
+          blockquote: DEFAULT_XSS_ATTR,
+          // 如果支持视频
+    //      audio: ['autoplay', 'controls', 'loop', 'preload', 'src'],
+    //      video: ['autoplay', 'controls', 'loop', 'preload', 'src', 'height', 'width']
         },
         stripIgnoreTagBody: true
       },
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 4ab83e897b..a598375541 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 4ab83e897bdbc55729fd7418b6a77e73e39b1df9
+Subproject commit a598375541a45898616db5085fd38c192bd6df4b
diff --git a/frontend/src/common/js/constants.js b/frontend/src/common/js/constants.js
index e2eaf01e39..aa0743c38d 100644
--- a/frontend/src/common/js/constants.js
+++ b/frontend/src/common/js/constants.js
@@ -202,4 +202,4 @@ export const ENV_TYPE = {
   GROUP: "GROUP"
 }
 
-
+export const DEFAULT_XSS_ATTR = ['style', 'class'];

From 894460a590067d449847908c162f4e44898bd4ab Mon Sep 17 00:00:00 2001
From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Tue, 21 Dec 2021 20:34:56 +0800
Subject: [PATCH 248/256] =?UTF-8?q?chore(=E5=9B=BD=E9=99=85=E5=8C=96):=20?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=20(#8689)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(国际化): 系统设置国际化处理

--bug=1008894 --user=郭雨琦 【ID1008894】【国际化】系统设置 模块，未翻译的地方汇总

* chore(国际化): 系统设置国际化处理

--bug=1008894 --user=郭雨琦 【ID1008894】【国际化】系统设置 模块，未翻译的地方汇总

Co-authored-by: guoyuqi <xiaomeinvG@126.com>
Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
---
 .../schedule/ScheduleNotification.vue         |  2 +-
 .../import/SwaggerTaskNotification.vue        |  2 +-
 .../components/ScheduleTaskNotification.vue   |  2 +-
 .../api/ApiAutomationNotification.vue         |  2 +-
 .../api/ApiDefinitionNotification.vue         |  2 +-
 .../components/api/ApiHomeNotification.vue    |  2 +-
 .../components/api/ApiReportNotification.vue  |  2 +-
 .../jenkins/JenkinsNotification.vue           |  2 +-
 .../PerformanceReportNotification.vue         |  2 +-
 .../PerformanceTestNotification.vue           |  2 +-
 .../track/DefectTaskNotification.vue          |  2 +-
 .../components/track/TestCaseNotification.vue |  2 +-
 .../track/TestPlanTaskNotification.vue        |  2 +-
 .../track/TestReviewNotification.vue          |  2 +-
 .../track/TrackHomeNotification.vue           |  2 +-
 .../track/TrackReportNotification.vue         |  2 +-
 .../template/TestCaseTemplateEdit.vue         |  2 +-
 .../template/TestCaseTemplateList.vue         |  2 +-
 .../plan/components/ScheduleNotification.vue  |  2 +-
 frontend/src/business/components/xpack        |  2 +-
 frontend/src/common/js/table-constants.js     | 22 ++++++++++---------
 21 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
index 098f9674e0..f7f517cb1c 100644
--- a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
+++ b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
@@ -60,7 +60,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook"  size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/api/definition/components/import/SwaggerTaskNotification.vue b/frontend/src/business/components/api/definition/components/import/SwaggerTaskNotification.vue
index 8d206a2b14..c11e746c6d 100644
--- a/frontend/src/business/components/api/definition/components/import/SwaggerTaskNotification.vue
+++ b/frontend/src/business/components/api/definition/components/import/SwaggerTaskNotification.vue
@@ -60,7 +60,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook"  size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/workspace/components/ScheduleTaskNotification.vue b/frontend/src/business/components/settings/workspace/components/ScheduleTaskNotification.vue
index fcc17a2114..01c42eaafc 100644
--- a/frontend/src/business/components/settings/workspace/components/ScheduleTaskNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/ScheduleTaskNotification.vue
@@ -60,7 +60,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook" size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue
index 9ed62909af..273bc47410 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue
@@ -62,7 +62,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook" size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue
index 72df488913..b47b140eba 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue
@@ -62,7 +62,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook" size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue
index ff3ab4b143..075590a73f 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue
@@ -62,7 +62,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook"  size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue
index 7a208ec3a5..cf3e300521 100644
--- a/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue
@@ -62,7 +62,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook"  size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/workspace/components/jenkins/JenkinsNotification.vue b/frontend/src/business/components/settings/workspace/components/jenkins/JenkinsNotification.vue
index 9f51d8e16b..c0fc2569fe 100644
--- a/frontend/src/business/components/settings/workspace/components/jenkins/JenkinsNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/jenkins/JenkinsNotification.vue
@@ -62,7 +62,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址"
+              <el-input v-model="scope.row.webhook"
                         size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
diff --git a/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue b/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue
index 098f590a91..2c220cedb6 100644
--- a/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue
@@ -62,7 +62,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook" size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue b/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue
index 5309182bd6..eb532b511f 100644
--- a/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue
@@ -62,7 +62,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook" size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue b/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue
index f862d70f60..afee25f8b5 100644
--- a/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue
@@ -62,7 +62,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook"  size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue
index 1e41ea0eb9..8a66a61eb8 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue
@@ -62,7 +62,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook"  size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue
index fd5cc14d85..b436eb7df0 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue
@@ -61,7 +61,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook" size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue
index f3da1a4377..d7c69a3b67 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue
@@ -62,7 +62,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook"  size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue
index fda958175d..6dcc3630c6 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue
@@ -62,7 +62,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook" size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue
index 675bb28361..be0a4f0ad9 100644
--- a/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue
@@ -62,7 +62,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook"  size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/settings/workspace/template/TestCaseTemplateEdit.vue b/frontend/src/business/components/settings/workspace/template/TestCaseTemplateEdit.vue
index 441c1b5100..545b9d440c 100644
--- a/frontend/src/business/components/settings/workspace/template/TestCaseTemplateEdit.vue
+++ b/frontend/src/business/components/settings/workspace/template/TestCaseTemplateEdit.vue
@@ -99,7 +99,7 @@ export default {
   },
   computed: {
     caseTypeOption() {
-      return CASE_TYPE_OPTION;
+      return new CASE_TYPE_OPTION();
     },
     isSystem() {
       return this.form.system;
diff --git a/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue b/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue
index 505685f6ad..648c73a187 100644
--- a/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue
+++ b/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue
@@ -142,7 +142,7 @@ export default {
       return CUSTOM_FIELD_LIST;
     },
     caseTypeFilters() {
-      return CASE_TYPE_OPTION;
+      return new CASE_TYPE_OPTION();
     },
     tableHeight() {
       return getDefaultTableHeight();
diff --git a/frontend/src/business/components/track/plan/components/ScheduleNotification.vue b/frontend/src/business/components/track/plan/components/ScheduleNotification.vue
index 23bec87f1c..ba504eb1c4 100644
--- a/frontend/src/business/components/track/plan/components/ScheduleNotification.vue
+++ b/frontend/src/business/components/track/plan/components/ScheduleNotification.vue
@@ -60,7 +60,7 @@
           </el-table-column>
           <el-table-column label="webhook" min-width="20%" prop="webhook">
             <template v-slot:default="scope">
-              <el-input v-model="scope.row.webhook" placeholder="webhook地址" size="mini"
+              <el-input v-model="scope.row.webhook" size="mini"
                         :disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
             </template>
           </el-table-column>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index a598375541..a821f89c14 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit a598375541a45898616db5085fd38c192bd6df4b
+Subproject commit a821f89c1409b4a4713442a79a7964e61f30355b
diff --git a/frontend/src/common/js/table-constants.js b/frontend/src/common/js/table-constants.js
index afd110feb0..9857a38f4a 100644
--- a/frontend/src/common/js/table-constants.js
+++ b/frontend/src/common/js/table-constants.js
@@ -24,15 +24,17 @@ export const CUSTOM_FIELD_SCENE_OPTION = [
   {value: 'ISSUE',text: 'workspace.issue_template_manage'},
 ];
 
-export const CASE_TYPE_OPTION = [
-  {value: 'functional',text: '功能用例'},
-];
+export function CASE_TYPE_OPTION(){
+  return [
+    {value: 'functional', text: i18n.t('api_test.home_page.failed_case_list.table_value.case_type.functional')},
+  ];
+}
 
 export const ISSUE_PLATFORM_OPTION = [
   {value: LOCAL, text: 'Metersphere'},
   {value: TAPD, text: 'Tapd'},
   {value: JIRA, text: 'JIRA'},
-  {value: ZEN_TAO, text: '禅道'},
+  {value: ZEN_TAO, text: 'Zentao'},
   {value: AZURE_DEVOPS, text: 'Azure Devops'},
 ];
 
@@ -75,12 +77,12 @@ export const SYSTEM_FIELD_NAME_MAP = {
 
 
 export const ISSUE_STATUS_MAP = {
-  'new': '新建',
-  'closed': '已关闭',
-  'resolved': '已解决',
-  'active': '激活',
-  'delete': '已删除',
-  'created':'新建'
+  'new': i18n.t('test_track.issue.status_new'),
+  'closed': i18n.t('test_track.issue.status_closed'),
+  'resolved': i18n.t('test_track.issue.status_resolved'),
+  'active': i18n.t('test_track.issue.status_active'),
+  'delete': i18n.t('test_track.issue.status_delete'),
+  'created':i18n.t('test_track.issue.status_new')
 }
 
 export function API_SCENARIO_FILTERS () {

From dccb66f289bb00860284115cee4126ae8a79dbd6 Mon Sep 17 00:00:00 2001
From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Tue, 21 Dec 2021 20:35:16 +0800
Subject: [PATCH 249/256] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E7=94=A8=E4=BE=8B=E5=BA=93bug=E4=BF=AE=E6=94=B9=20(#8?=
 =?UTF-8?q?684)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009040 --user=王孝刚 公共用例库bug https://www.tapd.cn/55049933/s/1084396

Co-authored-by: wxg0103 <727495428@qq.com>
---
 .../api/service/ApiAutomationService.java     |   4 +-
 .../api/service/ApiTestCaseService.java       |   4 +-
 .../automation/scenario/ApiScenarioList.vue   |   4 +-
 .../components/case/ApiCaseItem.vue           |   1 +
 .../components/form/CustomFiledFormItem.vue   |  10 +-
 .../components/track/case/TestCase.vue        |  59 +-
 .../case/components/TestCaseEditShow.vue      | 949 ++++++++++++++++++
 .../track/case/components/TestCaseList.vue    |  15 +
 .../track/common/TestCaseNodeTree.vue         |   3 +-
 frontend/src/i18n/en-US.js                    |  11 +-
 frontend/src/i18n/zh-CN.js                    |   3 +-
 frontend/src/i18n/zh-TW.js                    |   3 +-
 12 files changed, 1047 insertions(+), 19 deletions(-)
 create mode 100644 frontend/src/business/components/track/case/components/TestCaseEditShow.vue

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 79129c721d..fd9e3ae2c0 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -1818,12 +1818,12 @@ public class ApiAutomationService {
                         List<String> scenarioNames = extApiScenarioMapper.selectNameByIdIn(scenarioIdList);
 
                         if (StringUtils.isNotEmpty(deleteScenarioName) && CollectionUtils.isNotEmpty(scenarioNames)) {
-                            String nameListStr = "【";
+                            String nameListStr = "[";
                             for (String name : scenarioNames) {
                                 nameListStr += name + ",";
                             }
                             if (nameListStr.length() > 1) {
-                                nameListStr = nameListStr.substring(0, nameListStr.length() - 1) + "】";
+                                nameListStr = nameListStr.substring(0, nameListStr.length() - 1) + "]";
                             }
                             String msg = deleteScenarioName + " " + Translator.get("delete_check_reference_by") + ": " + nameListStr + " ";
                             checkMsgList.add(msg);
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
index 7923a5447b..76fe1dd978 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@@ -962,12 +962,12 @@ public class ApiTestCaseService {
                         String deleteCaseName = extApiTestCaseMapper.selectNameById(refreceId);
 
                         if (StringUtils.isNotEmpty(deleteCaseName) && CollectionUtils.isNotEmpty(scenarioNameList)) {
-                            String nameListStr = "【";
+                            String nameListStr = "[";
                             for (String name : scenarioNameList) {
                                 nameListStr += name + ",";
                             }
                             if (nameListStr.length() > 1) {
-                                nameListStr = nameListStr.substring(0, nameListStr.length() - 1) + "】";
+                                nameListStr = nameListStr.substring(0, nameListStr.length() - 1) + "]";
                             }
                             String msg = deleteCaseName + " " + Translator.get("delete_check_reference_by") + ": " + nameListStr + " ";
                             checkMsgList.add(msg);
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 8b08f1dd2b..3a020f670f 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -484,7 +484,7 @@ export default {
           permissions: ['PROJECT_API_SCENARIO:READ+DELETE']
         },
         {
-          name: "生成依赖关系",
+          name: this.$t('test_track.case.generate_dependencies'),
           handleClick: this.generateGraph,
           isXPack: true,
           permissions: ['PROJECT_API_SCENARIO:READ+EDIT']
@@ -1057,7 +1057,7 @@ export default {
           if (!checkResult.deleteFlag) {
             alertMsg = "";
             checkResult.checkMsg.forEach(item => {
-              alertMsg += item + ";";
+              alertMsg += item;
             });
             if (alertMsg === "") {
               alertMsg = this.$t('load_test.delete_threadgroup_confirm') + " ？";
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index 2fbd303ee3..fe37c8f16e 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -467,6 +467,7 @@ export default {
       if (this.validate(row)) {
         return;
       }
+      this.compare = [];
       if (this.compare.indexOf(row.id) === -1) {
         this.compare.push(row.id);
         if (this.api.saved) {
diff --git a/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue b/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
index 41296354f1..5f144eec3d 100644
--- a/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
+++ b/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
@@ -6,7 +6,7 @@
         <el-col :span="8" v-if="item.type !== 'richText'">
           <el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
                         :label-width="formLabelWidth">
-            <custom-filed-component :data="item" :form="form" prop="defaultValue"/>
+            <custom-filed-component :data="item" :form="form" prop="defaultValue" :disabled="isPublic"/>
           </el-form-item>
         </el-col>
         <div v-else>
@@ -38,7 +38,13 @@ export default {
       }
     },
     formLabelWidth: String,
-    form: Object
+    form: Object,
+    isPublic: {
+      type: Boolean,
+      default() {
+        return false;
+      }
+    }
   },
   computed: {
     customFieldRowNums() {
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index 2f28e099e5..4454e0d838 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -49,6 +49,7 @@
             :public-enable="true"
             @refreshTable="refresh"
             @testCaseEdit="editTestCase"
+            @testCaseEditShow="editTestCaseShow"
             @testCaseCopy="copyTestCase"
             @testCaseDetail="showTestCaseDetail"
             @getTrashList="getTrashList"
@@ -101,7 +102,7 @@
           :label="item.label"
           :name="item.name"
           closable>
-          <div class="ms-api-scenario-div">
+          <div class="ms-api-scenario-div" v-if="!showPublic">
             <test-case-edit
               :currentTestCaseInfo="item.testCaseInfo"
               @refresh="refreshTable"
@@ -116,6 +117,22 @@
               ref="testCaseEdit">
             </test-case-edit>
           </div>
+          <div class="ms-api-scenario-div" v-if="showPublic">
+            <test-case-edit-show
+              :currentTestCaseInfo="item.testCaseInfo"
+              @refresh="refreshTable"
+              @caseEdit="handleCaseCreateOrEdit($event,'edit')"
+              @caseCreate="handleCaseCreateOrEdit($event,'add')"
+              :read-only="testCaseReadOnly"
+              :tree-nodes="treeNodes"
+              :select-node="selectNode"
+              :select-condition="condition"
+              :type="type"
+              :is-public="publicEnable"
+              @addTab="addTabShow"
+              ref="testCaseEditShow">
+            </test-case-edit-show>
+          </div>
         </el-tab-pane>
         <el-tab-pane name="add" v-if="hasPermission('PROJECT_TRACK_CASE:READ+CREATE')">
           <template v-slot:label>
@@ -162,7 +179,7 @@ import MsTabButton from "@/business/components/common/components/MsTabButton";
 import TestCaseMinder from "@/business/components/track/common/minder/TestCaseMinder";
 import IsChangeConfirm from "@/business/components/common/components/IsChangeConfirm";
 import {openMinderConfirm, saveMinderConfirm} from "@/business/components/track/common/minder/minderUtils";
-
+import TestCaseEditShow from "@/business/components/track/case/components/TestCaseEditShow";
 export default {
   name: "TestCase",
   components: {
@@ -171,7 +188,7 @@ export default {
     MsTabButton,
     TestCaseNodeTree,
     MsMainContainer,
-    MsAsideContainer, MsContainer, TestCaseList, NodeTree, TestCaseEdit, SelectMenu
+    MsAsideContainer, MsContainer, TestCaseList, NodeTree, TestCaseEdit, SelectMenu, TestCaseEditShow
   },
   comments: {},
   data() {
@@ -182,6 +199,7 @@ export default {
       testCaseReadOnly: true,
       trashEnable: false,
       publicEnable: false,
+      showPublic: false,
       condition: {},
       activeName: 'default',
       tabs: [],
@@ -321,6 +339,7 @@ export default {
         this.$warning(this.$t('commons.check_project_tip'));
         return;
       }
+      this.showPublic = true
       if (tab.name === 'add') {
         let label = this.$t('test_track.case.create');
         let name = getUUID().substring(0, 8);
@@ -338,6 +357,21 @@ export default {
 
       setCurTabId(this, tab, 'testCaseEdit');
     },
+    addTabShow(tab) {
+      if (!this.projectId) {
+        this.$warning(this.$t('commons.check_project_tip'));
+        return;
+      }
+      if (tab.name === 'show') {
+        this.showPublic = true
+        let label = this.$t('test_track.case.create');
+        let name = getUUID().substring(0, 8);
+        this.activeName = name;
+        label = tab.testCaseInfo.name;
+        this.tabs.push({label: label, name: name, testCaseInfo: tab.testCaseInfo});
+      }
+      setCurTabId(this, tab, 'testCaseEditShow');
+    },
     handleTabClose() {
       let message = "";
       this.tabs.forEach(t => {
@@ -458,6 +492,25 @@ export default {
         this.activeName = index.name;
       }
     },
+
+    editTestCaseShow(testCase) {
+      const index = this.tabs.find(p => p.testCaseInfo && p.testCaseInfo.id === testCase.id);
+      if (!index) {
+        this.type = "edit";
+        this.testCaseReadOnly = false;
+        if (testCase.label !== "redirect") {
+          if (this.treeNodes.length < 1) {
+            this.$warning(this.$t('test_track.case.create_module_first'));
+            return;
+          }
+        }
+        let hasEditPermission = hasPermission('PROJECT_TRACK_CASE:READ+EDIT');
+        this.$set(testCase, 'rowClickHasPermission', hasEditPermission);
+        this.addTabShow({name: 'show', testCaseInfo: testCase});
+      } else {
+        this.activeName = index.name;
+      }
+    },
     handleCaseCreateOrEdit(data, type) {
       if (this.$refs.minder) {
         this.$refs.minder.addCase(data, type);
diff --git a/frontend/src/business/components/track/case/components/TestCaseEditShow.vue b/frontend/src/business/components/track/case/components/TestCaseEditShow.vue
new file mode 100644
index 0000000000..d8c4731eb5
--- /dev/null
+++ b/frontend/src/business/components/track/case/components/TestCaseEditShow.vue
@@ -0,0 +1,949 @@
+<template>
+  <el-card>
+    <div class="card-content">
+      <div class="ms-main-div" @click="showAll">
+
+        <!--操作按钮-->
+        <div class="ms-opt-btn">
+          <el-tooltip :content="$t('commons.follow')" placement="bottom" effect="dark" v-if="!showFollow">
+            <i class="el-icon-star-off"
+               style="color: #783987; font-size: 25px;  margin-right: 15px;cursor: pointer;position: relative;top: 5px "
+               @click="saveFollow"/>
+          </el-tooltip>
+          <el-tooltip :content="$t('commons.cancel')" placement="bottom" effect="dark" v-if="showFollow">
+            <i class="el-icon-star-on"
+               style="color: #783987; font-size: 28px; margin-right: 15px;cursor: pointer;position: relative;top: 5px "
+               @click="saveFollow"/>
+          </el-tooltip>
+          <el-link type="primary" style="margin-right: 20px" @click="openHis" v-if="form.id">
+            {{ $t('operating_log.change_history') }}
+          </el-link>
+          <ms-table-button v-if="this.path!=='/test/case/add'"
+                           id="inputDelay"
+                           type="primary"
+                           :content="$t('commons.copy')"
+                           size="small" @click="handleCopyPublic"
+                           icon=""
+                           :disabled="readOnly"/>
+        </div>
+        <el-form :model="form" :rules="rules" ref="caseFrom" v-loading="result.loading" class="case-form">
+          <ms-form-divider :title="$t('test_track.plan_view.base_info')"/>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item
+                :placeholder="$t('test_track.case.input_name')"
+                :label="$t('test_track.case.name')"
+                :label-width="formLabelWidth"
+                prop="name">
+                <el-input :disabled="true" v-model="form.name" size="small" class="ms-case-input"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item :label="$t('test_track.case.project')" :label-width="formLabelWidth" prop="projectId">
+                <el-select v-model="form.projectId" filterable clearable :disabled="true">
+                  <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item :label="$t('commons.tag')" :label-width="formLabelWidth" prop="tag">
+                <ms-input-tag :read-only="true" :currentScenario="form" v-if="showInputTag" ref="tag" :disabled="true"
+                              class="ms-case-input"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <!-- 自定义字段 -->
+          <el-form v-if="isFormAlive" :model="customFieldForm" :rules="customFieldRules" ref="customFieldForm"
+                   class="case-form">
+            <custom-filed-form-item :form="customFieldForm" :form-label-width="formLabelWidth"
+                                    :issue-template="testCaseTemplate" :is-public="isPublic"/>
+          </el-form>
+
+          <el-row v-if="isCustomNum">
+            <el-col :span="7">
+              <el-form-item label="ID" :label-width="formLabelWidth" prop="customNum">
+                <el-input :disabled="true" v-model.trim="form.customNum" size="small"
+                          class="ms-case-input"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <ms-form-divider :title="$t('test_track.case.step_info')"/>
+
+          <form-rich-text-item :disabled="true" :label-width="formLabelWidth"
+                               :title="$t('test_track.case.prerequisite')" :data="form" prop="prerequisite"/>
+
+          <step-change-item :label-width="formLabelWidth" :form="form"/>
+          <form-rich-text-item :disabled="true" :label-width="formLabelWidth" v-if="form.stepModel === 'TEXT'"
+                               :title="$t('test_track.case.step_desc')" :data="form" prop="stepDescription"/>
+          <form-rich-text-item :disabled="true" :label-width="formLabelWidth" v-if="form.stepModel === 'TEXT'"
+                               :title="$t('test_track.case.expected_results')" :data="form" prop="expectedResult"/>
+
+          <test-case-step-item :label-width="formLabelWidth" v-if="form.stepModel === 'STEP' || !form.stepModel"
+                               :form="form" :read-only="true"/>
+
+          <ms-form-divider :title="$t('test_track.case.other_info')"/>
+
+          <test-case-edit-other-info :read-only="true" :project-id="projectIds" :form="form"
+                                     :label-width="formLabelWidth" :case-id="form.id" ref="otherInfo"/>
+
+          <el-row style="margin-top: 10px" v-if="type!=='add'">
+            <el-col :span="20" :offset="1">{{ $t('test_track.review.comment') }}:
+              <el-button icon="el-icon-plus" type="mini" @click="openComment" :disabled="true"></el-button>
+            </el-col>
+          </el-row>
+          <el-row v-if="type!=='add'">
+            <el-col :span="20" :offset="1">
+
+              <review-comment-item v-for="(comment,index) in comments"
+                                   :key="index"
+                                   :comment="comment"
+                                   @refresh="getComments" :disabled="true"/>
+              <div v-if="comments.length === 0" style="text-align: center">
+                <i class="el-icon-chat-line-square" style="font-size: 15px;color: #8a8b8d;">
+                      <span style="font-size: 15px; color: #8a8b8d;">
+                        {{ $t('test_track.comment.no_comment') }}
+                      </span>
+                </i>
+              </div>
+            </el-col>
+          </el-row>
+          <test-case-comment :case-id="form.id"
+                             @getComments="getComments" ref="testCaseComment"/>
+
+        </el-form>
+
+      </div>
+      <ms-change-history ref="changeHistory"/>
+
+    </div>
+    <batch-move ref="testBatchMove" :public-enable="isPublic"
+                @copyPublic="copyPublic"/>
+  </el-card>
+
+
+</template>
+
+<script>
+import {TokenKey} from '@/common/js/constants';
+import MsDialogFooter from '../../../common/components/MsDialogFooter'
+import {
+  getCurrentProjectID,
+  getCurrentUser,
+  getNodePath, getUUID,
+  handleCtrlSEvent, hasLicense, hasPermission,
+  listenGoBack,
+  removeGoBackListener
+} from "@/common/js/utils";
+import TestCaseAttachment from "@/business/components/track/case/components/TestCaseAttachment";
+import CaseComment from "@/business/components/track/case/components/CaseComment";
+import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
+import MsPreviousNextButton from "../../../common/components/MsPreviousNextButton";
+import {STEP} from "@/business/components/api/automation/scenario/Setting";
+import TestCaseComment from "@/business/components/track/case/components/TestCaseComment";
+import ReviewCommentItem from "@/business/components/track/review/commom/ReviewCommentItem";
+import {API_STATUS, REVIEW_STATUS} from "@/business/components/api/definition/model/JsonData";
+import MsTableButton from "@/business/components/common/components/MsTableButton";
+import MsSelectTree from "../../../common/select-tree/SelectTree";
+import MsTestCaseStepRichText from "./MsRichText";
+import CustomFiledComponent from "@/business/components/settings/workspace/template/CustomFiledComponent";
+import {
+  buildCustomFields,
+  buildTestCaseOldFields,
+  getTemplate,
+  parseCustomField
+} from "@/common/js/custom_field";
+import MsFormDivider from "@/business/components/common/components/MsFormDivider";
+import TestCaseEditOtherInfo from "@/business/components/track/case/components/TestCaseEditOtherInfo";
+import FormRichTextItem from "@/business/components/track/case/components/FormRichTextItem";
+import TestCaseStepItem from "@/business/components/track/case/components/TestCaseStepItem";
+import StepChangeItem from "@/business/components/track/case/components/StepChangeItem";
+import MsChangeHistory from "../../../history/ChangeHistory";
+import {getTestTemplate} from "@/network/custom-field-template";
+import CustomFiledFormItem from "@/business/components/common/components/form/CustomFiledFormItem";
+import BatchMove from "@/business/components/track/case/components/BatchMove";
+
+export default {
+  name: "TestCaseEditShow",
+  components: {
+    CustomFiledFormItem,
+    StepChangeItem,
+    TestCaseStepItem,
+    FormRichTextItem,
+    TestCaseEditOtherInfo,
+    MsFormDivider,
+    CustomFiledComponent,
+    MsTableButton,
+    MsSelectTree,
+    ReviewCommentItem,
+    TestCaseComment, MsPreviousNextButton, MsInputTag, CaseComment, MsDialogFooter, TestCaseAttachment,
+    MsTestCaseStepRichText,
+    MsChangeHistory,
+    BatchMove
+  },
+  data() {
+    return {
+      // sysList: [],//一级选择框的数据
+      path: "/test/case/add",
+      selectIds: [],
+      projectList: [],
+      publicEnable: false,
+      isXpack: false,
+      testCaseTemplate: {},
+      options: REVIEW_STATUS,
+      statuOptions: API_STATUS,
+      comments: [],
+      result: {},
+      dialogFormVisible: false,
+      showFollow: false,
+      form: {
+        name: '',
+        module: 'default-module',
+        nodePath: '/未规划用例',
+        maintainer: getCurrentUser().id,
+        priority: 'P0',
+        type: '',
+        method: '',
+        prerequisite: '',
+        testId: '',
+        otherTestName: '',
+        steps: [{
+          num: 1,
+          desc: '',
+          result: ''
+        }],
+        stepDesc: '',
+        stepResult: '',
+        selected: [],
+        remark: '',
+        tags: [],
+        demandId: '',
+        demandName: '',
+        status: 'Prepare',
+        reviewStatus: 'Prepare',
+        stepDescription: '',
+        expectedResult: '',
+        stepModel: 'STEP',
+        customNum: '',
+        followPeople: '',
+      },
+      maintainerOptions: [],
+      // testOptions: [],
+      workspaceId: '',
+      rules: {
+        name: [
+          {required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},
+          {max: 255, message: this.$t('test_track.length_less_than') + '255', trigger: 'blur'}
+        ],
+        module: [{required: true, message: this.$t('test_track.case.input_module'), trigger: 'change'}],
+        customNum: [
+          {required: true, message: "ID必填", trigger: 'blur'},
+          {max: 50, message: this.$t('test_track.length_less_than') + '50', trigger: 'blur'}
+        ],
+        demandName: [{required: true, message: this.$t('test_track.case.input_demand_name'), trigger: 'change'}],
+        maintainer: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}],
+        priority: [{required: true, message: this.$t('test_track.case.input_priority'), trigger: 'change'}],
+        method: [{required: true, message: this.$t('test_track.case.input_method'), trigger: 'change'}],
+        // prerequisite: [{max: 500, message: this.$t('test_track.length_less_than') + '500', trigger: 'blur'}],
+        // remark: [{max: 1000, message: this.$t('test_track.length_less_than') + '1000', trigger: 'blur'}]
+      },
+      customFieldRules: {},
+      customFieldForm: null,
+      formLabelWidth: "100px",
+      operationType: '',
+      isCreateContinue: false,
+      isStepTableAlive: true,
+      isFormAlive: true,
+      methodOptions: [
+        {value: 'auto', label: this.$t('test_track.case.auto')},
+        {value: 'manual', label: this.$t('test_track.case.manual')}
+      ],
+      testCase: {},
+      testCases: [],
+      index: 0,
+      showInputTag: true,
+      tableType: "",
+      stepFilter: new STEP,
+      moduleObj: {
+        id: 'id',
+        label: 'name',
+      },
+      tabId: getUUID()
+    };
+  },
+  props: {
+    treeNodes: {
+      type: Array
+    },
+    currentTestCaseInfo: {},
+    selectNode: {
+      type: Object
+    },
+    selectCondition: {
+      type: Object
+    },
+    type: String,
+    isPublic: {
+      type: Boolean
+    }
+  },
+  computed: {
+    projectIds() {
+      return getCurrentProjectID();
+    },
+    moduleOptions() {
+      return this.$store.state.testCaseModuleOptions;
+    },
+    isCustomNum() {
+      return this.$store.state.currentProjectIsCustomNum;
+    },
+    readOnly() {
+      const {rowClickHasPermission} = this.currentTestCaseInfo;
+      if (rowClickHasPermission !== undefined) {
+        return !rowClickHasPermission;
+      }
+      return !hasPermission('PROJECT_TRACK_CASE:READ+CREATE') &&
+        !hasPermission('PROJECT_TRACK_CASE:READ+EDIT');
+    }
+  },
+
+  beforeDestroy() {
+    this.removeListener();
+  },
+  mounted() {
+    this.getSelectOptions();
+    if (this.type === 'edit' || this.type === 'copy') {
+      this.open(this.currentTestCaseInfo)
+      this.getComments(this.currentTestCaseInfo)
+    }
+    // Cascader 级联选择器: 点击文本就让它自动点击前面的input就可以触发选择。
+    setInterval(function () {
+      document.querySelectorAll('.el-cascader-node__label').forEach(el => {
+        el.onclick = function () {
+          if (this.previousElementSibling) this.previousElementSibling.click();
+        };
+      });
+    }, 1000);
+    if (this.selectNode && this.selectNode.data && !this.form.id) {
+      this.form.module = this.selectNode.data.id;
+      this.form.nodePath = this.selectNode.data.path;
+    }
+    if ((!this.form.module || this.form.module === "default-module" || this.form.module === "root") && this.treeNodes.length > 0) {
+      this.form.module = this.treeNodes[0].id;
+      this.form.nodePath = this.treeNodes[0].path;
+    }
+    if (!(this.$store.state.testCaseMap instanceof Map)) {
+      this.$store.state.testCaseMap = new Map();
+    }
+    this.$store.state.testCaseMap.set(this.form.id, 0);
+  },
+  created() {
+    if (!this.projectList || this.projectList.length === 0) {   //没有项目数据的话请求项目数据
+      this.$get("/project/listAll", (response) => {
+        this.projectList = response.data;  //获取当前工作空间所拥有的项目,
+      })
+    }
+    this.projectId = this.projectIds;
+    let initAddFuc = this.initAddFuc;
+    getTestTemplate()
+      .then((template) => {
+        this.testCaseTemplate = template;
+        this.$store.commit('setTestCaseTemplate', this.testCaseTemplate);
+        initAddFuc();
+      });
+    if (this.selectNode && this.selectNode.data && !this.form.id) {
+      this.form.module = this.selectNode.data.id;
+      this.form.nodePath = this.selectNode.data.path;
+    } else {
+      this.form.module = this.treeNodes && this.length > 0 ? this.treeNodes[0].id : "";
+    }
+    if (this.type === 'edit' || this.type === 'copy') {
+      this.form.module = this.currentTestCaseInfo.nodeId;
+      this.form.nodePath = this.currentTestCaseInfo.nodePath;
+    }
+    if ((!this.form.module || this.form.module === "default-module" || this.form.module === "root") && this.treeNodes.length > 0) {
+      this.form.module = this.treeNodes[0].id;
+      this.form.nodePath = this.treeNodes[0].path;
+    }
+    this.$get('/test/case/follow/' + this.currentTestCaseInfo.id, response => {
+      this.form.follows = response.data;
+      for (let i = 0; i < response.data.length; i++) {
+        if (response.data[i] === this.currentUser().id) {
+          this.showFollow = true;
+          break;
+        }
+      }
+    }),
+      this.result = this.$get('/project/get/' + this.projectId, res => {
+        let data = res.data;
+        if (data.casePublic) {
+          this.publicEnable = true;
+        }
+      })
+    if (hasLicense()) {
+      this.isXpack = true;
+    } else {
+      this.isXpack = false;
+    }
+  },
+  methods: {
+    currentUser: () => {
+      return getCurrentUser();
+    },
+    openHis() {
+      this.$refs.changeHistory.open(this.form.id, ["测试用例", "測試用例", "Test case"]);
+    },
+    setModule(id, data) {
+      this.form.module = id;
+      this.form.nodePath = data.path;
+    },
+    initAddFuc() {
+      // this.loadOptions();
+      this.addListener(); //  添加 ctrl s 监听
+      if (this.selectNode && this.selectNode.data && !this.form.id) {
+        this.form.module = this.selectNode.data.id;
+        this.form.nodePath = this.selectNode.data.path;
+      } else {
+        this.form.module = this.treeNodes && this.length > 0 ? this.treeNodes[0].id : "";
+      }
+      if (this.type === 'edit' || this.type === 'copy') {
+        this.form.module = this.currentTestCaseInfo.nodeId;
+        this.form.nodePath = this.currentTestCaseInfo.nodePath;
+      }
+      if ((!this.form.module || this.form.module === "default-module" || this.form.module === "root") && this.treeNodes.length > 0) {
+        this.form.module = this.treeNodes[0].id;
+        this.form.nodePath = this.treeNodes[0].path;
+      }
+      if (this.type === 'add') {
+        //设置自定义熟悉默认值
+        this.customFieldForm = parseCustomField(this.form, this.testCaseTemplate, this.customFieldRules);
+        this.form.name = this.testCaseTemplate.caseName;
+        this.form.stepDescription = this.testCaseTemplate.stepDescription;
+        this.form.expectedResult = this.testCaseTemplate.expectedResult;
+        this.form.prerequisite = this.testCaseTemplate.prerequisite;
+        this.form.stepModel = this.testCaseTemplate.stepModel;
+        if (this.testCaseTemplate.steps) {
+          this.form.steps = JSON.parse(this.testCaseTemplate.steps);
+        }
+      }
+    },
+    setDefaultValue() {
+      if (!this.form.prerequisite) {
+        this.form.prerequisite = "";
+      }
+      if (!this.form.stepDescription) {
+        this.form.stepDescription = "";
+      }
+      if (!this.form.expectedResult) {
+        this.form.expectedResult = "";
+      }
+      if (!this.form.remark) {
+        this.form.remark = "";
+      }
+      this.$store.state.testCaseMap.set(this.form.id, 0);
+    },
+    handleCommand(e) {
+      if (e === "ADD_AND_CREATE") {
+        this.$refs['caseFrom'].validate((valid) => {
+          if (!valid) {
+            this.saveCase();
+          } else {
+            this.saveCase(function (t) {
+              let tab = {};
+              tab.name = 'add';
+              t.$emit('addTab', tab);
+            });
+          }
+        })
+      } else if (e === 'ADD_AND_PUBLIC') {
+        this.form.casePublic = true;
+        this.saveCase();
+      } else {
+        this.saveCase();
+      }
+    },
+    openComment() {
+      this.$refs.testCaseComment.open()
+    },
+    getComments(testCase) {
+      let id = '';
+      if (testCase) {
+        id = testCase.id;
+      } else {
+        id = this.form.id;
+      }
+      this.result = this.$get('/test/case/comment/list/' + id, res => {
+        this.comments = res.data;
+      })
+    },
+    showAll() {
+      if (!this.customizeVisible) {
+        this.operatingElements = this.stepFilter.get("ALL");
+        this.selectedTreeNode = undefined;
+      }
+      //this.reload();
+    },
+    reload() {
+      this.isStepTableAlive = false;
+      this.$nextTick(() => {
+        this.isStepTableAlive = true;
+        this.$store.state.testCaseMap.set(this.form.id, 0);
+      });
+    },
+    reloadForm() {
+      this.isFormAlive = false;
+      this.$nextTick(() => (this.isFormAlive = true));
+    },
+    open(testCase) {
+      /*
+             this.form.selected=[["automation", "3edaaf31-3fa4-4a53-9654-320205c2953a"],["automation", "3aa58bd1-c986-448c-8060-d32713dbd4eb"]]
+      */
+      this.projectId = this.projectIds;
+      let initFuc = this.initEdit;
+      getTemplate('field/template/case/get/relate/', this)
+        .then((template) => {
+          this.testCaseTemplate = template;
+          this.$store.commit('setTestCaseTemplate', this.testCaseTemplate);
+          initFuc(testCase);
+        });
+    },
+    initEdit(testCase) {
+      if (window.history && window.history.pushState) {
+        history.pushState(null, null, document.URL);
+        window.addEventListener('popstate', this.close);
+      }
+      this.resetForm();
+      listenGoBack(this.close);
+      this.operationType = 'add';
+      if (testCase) {
+        //修改
+        this.operationType = 'edit';
+        //复制
+        if (this.type === 'copy') {
+          this.operationType = 'add';
+          this.setFormData(testCase);
+          this.setTestCaseExtInfo(testCase);
+          this.getSelectOptions();
+          //设置自定义熟悉默认值
+          this.customFieldForm = parseCustomField(this.form, this.testCaseTemplate, this.customFieldRules, buildTestCaseOldFields(this.form));
+          this.reload();
+        } else {
+          this.initTestCases(testCase);
+        }
+      } else {
+        if (this.selectNode.data) {
+          this.form.module = this.selectNode.data.id;
+        } else {
+          if (this.moduleOptions.length > 0) {
+            this.form.module = this.moduleOptions[0].id;
+          }
+        }
+        let user = JSON.parse(localStorage.getItem(TokenKey));
+        this.form.priority = 'P3';
+        this.form.type = 'functional';
+        this.form.method = 'manual';
+        this.form.maintainer = user.id;
+        this.form.tags = [];
+        this.getSelectOptions();
+        this.customFieldForm = parseCustomField(this.form, this.testCaseTemplate, this.customFieldRules);
+        this.reload();
+      }
+    },
+    handlePre() {
+      this.index--;
+      this.getTestCase(this.index)
+    },
+    handleNext() {
+      this.index++;
+      this.getTestCase(this.index);
+    },
+    initTestCases(testCase) {
+      this.selectCondition.workspaceId = null;
+      this.result = this.$post('/test/case/list/ids', this.selectCondition, response => {
+        this.testCases = response.data;
+        for (let i = 0; i < this.testCases.length; i++) {
+          if (this.testCases[i].id === testCase.id) {
+            this.index = i;
+            this.getTestCase(i);
+          }
+        }
+      });
+    },
+    getTestCase(index) {
+      let id = "";
+      this.showInputTag = false;
+      let testCase = this.testCases[index];
+      if (typeof (index) == "undefined") {
+        id = this.currentTestCaseInfo.id;
+
+      } else {
+        id = testCase.id;
+      }
+      this.result = this.$get('/test/case/get/' + id, response => {
+        if (response.data) {
+          this.path = "/test/case/edit";
+          if (this.currentTestCaseInfo.isCopy) {
+            this.path = "/test/case/add";
+          }
+        } else {
+          this.path = "/test/case/add";
+        }
+        let testCase = response.data;
+        this.setFormData(testCase);
+        this.setTestCaseExtInfo(testCase);
+        this.getSelectOptions();
+        this.reload();
+        this.$nextTick(() => {
+          this.showInputTag = true;
+        });
+      });
+    },
+    async setFormData(testCase) {
+      try {
+        testCase.selected = JSON.parse(testCase.testId);
+      } catch (error) {
+        testCase.selected = testCase.testId
+      }
+      let tmp = {};
+      Object.assign(tmp, testCase);
+      tmp.steps = JSON.parse(testCase.steps);
+      if (!tmp.steps || tmp.steps.length < 1) {
+        tmp.steps = [{
+          num: 1,
+          desc: '',
+          result: ''
+        }];
+      }
+      tmp.tags = JSON.parse(tmp.tags);
+      Object.assign(this.form, tmp);
+      if (!this.form.stepModel) {
+        this.form.stepModel = "STEP";
+      }
+      this.form.module = testCase.nodeId;
+      //设置自定义熟悉默认值
+      this.customFieldForm = parseCustomField(this.form, this.testCaseTemplate, this.customFieldRules, testCase ? buildTestCaseOldFields(this.form) : null);
+      this.setDefaultValue();
+      // 重新渲染，显示自定义字段的必填校验
+      this.reloadForm();
+    },
+    setTestCaseExtInfo(testCase) {
+      this.testCase = {};
+      if (testCase) {
+        // 复制 不查询评论
+        this.testCase = testCase.isCopy ? {} : testCase;
+      }
+    },
+    close() {
+      //移除监听，防止监听其他页面
+      removeGoBackListener(this.close);
+      this.dialogFormVisible = false;
+    },
+    handleCopyPublic(testCase) {
+      this.selectIds.push(this.form.id);
+      this.$refs.testBatchMove.open(this.treeNodes, this.selectIds, this.moduleOptions);
+
+    },
+    copyPublic(param) {
+      param.condition = this.condition;
+      this.result = this.$post('/test/case/batch/copy/public', param, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.$refs.testBatchMove.close();
+        this.$emit("refresh", this.form);
+      });
+    },
+    saveCase(callback) {
+      let isValidate = true;
+      this.$refs['caseFrom'].validate((valid) => {
+        if (!valid) {
+          isValidate = false;
+          return false;
+        }
+      });
+      this.$refs['customFieldForm'].validate((valid) => {
+        if (!valid) {
+          isValidate = false;
+          return false;
+        }
+      });
+      if (isValidate) {
+        this._saveCase(callback);
+      }
+    },
+    _saveCase(callback) {
+      let param = this.buildParam();
+      if (this.validate(param)) {
+        let option = this.getOption(param);
+        this.result = this.$request(option, (response) => {
+          this.$success(this.$t('commons.save_success'));
+          this.path = "/test/case/edit";
+          // this.operationType = "edit"
+          this.$emit("refreshTestCase",);
+          this.$store.state.testCaseMap.delete(this.form.id);
+          //this.tableType = 'edit';
+          this.$emit("refresh", this.form);
+          if (this.form.id) {
+            this.$emit("caseEdit", param);
+          } else {
+            param.id = response.data.id;
+            this.$emit("caseCreate", param);
+            this.close();
+          }
+          this.form.id = response.data.id;
+
+          if (callback) {
+            callback(this);
+          }
+          // 保存用例后刷新附件
+        });
+      }
+    },
+    buildParam() {
+      let param = {};
+      Object.assign(param, this.form);
+      param.steps = JSON.stringify(this.form.steps);
+      param.nodeId = this.form.module;
+      param.nodePath = getNodePath(this.form.module, this.moduleOptions);
+      if (this.projectId) {
+        param.projectId = this.projectId;
+      }
+      param.name = param.name.trim();
+
+      if (this.form.tags instanceof Array) {
+        this.form.tags = JSON.stringify(this.form.tags);
+      }
+      param.testId = JSON.stringify(this.form.selected);
+      param.tags = this.form.tags;
+      param.type = 'functional';
+      buildCustomFields(this.form, param, this.testCaseTemplate);
+      this.parseOldFields(param);
+      return param;
+    },
+    parseOldFields(param) {
+      let customFieldsStr = param.customFields;
+      if (customFieldsStr) {
+        let customFields = JSON.parse(customFieldsStr);
+        customFields.forEach(item => {
+          if (item.name === '用例等级') {
+            param.priority = item.value;
+          }
+          if (item.name === '责任人') {
+            param.maintainer = item.value;
+          }
+          if (item.name === '用例状态') {
+            param.status = item.value;
+          }
+        });
+      }
+    },
+    getOption(param) {
+      let formData = new FormData();
+      if (this.$refs.otherInfo && this.$refs.otherInfo.uploadList) {
+        this.$refs.otherInfo.uploadList.forEach(f => {
+          formData.append("file", f);
+        });
+      }
+
+      if (this.$refs.otherInfo && this.$refs.otherInfo.fileList) {
+        if (param.isCopy) {
+          // 如果是copy，则把文件的ID传到后台进行文件复制
+          param.fileIds = this.$refs.otherInfo.fileList.map(f => f.id);
+        }
+        param.updatedFileList = this.$refs.otherInfo.fileList;
+      } else {
+        param.fileIds = [];
+        param.updatedFileList = [];
+      }
+
+      let requestJson = JSON.stringify(param, function (key, value) {
+        return key === "file" ? undefined : value
+      });
+
+      formData.append('request', new Blob([requestJson], {
+        type: "application/json"
+      }));
+      return {
+        method: 'POST',
+        url: this.path,
+        data: formData,
+        headers: {
+          'Content-Type': undefined
+        }
+      };
+    },
+    validate(param) {
+      for (let i = 0; i < param.steps.length; i++) {
+        if ((param.steps[i].desc && param.steps[i].desc.length > 300) ||
+          (param.steps[i].result && param.steps[i].result.length > 300)) {
+          this.$warning(this.$t('test_track.case.step_desc') + ","
+            + this.$t('test_track.case.expected_results') + this.$t('test_track.length_less_than') + '300');
+          return false;
+        }
+      }
+      if (param.name === '') {
+        this.$warning(this.$t('test_track.case.input_name'));
+        return false;
+      }
+      return true;
+    },
+    typeChange() {
+      this.form.testId = '';
+    },
+    getMaintainerOptions() {
+      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
+        this.maintainerOptions = response.data;
+      });
+    },
+    getSelectOptions() {
+      this.getMaintainerOptions();
+    },
+    resetForm() {
+      //防止点击修改后，点击新建触发校验
+      if (this.$refs['caseFrom']) {
+        this.$refs['caseFrom'].validate((valid) => {
+          this.$refs['caseFrom'].resetFields();
+          this._resetForm();
+          return true;
+        });
+      } else {
+        this._resetForm();
+      }
+    },
+    _resetForm() {
+      this.form.name = '';
+      this.form.module = '';
+      this.form.type = '';
+      this.form.method = '';
+      this.form.maintainer = '';
+      this.form.priority = '';
+      this.form.prerequisite = '';
+      this.form.remark = '';
+      this.form.testId = '';
+      this.form.testName = '';
+      this.form.steps = [{
+        num: 1,
+        desc: '',
+        result: ''
+      }];
+      this.form.customNum = '';
+    },
+    addListener() {
+      document.addEventListener("keydown", this.createCtrlSHandle);
+    },
+    removeListener() {
+      document.removeEventListener("keydown", this.createCtrlSHandle);
+    },
+    createCtrlSHandle(event) {
+      let curTabId = this.$store.state.curTabId;
+      if (curTabId === this.tabId)
+        handleCtrlSEvent(event, this.saveCase);
+    },
+    saveFollow() {
+      if (this.showFollow) {
+        this.showFollow = false;
+        for (let i = 0; i < this.form.follows.length; i++) {
+          if (this.form.follows[i] === this.currentUser().id) {
+            this.form.follows.splice(i, 1)
+            break;
+          }
+        }
+        if (this.path === "/test/case/edit") {
+          this.result.loading = true
+          this.$post('/test/case/edit/follows/' + this.form.id, this.form.follows, () => {
+            this.result.loading = false
+            this.$success(this.$t('commons.cancel_follow_success'));
+          });
+        }
+
+      } else {
+        this.showFollow = true;
+        if (!this.form.follows) {
+          this.form.follows = [];
+        }
+        this.form.follows.push(this.currentUser().id)
+
+        if (this.path === "/test/case/edit") {
+          this.result.loading = true
+          this.$post('/test/case/edit/follows/' + this.form.id, this.form.follows, () => {
+            this.result.loading = false
+            this.$success(this.$t('commons.follow_success'));
+          });
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+.el-switch {
+  margin-bottom: 10px;
+}
+
+.case-name {
+  width: 194px;
+}
+
+.container {
+  height: 100vh;
+}
+
+.case-form {
+  height: 95%;
+  overflow: auto;
+}
+
+.case-dialog >>> .el-dialog__body {
+  padding: 0 20px 10px 20px;
+}
+
+.container >>> .el-card__body {
+  height: calc(100vh - 120px);
+}
+
+.comment-card >>> .el-card__header {
+  padding: 27px 20px;
+}
+
+.comment-card >>> .el-card__body {
+  height: calc(100vh - 120px);
+}
+
+.head-right {
+  text-align: right;
+}
+
+.ms-main-div {
+  background-color: white;
+}
+
+.ms-opt-btn {
+  position: fixed;
+  right: 50px;
+  z-index: 1;
+}
+
+.ms-case-input {
+  width: 100%;
+}
+
+.ms-case {
+  width: 100%;
+}
+
+/deep/ .el-button-group > .el-button:first-child {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  height: 32px;
+  width: 56px;
+}
+
+.other-info-tabs {
+  padding-left: 60px;
+  margin-left: 40px;
+}
+</style>
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 25c377d223..776ac6be7e 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -12,6 +12,7 @@
       :total="page.total"
       :page-size.sync="page.pageSize"
       :operators="operators"
+      operator-width="170px"
       :screen-height="screenHeight"
       :batch-operators="batchButtons"
       :remember-order="true"
@@ -406,6 +407,11 @@ export default {
         }
       ],
       publicOperators: [
+        {
+          tip: this.$t('commons.view'), icon: "el-icon-view",
+          exec: this.handleEditShow,
+          permissions: ['PROJECT_TRACK_CASE:READ'],
+        },
         {
           tip: this.$t('commons.edit'), icon: "el-icon-edit",
           exec: this.handleEdit,
@@ -757,6 +763,15 @@ export default {
         });
       }
 
+    },
+    handleEditShow(testCase, column) {
+      if (column.label !== this.$t('test_track.case.case_desc')) {
+        this.$get('test/case/get/' + testCase.id, response => {
+          let testCase = response.data;
+          this.$emit('testCaseEditShow', testCase);
+        });
+      }
+
     },
     isPublic(testCase) {
       if (testCase.maintainer && testCase.maintainer !== getCurrentUserId()) {
diff --git a/frontend/src/business/components/track/common/TestCaseNodeTree.vue b/frontend/src/business/components/track/common/TestCaseNodeTree.vue
index 1234cf9efa..f2f54849df 100644
--- a/frontend/src/business/components/track/common/TestCaseNodeTree.vue
+++ b/frontend/src/business/components/track/common/TestCaseNodeTree.vue
@@ -75,7 +75,8 @@ export default {
       treeNodes: [],
       condition: {
         filterText: "",
-        trashEnable: false
+        trashEnable: false,
+        publicEnable: false
       },
       operators: [
         {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index d607081224..c391d04a7e 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -103,6 +103,7 @@ export default {
     system_setting: 'Settings',
     api: 'API',
     encode: 'Encode',
+    view: 'view',
     follow_api: 'Follow API definition',
     response_time_delay: 'Response delay time',
     my_workstation: 'MyWorkstation',
@@ -219,7 +220,7 @@ export default {
     run_completed: "Run Completed",
     run_fail: "Run Fail",
     run_warning: "Is running, please check later",
-    run_stop: "當前任務已停止，無法查看報告",
+    run_stop: "The current task has been stopped and the report cannot be viewed",
     follow_success: "Follow Success",
     cancel_follow_success: "Cancel Follow Success",
     generate_test_data: "Generate test data",
@@ -696,7 +697,7 @@ export default {
     repeatable_info: 'After enabling, the interface definition repeatability check will not check the URL',
     case_public: 'Public Library',
     public: 'Start Public Library',
-    public_info: 'You can use public test case library data, or you can add test cases to the public test case library by yourself',
+    public_info: 'You can add test cases to the public test case library by yourself',
     upload_file_again: 'Upload again',
     code_segment: {
       code_segment: "Custom Code",
@@ -981,7 +982,7 @@ export default {
     custom_ratio: 'Custom',
     specify_resource: 'Specify node',
     schedule_tip: 'The interval must not be less than the pressure measuring time',
-    delete_threadgroup_confirm: 'Confirm delete scenario: ',
+    delete_threadgroup_confirm: 'Confirm delete scenario',
     scenario_list: 'Scenario List',
     scenario_name: 'Scenario Name',
     upload_jmx: 'Upload JMX',
@@ -1091,7 +1092,7 @@ export default {
       api_all: 'All interfaces',
       unplanned_api: 'Unplanned interface',
       id: 'Api Definition ID',
-      api_title: "Api test",
+      api_title: "Api Test",
       case_title: "Test Case",
       doc_title: "DOC",
       api_name: "Api name",
@@ -2314,7 +2315,7 @@ export default {
     home: 'Home',
     definition: 'Api Definition',
     automation: 'Api Automation',
-    report: 'Test report',
+    report: 'Test Report',
   },
   ldap: {
     url: 'LDAP URL',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 56daf9947e..156390b32c 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -105,6 +105,7 @@ export default {
     api: '接口测试',
     follow_api: '跟随API定义',
     encode: '编码',
+    view: '查看',
     response_time_delay: '响应延迟时间',
     performance: '性能测试',
     enable_settings: '启用设置',
@@ -700,7 +701,7 @@ export default {
     repeatable_info: '启用后接口定义重复性校验将不校验URL',
     case_public: '公共用例库',
     public: '启动公共用例库',
-    public_info: '可以使用公共用例库数据，也可以自行添加用例至公共用例库',
+    public_info: '可以自行添加用例至公共用例库',
     upload_file_again: '重新上传',
     code_segment: {
       code_segment: "自定义代码片段",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 97ae9eff0c..d72e8a7462 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -105,6 +105,7 @@ export default {
     api: '接口測試',
     follow_api: '跟隨API定義',
     encode: '編碼',
+    view: '查看',
     response_time_delay: '響應延遲時間',
     performance: '性能測試',
     enable_settings: '啟用設置',
@@ -700,7 +701,7 @@ export default {
     repeatable_info: '啟用後接口定義重復性校驗將不校驗URL',
     case_public: '公共用例庫',
     public: '啟動公共用例庫',
-    public_info: '可以使用公共用例庫數據，也可以自行添加用例至公共用例庫',
+    public_info: '可以自行添加用例至公共用例庫',
     upload_file_again: '重新上傳',
     code_segment: {
       code_segment: "自定義代碼片段",

From 28e04ab5df00b3abbbee15f6ffc37ac27920a255 Mon Sep 17 00:00:00 2001
From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Tue, 21 Dec 2021 20:36:07 +0800
Subject: [PATCH 250/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BB=8E=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E8=8F=9C=E5=8D=95=E7=82=B9=E5=88=B0=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E8=8F=9C=E5=8D=95=E5=90=8E=EF=BC=8C=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=8A=A5=E5=91=8A=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=20(#8688)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009098 --user=王孝刚 从接口自动化菜单点到测试报告菜单后，测试报告数据没有更新
https://www.tapd.cn/55049933/s/1084412

Co-authored-by: wxg0103 <727495428@qq.com>
---
 .../components/api/automation/report/ApiReportList.vue | 10 ++++++----
 frontend/src/i18n/en-US.js                             |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/api/automation/report/ApiReportList.vue b/frontend/src/business/components/api/automation/report/ApiReportList.vue
index 48754cd82f..d8ffff62dd 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportList.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportList.vue
@@ -128,7 +128,9 @@ export default {
       ],
       buttons: [
         {
-          name: this.$t('api_report.batch_delete'), handleClick: this.handleBatchDelete, permissions: ['PROJECT_API_REPORT:READ+DELETE']
+          name: this.$t('api_report.batch_delete'),
+          handleClick: this.handleBatchDelete,
+          permissions: ['PROJECT_API_REPORT:READ+DELETE']
         }
       ],
       selectRows: new Set(),
@@ -138,9 +140,9 @@ export default {
       screenHeight: 'calc(100vh - 200px)',
     }
   },
-  // watch: {
-  //   '$route': 'init',
-  // },
+  watch: {
+    '$route': 'init',
+  },
 
   methods: {
     search() {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index c391d04a7e..d21c71ff0d 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1613,6 +1613,7 @@ export default {
       esb_tip: "Only ESB xlsx files are supported",
       postman_tip: "Only Postman Collection V2.1 json files are supported",
       postman_export_tip: "Export the test collection by Postman",
+      post_export_tip: "Export the test collection by Postman",
       swagger_export_tip: "Export jSON-formatted files via Swagger website",
       jmeter_export_tip: "Generating JMX file through JMeter",
       jmeter_tip: "JMX files supporting JMeter 5.2-5.4",

From 374d2de7ce672aab4685d7640a6e69acde5b90a6 Mon Sep 17 00:00:00 2001
From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Tue, 21 Dec 2021 21:05:25 +0800
Subject: [PATCH 251/256] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0xpack=20(#8700?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 frontend/src/business/components/xpack     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 8e54dfc4cd..25fa8fc0d7 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 8e54dfc4cd510f2d676787dad1599067ac02f2d9
+Subproject commit 25fa8fc0d7972b56f86fb466417ec55588a4812d
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index a821f89c14..4ab83e897b 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit a821f89c1409b4a4713442a79a7964e61f30355b
+Subproject commit 4ab83e897bdbc55729fd7418b6a77e73e39b1df9

From 654a6e9484c4b26aaae4c67b7810151cf64b7a40 Mon Sep 17 00:00:00 2001
From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Tue, 21 Dec 2021 21:05:33 +0800
Subject: [PATCH 252/256] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=94=A8=E4=BE=8B=E5=85=B3=E8=81=94=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?url=E5=A4=9A=E4=BD=99=E6=96=9C=E6=9D=A0=20(#8699)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
---
 .../components/track/case/components/TestCaseRelateApiList.vue  | 2 +-
 .../components/track/case/components/TestCaseRelateLoadList.vue | 2 +-
 .../track/case/components/TestCaseRelateScenarioList.vue        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/TestCaseRelateApiList.vue b/frontend/src/business/components/track/case/components/TestCaseRelateApiList.vue
index f3a44f3cba..8b8c7c2f3d 100644
--- a/frontend/src/business/components/track/case/components/TestCaseRelateApiList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseRelateApiList.vue
@@ -166,7 +166,7 @@ export default {
       }
     },
     buildPagePath(path) {
-      return path + "/" + this.currentPage + "/" + this.pageSize;
+      return path + this.currentPage + "/" + this.pageSize;
     },
     getSelectIds() {
       return this.$refs.table.selectIds;
diff --git a/frontend/src/business/components/track/case/components/TestCaseRelateLoadList.vue b/frontend/src/business/components/track/case/components/TestCaseRelateLoadList.vue
index 1879a4fb69..ebe96c0abc 100644
--- a/frontend/src/business/components/track/case/components/TestCaseRelateLoadList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseRelateLoadList.vue
@@ -131,7 +131,7 @@ export default {
       }
     },
     buildPagePath(path) {
-      return path + "/" + this.currentPage + "/" + this.pageSize;
+      return path + this.currentPage + "/" + this.pageSize;
     },
     getSelectIds() {
       return this.$refs.table.selectIds;
diff --git a/frontend/src/business/components/track/case/components/TestCaseRelateScenarioList.vue b/frontend/src/business/components/track/case/components/TestCaseRelateScenarioList.vue
index c9c8a7f090..046e63de09 100644
--- a/frontend/src/business/components/track/case/components/TestCaseRelateScenarioList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseRelateScenarioList.vue
@@ -168,7 +168,7 @@ export default {
       }
     },
     buildPagePath(path) {
-      return path + "/" + this.currentPage + "/" + this.pageSize;
+      return path + this.currentPage + "/" + this.pageSize;
     },
     getSelectIds() {
       return this.$refs.table.selectIds;

From 06360cbfdaaab5c1b05f94cd73733796d0445a38 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 21 Dec 2021 21:18:51 +0800
Subject: [PATCH 253/256] =?UTF-8?q?fix:=20=E8=84=91=E5=9B=BE=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=BC=BA=E9=99=B7=E4=BF=9D=E5=AD=98=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=20--bug=3D1009066=20--user=3D=E9=99=88=E5=BB=BA=E6=98=9F=20?=
 =?UTF-8?q?=E3=80=90=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA=E3=80=91=E7=A6=85?=
 =?UTF-8?q?=E9=81=93=E7=BC=BA=E9=99=B7=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E4=B8=AD=EF=BC=8C=E8=84=91=E5=9B=BE?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=BC=96=E8=BE=91=E7=BC=BA=E9=99=B7=E5=90=8E?=
 =?UTF-8?q?=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=8F=96=E6=B6=88=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=20https://www.tapd.cn/55049933/s/1084596?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/track/issue/AbstractIssuePlatform.java    | 4 +++-
 .../track/request/testcase/IssuesUpdateRequest.java          | 2 ++
 .../components/track/case/components/TestPlanIssueEdit.vue   | 4 ++--
 .../components/track/common/minder/TestCaseMinder.vue        | 2 +-
 .../src/business/components/track/issue/IssueEditDetail.vue  | 5 ++++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
index 1dee347300..7be0ab7042 100644
--- a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
@@ -174,7 +174,9 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
     protected void handleIssueUpdate(IssuesUpdateRequest request) {
         request.setUpdateTime(System.currentTimeMillis());
         issuesMapper.updateByPrimaryKeySelective(request);
-        handleTestCaseIssues(request);
+        if (!request.isWithoutTestCaseIssue()) {
+            handleTestCaseIssues(request);
+        }
     }
 
     protected void handleTestCaseIssues(IssuesUpdateRequest issuesRequest) {
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java
index afc96dcafd..58441ff9bc 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java
@@ -28,4 +28,6 @@ public class IssuesUpdateRequest extends IssuesWithBLOBs {
     private boolean thirdPartPlatform;
 
     private List<String> follows;
+
+    private boolean withoutTestCaseIssue; // 不更新用例和缺陷的关联关系
 }
diff --git a/frontend/src/business/components/track/case/components/TestPlanIssueEdit.vue b/frontend/src/business/components/track/case/components/TestPlanIssueEdit.vue
index a2f7373251..2d0a52e35e 100644
--- a/frontend/src/business/components/track/case/components/TestPlanIssueEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestPlanIssueEdit.vue
@@ -7,7 +7,7 @@
     append-to-body
     ref="msEditDialog">
     <template v-slot:default="scope">
-      <issue-edit-detail :plan-id="planId" :case-id="caseId" :is-plan="true" @refresh="refresh" @close="handleClose" ref="issueEditDetail"/>
+      <issue-edit-detail :is-minder="isMinder" :plan-id="planId" :case-id="caseId" :is-plan="true" @refresh="refresh" @close="handleClose" ref="issueEditDetail"/>
     </template>
   </ms-edit-dialog>
 </template>
@@ -31,7 +31,7 @@ export default {
       return getCurrentProjectID();
     }
   },
-  props: ['caseId', 'planId'],
+  props: ['caseId', 'planId', 'isMinder'],
   methods: {
     open(data) {
       this.visible = true;
diff --git a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index 2a09238b9e..3e4b4cf2ec 100644
--- a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -18,7 +18,7 @@
       ref="minder"
     />
     <IssueRelateList :case-id="getCurCaseId()"  @refresh="refreshRelateIssue" ref="issueRelate"/>
-    <test-plan-issue-edit :plan-id="null" :case-id="getCurCaseId()" @refresh="refreshIssue" ref="issueEdit"/>
+    <test-plan-issue-edit :is-minder="true" :plan-id="null" :case-id="getCurCaseId()" @refresh="refreshIssue"  ref="issueEdit"/>
   </div>
 
 </template>
diff --git a/frontend/src/business/components/track/issue/IssueEditDetail.vue b/frontend/src/business/components/track/issue/IssueEditDetail.vue
index b5230a460e..1adf60b3d4 100644
--- a/frontend/src/business/components/track/issue/IssueEditDetail.vue
+++ b/frontend/src/business/components/track/issue/IssueEditDetail.vue
@@ -150,7 +150,8 @@ export default {
       }
     },
     caseId: String,
-    planId: String
+    planId: String,
+    isMinder: Boolean,
   },
   computed: {
     isSystem() {
@@ -293,6 +294,8 @@ export default {
         param.resourceId = this.planId;
       }
 
+      param.withoutTestCaseIssue = this.isMinder;
+
       param.thirdPartPlatform = this.enableThirdPartTemplate;
       return param;
     },

From 052c96668e985dec40ed99b2ffdb74ec80c24109 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 21 Dec 2021 21:48:04 +0800
Subject: [PATCH 254/256] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A):=20=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化项目报告调用selenium的方法，由一张图表调用一次生成一个图表，改为一次报告调用一次生成一批图表
---
 .../reportstatistics/dto/HeadlessRequest.java |  9 ++-
 .../service/ReportStatisticsService.java      | 28 +++++---
 .../reportstatistics/utils/ChromeUtils.java   | 69 +++++++++++--------
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 frontend/src/business/components/xpack        |  2 +-
 5 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/reportstatistics/dto/HeadlessRequest.java b/backend/src/main/java/io/metersphere/reportstatistics/dto/HeadlessRequest.java
index 171a007233..9dd6c2e48c 100644
--- a/backend/src/main/java/io/metersphere/reportstatistics/dto/HeadlessRequest.java
+++ b/backend/src/main/java/io/metersphere/reportstatistics/dto/HeadlessRequest.java
@@ -2,15 +2,20 @@ package io.metersphere.reportstatistics.dto;
 
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.List;
+import java.util.Map;
+
 @Getter
 @Setter
 public class HeadlessRequest {
-    private String url;
+    private Map<String, String> urlMap;
     private String remoteDriverUrl;
 
     public boolean isEmpty() {
-        return StringUtils.isEmpty(this.url) || StringUtils.isEmpty(this.remoteDriverUrl);
+        return MapUtils.isEmpty(this.urlMap) || StringUtils.isEmpty(this.remoteDriverUrl);
     }
 }
diff --git a/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java b/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
index 2c517c2031..47fb8e80c8 100644
--- a/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
+++ b/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
@@ -16,15 +16,13 @@ import io.metersphere.reportstatistics.dto.table.TestCaseCountTableItemDataDTO;
 import io.metersphere.reportstatistics.dto.table.TestCaseCountTableRowDTO;
 import io.metersphere.reportstatistics.utils.ChromeUtils;
 import io.metersphere.service.SystemParameterService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * @author song.tianyang
@@ -73,6 +71,9 @@ public class ReportStatisticsService {
 
     public ReportStatisticsWithBLOBs selectById(String id) {
         ReportStatisticsWithBLOBs blob = reportStatisticsMapper.selectByPrimaryKey(id);
+        if (blob == null) {
+            return null;
+        }
         JSONObject selectOption = JSONObject.parseObject(blob.getSelectOption());
         JSONObject dataOption = JSONObject.parseObject(blob.getDataOption());
         boolean isReportNeedUpdate = this.isReportNeedUpdate(blob);
@@ -250,7 +251,11 @@ public class ReportStatisticsService {
         return reportStatisticsMapper.selectByExample(example);
     }
 
-    public String getImageContentById(ReportStatisticsWithBLOBs reportRecordId, String language) {
+    public Map<String, String> getImageContentById(List<ReportStatisticsWithBLOBs> reportRecordIdList, String language) {
+        if (CollectionUtils.isEmpty(reportRecordIdList)) {
+            return new HashMap<>();
+        }
+
         ChromeUtils chromeUtils = ChromeUtils.getInstance();
         HeadlessRequest headlessRequest = new HeadlessRequest();
         BaseSystemConfigDTO baseInfo = CommonBeanFactory.getBean(SystemParameterService.class).getBaseInfo();
@@ -261,11 +266,16 @@ public class ReportStatisticsService {
             platformUrl = baseInfo.getUrl();
             remoteDriverUrl = baseInfo.getSeleniumDockerUrl();
         }
-        platformUrl += "/echartPic?shareId=" + reportRecordId.getId();
-        headlessRequest.setUrl(platformUrl);
+
+        Map<String, String> urlMap = new HashMap<>();
+        for (ReportStatisticsWithBLOBs blob : reportRecordIdList) {
+            String url = platformUrl + "/echartPic?shareId=" + blob.getId();
+            urlMap.put(blob.getId(), url);
+        }
+        headlessRequest.setUrlMap(urlMap);
         headlessRequest.setRemoteDriverUrl(remoteDriverUrl);
-        String imageData = chromeUtils.getImageInfo(headlessRequest, language);
-        return imageData;
+        Map<String, String> returnMap = chromeUtils.getImageInfo(headlessRequest, language);
+        return returnMap;
     }
 
     public boolean isReportNeedUpdate(ReportStatisticsWithBLOBs model) {
diff --git a/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java b/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java
index b117db965b..183422536d 100644
--- a/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java
+++ b/backend/src/main/java/io/metersphere/reportstatistics/utils/ChromeUtils.java
@@ -23,18 +23,18 @@ public class ChromeUtils {
         return chromeUtils;
     }
 
-    private synchronized WebDriver genWebDriver(HeadlessRequest headlessRequest, String language) {
-        if (headlessRequest.isEmpty()) {
-            LogUtil.error("Headless request is null! " + JSON.toJSONString(headlessRequest));
+    private synchronized WebDriver genWebDriver(String seleniumUrl, String language) {
+        if (StringUtils.isEmpty(seleniumUrl)) {
+            LogUtil.error("Headless request is null! " + seleniumUrl);
             return null;
         }
         //初始化一个chrome浏览器实例driver
         ChromeOptions options = new ChromeOptions();
 
         if (StringUtils.isEmpty(language)) {
-            language = "zh-cn";
+            language = "zh_cn";
         }
-        if (StringUtils.equalsAnyIgnoreCase(language, "zh-cn")) {
+        if (StringUtils.equalsAnyIgnoreCase(language, "zh_cn")) {
             Map<String, Object> optionMap = new HashMap<>();
             optionMap.put("intl.accept_languages", "zh-CN,en,en_US");
             options.setExperimentalOption("prefs", optionMap);
@@ -46,9 +46,7 @@ public class ChromeUtils {
 
         WebDriver driver = null;
         try {
-            driver = new RemoteWebDriver(new URL(headlessRequest.getRemoteDriverUrl()), options);
-            driver.get(headlessRequest.getUrl());
-            driver.manage().window().fullscreen();
+            driver = new RemoteWebDriver(new URL(seleniumUrl), options);
         } catch (Exception e) {
             if (driver != null) {
                 driver.quit();
@@ -59,31 +57,42 @@ public class ChromeUtils {
         return driver;
     }
 
-    public synchronized String getImageInfo(HeadlessRequest request, String langurage) {
-        WebDriver driver = this.genWebDriver(request, langurage);
-        String files = null;
+    public synchronized Map<String, String> getImageInfo(HeadlessRequest request, String langurage) {
+        Map<String, String> returnMap = new HashMap<>();
+        if (request.isEmpty()) {
+            return returnMap;
+        }
+        WebDriver driver = this.genWebDriver(request.getRemoteDriverUrl(), langurage);
         if (driver != null) {
-            try {
-                //预留echart动画的加载时间
-                Thread.sleep(3 * 1000);
-                String js = "var chartsCanvas = document.getElementById('picChart').getElementsByTagName('canvas')[0];" +
-                        "var imageUrl = null;" +
-                        "if (chartsCanvas!= null) {" +
-                        " imageUrl = chartsCanvas && chartsCanvas.toDataURL('image/png');" +
-                        "return imageUrl;" +
-                        "}";
-                files = ((JavascriptExecutor) driver).executeScript(js).toString();
-            } catch (Exception e) {
-                LogUtil.error(e);
-            } finally {
+            for (Map.Entry<String, String> urlEntry : request.getUrlMap().entrySet()) {
+                String id = urlEntry.getKey();
+                String url = urlEntry.getValue();
+                try {
+                    driver.get(url);
+                    driver.manage().window().fullscreen();
+                    //预留echart动画的加载时间
+                    Thread.sleep(3 * 1000);
+                    String js = "var chartsCanvas = document.getElementById('picChart').getElementsByTagName('canvas')[0];" +
+                            "var imageUrl = null;" +
+                            "if (chartsCanvas!= null) {" +
+                            " imageUrl = chartsCanvas && chartsCanvas.toDataURL('image/png');" +
+                            "return imageUrl;" +
+                            "}";
+                    String files = ((JavascriptExecutor) driver).executeScript(js).toString();
+                    if (StringUtils.isNotEmpty(files)) {
+                        returnMap.put(id, files);
+                    }
+                    Thread.sleep(1 * 1000);
+                } catch (Exception e) {
+                    LogUtil.error(e);
+                }
+
+            }
+
+            if (driver != null) {
                 driver.quit();
             }
         }
-        if (StringUtils.isNotEmpty(files)) {
-            return files;
-        } else {
-            LogUtil.error("获取报表图片失败！参数：" + JSON.toJSONString(request));
-            return null;
-        }
+        return returnMap;
     }
 }
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 25fa8fc0d7..a1e39f9c1b 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 25fa8fc0d7972b56f86fb466417ec55588a4812d
+Subproject commit a1e39f9c1baf30f52da50ab34ea1bacbfbeff60c
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 4ab83e897b..a2a8dde5be 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 4ab83e897bdbc55729fd7418b6a77e73e39b1df9
+Subproject commit a2a8dde5beb470590e7860e9d4376a56ce41d791

From 7115516bf0b6c91039f33dd1dc60a8fc15a39bf0 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Wed, 22 Dec 2021 09:23:30 +0800
Subject: [PATCH 255/256] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E8=BD=AC=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E6=97=B6jmx?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E6=9C=89=E9=97=AE=E9=A2=98=E7=9A=84=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复场景转性能测试时jmx结构有问题的缺陷
---
 .../api/service/APITestService.java           | 30 +++++++++++++------
 .../projectstatistics/ReportCard.vue          |  8 ++---
 frontend/src/i18n/en-US.js                    |  1 +
 frontend/src/i18n/zh-CN.js                    |  1 +
 frontend/src/i18n/zh-TW.js                    |  1 +
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java
index 71a9dce003..14c7cadc18 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -33,6 +33,7 @@ import io.metersphere.job.sechedule.ApiTestJob;
 import io.metersphere.service.FileService;
 import io.metersphere.service.ScheduleService;
 import io.metersphere.track.service.TestCaseService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.constants.CommonConstants;
@@ -43,7 +44,6 @@ import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -505,14 +505,9 @@ public class APITestService {
                     //HTTPSamplerProxy， 进行附件转化： 1.elementProp里去掉路径； 2。elementProp->filePath获取路径并读出来
                     attachmentFilePathList.addAll(this.parseAttachmentFileInfo(element));
 
-                    //查看是否含有RunningDebugSampler,转jmx的时候去掉
-                    List<Element> debugSamplerElementList = element.elements("DebugSampler");
-                    for (Element debugSampler : debugSamplerElementList) {
-                        String testname = debugSampler.attributeValue("testname");
-                        if (StringUtils.equalsAnyIgnoreCase(testname, RunningParamKeys.RUNNING_DEBUG_SAMPLER_NAME)) {
-                            element.remove(debugSampler);
-                        }
-                    }
+                    //检查并去掉RunningDebugSampler,转jmx的时候去掉
+                    this.checkAndRemoveRunningDebugSampler(element);
+
                 }
                 //如果存在证书文件，也要匹配出来
                 attachmentFilePathList.addAll(this.parseAttachmentFileInfo(innerHashTreeElement));
@@ -551,6 +546,23 @@ public class APITestService {
         return returnDTO;
     }
 
+    private void checkAndRemoveRunningDebugSampler(Element element) {
+        List<Element> childElements = element.elements();
+        if (CollectionUtils.isNotEmpty(childElements)) {
+            if (childElements.size() > 1) {
+                Element checkElement = childElements.get(childElements.size() - 2);
+                String elementName = checkElement.attributeValue("testname");
+                if (StringUtils.equalsIgnoreCase(elementName, RunningParamKeys.RUNNING_DEBUG_SAMPLER_NAME)) {
+                    Element checkHashTreeElement = childElements.get(childElements.size() - 1);
+                    if (StringUtils.equalsIgnoreCase("hashtree", checkHashTreeElement.getName())) {
+                        element.remove(checkHashTreeElement);
+                        element.remove(checkElement);
+                    }
+                }
+            }
+        }
+    }
+
     private List<String> parseAttachmentFileInfo(Element parentHashTreeElement) {
         List<String> attachmentFilePathList = new ArrayList<>();
         List<Element> parentElementList = parentHashTreeElement.elements();
diff --git a/frontend/src/business/components/reportstatistics/projectstatistics/ReportCard.vue b/frontend/src/business/components/reportstatistics/projectstatistics/ReportCard.vue
index 405e0bfb26..c758fd6bff 100644
--- a/frontend/src/business/components/reportstatistics/projectstatistics/ReportCard.vue
+++ b/frontend/src/business/components/reportstatistics/projectstatistics/ReportCard.vue
@@ -27,7 +27,7 @@
         <el-card :body-style="{ padding: '0px' }" class="ms-col">
           <img src="@/assets/other.png" class="image">
           <div style="padding: 10px;">
-            <span>预留模块敬请期待</span>
+            <span>{{ $t('commons.report_statistics.reserved') }}</span>
             <div class="bottom clearfix">
               <time class="time">{{ $t('commons.report_statistics.test_case_activity') }}</time>
             </div>
@@ -38,7 +38,7 @@
         <el-card :body-style="{ padding: '0px' }" class="ms-col">
           <img src="@/assets/other.png" class="image">
           <div style="padding: 10px;">
-            <span>预留模块敬请期待</span>
+            <span>{{ $t('commons.report_statistics.reserved') }}</span>
             <div class="bottom clearfix">
               <time class="time">{{ $t('commons.report_statistics.test_case_activity') }}</time>
             </div>
@@ -49,7 +49,7 @@
         <el-card :body-style="{ padding: '0px' }" class="ms-col">
           <img src="@/assets/other.png" class="image">
           <div style="padding: 10px;">
-            <span>预留模块敬请期待</span>
+            <span>{{ $t('commons.report_statistics.reserved') }}</span>
             <div class="bottom clearfix">
               <time class="time">{{ $t('commons.report_statistics.test_case_activity') }}</time>
             </div>
@@ -60,7 +60,7 @@
         <el-card :body-style="{ padding: '0px' }" class="ms-col">
           <img src="@/assets/other.png" class="image">
           <div style="padding: 10px;">
-            <span>预留模块敬请期待</span>
+            <span>{{ $t('commons.report_statistics.reserved') }}</span>
             <div class="bottom clearfix">
               <time class="time">{{ $t('commons.report_statistics.test_case_activity') }}</time>
             </div>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index d21c71ff0d..c279e76a2b 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -314,6 +314,7 @@ export default {
       default_module: "Default module",
     },
     report_statistics: {
+      reserved: "Reserved",
       menu: {
         project_statistics: "Project statistics",
         project_report: "Project report",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 156390b32c..5993d04ee3 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -315,6 +315,7 @@ export default {
       default_module: "默认模块",
     },
     report_statistics: {
+      reserved: "预留模块敬请期待",
       menu: {
         project_statistics: "项目报表",
         project_report: "项目报告",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index d72e8a7462..64c53a9f45 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -315,6 +315,7 @@ export default {
       default_module: "默認模塊",
     },
     report_statistics: {
+      reserved: "預留模塊敬請期待",
       menu: {
         project_statistics: "項目報表",
         project_report: "項目報告",

From 0e4cc6bb42616ed35b7fb7b10944ea45bf51b457 Mon Sep 17 00:00:00 2001
From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Wed, 22 Dec 2021 10:22:34 +0800
Subject: [PATCH 256/256] =?UTF-8?q?feat:=20=E7=BC=BA=E9=99=B7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=A2=9E=E5=8A=A0=E8=AF=84=E8=AE=BA=E5=B9=B6=E4=B8=94?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AB=99=E5=86=85=E4=BF=A1=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=20(#8703)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 缺陷详情增加评论并且增加站内信通知
--story=1004214 --user=张大海 11.缺陷详情添加评论 以免修改状态无法增加描述 https://www.tapd.cn/55049933/s/1084637

* refactor: 代码优化

Co-authored-by: zhangdahai111 <dahai.zhang@fit2cloud.com>
Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
---
 .../metersphere/base/domain/IssueComment.java |  23 +
 .../base/domain/IssueCommentExample.java      | 600 ++++++++++++++++++
 .../base/mapper/IssueCommentMapper.java       |  36 ++
 .../base/mapper/IssueCommentMapper.xml        | 287 +++++++++
 .../mapper/ext/ExtIssueCommentMapper.java     |  18 +
 .../base/mapper/ext/ExtIssueCommentMapper.xml |  15 +
 .../controller/IssueCommentController.java    |  56 ++
 .../track/controller/IssuesController.java    |   1 +
 .../track/dto/IssueCommentDTO.java            |   9 +
 .../issues/IssuesRelevanceRequest.java        |   4 +
 .../issues/SaveIssueCommentRequest.java       |  11 +
 .../track/service/IssueCommentService.java    |  80 +++
 .../track/service/IssuesService.java          |  12 +-
 .../db/migration/V103__v1.16_release.sql      |  16 +-
 .../mail/track/IssuesCommentUpdate.html       |  12 +
 .../track/DefectTaskNotification.vue          |   9 +
 .../track/case/components/TestCaseEdit.vue    |   1 +
 .../components/track/issue/IssueComment.vue   | 118 ++++
 .../track/issue/IssueEditDetail.vue           |  84 ++-
 .../components/track/issue/IssueList.vue      |   1 +
 .../track/review/commom/ReviewComment.vue     |   2 +-
 .../track/review/commom/ReviewCommentItem.vue |   5 +-
 22 files changed, 1389 insertions(+), 11 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/IssueComment.java
 create mode 100644 backend/src/main/java/io/metersphere/base/domain/IssueCommentExample.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/IssueCommentMapper.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/IssueCommentMapper.xml
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssueCommentMapper.java
 create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssueCommentMapper.xml
 create mode 100644 backend/src/main/java/io/metersphere/track/controller/IssueCommentController.java
 create mode 100644 backend/src/main/java/io/metersphere/track/dto/IssueCommentDTO.java
 create mode 100644 backend/src/main/java/io/metersphere/track/request/issues/SaveIssueCommentRequest.java
 create mode 100644 backend/src/main/java/io/metersphere/track/service/IssueCommentService.java
 create mode 100644 backend/src/main/resources/mail/track/IssuesCommentUpdate.html
 create mode 100644 frontend/src/business/components/track/issue/IssueComment.vue

diff --git a/backend/src/main/java/io/metersphere/base/domain/IssueComment.java b/backend/src/main/java/io/metersphere/base/domain/IssueComment.java
new file mode 100644
index 0000000000..e498e1e11c
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/IssueComment.java
@@ -0,0 +1,23 @@
+package io.metersphere.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class IssueComment implements Serializable {
+    private String id;
+
+    private String issueId;
+
+    private String author;
+
+    private Long createTime;
+
+    private Long updateTime;
+
+    private String status;
+
+    private String description;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/IssueCommentExample.java b/backend/src/main/java/io/metersphere/base/domain/IssueCommentExample.java
new file mode 100644
index 0000000000..2acd31cb8b
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/domain/IssueCommentExample.java
@@ -0,0 +1,600 @@
+package io.metersphere.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class IssueCommentExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public IssueCommentExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueIdIsNull() {
+            addCriterion("issue_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueIdIsNotNull() {
+            addCriterion("issue_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueIdEqualTo(String value) {
+            addCriterion("issue_id =", value, "issueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueIdNotEqualTo(String value) {
+            addCriterion("issue_id <>", value, "issueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueIdGreaterThan(String value) {
+            addCriterion("issue_id >", value, "issueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueIdGreaterThanOrEqualTo(String value) {
+            addCriterion("issue_id >=", value, "issueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueIdLessThan(String value) {
+            addCriterion("issue_id <", value, "issueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueIdLessThanOrEqualTo(String value) {
+            addCriterion("issue_id <=", value, "issueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueIdLike(String value) {
+            addCriterion("issue_id like", value, "issueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueIdNotLike(String value) {
+            addCriterion("issue_id not like", value, "issueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueIdIn(List<String> values) {
+            addCriterion("issue_id in", values, "issueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueIdNotIn(List<String> values) {
+            addCriterion("issue_id not in", values, "issueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueIdBetween(String value1, String value2) {
+            addCriterion("issue_id between", value1, value2, "issueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueIdNotBetween(String value1, String value2) {
+            addCriterion("issue_id not between", value1, value2, "issueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorIsNull() {
+            addCriterion("author is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorIsNotNull() {
+            addCriterion("author is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorEqualTo(String value) {
+            addCriterion("author =", value, "author");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorNotEqualTo(String value) {
+            addCriterion("author <>", value, "author");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorGreaterThan(String value) {
+            addCriterion("author >", value, "author");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorGreaterThanOrEqualTo(String value) {
+            addCriterion("author >=", value, "author");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorLessThan(String value) {
+            addCriterion("author <", value, "author");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorLessThanOrEqualTo(String value) {
+            addCriterion("author <=", value, "author");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorLike(String value) {
+            addCriterion("author like", value, "author");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorNotLike(String value) {
+            addCriterion("author not like", value, "author");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorIn(List<String> values) {
+            addCriterion("author in", values, "author");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorNotIn(List<String> values) {
+            addCriterion("author not in", values, "author");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorBetween(String value1, String value2) {
+            addCriterion("author between", value1, value2, "author");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorNotBetween(String value1, String value2) {
+            addCriterion("author not between", value1, value2, "author");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Long value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Long value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Long value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Long value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Long value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Long> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Long> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Long value1, Long value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Long value1, Long value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Long value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Long value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Long value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Long value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Long value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Long> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Long> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Long value1, Long value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Long value1, Long value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(String value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(String value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(String value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(String value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(String value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLike(String value) {
+            addCriterion("`status` like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotLike(String value) {
+            addCriterion("`status` not like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<String> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<String> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(String value1, String value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(String value1, String value2) {
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/IssueCommentMapper.java b/backend/src/main/java/io/metersphere/base/mapper/IssueCommentMapper.java
new file mode 100644
index 0000000000..fd6f96ecd6
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/IssueCommentMapper.java
@@ -0,0 +1,36 @@
+package io.metersphere.base.mapper;
+
+import io.metersphere.base.domain.IssueComment;
+import io.metersphere.base.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);
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/IssueCommentMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/IssueCommentMapper.xml
new file mode 100644
index 0000000000..f0676da789
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/IssueCommentMapper.xml
@@ -0,0 +1,287 @@
+<?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.base.mapper.IssueCommentMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.base.domain.IssueComment">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="issue_id" jdbcType="VARCHAR" property="issueId" />
+    <result column="author" jdbcType="VARCHAR" property="author" />
+    <result column="create_time" jdbcType="BIGINT" property="createTime" />
+    <result column="update_time" jdbcType="BIGINT" property="updateTime" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.IssueComment">
+    <result column="description" jdbcType="LONGVARCHAR" property="description" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, issue_id, author, create_time, update_time, `status`
+  </sql>
+  <sql id="Blob_Column_List">
+    description
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.base.domain.IssueCommentExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from issue_comment
+    <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.base.domain.IssueCommentExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from issue_comment
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from issue_comment
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from issue_comment
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.metersphere.base.domain.IssueCommentExample">
+    delete from issue_comment
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.metersphere.base.domain.IssueComment">
+    insert into issue_comment (id, issue_id, author, 
+      create_time, update_time, `status`, 
+      description)
+    values (#{id,jdbcType=VARCHAR}, #{issueId,jdbcType=VARCHAR}, #{author,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR}, 
+      #{description,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="io.metersphere.base.domain.IssueComment">
+    insert into issue_comment
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="issueId != null">
+        issue_id,
+      </if>
+      <if test="author != null">
+        author,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="description != null">
+        description,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="issueId != null">
+        #{issueId,jdbcType=VARCHAR},
+      </if>
+      <if test="author != null">
+        #{author,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.metersphere.base.domain.IssueCommentExample" resultType="java.lang.Long">
+    select count(*) from issue_comment
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update issue_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>
+      <if test="record.author != null">
+        author = #{record.author,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.status != null">
+        `status` = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.description != null">
+        description = #{record.description,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update issue_comment
+    set id = #{record.id,jdbcType=VARCHAR},
+      issue_id = #{record.issueId,jdbcType=VARCHAR},
+      author = #{record.author,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT},
+      update_time = #{record.updateTime,jdbcType=BIGINT},
+      `status` = #{record.status,jdbcType=VARCHAR},
+      description = #{record.description,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update issue_comment
+    set id = #{record.id,jdbcType=VARCHAR},
+      issue_id = #{record.issueId,jdbcType=VARCHAR},
+      author = #{record.author,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT},
+      update_time = #{record.updateTime,jdbcType=BIGINT},
+      `status` = #{record.status,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.IssueComment">
+    update issue_comment
+    <set>
+      <if test="issueId != null">
+        issue_id = #{issueId,jdbcType=VARCHAR},
+      </if>
+      <if test="author != null">
+        author = #{author,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=BIGINT},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=BIGINT},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null">
+        description = #{description,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.IssueComment">
+    update issue_comment
+    set issue_id = #{issueId,jdbcType=VARCHAR},
+      author = #{author,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT},
+      update_time = #{updateTime,jdbcType=BIGINT},
+      `status` = #{status,jdbcType=VARCHAR},
+      description = #{description,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.IssueComment">
+    update issue_comment
+    set issue_id = #{issueId,jdbcType=VARCHAR},
+      author = #{author,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT},
+      update_time = #{updateTime,jdbcType=BIGINT},
+      `status` = #{status,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssueCommentMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssueCommentMapper.java
new file mode 100644
index 0000000000..79efb1b525
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssueCommentMapper.java
@@ -0,0 +1,18 @@
+package io.metersphere.base.mapper.ext;
+
+import io.metersphere.track.dto.IssueCommentDTO;
+import io.metersphere.track.dto.TestCaseCommentDTO;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface ExtIssueCommentMapper {
+
+    /**
+     * 获取用例的评论
+     * @param issueId
+     * @return
+     */
+    List<IssueCommentDTO> getComments(@Param("issueId") String issueId);
+
+}
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssueCommentMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssueCommentMapper.xml
new file mode 100644
index 0000000000..f44207354d
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssueCommentMapper.xml
@@ -0,0 +1,15 @@
+<?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.base.mapper.ext.ExtIssueCommentMapper">
+
+    <select id="getComments" resultType="io.metersphere.track.dto.IssueCommentDTO"
+            parameterType="java.lang.String">
+        select *, user.name as authorName
+        from issue_comment,
+             user
+        where issue_comment.author = user.id
+          and issue_id = #{issueId}
+        order by issue_comment.update_time desc
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/track/controller/IssueCommentController.java b/backend/src/main/java/io/metersphere/track/controller/IssueCommentController.java
new file mode 100644
index 0000000000..64092d8d73
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/controller/IssueCommentController.java
@@ -0,0 +1,56 @@
+package io.metersphere.track.controller;
+
+import io.metersphere.base.domain.IssueComment;
+import io.metersphere.commons.constants.NoticeConstants;
+import io.metersphere.commons.constants.OperLogConstants;
+import io.metersphere.commons.constants.PermissionConstants;
+import io.metersphere.log.annotation.MsAuditLog;
+import io.metersphere.notice.annotation.SendNotice;
+import io.metersphere.track.dto.IssueCommentDTO;
+import io.metersphere.track.request.issues.IssuesRelevanceRequest;
+import io.metersphere.track.request.issues.SaveIssueCommentRequest;
+import io.metersphere.track.service.IssueCommentService;
+import io.metersphere.track.service.IssuesService;
+import io.metersphere.track.service.TestCaseCommentService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.UUID;
+
+@RequestMapping("/issues/comment")
+@RestController
+public class IssueCommentController {
+
+    @Resource
+    private IssueCommentService issueCommentService;
+
+    @PostMapping("/save")
+    @RequiresPermissions(PermissionConstants.PROJECT_TRACK_REVIEW_READ_COMMENT)
+    @SendNotice(taskType = NoticeConstants.TaskType.DEFECT_TASK, target = "#targetClass.get(#request.issuesId)", targetClass = IssuesService.class,
+            event = NoticeConstants.Event.COMMENT, mailTemplate = "track/IssuesCommentUpdate", subject = "缺陷评论更新通知")
+    public IssueComment saveComment(@RequestBody IssuesRelevanceRequest request) {
+        request.setId(UUID.randomUUID().toString());
+        return issueCommentService.saveComment(request);
+    }
+
+    @GetMapping("/list/{issueId}")
+    public List<IssueCommentDTO> getComments(@PathVariable String issueId) {
+        return issueCommentService.getComments(issueId);
+    }
+
+    @GetMapping("/delete/{commentId}")
+    @RequiresPermissions(PermissionConstants.PROJECT_TRACK_REVIEW_READ_COMMENT)
+    @MsAuditLog(module = "track_bug", type = OperLogConstants.DELETE, beforeEvent = "#msClass.getLogDetails(#commentId)", msClass = TestCaseCommentService.class)
+    public void deleteComment(@PathVariable String commentId) {
+        issueCommentService.delete(commentId);
+    }
+
+    @PostMapping("/edit")
+    @RequiresPermissions(PermissionConstants.PROJECT_TRACK_REVIEW_READ_COMMENT)
+    @MsAuditLog(module = "track_bug", type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#request.id)", content = "#msClass.getLogDetails(#request.id)", msClass = TestCaseCommentService.class)
+    public IssueComment editComment(@RequestBody SaveIssueCommentRequest request) {
+       return issueCommentService.edit(request);
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/track/controller/IssuesController.java b/backend/src/main/java/io/metersphere/track/controller/IssuesController.java
index 2b8bb3dd6f..6c0c7e095a 100644
--- a/backend/src/main/java/io/metersphere/track/controller/IssuesController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/IssuesController.java
@@ -150,4 +150,5 @@ public class IssuesController {
     public IssueTemplateDao getThirdPartTemplate(@PathVariable String projectId) {
         return issuesService.getThirdPartTemplate(projectId);
     }
+
 }
diff --git a/backend/src/main/java/io/metersphere/track/dto/IssueCommentDTO.java b/backend/src/main/java/io/metersphere/track/dto/IssueCommentDTO.java
new file mode 100644
index 0000000000..82c8857f92
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/dto/IssueCommentDTO.java
@@ -0,0 +1,9 @@
+package io.metersphere.track.dto;
+
+import io.metersphere.base.domain.IssueComment;
+import lombok.Data;
+
+@Data
+public class IssueCommentDTO extends IssueComment {
+    private String authorName;
+}
diff --git a/backend/src/main/java/io/metersphere/track/request/issues/IssuesRelevanceRequest.java b/backend/src/main/java/io/metersphere/track/request/issues/IssuesRelevanceRequest.java
index deac7ff00d..0bcb7be9c4 100644
--- a/backend/src/main/java/io/metersphere/track/request/issues/IssuesRelevanceRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/issues/IssuesRelevanceRequest.java
@@ -10,6 +10,8 @@ import java.util.List;
 @Getter
 @Setter
 public class IssuesRelevanceRequest {
+    private String id;
+
     /**
      * 缺陷ID
      */
@@ -30,4 +32,6 @@ public class IssuesRelevanceRequest {
     private List<String> issueIds;
 
     private Boolean checked;
+
+    private String description;
 }
diff --git a/backend/src/main/java/io/metersphere/track/request/issues/SaveIssueCommentRequest.java b/backend/src/main/java/io/metersphere/track/request/issues/SaveIssueCommentRequest.java
new file mode 100644
index 0000000000..fc4dbfd274
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/request/issues/SaveIssueCommentRequest.java
@@ -0,0 +1,11 @@
+package io.metersphere.track.request.issues;
+
+import io.metersphere.base.domain.IssueComment;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SaveIssueCommentRequest extends IssueComment {
+     private String reviewId;
+}
diff --git a/backend/src/main/java/io/metersphere/track/service/IssueCommentService.java b/backend/src/main/java/io/metersphere/track/service/IssueCommentService.java
new file mode 100644
index 0000000000..c95c000568
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/service/IssueCommentService.java
@@ -0,0 +1,80 @@
+package io.metersphere.track.service;
+
+import com.alibaba.fastjson.JSON;
+import io.metersphere.base.domain.IssueComment;
+import io.metersphere.base.domain.Issues;
+import io.metersphere.base.mapper.IssueCommentMapper;
+import io.metersphere.base.mapper.IssuesMapper;
+import io.metersphere.base.mapper.ext.ExtIssueCommentMapper;
+import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.i18n.Translator;
+import io.metersphere.log.utils.ReflexObjectUtil;
+import io.metersphere.log.vo.DetailColumn;
+import io.metersphere.log.vo.OperatingLogDetails;
+import io.metersphere.log.vo.track.TestCaseReviewReference;
+import io.metersphere.track.dto.IssueCommentDTO;
+import io.metersphere.track.request.issues.IssuesRelevanceRequest;
+import io.metersphere.track.request.issues.SaveIssueCommentRequest;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class IssueCommentService {
+    @Resource
+    private IssuesMapper issuesMapper;
+    @Resource
+    private ExtIssueCommentMapper extIssueCommentMapper;
+    @Resource
+    private IssueCommentMapper issueCommentMapper;
+
+    public IssueComment saveComment(IssuesRelevanceRequest request) {
+        IssueComment issueComment = new IssueComment();
+        issueComment.setId(request.getId());
+        issueComment.setAuthor(SessionUtils.getUser().getId());
+        issueComment.setIssueId(request.getIssuesId());
+        issueComment.setCreateTime(System.currentTimeMillis());
+        issueComment.setUpdateTime(System.currentTimeMillis());
+        issueComment.setDescription(request.getDescription());
+        issueCommentMapper.insert(issueComment);
+        return issueComment;
+    }
+
+    public List<IssueCommentDTO> getComments(String caseId) {
+        return extIssueCommentMapper.getComments(caseId);
+    }
+
+    public void delete(String commentId) {
+        checkCommentOwner(commentId);
+        issueCommentMapper.deleteByPrimaryKey(commentId);
+    }
+
+    public IssueComment edit(SaveIssueCommentRequest request) {
+        checkCommentOwner(request.getId());
+        issueCommentMapper.updateByPrimaryKeySelective(request);
+        return issueCommentMapper.selectByPrimaryKey(request.getId());
+    }
+
+    private void checkCommentOwner(String commentId) {
+        IssueComment comment = issueCommentMapper.selectByPrimaryKey(commentId);
+        if (!StringUtils.equals(comment.getAuthor(), SessionUtils.getUser().getId())) {
+            MSException.throwException(Translator.get("check_owner_comment"));
+        }
+    }
+
+    public String getLogDetails(String id) {
+        IssueComment issueComment = issueCommentMapper.selectByPrimaryKey(id);
+        if (issueComment != null) {
+            Issues review = issuesMapper.selectByPrimaryKey(issueComment.getIssueId());
+            List<DetailColumn> columns = ReflexObjectUtil.getColumns(issueComment, TestCaseReviewReference.commentReviewColumns);
+            OperatingLogDetails details = new OperatingLogDetails(JSON.toJSONString(issueComment.getId()), review.getProjectId(), issueComment.getDescription(), issueComment.getAuthor(), columns);
+            return JSON.toJSONString(details);
+        }
+        return null;
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/track/service/IssuesService.java b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
index 126bcaa910..e743b26b7d 100644
--- a/backend/src/main/java/io/metersphere/track/service/IssuesService.java
+++ b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
@@ -64,8 +64,6 @@ public class IssuesService {
     @Resource
     private TestCaseIssuesMapper testCaseIssuesMapper;
     @Resource
-    private IssueTemplateMapper issueTemplateMapper;
-    @Resource
     private ExtIssuesMapper extIssuesMapper;
     @Resource
     private CustomFieldTemplateService customFieldTemplateService;
@@ -111,6 +109,7 @@ public class IssuesService {
         //saveFollows(issuesRequest.getId(), issuesRequest.getFollows());
         // todo 缺陷更新事件？
     }
+
     public void saveFollows(String issueId, List<String> follows) {
         IssueFollowExample example = new IssueFollowExample();
         example.createCriteria().andIssueIdEqualTo(issueId);
@@ -124,6 +123,7 @@ public class IssuesService {
             }
         }
     }
+
     public List<AbstractIssuePlatform> getAddPlatforms(IssuesUpdateRequest updateRequest) {
         List<String> platforms = new ArrayList<>();
         if (StringUtils.isNotBlank(updateRequest.getTestCaseId())) {
@@ -353,7 +353,7 @@ public class IssuesService {
                     .collect(Collectors.toList());
             item.setCaseIds(caseIds);
             item.setCaseCount(testCaseIssues.size());
-            if(StringUtils.equals(item.getPlatform(),"Tapd")){
+            if (StringUtils.equals(item.getPlatform(), "Tapd")) {
                 TapdPlatform platform = (TapdPlatform) IssueFactory.createPlatform(item.getPlatform(), request);
                 List<String> tapdUsers = platform.getTapdUsers(item.getProjectId(), item.getPlatformId());
                 item.setTapdUsers(tapdUsers);
@@ -469,6 +469,7 @@ public class IssuesService {
 
     /**
      * 获取默认的自定义字段的取值，同步之后更新成第三方平台的值
+     *
      * @param projectId
      * @return
      */
@@ -606,7 +607,7 @@ public class IssuesService {
         issuesMapper.updateByPrimaryKeySelective(issues);
     }
 
-    public List<IssuesDao> getCountByStatus(IssuesRequest request){
+    public List<IssuesDao> getCountByStatus(IssuesRequest request) {
         return extIssuesMapper.getCountByStatus(request);
 
     }
@@ -619,7 +620,7 @@ public class IssuesService {
         IssueFollowExample example = new IssueFollowExample();
         example.createCriteria().andIssueIdEqualTo(issueId);
         List<IssueFollow> follows = issueFollowMapper.selectByExample(example);
-        if(follows==null||follows.size()==0){
+        if (follows == null || follows.size() == 0) {
             return result;
         }
         result = follows.stream().map(IssueFollow::getFollowId).distinct().collect(Collectors.toList());
@@ -635,6 +636,7 @@ public class IssuesService {
         return issuesMapper.selectByExampleWithBLOBs(example);
     }
 
+
     public IssueTemplateDao getThirdPartTemplate(String projectId) {
         if (StringUtils.isNotBlank(projectId)) {
             Project project = projectService.getProjectById(projectId);
diff --git a/backend/src/main/resources/db/migration/V103__v1.16_release.sql b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
index 4be971e034..40ea3ea2fa 100644
--- a/backend/src/main/resources/db/migration/V103__v1.16_release.sql
+++ b/backend/src/main/resources/db/migration/V103__v1.16_release.sql
@@ -65,6 +65,19 @@ CREATE TABLE IF NOT EXISTS `api_scenario_report_structure`
 INSERT INTO user_group_permission (id, group_id, permission_id, module_id)
 VALUES (UUID(), 'project_app_manager', 'PROJECT_APP_MANAGER:READ+EDIT', 'PROJECT_APP_MANAGER');
 
+CREATE TABLE `issue_comment`
+(
+    `id`          varchar(64) NOT NULL,
+    `issue_id`    varchar(64) DEFAULT NULL,
+    `description` text,
+    `author`      varchar(50) DEFAULT NULL,
+    `create_time` bigint(13)  DEFAULT NULL,
+    `update_time` bigint(13)  DEFAULT NULL,
+    `status`      varchar(80) DEFAULT NULL,
+    PRIMARY KEY (`id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8;
+
 CREATE TABLE IF NOT EXISTS `api_execution_queue`
 (
      `id` varchar(50) NOT NULL COMMENT 'ID',
@@ -90,4 +103,5 @@ CREATE TABLE IF NOT EXISTS `api_execution_queue_detail`
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
 
 ALTER TABLE load_test
-    MODIFY name VARCHAR(255) NOT NULL COMMENT 'Test name';
\ No newline at end of file
+    MODIFY name VARCHAR(255) NOT NULL COMMENT 'Test name';
+
diff --git a/backend/src/main/resources/mail/track/IssuesCommentUpdate.html b/backend/src/main/resources/mail/track/IssuesCommentUpdate.html
new file mode 100644
index 0000000000..8169964b7b
--- /dev/null
+++ b/backend/src/main/resources/mail/track/IssuesCommentUpdate.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>MeterSphere</title>
+</head>
+<body>
+<div>
+    <p>${operator}更新了缺陷评论: ${title}</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue b/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue
index afee25f8b5..586bae265d 100644
--- a/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue
+++ b/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue
@@ -174,6 +174,7 @@ export default {
         {value: 'CREATE', label: this.$t('commons.create')},
         {value: 'UPDATE', label: this.$t('commons.update')},
         {value: 'DELETE', label: this.$t('commons.delete')},
+        {value: 'COMMENT', label: this.$t('commons.comment')},
       ],
       variables: [
         {
@@ -378,6 +379,14 @@ export default {
             }
           }
           break;
+        case "COMMENT":
+          testPlanReceivers.unshift({id: 'CREATOR', name: this.$t('commons.create_user')});
+          if (row.isSet) {
+            if (i2 < 0) {
+              row.userIds.unshift('CREATOR');
+            }
+          }
+          break;
         default:
           break;
       }
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 9dc1f7d400..429dffa8a3 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -411,6 +411,7 @@ export default {
     }
   },
   methods: {
+    alert:alert,
     currentUser: () => {
       return getCurrentUser();
     },
diff --git a/frontend/src/business/components/track/issue/IssueComment.vue b/frontend/src/business/components/track/issue/IssueComment.vue
new file mode 100644
index 0000000000..c1a4a652dc
--- /dev/null
+++ b/frontend/src/business/components/track/issue/IssueComment.vue
@@ -0,0 +1,118 @@
+<template>
+  <el-dialog :visible.sync="dialogTableVisible" append-to-body>
+
+    <div v-loading="result.loading">
+      <div class="editors_div_style">
+        <div id="editorsDiv">
+          <ms-mark-down-text prop="description" :data="from" :toolbars="toolbars"/>
+        </div>
+      </div>
+      <div>
+        <el-button type="primary" size="mini" class="send-btn" @click="sendComment" :disabled="isReadOnly">
+          {{ $t('test_track.comment.send') }}
+        </el-button>
+      </div>
+    </div>
+
+  </el-dialog>
+</template>
+
+<script>
+import ReviewCommentItem from "@/business/components/track/review/commom/ReviewCommentItem";
+import {uploadMarkDownImg} from "@/network/image";
+import MsMarkDownText from "@/business/components/track/case/components/MsMarkDownText";
+
+export default {
+  name: "IssueComment",
+  components: {MsMarkDownText, ReviewCommentItem},
+  props: {
+    issuesId: String,
+    reviewId: String,
+  },
+  data() {
+    return {
+      result: {},
+      from: {
+        description: ''
+      },
+      isReadOnly: false,
+      dialogTableVisible: false,
+      toolbars: {
+        bold: false, // 粗体
+        italic: false, // 斜体
+        header: false, // 标题
+        underline: false, // 下划线
+        strikethrough: false, // 中划线
+        mark: false, // 标记
+        superscript: false, // 上角标
+        subscript: false, // 下角标
+        quote: false, // 引用
+        ol: false, // 有序列表
+        ul: false, // 无序列表
+        link: false, // 链接
+        imagelink: true, // 图片链接
+        code: false, // code
+        table: false, // 表格
+        fullscreen: false, // 全屏编辑
+        readmodel: false, // 沉浸式阅读
+        htmlcode: false, // 展示html源码
+        help: false, // 帮助
+        /* 1.3.5 */
+        undo: false, // 上一步
+        redo: false, // 下一步
+        trash: false, // 清空
+        save: false, // 保存（触发events中的save事件）
+        /* 1.4.2 */
+        navigation: false, // 导航目录
+        /* 2.1.8 */
+        alignleft: false, // 左对齐
+        aligncenter: false, // 居中
+        alignright: false, // 右对齐
+        /* 2.2.1 */
+        subfield: false, // 单双栏模式
+        preview: false, // 预览
+      }
+    };
+  },
+  methods: {
+    open() {
+      this.dialogTableVisible = true;
+    },
+    sendComment() {
+      let comment = {};
+      comment.issuesId = this.issuesId;
+      comment.description = this.from.description;
+      if (!comment.description) {
+        this.$warning(this.$t('test_track.comment.description_is_null'));
+        return;
+      }
+      this.result = this.$post('/issues/comment/save', comment, () => {
+        this.$success(this.$t('test_track.comment.send_success'));
+        this.refresh(comment.IssueId);
+        this.from.description = '';
+        this.dialogTableVisible = false;
+      });
+    },
+    refresh(id) {
+      this.$emit('getComments');
+    }
+  }
+};
+</script>
+
+<style scoped>
+.send-btn {
+  margin-top: 5px;
+  width: 100%;
+}
+
+.comment-list {
+  overflow-y: scroll;
+  height: calc(100vh - 250px);
+}
+
+.editors_div_style {
+  height: 300px;
+  overflow: auto
+}
+</style>
diff --git a/frontend/src/business/components/track/issue/IssueEditDetail.vue b/frontend/src/business/components/track/issue/IssueEditDetail.vue
index 1adf60b3d4..ccc408e353 100644
--- a/frontend/src/business/components/track/issue/IssueEditDetail.vue
+++ b/frontend/src/business/components/track/issue/IssueEditDetail.vue
@@ -66,6 +66,31 @@
                                 ref="testCaseIssueList"/>
         </el-form-item>
 
+<!--        <form-rich-text-item :title="$t('commons.remark')" :data="form" prop="remark"/>-->
+
+        <el-row style="margin-top: 10px" v-if="type!=='add'">
+          <el-col :span="20" :offset="1">{{ $t('test_track.review.comment') }}:
+            <el-button icon="el-icon-plus" type="mini" @click="openComment"></el-button>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="20" :offset="1">
+
+            <review-comment-item v-for="(comment,index) in comments"
+                                 :key="index"
+                                 :comment="comment"
+                                 @refresh="getComments" api-url="/issues"/>
+            <div v-if="comments.length === 0" style="text-align: center">
+              <i class="el-icon-chat-line-square" style="font-size: 15px;color: #8a8b8d;">
+                      <span style="font-size: 15px; color: #8a8b8d;">
+                        {{ $t('test_track.comment.no_comment') }}
+                      </span>
+              </i>
+            </div>
+          </el-col>
+        </el-row>
+        <issue-comment :issues-id="form.id"
+                           @getComments="getComments" ref="issueComment"/>
       </el-form>
     </el-scrollbar>
 
@@ -92,6 +117,9 @@ import {
 } from "@/common/js/utils";
 import {enableThirdPartTemplate, getIssuePartTemplateWithProject} from "@/network/Issue";
 import CustomFiledFormItem from "@/business/components/common/components/form/CustomFiledFormItem";
+import MsMarkDownText from "@/business/components/track/case/components/MsMarkDownText";
+import IssueComment from "@/business/components/track/issue/IssueComment";
+import ReviewCommentItem from "@/business/components/track/review/commom/ReviewCommentItem";
 
 export default {
   name: "IssueEditDetail",
@@ -104,10 +132,14 @@ export default {
     CustomFieldRelateList,
     CustomFieldFormList,
     MsFormDivider,
-    TemplateComponentEditHeader
+    TemplateComponentEditHeader,
+    MsMarkDownText,
+    IssueComment,
+    ReviewCommentItem
   },
   data() {
     return {
+      type: null,
       issueId:'',
       result: {
         loading: false
@@ -133,13 +165,50 @@ export default {
         title: '',
         description: '',
         creator: null,
+        remark: null
       },
       tapdUsers: [],
       zentaoUsers: [],
       Builds: [],
       hasTapdId: false,
       hasZentaoId: false,
-      currentProject: null
+      currentProject: null,
+      toolbars: {
+        bold: false, // 粗体
+        italic: false, // 斜体
+        header: false, // 标题
+        underline: false, // 下划线
+        strikethrough: false, // 中划线
+        mark: false, // 标记
+        superscript: false, // 上角标
+        subscript: false, // 下角标
+        quote: false, // 引用
+        ol: false, // 有序列表
+        ul: false, // 无序列表
+        link: false, // 链接
+        imagelink: true, // 图片链接
+        code: false, // code
+        table: false, // 表格
+        fullscreen: false, // 全屏编辑
+        readmodel: false, // 沉浸式阅读
+        htmlcode: false, // 展示html源码
+        help: false, // 帮助
+        /* 1.3.5 */
+        undo: false, // 上一步
+        redo: false, // 下一步
+        trash: false, // 清空
+        save: false, // 保存（触发events中的save事件）
+        /* 1.4.2 */
+        navigation: false, // 导航目录
+        /* 2.1.8 */
+        alignleft: false, // 左对齐
+        aligncenter: false, // 居中
+        alignright: false, // 右对齐
+        /* 2.2.1 */
+        subfield: false, // 单双栏模式
+        preview: false, // 预览
+      },
+      comments: []
     };
   },
   props: {
@@ -259,6 +328,7 @@ export default {
         if (this.$refs.testCaseIssueList) {
           this.$refs.testCaseIssueList.initTableData();
         }
+        this.getComments();
       });
     },
     save() {
@@ -349,6 +419,16 @@ export default {
           });
         }
       }
+    },
+    openComment() {
+      this.$refs.issueComment.open();
+    },
+    getComments() {
+      if (this.issueId) {
+        this.result = this.$get('/issues/comment/list/' + this.issueId, res => {
+          this.comments = res.data;
+        })
+      }
     }
   }
 };
diff --git a/frontend/src/business/components/track/issue/IssueList.vue b/frontend/src/business/components/track/issue/IssueList.vue
index e93ef64bb1..07c24748f4 100644
--- a/frontend/src/business/components/track/issue/IssueList.vue
+++ b/frontend/src/business/components/track/issue/IssueList.vue
@@ -1,6 +1,7 @@
 <template>
   <ms-container>
     <ms-main-container>
+
       <el-card class="table-card">
         <template v-slot:header>
           <ms-table-header :create-permission="['PROJECT_TRACK_ISSUE:READ+CREATE']" :condition.sync="page.condition" @search="getIssues" @create="handleCreate"
diff --git a/frontend/src/business/components/track/review/commom/ReviewComment.vue b/frontend/src/business/components/track/review/commom/ReviewComment.vue
index fe4bc86196..0cbe643f01 100644
--- a/frontend/src/business/components/track/review/commom/ReviewComment.vue
+++ b/frontend/src/business/components/track/review/commom/ReviewComment.vue
@@ -5,7 +5,7 @@
                            ref="reviewComments"
                            :comment="comment"
                            @refresh="refresh"
-                           :review-status="reviewStatus"/>
+                           :review-status="reviewStatus" api-url="/test/case"/>
       <div v-if="comments.length === 0" style="text-align: center" >
         <i class="el-icon-chat-line-square" style="font-size: 15px;color: #8a8b8d;">
         <span style="font-size: 15px; color: #8a8b8d;">
diff --git a/frontend/src/business/components/track/review/commom/ReviewCommentItem.vue b/frontend/src/business/components/track/review/commom/ReviewCommentItem.vue
index 16b3be2951..d0f5417515 100644
--- a/frontend/src/business/components/track/review/commom/ReviewCommentItem.vue
+++ b/frontend/src/business/components/track/review/commom/ReviewCommentItem.vue
@@ -77,6 +77,7 @@ export default {
       default: false
     },
     reviewStatus: String,
+    apiUrl: String
   },
   data() {
     return {
@@ -106,7 +107,7 @@ export default {
           this.$get('/resource/md/delete/' + imgName);
         });
       }
-      this.$get("/test/case/comment/delete/" + this.comment.id, () => {
+      this.$get(this.apiUrl + "/comment/delete/" + this.comment.id, () => {
         this.$success(this.$t('commons.delete_success'));
         this.$emit("refresh");
       });
@@ -120,7 +121,7 @@ export default {
       this.visible = true;
     },
     editComment() {
-      this.$post("/test/case/comment/edit", {id: this.comment.id, description: this.description}, () => {
+      this.$post(this.apiUrl + "/comment/edit", {id: this.comment.id, description: this.description}, () => {
         this.visible = false;
         this.$success(this.$t('commons.modify_success'));
         this.$emit("refresh");