From cc4e72906ee826ee255bc1ab5331b8398507265f Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 15 Jun 2020 10:59:10 +0800
Subject: [PATCH 01/28] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestPlanTestCaseMapper.xml  |   3 +
 .../track/dto/TestCaseReportMetricDTO.java    |   1 +
 .../QueryTestPlanCaseRequest.java             |   2 +
 .../track/service/TestPlanService.java        |  19 ++-
 .../FailureResultComponent.vue                | 119 ++++++++++++++++++
 .../TemplateComponent/TemplateComponent.vue   |   7 +-
 6 files changed, 146 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue

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 d82ed5dbba..cabc50ee96 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
@@ -36,6 +36,9 @@
                     #{nodeId}
                 </foreach>
             </if>
+            <if test="request.status != null">
+                and test_plan_test_case.status = #{request.status}
+            </if>
             <if test="request.executor != null">
                 and test_plan_test_case.executor = #{request.executor}
             </if>
diff --git a/backend/src/main/java/io/metersphere/track/dto/TestCaseReportMetricDTO.java b/backend/src/main/java/io/metersphere/track/dto/TestCaseReportMetricDTO.java
index 68bc086c1e..e061230151 100644
--- a/backend/src/main/java/io/metersphere/track/dto/TestCaseReportMetricDTO.java
+++ b/backend/src/main/java/io/metersphere/track/dto/TestCaseReportMetricDTO.java
@@ -11,6 +11,7 @@ public class TestCaseReportMetricDTO {
 
     private List<TestCaseReportStatusResultDTO> executeResult;
     private List<TestCaseReportModuleResultDTO> moduleExecuteResult;
+    private List<TestPlanCaseDTO> failureTestCases;
     private List<String> executors;
     private String principal;
     private Long startTime;
diff --git a/backend/src/main/java/io/metersphere/track/request/testplancase/QueryTestPlanCaseRequest.java b/backend/src/main/java/io/metersphere/track/request/testplancase/QueryTestPlanCaseRequest.java
index 434a3ee576..c4af29338c 100644
--- a/backend/src/main/java/io/metersphere/track/request/testplancase/QueryTestPlanCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testplancase/QueryTestPlanCaseRequest.java
@@ -25,4 +25,6 @@ public class QueryTestPlanCaseRequest extends TestPlanTestCase {
     private String workspaceId;
 
     private String name;
+
+    private String status;
 }
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 14a64840b7..6e3db32e8d 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -3,10 +3,7 @@ package io.metersphere.track.service;
 
 import com.alibaba.fastjson.JSON;
 import io.metersphere.base.domain.*;
-import io.metersphere.base.mapper.TestCaseMapper;
-import io.metersphere.base.mapper.TestCaseNodeMapper;
-import io.metersphere.base.mapper.TestPlanMapper;
-import io.metersphere.base.mapper.TestPlanTestCaseMapper;
+import io.metersphere.base.mapper.*;
 import io.metersphere.base.mapper.ext.ExtProjectMapper;
 import io.metersphere.base.mapper.ext.ExtTestPlanMapper;
 import io.metersphere.base.mapper.ext.ExtTestPlanTestCaseMapper;
@@ -67,6 +64,9 @@ public class TestPlanService {
     @Resource
     ExtProjectMapper extProjectMapper;
 
+    @Resource
+    TestCaseReportMapper testCaseReportMapper;
+
     public void addTestPlan(TestPlan testPlan) {
         if (getTestPlanByName(testPlan.getName()).size() > 0) {
             MSException.throwException(Translator.get("plan_name_already_exists"));
@@ -256,6 +256,8 @@ public class TestPlanService {
         QueryTestPlanRequest queryTestPlanRequest = new QueryTestPlanRequest();
         queryTestPlanRequest.setId(planId);
         TestPlanDTO testPlan = extTestPlanMapper.list(queryTestPlanRequest).get(0);
+        TestCaseReport testCaseReport = testCaseReportMapper.selectByPrimaryKey(testPlan.getReportId());
+//        testCaseReport.get
 
         Set<String> executors = new HashSet<>();
         Map<String, TestCaseReportStatusResultDTO> reportStatusResultMap = new HashMap<>();
@@ -274,6 +276,7 @@ public class TestPlanService {
         });
 
         List<TestPlanCaseDTO> testPlanTestCases = listTestCaseByPlanId(planId);
+        List<TestPlanCaseDTO> failureTestCases = new ArrayList<>();
 
         Map<String, TestCaseReportModuleResultDTO> moduleResultMap = new HashMap<>();
 
@@ -281,6 +284,7 @@ public class TestPlanService {
             executors.add(testCase.getExecutor());
             getStatusResultMap(reportStatusResultMap, testCase);
             getModuleResultMap(childIdMap, moduleResultMap, testCase, nodeTrees);
+            getFailureTestCases(failureTestCases, testCase);
         }
 
         nodeTrees.forEach(rootNode -> {
@@ -303,10 +307,17 @@ public class TestPlanService {
         testCaseReportMetricDTO.setExecutors(new ArrayList<>(executors));
         testCaseReportMetricDTO.setExecuteResult(new ArrayList<>(reportStatusResultMap.values()));
         testCaseReportMetricDTO.setModuleExecuteResult(new ArrayList<>(moduleResultMap.values()));
+        testCaseReportMetricDTO.setFailureTestCases(failureTestCases);
 
         return testCaseReportMetricDTO;
     }
 
+    private void getFailureTestCases(List<TestPlanCaseDTO> failureTestCases, TestPlanCaseDTO testCase) {
+        if (StringUtils.equals(testCase.getStatus(), TestPlanTestCaseStatus.Failure.name())) {
+            failureTestCases.add(testCase);
+        }
+    }
+
     private void getStatusResultMap(Map<String, TestCaseReportStatusResultDTO> reportStatusResultMap, TestPlanCaseDTO testCase) {
         TestCaseReportStatusResultDTO statusResult = reportStatusResultMap.get(testCase.getStatus());
         if (statusResult == null) {
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue
new file mode 100644
index 0000000000..b1840b028c
--- /dev/null
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue
@@ -0,0 +1,119 @@
+<template>
+
+  <common-component :title="'失败用例'">
+    <template>
+      <el-table
+        row-key="id"
+        :data="failureTestCases">
+        <el-table-column
+          prop="name"
+          :label="$t('commons.name')"
+          show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column
+          prop="priority"
+          column-key="priority"
+          :label="$t('test_track.case.priority')">
+          <template v-slot:default="scope">
+            <priority-table-item :value="scope.row.priority" ref="priority"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="type"
+          column-key="type"
+          :label="$t('test_track.case.type')"
+          show-overflow-tooltip>
+          <template v-slot:default="scope">
+            <type-table-item :value="scope.row.type"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="method"
+          column-key="method"
+          :label="$t('test_track.case.method')"
+          show-overflow-tooltip>
+          <template v-slot:default="scope">
+            <method-table-item :value="scope.row.method"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="nodePath"
+          :label="$t('test_track.case.module')"
+          show-overflow-tooltip>
+        </el-table-column>
+
+        <el-table-column
+          prop="executorName"
+          :label="$t('test_track.plan_view.executor')">
+        </el-table-column>
+
+        <el-table-column
+          prop="status"
+          column-key="status"
+          :label="$t('test_track.plan_view.execute_result')">
+          <template v-slot:default="scope">
+            <status-table-item :value="scope.row.status"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          sortable
+          prop="updateTime"
+          :label="$t('commons.update_time')"
+          show-overflow-tooltip>
+          <template v-slot:default="scope">
+            <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </template>
+
+  </common-component>
+
+</template>
+
+<script>
+    import CommonComponent from "./CommonComponent";
+    import PriorityTableItem from "../../../../../common/tableItems/planview/PriorityTableItem";
+    import TypeTableItem from "../../../../../common/tableItems/planview/TypeTableItem";
+    import MethodTableItem from "../../../../../common/tableItems/planview/MethodTableItem";
+    import StatusTableItem from "../../../../../common/tableItems/planview/StatusTableItem";
+    export default {
+      name: "FailureResultComponent",
+      components: {StatusTableItem, MethodTableItem, TypeTableItem, PriorityTableItem, CommonComponent},
+      props: {
+        failureTestCases: {
+          type: Array,
+          default() {
+            return [
+              {
+                moduleName: this.$t('test_track.module.module') + '1',
+                caseCount: '14',
+                passRate: 10.8,
+                issuesCount: 3
+              },
+              {
+                moduleName: this.$t('test_track.module.module') + '2',
+                caseCount: '24',
+                passRate: 40,
+                issuesCount: 6
+              },
+              {
+                moduleName: this.$t('test_track.module.module') + '3',
+                caseCount: '50',
+                passRate: 76.9,
+                issuesCount: 8
+              }
+            ]
+          }
+        }
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TemplateComponent.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TemplateComponent.vue
index dfb5d74f8f..a4bcff464a 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TemplateComponent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TemplateComponent.vue
@@ -7,6 +7,7 @@
       <test-result-component v-if="preview.id == 2"/>
       <test-result-chart-component v-if="preview.id == 3"/>
       <rich-text-component :preview="preview" v-if="preview.type != 'system'"/>
+      <failure-result-component/>
     </div>
 
     <!--报告-->
@@ -15,6 +16,7 @@
       <test-result-component :test-results="metric.moduleExecuteResult" v-if="preview.id == 2"/>
       <test-result-chart-component :execute-result="metric.executeResult" v-if="preview.id == 3"/>
       <rich-text-component :is-report-view="isReportView" :preview="preview" v-if="preview.type != 'system'"/>
+      <failure-result-component :failure-test-cases="metric.failureTestCases"/>
     </div>
 
   </div>
@@ -25,9 +27,12 @@
     import TestResultComponent from "./TestResultComponent";
     import TestResultChartComponent from "./TestResultChartComponent";
     import RichTextComponent from "./RichTextComponent";
+    import FailureResultComponent from "./FailureResultComponent";
     export default {
       name: "TemplateComponent",
-      components: {RichTextComponent, TestResultChartComponent, TestResultComponent, BaseInfoComponent},
+      components: {
+        FailureResultComponent,
+        RichTextComponent, TestResultChartComponent, TestResultComponent, BaseInfoComponent},
       props: {
         preview: {
           type: Object

From 12537966640726e719707cd172201976e0e4fa49 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 15 Jun 2020 11:28:56 +0800
Subject: [PATCH 02/28] =?UTF-8?q?=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=B5=8B=E8=AF=95=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/api/head/ApiHeaderMenus.vue    |  2 +-
 .../components/common/head/CreateTest.vue     |  3 +--
 .../head/PerformanceHeaderMenus.vue           |  2 +-
 .../performance/test/PerformanceTestPlan.vue  | 19 ++++++++-----------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/frontend/src/business/components/api/head/ApiHeaderMenus.vue b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
index e59943b152..7246c6d84f 100644
--- a/frontend/src/business/components/api/head/ApiHeaderMenus.vue
+++ b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
@@ -35,7 +35,7 @@
       </el-col>
       <el-col :span="8">
         <el-row type="flex" justify="center">
-          <ms-create-test v-permission="['test_manager','test_user']" :to="'/api/test/create'"/>
+          <ms-create-test :to="'/api/test/create'"/>
         </el-row>
       </el-col>
       <el-col :span="8"/>
diff --git a/frontend/src/business/components/common/head/CreateTest.vue b/frontend/src/business/components/common/head/CreateTest.vue
index 1c28a9f13d..c01577b02c 100644
--- a/frontend/src/business/components/common/head/CreateTest.vue
+++ b/frontend/src/business/components/common/head/CreateTest.vue
@@ -1,5 +1,5 @@
 <template>
-  <router-link v-if="this.show" class="create-test" :to="this.to" v-permission="this.permission">
+  <router-link class="create-test" :to="this.to" v-permission="this.permission">
     <el-button type="primary" size="small">{{this.title}}</el-button>
   </router-link>
 </template>
@@ -8,7 +8,6 @@
   export default {
     name: "MsCreateTest",
     props: {
-      show: Boolean,
       to: [String, Object],
       title: {
         type: String,
diff --git a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
index 5813802675..cb0fc1c071 100644
--- a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
+++ b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
@@ -36,7 +36,7 @@
       </el-col>
       <el-col :span="8">
         <el-row type="flex" justify="center">
-          <ms-create-test v-permission="['test_manager','test_user']" :to="'/performance/test/create'"/>
+          <ms-create-test :to="'/performance/test/create'"/>
         </el-row>
       </el-col>
       <el-col :span="8"/>
diff --git a/frontend/src/business/components/performance/test/PerformanceTestPlan.vue b/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
index 9e4419a759..68a5d12331 100644
--- a/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
+++ b/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
@@ -3,17 +3,9 @@
     <ms-main-container>
       <el-card class="table-card" v-loading="result.loading">
         <template v-slot:header>
-          <div>
-            <el-row type="flex" justify="space-between" align="middle">
-              <span class="title">{{$t('commons.test')}}</span>
-              <span class="search">
-            <el-input type="text" size="small" :placeholder="$t('load_test.search_by_name')"
-                      prefix-icon="el-icon-search"
-                      maxlength="60"
-                      v-model="condition.name" @change="search" clearable/>
-          </span>
-            </el-row>
-          </div>
+          <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="search"
+                           :title="$t('commons.test')"
+                           @create="create" :createTip="$t('load_test.create')"/>
         </template>
 
         <el-table :data="tableData" class="test-content"
@@ -89,9 +81,11 @@
   import MsPerformanceTestStatus from "./PerformanceTestStatus";
   import MsTableOperators from "../../common/components/MsTableOperators";
   import {_filter, _sort} from "../../../../common/js/utils";
+  import MsTableHeader from "../../common/components/MsTableHeader";
 
   export default {
     components: {
+      MsTableHeader,
       MsPerformanceTestStatus,
       MsTablePagination,
       MsTableOperator,
@@ -210,6 +204,9 @@
         this.$router.push({
           path: '/performance/test/edit/' + row.id,
         })
+      },
+      create() {
+        this.$router.push('/performance/test/create');
       }
     }
   }

From 4e04c0a1ab7ee925aac91fe4d614193c893c73ac Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 15 Jun 2020 15:05:26 +0800
Subject: [PATCH 03/28] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=E6=8F=8F=E8=BF=B0=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/settings/system/SystemWorkspace.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index 19bf9e366a..f3f6bac586 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -61,7 +61,7 @@
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"/>
         </el-form-item>
-        <el-form-item :label="$t('commons.description')">
+        <el-form-item :label="$t('commons.description')" prop="description">
           <el-input type="textarea" v-model="form.description"></el-input>
         </el-form-item>
         <el-form-item :label="$t('workspace.organization_name')" prop="organizationId">

From df313fb05ca55418068d4bc8e33f41edfa7572ca Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 15 Jun 2020 15:58:53 +0800
Subject: [PATCH 04/28] =?UTF-8?q?fix=20=E6=8F=8F=E8=BF=B0=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/settings/system/Organization.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue
index e257088563..ccdba1a9b3 100644
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/frontend/src/business/components/settings/system/Organization.vue
@@ -61,7 +61,7 @@
           <el-input v-model="form.name" autocomplete="off"/>
         </el-form-item>
         <el-form-item :label="$t('commons.description')" prop="description">
-          <el-input v-model="form.description" autocomplete="off"/>
+          <el-input v-model="form.description" autocomplete="off" type="textarea"/>
         </el-form-item>
       </el-form>
       <template v-slot:footer>

From 42f99a015455899376208aaf730b6866bf2f1387 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Mon, 15 Jun 2020 18:05:48 +0800
Subject: [PATCH 05/28] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E9=87=8D=E5=90=8Dbug=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8E=E7=AB=AFmodel=E4=BB=A5=E4=BE=BF?=
 =?UTF-8?q?=E6=9C=AA=E6=9D=A5=E6=94=AF=E6=8C=81=E5=AF=BC=E5=85=A5=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=93=8D=E5=BA=94=E6=97=B6=E9=97=B4=E6=96=AD?=
 =?UTF-8?q?=E8=A8=80=E5=90=8D=E7=A7=B0=EF=BC=8C=E8=B7=9Fjmeter=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/SaveAPITestRequest.java           |  5 ++++-
 .../io/metersphere/api/dto/scenario/Body.java | 12 ++++++++++
 .../api/dto/scenario/KeyValue.java            |  9 ++++++++
 .../metersphere/api/dto/scenario/Request.java | 19 ++++++++++++++++
 .../api/dto/scenario/Scenario.java            | 14 ++++++++++++
 .../assertions/AssertionDuration.java         | 14 ++++++++++++
 .../scenario/assertions/AssertionRegex.java   | 16 ++++++++++++++
 .../scenario/assertions/AssertionType.java    | 12 ++++++++++
 .../dto/scenario/assertions/Assertions.java   | 11 ++++++++++
 .../api/dto/scenario/extract/Extract.java     | 12 ++++++++++
 .../dto/scenario/extract/ExtractCommon.java   | 13 +++++++++++
 .../dto/scenario/extract/ExtractJSONPath.java | 12 ++++++++++
 .../dto/scenario/extract/ExtractRegex.java    | 12 ++++++++++
 .../api/dto/scenario/extract/ExtractType.java | 12 ++++++++++
 .../dto/scenario/extract/ExtractXPath.java    | 12 ++++++++++
 .../api/service/APITestService.java           | 22 ++++++++++++++-----
 .../components/api/test/ApiTestConfig.vue     | 17 ++++++--------
 .../components/api/test/ApiTestList.vue       |  2 +-
 ...ponseTime.vue => ApiAssertionDuration.vue} |  6 ++---
 .../components/assertion/ApiAssertions.vue    | 12 +++++-----
 .../assertion/ApiAssertionsEdit.vue           |  6 ++---
 .../api/test/model/ScenarioModel.js           |  8 +++----
 22 files changed, 224 insertions(+), 34 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/scenario/Body.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/scenario/Request.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/scenario/Scenario.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/scenario/assertions/AssertionDuration.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/scenario/assertions/AssertionRegex.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/scenario/assertions/AssertionType.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/scenario/assertions/Assertions.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/scenario/extract/Extract.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractCommon.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractJSONPath.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractRegex.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractType.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractXPath.java
 rename frontend/src/business/components/api/test/components/assertion/{ApiAssertionResponseTime.vue => ApiAssertionDuration.vue} (91%)

diff --git a/backend/src/main/java/io/metersphere/api/dto/SaveAPITestRequest.java b/backend/src/main/java/io/metersphere/api/dto/SaveAPITestRequest.java
index 8f93f2b0a8..ccddb708c7 100644
--- a/backend/src/main/java/io/metersphere/api/dto/SaveAPITestRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/SaveAPITestRequest.java
@@ -1,8 +1,11 @@
 package io.metersphere.api.dto;
 
+import io.metersphere.api.dto.scenario.Scenario;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 @Setter
 @Getter
 public class SaveAPITestRequest {
@@ -13,5 +16,5 @@ public class SaveAPITestRequest {
 
     private String name;
 
-    private String scenarioDefinition;
+    private List<Scenario> scenarioDefinition;
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/Body.java b/backend/src/main/java/io/metersphere/api/dto/scenario/Body.java
new file mode 100644
index 0000000000..63db961c19
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/Body.java
@@ -0,0 +1,12 @@
+package io.metersphere.api.dto.scenario;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Body {
+    private String type;
+    private String raw;
+    private List<KeyValue> kvs;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java b/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
new file mode 100644
index 0000000000..26d1450608
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
@@ -0,0 +1,9 @@
+package io.metersphere.api.dto.scenario;
+
+import lombok.Data;
+
+@Data
+public class KeyValue {
+    private String name;
+    private String value;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/Request.java b/backend/src/main/java/io/metersphere/api/dto/scenario/Request.java
new file mode 100644
index 0000000000..ce55174015
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/Request.java
@@ -0,0 +1,19 @@
+package io.metersphere.api.dto.scenario;
+
+import io.metersphere.api.dto.scenario.assertions.Assertions;
+import io.metersphere.api.dto.scenario.extract.Extract;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Request {
+    private String name;
+    private String url;
+    private String method;
+    private List<KeyValue> parameters;
+    private List<KeyValue> headers;
+    private Body body;
+    private Assertions assertions;
+    private Extract extract;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/Scenario.java b/backend/src/main/java/io/metersphere/api/dto/scenario/Scenario.java
new file mode 100644
index 0000000000..df60feb3b6
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/Scenario.java
@@ -0,0 +1,14 @@
+package io.metersphere.api.dto.scenario;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Scenario {
+    private String name;
+    private String url;
+    private List<KeyValue> variables;
+    private List<KeyValue> headers;
+    private List<Request> requests;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/assertions/AssertionDuration.java b/backend/src/main/java/io/metersphere/api/dto/scenario/assertions/AssertionDuration.java
new file mode 100644
index 0000000000..af9f5ebbf1
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/assertions/AssertionDuration.java
@@ -0,0 +1,14 @@
+package io.metersphere.api.dto.scenario.assertions;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class AssertionDuration extends AssertionType {
+    private long value;
+
+    public AssertionDuration() {
+        setType(AssertionType.DURATION);
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/assertions/AssertionRegex.java b/backend/src/main/java/io/metersphere/api/dto/scenario/assertions/AssertionRegex.java
new file mode 100644
index 0000000000..8b787d5c1a
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/assertions/AssertionRegex.java
@@ -0,0 +1,16 @@
+package io.metersphere.api.dto.scenario.assertions;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class AssertionRegex extends AssertionType {
+    private String subject;
+    private String expression;
+    private String description;
+
+    public AssertionRegex() {
+        setType(AssertionType.REGEX);
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/assertions/AssertionType.java b/backend/src/main/java/io/metersphere/api/dto/scenario/assertions/AssertionType.java
new file mode 100644
index 0000000000..5ae8414478
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/assertions/AssertionType.java
@@ -0,0 +1,12 @@
+package io.metersphere.api.dto.scenario.assertions;
+
+import lombok.Data;
+
+@Data
+public class AssertionType {
+    public final static String REGEX = "Regex";
+    public final static String DURATION = "Duration";
+    public final static String TEXT = "Text";
+
+    private String type;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/assertions/Assertions.java b/backend/src/main/java/io/metersphere/api/dto/scenario/assertions/Assertions.java
new file mode 100644
index 0000000000..678fcdc0ce
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/assertions/Assertions.java
@@ -0,0 +1,11 @@
+package io.metersphere.api.dto.scenario.assertions;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Assertions {
+    private List<AssertionRegex> regex;
+    private AssertionDuration duration;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/extract/Extract.java b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/Extract.java
new file mode 100644
index 0000000000..3a390df6f1
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/Extract.java
@@ -0,0 +1,12 @@
+package io.metersphere.api.dto.scenario.extract;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Extract {
+    private List<ExtractRegex> regex;
+    private List<ExtractJSONPath> json;
+    private List<ExtractXPath> xpath;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractCommon.java b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractCommon.java
new file mode 100644
index 0000000000..6757bc4cad
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractCommon.java
@@ -0,0 +1,13 @@
+package io.metersphere.api.dto.scenario.extract;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ExtractCommon extends ExtractType {
+    private String variable;
+    private String value; // value: ${variable}
+    private String expression;
+    private String description;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractJSONPath.java b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractJSONPath.java
new file mode 100644
index 0000000000..d151bf2118
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractJSONPath.java
@@ -0,0 +1,12 @@
+package io.metersphere.api.dto.scenario.extract;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ExtractJSONPath extends ExtractCommon {
+    public ExtractJSONPath() {
+        setType(ExtractType.JSON_PATH);
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractRegex.java b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractRegex.java
new file mode 100644
index 0000000000..3a2216fa27
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractRegex.java
@@ -0,0 +1,12 @@
+package io.metersphere.api.dto.scenario.extract;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ExtractRegex extends ExtractCommon {
+    public ExtractRegex() {
+        setType(ExtractType.REGEX);
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractType.java b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractType.java
new file mode 100644
index 0000000000..2df0b02e22
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractType.java
@@ -0,0 +1,12 @@
+package io.metersphere.api.dto.scenario.extract;
+
+import lombok.Data;
+
+@Data
+public class ExtractType {
+    public final static String REGEX = "Regex";
+    public final static String JSON_PATH = "JSONPath";
+    public final static String XPATH = "XPath";
+
+    private String type;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractXPath.java b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractXPath.java
new file mode 100644
index 0000000000..82e801b3b4
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractXPath.java
@@ -0,0 +1,12 @@
+package io.metersphere.api.dto.scenario.extract;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ExtractXPath extends ExtractCommon {
+    public ExtractXPath() {
+        setType(ExtractType.XPATH);
+    }
+}
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 e454d5afdd..9c1cdec6e0 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -1,5 +1,6 @@
 package io.metersphere.api.service;
 
+import com.alibaba.fastjson.JSONObject;
 import io.metersphere.api.dto.APITestResult;
 import io.metersphere.api.dto.QueryAPITestRequest;
 import io.metersphere.api.dto.SaveAPITestRequest;
@@ -25,6 +26,7 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.List;
 import java.util.Objects;
+import java.util.Random;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -73,10 +75,17 @@ public class APITestService {
     }
 
     public void copy(SaveAPITestRequest request) {
+        request.setName(request.getName() + " Copy");
+        try {
+            checkNameExist(request);
+        } catch (Exception e) {
+            request.setName(request.getName() + " " + new Random().nextInt(1000));
+        }
+
         // copy test
         ApiTestWithBLOBs copy = get(request.getId());
         copy.setId(UUID.randomUUID().toString());
-        copy.setName(copy.getName() + " Copy");
+        copy.setName(request.getName());
         copy.setCreateTime(System.currentTimeMillis());
         copy.setUpdateTime(System.currentTimeMillis());
         copy.setStatus(APITestStatus.Saved.name());
@@ -96,6 +105,10 @@ public class APITestService {
         return apiTestMapper.selectByPrimaryKey(id);
     }
 
+    public List<ApiTest> getApiTestByProjectId(String projectId) {
+        return extApiTestMapper.getApiTestByProjectId(projectId);
+    }
+
     public void delete(String testId) {
         deleteFileByTestId(testId);
         apiReportService.deleteByTestId(testId);
@@ -138,7 +151,7 @@ public class APITestService {
         test.setId(request.getId());
         test.setName(request.getName());
         test.setProjectId(request.getProjectId());
-        test.setScenarioDefinition(request.getScenarioDefinition());
+        test.setScenarioDefinition(JSONObject.toJSONString(request.getScenarioDefinition()));
         test.setUpdateTime(System.currentTimeMillis());
         test.setStatus(APITestStatus.Saved.name());
         apiTestMapper.updateByPrimaryKeySelective(test);
@@ -151,7 +164,7 @@ public class APITestService {
         test.setId(request.getId());
         test.setName(request.getName());
         test.setProjectId(request.getProjectId());
-        test.setScenarioDefinition(request.getScenarioDefinition());
+        test.setScenarioDefinition(JSONObject.toJSONString(request.getScenarioDefinition()));
         test.setCreateTime(System.currentTimeMillis());
         test.setUpdateTime(System.currentTimeMillis());
         test.setStatus(APITestStatus.Saved.name());
@@ -194,7 +207,4 @@ public class APITestService {
         }
     }
 
-    public List<ApiTest> getApiTestByProjectId(String projectId) {
-        return extApiTestMapper.getApiTestByProjectId(projectId);
-    }
 }
diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index 1929790b1c..2605d077fd 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/frontend/src/business/components/api/test/ApiTestConfig.vue
@@ -5,7 +5,8 @@
         <el-container class="test-container" v-loading="result.loading">
           <el-header>
             <el-row type="flex" align="middle">
-              <el-input :disabled="isReadOnly" class="test-name" v-model="test.name" maxlength="60" :placeholder="$t('api_test.input_name')"
+              <el-input :disabled="isReadOnly" class="test-name" v-model="test.name" maxlength="60"
+                        :placeholder="$t('api_test.input_name')"
                         show-word-limit>
                 <el-select :disabled="isReadOnly" class="test-project" v-model="test.projectId" slot="prepend"
                            :placeholder="$t('api_test.select_project')">
@@ -17,7 +18,8 @@
                 {{$t('commons.save')}}
               </el-button>
 
-              <el-button type="primary" plain v-if="!isShowRun" :disabled="isDisabled || isReadOnly" @click="saveRunTest">
+              <el-button type="primary" plain v-if="!isShowRun" :disabled="isDisabled || isReadOnly"
+                         @click="saveRunTest">
                 {{$t('load_test.save_and_run')}}
               </el-button>
 
@@ -25,7 +27,8 @@
                 {{$t('api_test.run')}}
               </el-button>
 
-              <el-button :disabled="isReadOnly" type="warning" plain @click="cancel">{{$t('commons.cancel')}}</el-button>
+              <el-button :disabled="isReadOnly" type="warning" plain @click="cancel">{{$t('commons.cancel')}}
+              </el-button>
 
               <el-dropdown trigger="click" @command="handleCommand">
                 <el-button class="el-dropdown-link more" icon="el-icon-more" plain/>
@@ -165,13 +168,7 @@
       },
       getOptions(url) {
         let formData = new FormData();
-        let request = {
-          id: this.test.id,
-          projectId: this.test.projectId,
-          name: this.test.name,
-          scenarioDefinition: JSON.stringify(this.test.scenarioDefinition)
-        }
-        let requestJson = JSON.stringify(request);
+        let requestJson = JSON.stringify(this.test);
 
         formData.append('request', new Blob([requestJson], {
           type: "application/json"
diff --git a/frontend/src/business/components/api/test/ApiTestList.vue b/frontend/src/business/components/api/test/ApiTestList.vue
index eac8067f29..7274cb5c94 100644
--- a/frontend/src/business/components/api/test/ApiTestList.vue
+++ b/frontend/src/business/components/api/test/ApiTestList.vue
@@ -143,7 +143,7 @@
         });
       },
       handleCopy(test) {
-        this.result = this.$post("/api/copy", {id: test.id}, () => {
+        this.result = this.$post("/api/copy", {projectId: test.projectId, id: test.id, name: test.name}, () => {
           this.$success(this.$t('commons.copy_success'));
           this.search();
         });
diff --git a/frontend/src/business/components/api/test/components/assertion/ApiAssertionResponseTime.vue b/frontend/src/business/components/api/test/components/assertion/ApiAssertionDuration.vue
similarity index 91%
rename from frontend/src/business/components/api/test/components/assertion/ApiAssertionResponseTime.vue
rename to frontend/src/business/components/api/test/components/assertion/ApiAssertionDuration.vue
index 1009ed163e..b992735f0b 100644
--- a/frontend/src/business/components/api/test/components/assertion/ApiAssertionResponseTime.vue
+++ b/frontend/src/business/components/api/test/components/assertion/ApiAssertionDuration.vue
@@ -15,13 +15,13 @@
 
 <script>
 
-  import {ResponseTime} from "../../model/ScenarioModel";
+  import {Duration} from "../../model/ScenarioModel";
 
   export default {
-    name: "MsApiAssertionResponseTime",
+    name: "MsApiAssertionDuration",
 
     props: {
-      duration: ResponseTime,
+      duration: Duration,
       value: [Number, String],
       edit: Boolean,
       callback: Function,
diff --git a/frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue b/frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue
index 5dbc2e30cc..c748a87e6e 100644
--- a/frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue
+++ b/frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue
@@ -6,14 +6,14 @@
                    size="small">
           <el-option :label="$t('api_test.request.assertions.text')" :value="options.TEXT"/>
           <el-option :label="$t('api_test.request.assertions.regex')" :value="options.REGEX"/>
-          <el-option :label="$t('api_test.request.assertions.response_time')" :value="options.RESPONSE_TIME"/>
+          <el-option :label="$t('api_test.request.assertions.response_time')" :value="options.DURATION"/>
         </el-select>
       </el-col>
       <el-col :span="20">
         <ms-api-assertion-text :is-read-only="isReadOnly" :list="assertions.regex" v-if="type === options.TEXT" :callback="after"/>
         <ms-api-assertion-regex :is-read-only="isReadOnly" :list="assertions.regex" v-if="type === options.REGEX" :callback="after"/>
-        <ms-api-assertion-response-time :is-read-only="isReadOnly" v-model="time" :duration="assertions.duration"
-                                        v-if="type === options.RESPONSE_TIME" :callback="after"/>
+        <ms-api-assertion-duration :is-read-only="isReadOnly" v-model="time" :duration="assertions.duration"
+                                        v-if="type === options.DURATION" :callback="after"/>
       </el-col>
     </el-row>
 
@@ -24,14 +24,14 @@
 <script>
   import MsApiAssertionText from "./ApiAssertionText";
   import MsApiAssertionRegex from "./ApiAssertionRegex";
-  import MsApiAssertionResponseTime from "./ApiAssertionResponseTime";
-  import {ASSERTION_TYPE, Assertions, ResponseTime} from "../../model/ScenarioModel";
+  import MsApiAssertionDuration from "./ApiAssertionDuration";
+  import {ASSERTION_TYPE, Assertions} from "../../model/ScenarioModel";
   import MsApiAssertionsEdit from "./ApiAssertionsEdit";
 
   export default {
     name: "MsApiAssertions",
 
-    components: {MsApiAssertionsEdit, MsApiAssertionResponseTime, MsApiAssertionRegex, MsApiAssertionText},
+    components: {MsApiAssertionsEdit, MsApiAssertionDuration, MsApiAssertionRegex, MsApiAssertionText},
 
     props: {
       assertions: Assertions,
diff --git a/frontend/src/business/components/api/test/components/assertion/ApiAssertionsEdit.vue b/frontend/src/business/components/api/test/components/assertion/ApiAssertionsEdit.vue
index b615797a25..914c8555f2 100644
--- a/frontend/src/business/components/api/test/components/assertion/ApiAssertionsEdit.vue
+++ b/frontend/src/business/components/api/test/components/assertion/ApiAssertionsEdit.vue
@@ -13,7 +13,7 @@
       <div>
         {{$t("api_test.request.assertions.response_time")}}
       </div>
-      <ms-api-assertion-response-time :is-read-only="isReadOnly" v-model="assertions.duration.value" :duration="assertions.duration" :edit="true"/>
+      <ms-api-assertion-duration :is-read-only="isReadOnly" v-model="assertions.duration.value" :duration="assertions.duration" :edit="true"/>
     </div>
   </div>
 
@@ -21,13 +21,13 @@
 
 <script>
   import MsApiAssertionRegex from "./ApiAssertionRegex";
-  import MsApiAssertionResponseTime from "./ApiAssertionResponseTime";
+  import MsApiAssertionDuration from "./ApiAssertionDuration";
   import {Assertions} from "../../model/ScenarioModel";
 
   export default {
     name: "MsApiAssertionsEdit",
 
-    components: {MsApiAssertionResponseTime, MsApiAssertionRegex},
+    components: {MsApiAssertionDuration, MsApiAssertionRegex},
 
     props: {
       assertions: Assertions,
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index a463df0052..2aabb5b06f 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -40,7 +40,7 @@ export const BODY_TYPE = {
 export const ASSERTION_TYPE = {
   TEXT: "Text",
   REGEX: "Regex",
-  RESPONSE_TIME: "Response Time"
+  DURATION: "Duration"
 }
 
 export const ASSERTION_REGEX_SUBJECT = {
@@ -253,7 +253,7 @@ export class Assertions extends BaseConfig {
 
   initOptions(options) {
     options = options || {};
-    options.duration = new ResponseTime(options.duration);
+    options.duration = new Duration(options.duration);
     return options;
   }
 }
@@ -291,9 +291,9 @@ export class Regex extends AssertionType {
   }
 }
 
-export class ResponseTime extends AssertionType {
+export class Duration extends AssertionType {
   constructor(options) {
-    super(ASSERTION_TYPE.RESPONSE_TIME);
+    super(ASSERTION_TYPE.DURATION);
     this.value = undefined;
 
     this.set(options);

From 5006919f91097be366d18c1740d06779d23b53cb Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 15 Jun 2020 18:31:51 +0800
Subject: [PATCH 06/28] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/commons/utils/MathUtils.java  |  18 +++
 .../track/Factory/ReportComponentFactory.java |  36 +++++
 .../track/domain/ReportBaseInfoComponent.java |  30 ++++
 .../track/domain/ReportComponent.java         |  15 ++
 .../domain/ReportFailureResultComponent.java  |  30 ++++
 .../domain/ReportResultChartComponent.java    |  41 ++++++
 .../track/domain/ReportResultComponent.java   | 105 ++++++++++++++
 .../track/dto/TestCaseReportMetricDTO.java    |   4 +
 .../track/service/TestPlanService.java        | 137 +++---------------
 .../FailureResultComponent.vue                |  31 ++--
 .../TemplateComponent/TemplateComponent.vue   |   4 +-
 .../report/TestCaseReportTemplateEdit.vue     |  13 +-
 .../comonents/report/TestCaseReportView.vue   |  12 +-
 13 files changed, 337 insertions(+), 139 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/commons/utils/MathUtils.java
 create mode 100644 backend/src/main/java/io/metersphere/track/Factory/ReportComponentFactory.java
 create mode 100644 backend/src/main/java/io/metersphere/track/domain/ReportBaseInfoComponent.java
 create mode 100644 backend/src/main/java/io/metersphere/track/domain/ReportComponent.java
 create mode 100644 backend/src/main/java/io/metersphere/track/domain/ReportFailureResultComponent.java
 create mode 100644 backend/src/main/java/io/metersphere/track/domain/ReportResultChartComponent.java
 create mode 100644 backend/src/main/java/io/metersphere/track/domain/ReportResultComponent.java

diff --git a/backend/src/main/java/io/metersphere/commons/utils/MathUtils.java b/backend/src/main/java/io/metersphere/commons/utils/MathUtils.java
new file mode 100644
index 0000000000..a14895041f
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/commons/utils/MathUtils.java
@@ -0,0 +1,18 @@
+package io.metersphere.commons.utils;
+
+import java.math.BigDecimal;
+
+public class MathUtils {
+
+    /**
+     * 获取百分比
+     * 保留一位小数
+     * @param value
+     * @return
+     */
+    public static double getPercentWithDecimal(double value) {
+        return new BigDecimal(value * 100)
+                .setScale(1, BigDecimal.ROUND_HALF_UP)
+                .doubleValue();
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/track/Factory/ReportComponentFactory.java b/backend/src/main/java/io/metersphere/track/Factory/ReportComponentFactory.java
new file mode 100644
index 0000000000..cf0f0e83a7
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/Factory/ReportComponentFactory.java
@@ -0,0 +1,36 @@
+package io.metersphere.track.Factory;
+
+import io.metersphere.track.domain.*;
+import io.metersphere.track.dto.TestPlanDTO;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ReportComponentFactory {
+
+    public static ReportComponent createComponent(String componentId, TestPlanDTO testPlan) {
+        if (StringUtils.equals("1", componentId)) {
+            return new ReportBaseInfoComponent(testPlan);
+        } else if (StringUtils.equals("2", componentId)) {
+            return new ReportResultComponent(testPlan);
+        } else if (StringUtils.equals("3", componentId)) {
+            return new ReportResultChartComponent(testPlan);
+        } else if (StringUtils.equals("4", componentId)) {
+            return new ReportFailureResultComponent(testPlan);
+        }
+        return null;
+    }
+
+    public static List<ReportComponent> createComponents(List<String> componentIds, TestPlanDTO testPlan) {
+        List<ReportComponent> components = new ArrayList<>();
+        componentIds.forEach(id -> {
+            ReportComponent component = createComponent(id, testPlan);
+            if (component != null) {
+                components.add(component);
+            }
+        });
+        return components;
+    }
+
+}
diff --git a/backend/src/main/java/io/metersphere/track/domain/ReportBaseInfoComponent.java b/backend/src/main/java/io/metersphere/track/domain/ReportBaseInfoComponent.java
new file mode 100644
index 0000000000..04dbfee877
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/domain/ReportBaseInfoComponent.java
@@ -0,0 +1,30 @@
+package io.metersphere.track.domain;
+
+import io.metersphere.track.dto.TestCaseReportMetricDTO;
+import io.metersphere.track.dto.TestPlanCaseDTO;
+import io.metersphere.track.dto.TestPlanDTO;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+public class ReportBaseInfoComponent extends ReportComponent {
+    private Set<String> executorsSet = new HashSet<>();
+
+    public ReportBaseInfoComponent(TestPlanDTO testPlan) {
+        super(testPlan);
+        componentId = "1";
+    }
+
+    @Override
+    public void readRecord(TestPlanCaseDTO testCase) {
+        executorsSet.add(testCase.getExecutor());
+    }
+
+    @Override
+    public void afterBuild(TestCaseReportMetricDTO testCaseReportMetric) {
+        testCaseReportMetric.setProjectName(testPlan.getProjectName());
+        testCaseReportMetric.setPrincipal(testPlan.getPrincipal());
+        testCaseReportMetric.setExecutors(new ArrayList<>(this.executorsSet));
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/track/domain/ReportComponent.java b/backend/src/main/java/io/metersphere/track/domain/ReportComponent.java
new file mode 100644
index 0000000000..3ae9a3ab21
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/domain/ReportComponent.java
@@ -0,0 +1,15 @@
+package io.metersphere.track.domain;
+
+import io.metersphere.track.dto.TestCaseReportMetricDTO;
+import io.metersphere.track.dto.TestPlanCaseDTO;
+import io.metersphere.track.dto.TestPlanDTO;
+
+public abstract class ReportComponent {
+    protected String componentId;
+    protected TestPlanDTO testPlan;
+    public ReportComponent(TestPlanDTO testPlan) {
+        this.testPlan = testPlan;
+    }
+    public abstract void readRecord(TestPlanCaseDTO testCase);
+    public abstract void afterBuild(TestCaseReportMetricDTO testCaseReportMetric);
+}
diff --git a/backend/src/main/java/io/metersphere/track/domain/ReportFailureResultComponent.java b/backend/src/main/java/io/metersphere/track/domain/ReportFailureResultComponent.java
new file mode 100644
index 0000000000..ba47414374
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/domain/ReportFailureResultComponent.java
@@ -0,0 +1,30 @@
+package io.metersphere.track.domain;
+
+import io.metersphere.commons.constants.TestPlanTestCaseStatus;
+import io.metersphere.track.dto.TestCaseReportMetricDTO;
+import io.metersphere.track.dto.TestPlanCaseDTO;
+import io.metersphere.track.dto.TestPlanDTO;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ReportFailureResultComponent extends ReportComponent {
+    private List<TestPlanCaseDTO> failureTestCases = new ArrayList<>();
+    public ReportFailureResultComponent(TestPlanDTO testPlan) {
+        super(testPlan);
+        componentId = "4";
+    }
+
+    @Override
+    public void readRecord(TestPlanCaseDTO testCase) {
+        if (StringUtils.equals(testCase.getStatus(), TestPlanTestCaseStatus.Failure.name())) {
+            this.failureTestCases.add(testCase);
+        }
+    }
+
+    @Override
+    public void afterBuild(TestCaseReportMetricDTO testCaseReportMetric) {
+        testCaseReportMetric.setFailureTestCases(failureTestCases);
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/track/domain/ReportResultChartComponent.java b/backend/src/main/java/io/metersphere/track/domain/ReportResultChartComponent.java
new file mode 100644
index 0000000000..52deed64ee
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/domain/ReportResultChartComponent.java
@@ -0,0 +1,41 @@
+package io.metersphere.track.domain;
+
+import io.metersphere.track.dto.TestCaseReportMetricDTO;
+import io.metersphere.track.dto.TestCaseReportStatusResultDTO;
+import io.metersphere.track.dto.TestPlanCaseDTO;
+import io.metersphere.track.dto.TestPlanDTO;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ReportResultChartComponent extends ReportComponent {
+    Map<String, TestCaseReportStatusResultDTO> reportStatusResultMap = new HashMap<>();
+
+    public ReportResultChartComponent(TestPlanDTO testPlan) {
+        super(testPlan);
+        componentId = "3";
+    }
+
+
+    @Override
+    public void readRecord(TestPlanCaseDTO testCase) {
+        getStatusResultMap(reportStatusResultMap, testCase);
+    }
+
+    @Override
+    public void afterBuild(TestCaseReportMetricDTO testCaseReportMetric) {
+        testCaseReportMetric.setExecuteResult(new ArrayList<>(reportStatusResultMap.values()));
+    }
+
+    private void getStatusResultMap(Map<String, TestCaseReportStatusResultDTO> reportStatusResultMap, TestPlanCaseDTO testCase) {
+        TestCaseReportStatusResultDTO statusResult = reportStatusResultMap.get(testCase.getStatus());
+        if (statusResult == null) {
+            statusResult = new TestCaseReportStatusResultDTO();
+            statusResult.setStatus(testCase.getStatus());
+            statusResult.setCount(0);
+        }
+        statusResult.setCount(statusResult.getCount() + 1);
+        reportStatusResultMap.put(testCase.getStatus(), statusResult);
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/track/domain/ReportResultComponent.java b/backend/src/main/java/io/metersphere/track/domain/ReportResultComponent.java
new file mode 100644
index 0000000000..f094e45fdc
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/domain/ReportResultComponent.java
@@ -0,0 +1,105 @@
+package io.metersphere.track.domain;
+
+import com.alibaba.fastjson.JSON;
+import io.metersphere.base.domain.TestCaseNode;
+import io.metersphere.base.domain.TestCaseNodeExample;
+import io.metersphere.base.mapper.TestCaseNodeMapper;
+import io.metersphere.commons.constants.TestPlanTestCaseStatus;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.commons.utils.MathUtils;
+import io.metersphere.track.dto.*;
+import io.metersphere.track.service.TestCaseNodeService;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.*;
+
+public class ReportResultComponent extends ReportComponent {
+
+    private List<TestCaseNodeDTO> nodeTrees = new ArrayList<>();
+    private Map<String, Set<String>> childIdMap = new HashMap<>();
+    private Map<String, TestCaseReportModuleResultDTO> moduleResultMap = new HashMap<>();
+
+    public ReportResultComponent(TestPlanDTO testPlan) {
+        super(testPlan);
+        componentId = "2";
+        init();
+    }
+
+    public void init() {
+        TestCaseNodeService testCaseNodeService = (TestCaseNodeService) CommonBeanFactory.getBean("testCaseNodeService");
+        TestCaseNodeMapper testCaseNodeMapper = (TestCaseNodeMapper) CommonBeanFactory.getBean("testCaseNodeMapper");
+        TestCaseNodeExample testCaseNodeExample = new TestCaseNodeExample();
+        testCaseNodeExample.createCriteria().andProjectIdEqualTo(testPlan.getProjectId());
+        List<TestCaseNode> nodes = testCaseNodeMapper.selectByExample(testCaseNodeExample);
+        nodeTrees = testCaseNodeService.getNodeTrees(nodes);
+        nodeTrees.forEach(item -> {
+            Set<String> childIds = new HashSet<>();
+            getChildIds(item, childIds);
+            childIdMap.put(item.getId(), childIds);
+        });
+    }
+
+    @Override
+    public void readRecord(TestPlanCaseDTO testCase) {
+        getModuleResultMap(childIdMap, moduleResultMap, testCase, nodeTrees);
+    }
+
+    @Override
+    public void afterBuild(TestCaseReportMetricDTO testCaseReportMetric) {
+
+        nodeTrees.forEach(rootNode -> {
+            TestCaseReportModuleResultDTO moduleResult = moduleResultMap.get(rootNode.getId());
+            if (moduleResult != null) {
+                moduleResult.setModuleName(rootNode.getName());
+            }
+        });
+
+        for (TestCaseReportModuleResultDTO moduleResult : moduleResultMap.values()) {
+            moduleResult.setPassRate(MathUtils.getPercentWithDecimal(moduleResult.getPassCount()*1.0f/moduleResult.getCaseCount()));
+            if (moduleResult.getCaseCount() <= 0) {
+                moduleResultMap.remove(moduleResult.getModuleId());
+            }
+        }
+        testCaseReportMetric.setModuleExecuteResult(new ArrayList<>(moduleResultMap.values()));
+    }
+
+    private void getChildIds(TestCaseNodeDTO rootNode, Set<String> childIds) {
+
+        childIds.add(rootNode.getId());
+
+        List<TestCaseNodeDTO> children = rootNode.getChildren();
+
+        if(children != null) {
+            Iterator<TestCaseNodeDTO> iterator = children.iterator();
+            while(iterator.hasNext()){
+                getChildIds(iterator.next(), childIds);
+            }
+        }
+    }
+
+    private void getModuleResultMap(Map<String, Set<String>> childIdMap, Map<String, TestCaseReportModuleResultDTO> moduleResultMap, TestPlanCaseDTO testCase, List<TestCaseNodeDTO> nodeTrees) {
+        childIdMap.forEach((rootNodeId, childIds) -> {
+            if (childIds.contains(testCase.getNodeId())) {
+                TestCaseReportModuleResultDTO moduleResult = moduleResultMap.get(rootNodeId);
+                if (moduleResult == null) {
+                    moduleResult = new TestCaseReportModuleResultDTO();
+                    moduleResult.setCaseCount(0);
+                    moduleResult.setPassCount(0);
+                    moduleResult.setIssuesCount(0);
+                    moduleResult.setModuleId(rootNodeId);
+                }
+                moduleResult.setCaseCount(moduleResult.getCaseCount() + 1);
+                if (StringUtils.equals(testCase.getStatus(), TestPlanTestCaseStatus.Pass.name())) {
+                    moduleResult.setPassCount(moduleResult.getPassCount() + 1);
+                }
+                if (StringUtils.isNotBlank(testCase.getIssues())) {
+                    if (JSON.parseObject(testCase.getIssues()).getBoolean("hasIssues")) {
+                        moduleResult.setIssuesCount(moduleResult.getIssuesCount() + 1);
+                    };
+                }
+                moduleResultMap.put(rootNodeId, moduleResult);
+                return;
+            }
+        });
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/track/dto/TestCaseReportMetricDTO.java b/backend/src/main/java/io/metersphere/track/dto/TestCaseReportMetricDTO.java
index e061230151..caf925bf40 100644
--- a/backend/src/main/java/io/metersphere/track/dto/TestCaseReportMetricDTO.java
+++ b/backend/src/main/java/io/metersphere/track/dto/TestCaseReportMetricDTO.java
@@ -1,5 +1,9 @@
 package io.metersphere.track.dto;
 
+import io.metersphere.track.domain.ReportBaseInfoComponent;
+import io.metersphere.track.domain.ReportFailureResultComponent;
+import io.metersphere.track.domain.ReportResultChartComponent;
+import io.metersphere.track.domain.ReportResultComponent;
 import lombok.Getter;
 import lombok.Setter;
 
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 6e3db32e8d..284da5d934 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -2,6 +2,8 @@ package io.metersphere.track.service;
 
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
 import io.metersphere.base.mapper.ext.ExtProjectMapper;
@@ -11,10 +13,14 @@ import io.metersphere.commons.constants.TestPlanStatus;
 import io.metersphere.commons.constants.TestPlanTestCaseStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.user.SessionUser;
+import io.metersphere.commons.utils.MathUtils;
 import io.metersphere.commons.utils.ServiceUtils;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.ProjectRequest;
+import io.metersphere.controller.request.member.QueryMemberRequest;
 import io.metersphere.dto.ProjectDTO;
+import io.metersphere.track.Factory.ReportComponentFactory;
+import io.metersphere.track.domain.ReportComponent;
 import io.metersphere.track.dto.*;
 import io.metersphere.track.request.testcase.PlanCaseRelevanceRequest;
 import io.metersphere.track.request.testcase.QueryTestPlanRequest;
@@ -24,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.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -55,11 +62,9 @@ public class TestPlanService {
     @Resource
     SqlSessionFactory sqlSessionFactory;
 
+    @Lazy
     @Resource
-    TestCaseNodeMapper testCaseNodeMapper;
-
-    @Resource
-    TestCaseNodeService testCaseNodeService;
+    TestPlanTestCaseService testPlanTestCaseService;
 
     @Resource
     ExtProjectMapper extProjectMapper;
@@ -226,23 +231,17 @@ public class TestPlanService {
                     }
                 });
             }
-            testPlan.setPassRate(getPercentWithTwoDecimals(testPlan.getTested() == 0 ? 0 : testPlan.getPassed()*1.0/testPlan.getTested()));
-            testPlan.setTestRate(getPercentWithTwoDecimals(testPlan.getTotal() == 0 ? 0 : testPlan.getTested()*1.0/testPlan.getTotal()));
+            testPlan.setPassRate(MathUtils.getPercentWithDecimal(testPlan.getTested() == 0 ? 0 : testPlan.getPassed()*1.0/testPlan.getTested()));
+            testPlan.setTestRate(MathUtils.getPercentWithDecimal(testPlan.getTotal() == 0 ? 0 : testPlan.getTested()*1.0/testPlan.getTotal()));
         });
 
         return testPlans;
     }
 
-    private double getPercentWithTwoDecimals(double value) {
-        return new BigDecimal(value * 100)
-                .setScale(1, BigDecimal.ROUND_HALF_UP)
-                .doubleValue();
-    }
-
     public List<TestPlanCaseDTO> listTestCaseByPlanId(String planId) {
         QueryTestPlanCaseRequest request = new QueryTestPlanCaseRequest();
         request.setPlanId(planId);
-        return extTestPlanTestCaseMapper.list(request);
+        return testPlanTestCaseService.list(request);
     }
 
     public List<TestPlanCaseDTO> listTestCaseByProjectIds(List<String> projectIds) {
@@ -255,118 +254,26 @@ public class TestPlanService {
 
         QueryTestPlanRequest queryTestPlanRequest = new QueryTestPlanRequest();
         queryTestPlanRequest.setId(planId);
+
         TestPlanDTO testPlan = extTestPlanMapper.list(queryTestPlanRequest).get(0);
         TestCaseReport testCaseReport = testCaseReportMapper.selectByPrimaryKey(testPlan.getReportId());
-//        testCaseReport.get
+        JSONObject content = JSONObject.parseObject(testCaseReport.getContent());
+        JSONArray componentIds = content.getJSONArray("components");
 
-        Set<String> executors = new HashSet<>();
-        Map<String, TestCaseReportStatusResultDTO> reportStatusResultMap = new HashMap<>();
-
-        TestCaseNodeExample testCaseNodeExample = new TestCaseNodeExample();
-        testCaseNodeExample.createCriteria().andProjectIdEqualTo(testPlan.getProjectId());
-        List<TestCaseNode> nodes = testCaseNodeMapper.selectByExample(testCaseNodeExample);
-
-        List<TestCaseNodeDTO> nodeTrees = testCaseNodeService.getNodeTrees(nodes);
-
-        Map<String, Set<String>> childIdMap = new HashMap<>();
-        nodeTrees.forEach(item -> {
-            Set<String> childIds = new HashSet<>();
-            getChildIds(item, childIds);
-            childIdMap.put(item.getId(), childIds);
-        });
+        List<ReportComponent> components = ReportComponentFactory.createComponents(componentIds.toJavaList(String.class), testPlan);
 
         List<TestPlanCaseDTO> testPlanTestCases = listTestCaseByPlanId(planId);
-        List<TestPlanCaseDTO> failureTestCases = new ArrayList<>();
-
-        Map<String, TestCaseReportModuleResultDTO> moduleResultMap = new HashMap<>();
-
         for (TestPlanCaseDTO testCase: testPlanTestCases) {
-            executors.add(testCase.getExecutor());
-            getStatusResultMap(reportStatusResultMap, testCase);
-            getModuleResultMap(childIdMap, moduleResultMap, testCase, nodeTrees);
-            getFailureTestCases(failureTestCases, testCase);
-        }
-
-        nodeTrees.forEach(rootNode -> {
-            TestCaseReportModuleResultDTO moduleResult = moduleResultMap.get(rootNode.getId());
-            if (moduleResult != null) {
-                moduleResult.setModuleName(rootNode.getName());
-            }
-        });
-
-        for (TestCaseReportModuleResultDTO moduleResult : moduleResultMap.values()) {
-            moduleResult.setPassRate(getPercentWithTwoDecimals(moduleResult.getPassCount()*1.0f/moduleResult.getCaseCount()));
-            if (moduleResult.getCaseCount() <= 0) {
-                moduleResultMap.remove(moduleResult.getModuleId());
-            }
+            components.forEach(component -> {
+                component.readRecord(testCase);
+            });
         }
 
         TestCaseReportMetricDTO testCaseReportMetricDTO = new TestCaseReportMetricDTO();
-        testCaseReportMetricDTO.setProjectName(testPlan.getProjectName());
-        testCaseReportMetricDTO.setPrincipal(testPlan.getPrincipal());
-        testCaseReportMetricDTO.setExecutors(new ArrayList<>(executors));
-        testCaseReportMetricDTO.setExecuteResult(new ArrayList<>(reportStatusResultMap.values()));
-        testCaseReportMetricDTO.setModuleExecuteResult(new ArrayList<>(moduleResultMap.values()));
-        testCaseReportMetricDTO.setFailureTestCases(failureTestCases);
-
-        return testCaseReportMetricDTO;
-    }
-
-    private void getFailureTestCases(List<TestPlanCaseDTO> failureTestCases, TestPlanCaseDTO testCase) {
-        if (StringUtils.equals(testCase.getStatus(), TestPlanTestCaseStatus.Failure.name())) {
-            failureTestCases.add(testCase);
-        }
-    }
-
-    private void getStatusResultMap(Map<String, TestCaseReportStatusResultDTO> reportStatusResultMap, TestPlanCaseDTO testCase) {
-        TestCaseReportStatusResultDTO statusResult = reportStatusResultMap.get(testCase.getStatus());
-        if (statusResult == null) {
-            statusResult = new TestCaseReportStatusResultDTO();
-            statusResult.setStatus(testCase.getStatus());
-            statusResult.setCount(0);
-        }
-        statusResult.setCount(statusResult.getCount() + 1);
-        reportStatusResultMap.put(testCase.getStatus(), statusResult);
-    }
-
-    private void getModuleResultMap(Map<String, Set<String>> childIdMap, Map<String, TestCaseReportModuleResultDTO> moduleResultMap, TestPlanCaseDTO testCase, List<TestCaseNodeDTO> nodeTrees) {
-        childIdMap.forEach((rootNodeId, childIds) -> {
-            if (childIds.contains(testCase.getNodeId())) {
-                TestCaseReportModuleResultDTO moduleResult = moduleResultMap.get(rootNodeId);
-                if (moduleResult == null) {
-                    moduleResult = new TestCaseReportModuleResultDTO();
-                    moduleResult.setCaseCount(0);
-                    moduleResult.setPassCount(0);
-                    moduleResult.setIssuesCount(0);
-                    moduleResult.setModuleId(rootNodeId);
-                }
-                moduleResult.setCaseCount(moduleResult.getCaseCount() + 1);
-                if (StringUtils.equals(testCase.getStatus(), TestPlanTestCaseStatus.Pass.name())) {
-                    moduleResult.setPassCount(moduleResult.getPassCount() + 1);
-                }
-                if (StringUtils.isNotBlank(testCase.getIssues())) {
-                    if (JSON.parseObject(testCase.getIssues()).getBoolean("hasIssues")) {
-                        moduleResult.setIssuesCount(moduleResult.getIssuesCount() + 1);
-                    };
-                }
-                moduleResultMap.put(rootNodeId, moduleResult);
-                return;
-            }
+        components.forEach(component -> {
+            component.afterBuild(testCaseReportMetricDTO);
         });
-    }
-
-    private void getChildIds(TestCaseNodeDTO rootNode, Set<String> childIds) {
-
-        childIds.add(rootNode.getId());
-
-        List<TestCaseNodeDTO> children = rootNode.getChildren();
-
-        if(children != null) {
-            Iterator<TestCaseNodeDTO> iterator = children.iterator();
-            while(iterator.hasNext()){
-                getChildIds(iterator.next(), childIds);
-            }
-        }
+        return testCaseReportMetricDTO;
     }
 
     public List<TestPlan> getTestPlanByIds(List<String> planIds) {
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue
index b1840b028c..e6142174fc 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue
@@ -60,7 +60,6 @@
         </el-table-column>
 
         <el-table-column
-          sortable
           prop="updateTime"
           :label="$t('commons.update_time')"
           show-overflow-tooltip>
@@ -90,22 +89,24 @@
           default() {
             return [
               {
-                moduleName: this.$t('test_track.module.module') + '1',
-                caseCount: '14',
-                passRate: 10.8,
-                issuesCount: 3
+                name: 'testCase1',
+                priority: 'P1',
+                type: 'api',
+                method: 'auto',
+                nodePath: '/module1/module2',
+                executorName: "Tom",
+                status: "Failure",
+                updateTime: new Date(),
               },
               {
-                moduleName: this.$t('test_track.module.module') + '2',
-                caseCount: '24',
-                passRate: 40,
-                issuesCount: 6
-              },
-              {
-                moduleName: this.$t('test_track.module.module') + '3',
-                caseCount: '50',
-                passRate: 76.9,
-                issuesCount: 8
+                name: 'testCase2',
+                priority: 'P0',
+                type: 'functional',
+                method: 'manual',
+                nodePath: '/module1',
+                executorName: "Micheal",
+                status: "Failure",
+                updateTime: new Date(),
               }
             ]
           }
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TemplateComponent.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TemplateComponent.vue
index a4bcff464a..911bddafe9 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TemplateComponent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TemplateComponent.vue
@@ -6,8 +6,8 @@
       <base-info-component :is-report="false" v-if="preview.id == 1"/>
       <test-result-component v-if="preview.id == 2"/>
       <test-result-chart-component v-if="preview.id == 3"/>
+      <failure-result-component v-if="preview.id == 4"/>
       <rich-text-component :preview="preview" v-if="preview.type != 'system'"/>
-      <failure-result-component/>
     </div>
 
     <!--报告-->
@@ -15,8 +15,8 @@
       <base-info-component :report-info="metric" v-if="preview.id == 1"/>
       <test-result-component :test-results="metric.moduleExecuteResult" v-if="preview.id == 2"/>
       <test-result-chart-component :execute-result="metric.executeResult" v-if="preview.id == 3"/>
+      <failure-result-component :failure-test-cases="metric.failureTestCases" v-if="preview.id == 4"/>
       <rich-text-component :is-report-view="isReportView" :preview="preview" v-if="preview.type != 'system'"/>
-      <failure-result-component :failure-test-cases="metric.failureTestCases"/>
     </div>
 
   </div>
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportTemplateEdit.vue b/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportTemplateEdit.vue
index a303bfb5bf..684dc497ca 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportTemplateEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportTemplateEdit.vue
@@ -76,10 +76,11 @@
               [1, { name: this.$t('test_track.plan_view.base_info'), id: 1 , type: 'system'}],
               [2, { name: this.$t('test_track.plan_view.test_result'), id: 2 , type: 'system'}],
               [3, { name: this.$t('test_track.plan_view.result_distribution'), id: 3 ,type: 'system'}],
-              [4, { name: this.$t('test_track.plan_view.custom_component'), id: 4 ,type: 'custom'}]
+              [4, { name: '失败用例', id: 4 ,type: 'system'}],
+              [5, { name: this.$t('test_track.plan_view.custom_component'), id: 5 ,type: 'custom'}]
             ]
           ),
-          components: [4],
+          components: [5],
           previews: [],
           template: {},
           isReport: false
@@ -107,13 +108,13 @@
           }
           this.template = {
             name: '',
-              content: {
-              components: [1,2,3,4],
-                customComponent: new Map()
+            content: {
+              components: [1,2,3,4,5],
+              customComponent: new Map()
             }
           };
           this.previews = [];
-          this.components = [4];
+          this.components = [5];
           if (id) {
             this.type = 'edit';
             this.getTemplateById(id);
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue b/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue
index 276b238798..8804465482 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue
@@ -68,7 +68,8 @@
               [1, { name: this.$t('test_track.plan_view.base_info'), id: 1 , type: 'system'}],
               [2, { name: this.$t('test_track.plan_view.test_result'), id: 2 , type: 'system'}],
               [3, { name: this.$t('test_track.plan_view.result_distribution'), id: 3 ,type: 'system'}],
-              [4, { name: this.$t('test_track.plan_view.custom_component'), id: 4 ,type: 'custom'}]
+              [4, { name: '失败用例', id: 4 ,type: 'system'}],
+              [5, { name: this.$t('test_track.plan_view.custom_component'), id: 5 ,type: 'custom'}]
             ]
           ),
           isTestManagerOrTestUser: false
@@ -165,6 +166,15 @@
         getMetric() {
           this.result = this.$get('/test/plan/get/metric/' + this.planId, response => {
             this.metric = response.data;
+            if (!this.metric.failureTestCases) {
+              this.metric.failureTestCases = [];
+            }
+            if (!this.metric.executeResult) {
+              this.metric.executeResult = [];
+            }
+            if (!this.metric.moduleExecuteResult) {
+              this.metric.moduleExecuteResult = [];
+            }
             if (this.report.startTime) {
               this.metric.startTime = new Date(this.report.startTime);
             }

From a3bd0a7be58fb4ddeb3c519d94d752e080a4716f Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 15 Jun 2020 18:59:55 +0800
Subject: [PATCH 07/28] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B=E5=88=97=E8=A1=A8i18n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/TemplateComponent/FailureResultComponent.vue         | 2 +-
 .../plan/view/comonents/report/TestCaseReportTemplateEdit.vue   | 2 +-
 .../track/plan/view/comonents/report/TestCaseReportView.vue     | 2 +-
 frontend/src/i18n/en-US.js                                      | 1 +
 frontend/src/i18n/zh-CN.js                                      | 1 +
 frontend/src/i18n/zh-TW.js                                      | 1 +
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue
index e6142174fc..1e4f7b11d4 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <common-component :title="'失败用例'">
+  <common-component :title="$t('test_track.plan_view.failure_case')">
     <template>
       <el-table
         row-key="id"
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportTemplateEdit.vue b/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportTemplateEdit.vue
index 684dc497ca..318c7cac11 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportTemplateEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportTemplateEdit.vue
@@ -76,7 +76,7 @@
               [1, { name: this.$t('test_track.plan_view.base_info'), id: 1 , type: 'system'}],
               [2, { name: this.$t('test_track.plan_view.test_result'), id: 2 , type: 'system'}],
               [3, { name: this.$t('test_track.plan_view.result_distribution'), id: 3 ,type: 'system'}],
-              [4, { name: '失败用例', id: 4 ,type: 'system'}],
+              [4, { name: this.$t('test_track.plan_view.failure_case'), id: 4 ,type: 'system'}],
               [5, { name: this.$t('test_track.plan_view.custom_component'), id: 5 ,type: 'custom'}]
             ]
           ),
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue b/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue
index 8804465482..a9f7514615 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue
@@ -68,7 +68,7 @@
               [1, { name: this.$t('test_track.plan_view.base_info'), id: 1 , type: 'system'}],
               [2, { name: this.$t('test_track.plan_view.test_result'), id: 2 , type: 'system'}],
               [3, { name: this.$t('test_track.plan_view.result_distribution'), id: 3 ,type: 'system'}],
-              [4, { name: '失败用例', id: 4 ,type: 'system'}],
+              [4, { name: this.$t('test_track.plan_view.failure_case'), id: 4 ,type: 'system'}],
               [5, { name: this.$t('test_track.plan_view.custom_component'), id: 5 ,type: 'custom'}]
             ]
           ),
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 11477227aa..e39c96ac8f 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -517,6 +517,7 @@ export default {
       create_template: "Create template",
       report_template: "Report template",
       test_detail: "Test detail",
+      failure_case: "Failure case",
     }
   },
   test_resource_pool: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 048c438be0..1d98b815b9 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -516,6 +516,7 @@ export default {
       create_template: "新建模版",
       report_template: "测试报告模版",
       test_detail: "测试详情",
+      failure_case: "失败用例",
     }
   },
   test_resource_pool: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 058358eb8c..4b4b99cb5a 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -515,6 +515,7 @@ export default {
       create_template: "新建模版",
       report_template: "測試報告模版",
       test_detail: "測試詳情",
+      failure_case: "失敗用例",
     }
   },
   test_resource_pool: {

From 276ad268cc64d134d30bfd19a36f723bd612d5f8 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 15 Jun 2020 11:28:56 +0800
Subject: [PATCH 08/28] merge

---
 .../components/api/head/ApiHeaderMenus.vue    |  2 +-
 .../components/common/head/CreateTest.vue     |  3 +--
 .../head/PerformanceHeaderMenus.vue           |  2 +-
 .../performance/test/PerformanceTestPlan.vue  | 19 ++++++++-----------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/frontend/src/business/components/api/head/ApiHeaderMenus.vue b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
index 24c56948ac..302aeef6d9 100644
--- a/frontend/src/business/components/api/head/ApiHeaderMenus.vue
+++ b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
@@ -35,7 +35,7 @@
       </el-col>
       <el-col :span="8">
         <el-row type="flex" justify="center">
-          <ms-create-test v-if="isTestManagerOrTestUser" :to="'/api/test/create'"/>
+          <ms-create-test :to="'/api/test/create'"/>
         </el-row>
       </el-col>
       <el-col :span="8"/>
diff --git a/frontend/src/business/components/common/head/CreateTest.vue b/frontend/src/business/components/common/head/CreateTest.vue
index 1c28a9f13d..c01577b02c 100644
--- a/frontend/src/business/components/common/head/CreateTest.vue
+++ b/frontend/src/business/components/common/head/CreateTest.vue
@@ -1,5 +1,5 @@
 <template>
-  <router-link v-if="this.show" class="create-test" :to="this.to" v-permission="this.permission">
+  <router-link class="create-test" :to="this.to" v-permission="this.permission">
     <el-button type="primary" size="small">{{this.title}}</el-button>
   </router-link>
 </template>
@@ -8,7 +8,6 @@
   export default {
     name: "MsCreateTest",
     props: {
-      show: Boolean,
       to: [String, Object],
       title: {
         type: String,
diff --git a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
index 83585b929f..48fa898e78 100644
--- a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
+++ b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
@@ -36,7 +36,7 @@
       </el-col>
       <el-col :span="8">
         <el-row type="flex" justify="center">
-          <ms-create-test v-if="isTestManagerOrTestUser" :to="'/performance/test/create'"/>
+          <ms-create-test :to="'/performance/test/create'"/>
         </el-row>
       </el-col>
       <el-col :span="8"/>
diff --git a/frontend/src/business/components/performance/test/PerformanceTestPlan.vue b/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
index 9e4419a759..68a5d12331 100644
--- a/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
+++ b/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
@@ -3,17 +3,9 @@
     <ms-main-container>
       <el-card class="table-card" v-loading="result.loading">
         <template v-slot:header>
-          <div>
-            <el-row type="flex" justify="space-between" align="middle">
-              <span class="title">{{$t('commons.test')}}</span>
-              <span class="search">
-            <el-input type="text" size="small" :placeholder="$t('load_test.search_by_name')"
-                      prefix-icon="el-icon-search"
-                      maxlength="60"
-                      v-model="condition.name" @change="search" clearable/>
-          </span>
-            </el-row>
-          </div>
+          <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="search"
+                           :title="$t('commons.test')"
+                           @create="create" :createTip="$t('load_test.create')"/>
         </template>
 
         <el-table :data="tableData" class="test-content"
@@ -89,9 +81,11 @@
   import MsPerformanceTestStatus from "./PerformanceTestStatus";
   import MsTableOperators from "../../common/components/MsTableOperators";
   import {_filter, _sort} from "../../../../common/js/utils";
+  import MsTableHeader from "../../common/components/MsTableHeader";
 
   export default {
     components: {
+      MsTableHeader,
       MsPerformanceTestStatus,
       MsTablePagination,
       MsTableOperator,
@@ -210,6 +204,9 @@
         this.$router.push({
           path: '/performance/test/edit/' + row.id,
         })
+      },
+      create() {
+        this.$router.push('/performance/test/create');
       }
     }
   }

From 8bd1a3413199449cec4b23ea7cd6438f4e0bee1b Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Tue, 16 Jun 2020 10:42:59 +0800
Subject: [PATCH 09/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/api/report/ApiReportView.vue   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/report/ApiReportView.vue b/frontend/src/business/components/api/report/ApiReportView.vue
index 8f4997d733..bf8ed1dc1a 100644
--- a/frontend/src/business/components/api/report/ApiReportView.vue
+++ b/frontend/src/business/components/api/report/ApiReportView.vue
@@ -63,7 +63,12 @@
           this.$get(url, response => {
             this.report = response.data || {};
             if (this.isNotRunning) {
-              this.content = JSON.parse(this.report.content);
+              try {
+                this.content = JSON.parse(this.report.content);
+              } catch (e) {
+                console.log(this.report.content)
+                throw e;
+              }
               this.getFails();
               this.loading = false;
             } else {

From 5ae9522282fd24a5f3293f3cd5df832a44fed9ef Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Tue, 16 Jun 2020 11:01:35 +0800
Subject: [PATCH 10/28] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/test/ApiTestConfig.vue      |  8 +++++++-
 frontend/src/common/js/utils.js                | 18 +++++++++++++++++-
 frontend/src/i18n/en-US.js                     |  1 +
 frontend/src/i18n/zh-CN.js                     |  1 +
 frontend/src/i18n/zh-TW.js                     |  1 +
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index 2605d077fd..7627a17a35 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/frontend/src/business/components/api/test/ApiTestConfig.vue
@@ -39,6 +39,9 @@
                   <el-dropdown-item command="performance" :disabled="create || isReadOnly">
                     {{$t('api_test.create_performance_test')}}
                   </el-dropdown-item>
+                  <el-dropdown-item command="export" :disabled="isDisabled || isReadOnly">
+                    {{$t('api_test.export_config')}}
+                  </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
 
@@ -57,7 +60,7 @@
   import {Test} from "./model/ScenarioModel"
   import MsApiReportStatus from "../report/ApiReportStatus";
   import MsApiReportDialog from "./ApiReportDialog";
-  import {checkoutTestManagerOrTestUser} from "../../../../common/js/utils";
+  import {checkoutTestManagerOrTestUser, downloadFile} from "../../../../common/js/utils";
 
   export default {
     name: "MsApiTestConfig",
@@ -201,6 +204,9 @@
               path: "/performance/test/create"
             })
             break;
+          case "export":
+            downloadFile(this.test.name + ".json", JSON.stringify(this.test));
+            break;
         }
       }
     },
diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index 918b4929bd..525d051775 100644
--- a/frontend/src/common/js/utils.js
+++ b/frontend/src/common/js/utils.js
@@ -125,7 +125,7 @@ export function _filter(filters, condition) {
   if (!condition.filters) {
     condition.filters = {};
   }
-  for(let filter in filters) {
+  for (let filter in filters) {
     if (filters[filter] && filters[filter].length > 0) {
       condition.filters[filter] = filters[filter];
     } else {
@@ -157,3 +157,19 @@ export function _sort(column, condition) {
     condition.orders.push({name: column.prop, type: column.order});
   }
 }
+
+export function downloadFile(name, content) {
+  const blob = new Blob([content]);
+  if ("download" in document.createElement("a")) {
+    // 非IE下载
+    //  chrome/firefox
+    let aTag = document.createElement('a');
+    aTag.download = name;
+    aTag.href = URL.createObjectURL(blob);
+    aTag.click();
+    URL.revokeObjectURL(aTag.href)
+  } else {
+    // IE10+下载
+    navigator.msSaveBlob(blob, name)
+  }
+}
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index e39c96ac8f..371a083dad 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -283,6 +283,7 @@ export default {
     key: "Key",
     value: "Value",
     create_performance_test: "Create Performance Test",
+    export_config: "Export Configuration",
     scenario: {
       config: "Scenario Config",
       input_name: "Please enter the scenario name",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 1d98b815b9..eb9616bb20 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -282,6 +282,7 @@ export default {
     key: "键",
     value: "值",
     create_performance_test: "创建性能测试",
+    export_config: "导出配置",
     scenario: {
       config: "场景配置",
       input_name: "请输入场景名称",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 4b4b99cb5a..eab2504f44 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -280,6 +280,7 @@ export default {
     key: "鍵",
     value: "值",
     create_performance_test: "創建性能測試",
+    export_config: "匯出配寘",
     scenario: {
       creator: "創建人",
       config: "場景配寘",

From 5964527509aa5ca50ac054aaffcff8c056d8052d Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Tue, 16 Jun 2020 11:08:12 +0800
Subject: [PATCH 11/28] =?UTF-8?q?=E5=8F=AA=E5=AF=BC=E5=87=BA=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/api/test/ApiTestConfig.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index 7627a17a35..1e3fc35d89 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/frontend/src/business/components/api/test/ApiTestConfig.vue
@@ -205,7 +205,7 @@
             })
             break;
           case "export":
-            downloadFile(this.test.name + ".json", JSON.stringify(this.test));
+            downloadFile(this.test.name + ".json", JSON.stringify(this.test.scenarioDefinition));
             break;
         }
       }

From ec44a1d3731885badc883bc89b910e16a56fe4ff Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Tue, 16 Jun 2020 11:14:29 +0800
Subject: [PATCH 12/28] =?UTF-8?q?=E5=87=8F=E5=B0=91warn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/js/utils.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index 525d051775..5297ab22b0 100644
--- a/frontend/src/common/js/utils.js
+++ b/frontend/src/common/js/utils.js
@@ -126,10 +126,12 @@ export function _filter(filters, condition) {
     condition.filters = {};
   }
   for (let filter in filters) {
-    if (filters[filter] && filters[filter].length > 0) {
-      condition.filters[filter] = filters[filter];
-    } else {
-      condition.filters[filter] = null;
+    if (filters.hasOwnProperty(filter)) {
+      if (filters[filter] && filters[filter].length > 0) {
+        condition.filters[filter] = filters[filter];
+      } else {
+        condition.filters[filter] = null;
+      }
     }
   }
 }
@@ -137,7 +139,7 @@ export function _filter(filters, condition) {
 //表格数据排序
 export function _sort(column, condition) {
   column.prop = humpToLine(column.prop);
-  if (column.order == 'descending') {
+  if (column.order === 'descending') {
     column.order = 'desc';
   } else {
     column.order = 'asc';
@@ -147,10 +149,9 @@ export function _sort(column, condition) {
   }
   let hasProp = false;
   condition.orders.forEach(order => {
-    if (order.name == column.prop) {
+    if (order.name === column.prop) {
       order.type = column.order;
       hasProp = true;
-      return;
     }
   });
   if (!hasProp) {

From 74eacb1bd4c639d68bfea67920d8738119835a65 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Tue, 16 Jun 2020 11:32:15 +0800
Subject: [PATCH 13/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E9=85=8D=E7=BD=AE=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E5=92=8C=E7=89=88=E6=9C=AC=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/api/test/ApiTestConfig.vue    |  2 +-
 .../components/api/test/model/ScenarioModel.js        | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index 1e3fc35d89..d224c9a9bb 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/frontend/src/business/components/api/test/ApiTestConfig.vue
@@ -205,7 +205,7 @@
             })
             break;
           case "export":
-            downloadFile(this.test.name + ".json", JSON.stringify(this.test.scenarioDefinition));
+            downloadFile(this.test.name + ".json", this.test.export());
             break;
         }
       }
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index 2aabb5b06f..e1dc1c4a41 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -94,6 +94,7 @@ export class BaseConfig {
 export class Test extends BaseConfig {
   constructor(options) {
     super();
+    this.type = "MS API CONFIG";
     this.version = '1.0.0';
     this.id = uuid();
     this.name = undefined;
@@ -104,6 +105,16 @@ export class Test extends BaseConfig {
     this.sets({scenarioDefinition: Scenario}, options);
   }
 
+  export() {
+    let obj = {
+      type: this.type,
+      version: this.version,
+      scenarios: this.scenarioDefinition
+    };
+
+    return JSON.stringify(obj);
+  }
+
   initOptions(options) {
     options = options || {};
     options.scenarioDefinition = options.scenarioDefinition || [new Scenario()];

From 5f1ff0753fd3135af03f54285602b6dd0011326d Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 16 Jun 2020 15:29:33 +0800
Subject: [PATCH 14/28] =?UTF-8?q?=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=8E=8B=E5=8A=9B=E9=85=8D=E7=BD=AE=E6=B7=BB=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/components/PerformancePressureConfig.vue           | 6 ++++++
 frontend/src/i18n/en-US.js                                  | 1 +
 frontend/src/i18n/zh-CN.js                                  | 1 +
 frontend/src/i18n/zh-TW.js                                  | 1 +
 4 files changed, 9 insertions(+)

diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index 1d17af9dec..c8d62366e6 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -304,6 +304,12 @@
           return false;
         }
 
+        if (!this.threadNumber || !this.duration || !this.rampUpTime || !this.step || !this.rpsLimit) {
+          this.$warning(this.$t('load_test.pressure_config_params_is_empty'));
+          this.$emit('changeActive', '1');
+          return false;
+        }
+
         return true;
       },
       convertProperty() {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 371a083dad..4c5b2e4305 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -268,6 +268,7 @@ export default {
     'download_log_file': 'Download',
     'user_name': 'Creator',
     'special_characters_are_not_supported': 'Test name does not support special characters',
+    'pressure_config_params_is_empty': 'Pressure configuration parameters cannot be empty!'
   },
   api_test: {
     creator: "Creator",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index eb9616bb20..019733f087 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -268,6 +268,7 @@ export default {
     'pressure_prediction_chart': '压力预估图',
     'user_name': '创建人',
     'special_characters_are_not_supported': '测试名称不支持特殊字符',
+    'pressure_config_params_is_empty': '压力配置参数不能为空!'
   },
   api_test: {
     creator: "创建人",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index eab2504f44..ffe86c83ec 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -266,6 +266,7 @@ export default {
     'pressure_prediction_chart': '壓力預估圖',
     'user_name': '創建人',
     'special_characters_are_not_supported': '測試名稱不支持特殊字符',
+    'pressure_config_params_is_empty': '壓力配置參數不能為空!'
   },
   api_test: {
     title: "測試",

From 47fc83bcc30f156511bdb03fadf06d0572164cc8 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 16 Jun 2020 15:47:34 +0800
Subject: [PATCH 15/28] =?UTF-8?q?'=E7=94=A8=E6=88=B7=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=A1=86=E6=8F=90=E7=A4=BA'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/settings/personal/PersonSetting.vue  | 2 +-
 frontend/src/business/components/settings/system/User.vue    | 5 +++--
 frontend/src/i18n/en-US.js                                   | 2 +-
 frontend/src/i18n/zh-CN.js                                   | 2 +-
 frontend/src/i18n/zh-TW.js                                   | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
index 222e0d6a51..343975f7a3 100644
--- a/frontend/src/business/components/settings/personal/PersonSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonSetting.vue
@@ -57,7 +57,7 @@
     </el-dialog>
 
     <!--Change personal password-->
-    <el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="30%" left>
+    <el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="35%" left>
       <el-form :model="ruleForm" :rules="rules" ref="editPasswordForm" label-width="120px" class="demo-ruleForm">
         <el-form-item :label="$t('member.old_password')" prop="password" style="margin-bottom: 29px">
           <el-input v-model="ruleForm.password" autocomplete="off" show-password/>
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index b9f0760669..f8ec130ecf 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -64,8 +64,9 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="form.phone" autocomplete="off" :placeholder="$t('user.input_phone')"/>
         </el-form-item>
-        <el-form-item :label="$t('commons.password')" prop="password">
-          <el-input v-model="form.password" autocomplete="new-password" show-password :placeholder="$t('user.input_password')"/>
+        <el-form-item :label="$t('commons.password')" prop="password" style="margin-bottom: 29px">
+          <el-input v-model="form.password" autocomplete="new-password" show-password
+                    :placeholder="$t('user.input_password')"/>
         </el-form-item>
         <div v-for="(role, index) in form.roles" :key="index">
           <el-form-item :label="$t('commons.role')+index"
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 4c5b2e4305..b5f7174ca9 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -155,7 +155,7 @@ export default {
     'special_characters_are_not_supported': 'Special characters are not supported',
     'mobile_number_format_is_incorrect': 'Mobile number format is incorrect',
     'email_format_is_incorrect': 'Email format is incorrect',
-    'password_format_is_incorrect': 'Password format is incorrect (At least 8-16 characters, at least 1 uppercase letter, 1 lowercase letter and 1 number)',
+    'password_format_is_incorrect': 'Valid password: 8-16 digits, English upper and lower case letters + numbers ',
     'old_password': 'Old Password',
     'new_password': 'New Password',
     'remove_member': 'Are you sure you want to remove this member',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 019733f087..732338ecbb 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -154,7 +154,7 @@ export default {
     'special_characters_are_not_supported': '不支持特殊字符',
     'mobile_number_format_is_incorrect': '手机号码格式不正确',
     'email_format_is_incorrect': '邮箱格式不正确',
-    'password_format_is_incorrect': '密码格式不正确(至少8-16个字符，至少1个大写字母，1个小写字母和1个数字)',
+    'password_format_is_incorrect': '有效密码：8-16位，英文大小写字母+数字',
     'old_password': '旧密码',
     'new_password': '新密码',
     'remove_member': '确定要移除该成员吗',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index ffe86c83ec..126aeb415d 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -152,7 +152,7 @@ export default {
     'special_characters_are_not_supported': '不支持特殊字符',
     'mobile_number_format_is_incorrect': '手機號碼格式不正確',
     'email_format_is_incorrect': '郵箱格式不正確',
-    'password_format_is_incorrect': '密碼格式不正確(至少8-16個字符,至少1個大寫字母,1個小寫字母和1個數字)',
+    'password_format_is_incorrect': '有效密碼：8-16比特，英文大小寫字母+數位',
     'old_password': '舊密碼',
     'new_password': '新密碼',
     'remove_member': '確定要移除該成員嗎',

From 19666312ae1bd173e21350598643acd15577a622 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Tue, 16 Jun 2020 15:57:09 +0800
Subject: [PATCH 16/28] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6=E6=94=B9=E4=B8=BA500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/api/test/components/ApiKeyValue.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/test/components/ApiKeyValue.vue b/frontend/src/business/components/api/test/components/ApiKeyValue.vue
index 5497d10a32..3bc2803cc2 100644
--- a/frontend/src/business/components/api/test/components/ApiKeyValue.vue
+++ b/frontend/src/business/components/api/test/components/ApiKeyValue.vue
@@ -10,7 +10,7 @@
                     :placeholder="$t('api_test.key')" show-word-limit/>
         </el-col>
         <el-col>
-          <el-input :disabled="isReadOnly" v-model="item.value" size="small" maxlength="100" @change="change"
+          <el-input :disabled="isReadOnly" v-model="item.value" size="small" maxlength="500" @change="change"
                     :placeholder="$t('api_test.value')" show-word-limit/>
         </el-col>
         <el-col class="kv-delete">

From 204d01ee9748e1279f919c13dcf6fbe20ff82765 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 16 Jun 2020 15:57:09 +0800
Subject: [PATCH 17/28] =?UTF-8?q?=E6=B7=BB=E5=8A=A0setup=20thread=20group?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/reader/jmx/JmeterDocumentParser.java  | 82 +++++++++++++++++++
 .../src/main/resources/application.properties |  1 -
 2 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
index faa70de519..450ba4bd67 100644
--- a/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
+++ b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
@@ -85,6 +85,7 @@ public class JmeterDocumentParser implements DocumentParser {
                     if (nodeNameEquals(ele, HASH_TREE_ELEMENT)) {
                         parseHashTree(ele);
                     } else if (nodeNameEquals(ele, TEST_PLAN)) {
+                        processSetupTestPlan(ele);
                         processTearDownTestPlan(ele);
                         processCheckoutConfigTestElement(ele);
                         processCheckoutDnsCacheManager(ele);
@@ -436,6 +437,87 @@ public class JmeterDocumentParser implements DocumentParser {
         }
     }
 
+    private void processSetupTestPlan(Element ele) {
+        Document document = ele.getOwnerDocument();
+        Node hashTree = ele.getNextSibling();
+        while (!(hashTree instanceof Element)) {
+            hashTree = hashTree.getNextSibling();
+        }
+
+        KafkaProperties kafkaProperties = CommonBeanFactory.getBean(KafkaProperties.class);
+        String bootstrapServers = kafkaProperties.getBootstrapServers();
+        String[] servers = StringUtils.split(bootstrapServers, ",");
+        for (String s : servers) {
+            String[] ipAndPort = StringUtils.split(s, ":");
+            Element setupElement = document.createElement("SetupThreadGroup");
+            setupElement.setAttribute("guiclass", "SetupThreadGroupGui");
+            setupElement.setAttribute("testclass", "SetupThreadGroup");
+            setupElement.setAttribute("testname", "setUp Thread Group");
+            setupElement.setAttribute("enabled", "true");
+            setupElement.appendChild(createStringProp(document, "ThreadGroup.on_sample_error", "stoptestnow"));
+            Element elementProp = document.createElement("elementProp");
+            elementProp.setAttribute("name", "ThreadGroup.main_controller");
+            elementProp.setAttribute("elementType", "LoopController");
+            elementProp.setAttribute("guiclass", "LoopControlPanel");
+            elementProp.setAttribute("testclass", "LoopController");
+            elementProp.setAttribute("testname", "Loop Controller");
+            elementProp.setAttribute("enabled", "true");
+            elementProp.appendChild(createBoolProp(document, "LoopController.continue_forever", false));
+            elementProp.appendChild(createIntProp(document, "LoopController.loops", -1));
+            setupElement.appendChild(elementProp);
+            setupElement.appendChild(createStringProp(document, "ThreadGroup.num_threads", "1"));
+            setupElement.appendChild(createStringProp(document, "ThreadGroup.ramp_time", "1"));
+            setupElement.appendChild(createStringProp(document, "ThreadGroup.duration", ""));
+            setupElement.appendChild(createStringProp(document, "ThreadGroup.delay", ""));
+            setupElement.appendChild(createBoolProp(document, "ThreadGroup.scheduler", false));
+            setupElement.appendChild(createBoolProp(document, "ThreadGroup.same_user_on_next_iteration", true));
+            hashTree.appendChild(setupElement);
+
+            Element setupHashTree = document.createElement(HASH_TREE_ELEMENT);
+
+            Element tcpSampler = document.createElement("TCPSampler");
+            tcpSampler.setAttribute("guiclass", "TCPSamplerGui");
+            tcpSampler.setAttribute("testclass", "TCPSampler");
+            tcpSampler.setAttribute("testname", "TCP Sampler");
+            tcpSampler.setAttribute("enabled", "true");
+            tcpSampler.appendChild(createStringProp(document, "TCPSampler.classname", "TCPClientImpl"));
+            tcpSampler.appendChild(createStringProp(document, "TCPSampler.server", ipAndPort[0]));
+            tcpSampler.appendChild(createBoolProp(document, "TCPSampler.reUseConnection", true));
+            tcpSampler.appendChild(createStringProp(document, "TCPSampler.port", ipAndPort[1]));
+            tcpSampler.appendChild(createBoolProp(document, "TCPSampler.nodelay", false));
+            tcpSampler.appendChild(createStringProp(document, "TCPSampler.timeout", "100"));
+            tcpSampler.appendChild(createStringProp(document, "TCPSampler.ctimeout", "100"));
+            tcpSampler.appendChild(createStringProp(document, "TCPSampler.request", "1010"));
+            tcpSampler.appendChild(createBoolProp(document, "TCPSampler.closeConnection", false));
+            tcpSampler.appendChild(createStringProp(document, "TCPSampler.EolByte", "0"));
+            tcpSampler.appendChild(createStringProp(document, "ConfigTestElement.username", ""));
+            tcpSampler.appendChild(createStringProp(document, "ConfigTestElement.password", ""));
+
+            Element tcpSamplerHashTree = document.createElement(HASH_TREE_ELEMENT);
+
+            Element responseAssertion = document.createElement("ResponseAssertion");
+            responseAssertion.setAttribute("guiclass", "AssertionGui");
+            responseAssertion.setAttribute("testclass", "ResponseAssertion");
+            responseAssertion.setAttribute("testname", "Response Assertion");
+            responseAssertion.setAttribute("enabled", "true");
+            Element collectionProp = document.createElement("collectionProp");
+            collectionProp.setAttribute("name", "Asserion.test_strings");
+            collectionProp.appendChild(createStringProp(document, "49586", "200"));
+            responseAssertion.appendChild(collectionProp);
+            responseAssertion.appendChild(createStringProp(document, "Assertion.custom_message", ""));
+            responseAssertion.appendChild(createStringProp(document, "Assertion.test_field", "Assertion.response_code"));
+            responseAssertion.appendChild(createBoolProp(document, "Assertion.assume_success", false));
+            responseAssertion.appendChild(createIntProp(document, "Assertion.test_type", 8));
+            tcpSamplerHashTree.appendChild(responseAssertion);
+            // 添加空的hashtree
+            tcpSamplerHashTree.appendChild(document.createElement(HASH_TREE_ELEMENT));
+
+            setupHashTree.appendChild(tcpSampler);
+            setupHashTree.appendChild(tcpSamplerHashTree);
+
+            hashTree.appendChild(setupHashTree);
+        }
+    }
 
     private void processTearDownTestPlan(Element ele) {
         /*<boolProp name="TestPlan.tearDown_on_shutdown">true</boolProp>*/
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 32cd3cb002..2afe88e538 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -64,5 +64,4 @@ kafka.ssl.provider=
 kafka.ssl.truststore-type=
 
 # jmeter
-jmeter.image=registry.fit2cloud.com/metersphere/jmeter-master:0.0.4
 jmeter.home=/opt/jmeter
\ No newline at end of file

From 879f0f86448814dc15fa650890e102e0b0067180 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 16 Jun 2020 16:30:04 +0800
Subject: [PATCH 18/28] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82url=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/test/components/ApiRequestForm.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/ApiRequestForm.vue b/frontend/src/business/components/api/test/components/ApiRequestForm.vue
index b4d529a443..96abed1e51 100644
--- a/frontend/src/business/components/api/test/components/ApiRequestForm.vue
+++ b/frontend/src/business/components/api/test/components/ApiRequestForm.vue
@@ -5,7 +5,7 @@
     </el-form-item>
 
     <el-form-item :label="$t('api_test.request.url')" prop="url">
-      <el-input :disabled="isReadOnly" v-model="request.url" maxlength="100" :placeholder="$t('api_test.request.url_description')"
+      <el-input :disabled="isReadOnly" v-model="request.url" maxlength="500" :placeholder="$t('api_test.request.url_description')"
                 @change="urlChange" clearable>
         <el-select :disabled="isReadOnly" v-model="request.method" slot="prepend" class="request-method-select" @change="methodChange">
           <el-option label="GET" value="GET"/>
@@ -74,7 +74,7 @@
             {max: 100, message: this.$t('commons.input_limit', [0, 100]), trigger: 'blur'}
           ],
           url: [
-            {max: 100, required: true, message: this.$t('commons.input_limit', [0, 100]), trigger: 'blur'},
+            {max: 500, required: true, message: this.$t('commons.input_limit', [0, 500]), trigger: 'blur'},
             {validator: validateURL, trigger: 'blur'}
           ]
         }

From bf3051cfe78ff35d68f948bc8cfb1b5bb2f4c634 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 16 Jun 2020 16:31:29 +0800
Subject: [PATCH 19/28] =?UTF-8?q?'=E5=8E=BB=E6=8E=89=E5=8E=9F=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=A4=8D=E6=9D=82=E5=BA=A6=E6=A0=A1=E9=AA=8C'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/settings/personal/PersonSetting.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
index 343975f7a3..07050c3259 100644
--- a/frontend/src/business/components/settings/personal/PersonSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonSetting.vue
@@ -128,12 +128,6 @@
         rules:{
           password: [
             {required: true, message: this.$t('user.input_password'), trigger: 'blur'},
-            {
-              required: true,
-              pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,16}$/,
-              message: this.$t('member.password_format_is_incorrect'),
-              trigger: 'blur'
-            }
           ],
           newpassword: [
             {required: true, message: this.$t('user.input_password'), trigger: 'blur'},

From 4bb76b6f507d44f477ccce8f5e52f2460f42dc14 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 16 Jun 2020 16:33:57 +0800
Subject: [PATCH 20/28] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=89=8D=E6=A3=80=E6=9F=A5kafka?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/PerformanceTestService.java       | 33 +++++++++++++++++++
 .../resources/i18n/messages_en_US.properties  |  1 +
 .../resources/i18n/messages_zh_CN.properties  |  1 +
 .../resources/i18n/messages_zh_TW.properties  |  1 +
 4 files changed, 36 insertions(+)

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 b539a94f88..87da37f9f6 100644
--- a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
+++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
@@ -11,6 +11,7 @@ import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.commons.utils.ServiceUtils;
 import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.config.KafkaProperties;
 import io.metersphere.controller.request.OrderRequest;
 import io.metersphere.dto.DashboardTestDTO;
 import io.metersphere.dto.LoadTestDTO;
@@ -28,6 +29,9 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
@@ -62,6 +66,8 @@ public class PerformanceTestService {
     private TestResourceService testResourceService;
     @Resource
     private ReportService reportService;
+    @Resource
+    private KafkaProperties kafkaProperties;
 
     public List<LoadTestDTO> list(QueryTestPlanRequest request) {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
@@ -197,6 +203,8 @@ public class PerformanceTestService {
         if (StringUtils.equalsAny(loadTest.getStatus(), PerformanceTestStatus.Running.name(), PerformanceTestStatus.Starting.name())) {
             MSException.throwException(Translator.get("load_test_is_running"));
         }
+        // check kafka
+        checkKafka();
 
         LogUtil.info("Load test started " + loadTest.getName());
         // engine type (NODE)
@@ -212,6 +220,31 @@ public class PerformanceTestService {
         return engine.getReportId();
     }
 
+    private void checkKafka() {
+        String bootstrapServers = kafkaProperties.getBootstrapServers();
+        String[] servers = StringUtils.split(bootstrapServers, ",");
+        try {
+            for (String s : servers) {
+                String[] ipAndPort = s.split(":");
+                //1,建立tcp
+                String ip = ipAndPort[0];
+                int port = Integer.parseInt(ipAndPort[1]);
+                Socket soc = new Socket();
+                soc.connect(new InetSocketAddress(ip, port), 1000); // 1s timeout
+                //2.输入内容
+                String content = "1010";
+                byte[] bs = content.getBytes();
+                OutputStream os = soc.getOutputStream();
+                os.write(bs);
+                //3.关闭
+                soc.close();
+            }
+        } catch (Exception e) {
+            LogUtil.error(e);
+            MSException.throwException(Translator.get("load_test_kafka_invalid"));
+        }
+    }
+
     private void startEngine(LoadTestWithBLOBs loadTest, Engine engine) {
         LoadTestReport testReport = new LoadTestReport();
         testReport.setId(engine.getReportId());
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index 26299d19df..00701a76ea 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -34,6 +34,7 @@ run_load_test_file_not_found=Unable to run test, unable to get test file meta in
 run_load_test_file_content_not_found=Cannot run test, cannot get test file content, test ID=
 run_load_test_file_init_error=Failed to run test, failed to initialize run environment, test ID=
 load_test_is_running=Load test is running, please wait.
+load_test_kafka_invalid=Kafka is not available, please check the configuration
 cannot_edit_load_test_running=Cannot modify the running test
 test_not_found=Test cannot be found:
 test_not_running=Test is not running
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index a4a484939f..4605816ba7 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -34,6 +34,7 @@ run_load_test_file_not_found=无法运行测试，无法获取测试文件元信
 run_load_test_file_content_not_found=无法运行测试，无法获取测试文件内容，测试ID：
 run_load_test_file_init_error=无法运行测试，初始化运行环境失败，测试ID：
 load_test_is_running=测试正在运行, 请等待
+load_test_kafka_invalid=Kafka 不可用，请检查配置
 cannot_edit_load_test_running=不能修改正在运行的测试
 test_not_found=测试不存在:
 test_not_running=测试未运行
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 84ff087fb3..265ae7182f 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -34,6 +34,7 @@ run_load_test_file_not_found=無法運行測試，無法獲取測試文件元信
 run_load_test_file_content_not_found=無法運行測試，無法獲取測試文件內容，測試ID：
 run_load_test_file_init_error=無法運行測試，初始化運行環境失敗，測試ID：
 load_test_is_running=測試正在運行, 請等待
+load_test_kafka_invalid=Kafka 不可用，請檢查配置
 cannot_edit_load_test_running=不能修改正在運行的測試
 test_not_found=測試不存在:
 test_not_running=測試未運行

From a7f15275cd8ded1f7964a8ec2c935d75e709f0cb Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 16 Jun 2020 19:09:13 +0800
Subject: [PATCH 21/28] =?UTF-8?q?fix=20=E5=A4=9A=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8A=B6=E6=80=81=E6=98=BE=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

---
 .../track/plan/components/TestPlanList.vue          | 13 +++++++------
 .../plan/view/comonents/TestPlanTestCaseList.vue    | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index 1309070ff2..30ae8f7b6a 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -30,24 +30,23 @@
         show-overflow-tooltip>
         <template v-slot:default="scope">
           <span @click.stop="clickt = 'stop'">
-            <el-dropdown v-permission="['test_manager','test_user']" class="test-case-status" @command="statusChange">
+            <el-dropdown class="test-case-status" @command="statusChange">
               <span class="el-dropdown-link">
                 <plan-status-table-item :value="scope.row.status"/>
               </span>
               <el-dropdown-menu slot="dropdown" chang>
-                <el-dropdown-item :command="{id: scope.row.id, status: 'Prepare'}">
+                <el-dropdown-item :disabled="!isTestManagerOrTestUser" :command="{id: scope.row.id, status: 'Prepare'}">
                   {{$t('test_track.plan.plan_status_prepare')}}
                 </el-dropdown-item>
-                <el-dropdown-item :command="{id: scope.row.id, status: 'Underway'}">
+                <el-dropdown-item :disabled="!isTestManagerOrTestUser" :command="{id: scope.row.id, status: 'Underway'}">
                   {{$t('test_track.plan.plan_status_running')}}
                 </el-dropdown-item>
-                <el-dropdown-item :command="{id: scope.row.id, status: 'Completed'}">
+                <el-dropdown-item :disabled="!isTestManagerOrTestUser" :command="{id: scope.row.id, status: 'Completed'}">
                   {{$t('test_track.plan.plan_status_completed')}}
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </span>
-          <plan-status-table-item v-permission="['test_viewer']" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column
@@ -115,7 +114,7 @@
   import MsTableOperator from "../../../common/components/MsTableOperator";
   import PlanStatusTableItem from "../../common/tableItems/plan/PlanStatusTableItem";
   import PlanStageTableItem from "../../common/tableItems/plan/PlanStageTableItem";
-  import {_filter, _sort} from "../../../../../common/js/utils";
+  import {_filter, _sort, checkoutTestManagerOrTestUser} from "../../../../../common/js/utils";
   import TestReportTemplateList from "../view/comonents/TestReportTemplateList";
   import TestCaseReportView from "../view/comonents/report/TestCaseReportView";
   import MsDeleteConfirm from "../../../common/components/MsDeleteConfirm";
@@ -137,6 +136,7 @@
           condition: {},
           currentPage: 1,
           pageSize: 10,
+          isTestManagerOrTestUser: false,
           total: 0,
           tableData: [],
           statusFilters: [
@@ -160,6 +160,7 @@
       },
       created() {
         this.projectId = this.$route.params.projectId;
+        this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
         this.initTableData();
       },
       methods: {
diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
index 0d6053e319..f59dd8db8a 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
@@ -89,27 +89,26 @@
           :label="$t('test_track.plan_view.execute_result')">
           <template v-slot:default="scope">
             <span @click.stop="clickt = 'stop'">
-              <el-dropdown v-permission="['test_manager','test_user']" class="test-case-status" @command="statusChange" >
+              <el-dropdown class="test-case-status" @command="statusChange" >
                 <span class="el-dropdown-link">
                   <status-table-item :value="scope.row.status"/>
                 </span>
                 <el-dropdown-menu slot="dropdown" chang>
-                  <el-dropdown-item :command="{id: scope.row.id, status: 'Pass'}">
+                  <el-dropdown-item :disabled="!isTestManagerOrTestUser" :command="{id: scope.row.id, status: 'Pass'}">
                     {{$t('test_track.plan_view.pass')}}
                   </el-dropdown-item>
-                  <el-dropdown-item :command="{id: scope.row.id, status: 'Failure'}">
+                  <el-dropdown-item :disabled="!isTestManagerOrTestUser" :command="{id: scope.row.id, status: 'Failure'}">
                     {{$t('test_track.plan_view.failure')}}
                   </el-dropdown-item>
-                  <el-dropdown-item :command="{id: scope.row.id, status: 'Blocking'}">
+                  <el-dropdown-item :disabled="!isTestManagerOrTestUser" :command="{id: scope.row.id, status: 'Blocking'}">
                     {{$t('test_track.plan_view.blocking')}}
                   </el-dropdown-item>
-                  <el-dropdown-item :command="{id: scope.row.id, status: 'Skip'}">
+                  <el-dropdown-item :disabled="!isTestManagerOrTestUser" :command="{id: scope.row.id, status: 'Skip'}">
                     {{$t('test_track.plan_view.skip')}}
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </span>
-            <status-table-item v-permission="['test_viewer']" :value="scope.row.status"/>
           </template>
         </el-table-column>
 
@@ -199,6 +198,7 @@
           selectIds: new Set(),
           testPlan: {},
           isReadOnly: false,
+          isTestManagerOrTestUser: false,
           priorityFilters: [
             {text: 'P0', value: 'P0'},
             {text: 'P1', value: 'P1'},
@@ -244,6 +244,7 @@
       },
       mounted() {
         this.refreshTableAndPlan();
+        this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
       },
       methods: {
         initTableData() {

From 12cc7da26bc45dbafea5ed0eba3c014022d756a1 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 16 Jun 2020 19:49:00 +0800
Subject: [PATCH 22/28] =?UTF-8?q?fix=20=E6=B5=8B=E8=AF=95=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E4=BA=BA=E7=AD=89=E8=BF=87=E6=BB=A4=E5=8F=AA=E8=AF=BB?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtUserRoleMapper.java            |  1 +
 .../metersphere/base/mapper/ext/ExtUserRoleMapper.xml | 11 ++++++++---
 .../io/metersphere/controller/UserController.java     | 10 ++++++++++
 .../main/java/io/metersphere/service/UserService.java |  3 +++
 .../components/track/case/components/TestCaseEdit.vue |  2 +-
 .../components/track/plan/components/TestPlanEdit.vue |  2 +-
 .../track/plan/view/comonents/ExecutorEdit.vue        |  2 +-
 7 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.java
index 4bc8eb87cc..f504f373c0 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.java
@@ -27,4 +27,5 @@ public interface ExtUserRoleMapper {
     List<User> getBesideOrgMemberList(@Param("orgId") String orgId);
 
 
+    List<User> getTestManagerAndTestUserList(@Param("request") QueryMemberRequest request);
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
index 5b15cd3e29..f45f2d2d17 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
@@ -89,7 +89,12 @@
           join role r on r.id = ur.role_id
          where w.id = #{workspaceId} and ur.user_id = #{userId}
     </select>
-
-
-
+    <select id="getTestManagerAndTestUserList" resultType="io.metersphere.base.domain.User">
+        SELECT distinct `user`.* FROM user_role INNER JOIN `user` ON user_role.user_id = `user`.id
+        WHERE user_role.source_id = #{request.workspaceId} And user_role.role_id in ('test_manager', 'test_user')
+        <if test="request.name != null">
+            AND `user`.name like CONCAT('%', #{request.name},'%')
+        </if>
+        order by user_role.update_time desc
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/controller/UserController.java b/backend/src/main/java/io/metersphere/controller/UserController.java
index 0deb7b9ba6..d674014dbd 100644
--- a/backend/src/main/java/io/metersphere/controller/UserController.java
+++ b/backend/src/main/java/io/metersphere/controller/UserController.java
@@ -274,4 +274,14 @@ public class UserController {
         return userService.updateUserPassword(request);
     }
 
+    /**
+     * 获取工作空间成员用户 不分页
+     */
+    @PostMapping("/ws/member/tester/list")
+    @RequiresRoles(value = {RoleConstants.ORG_ADMIN, RoleConstants.TEST_MANAGER,
+            RoleConstants.TEST_USER, RoleConstants.TEST_VIEWER}, logical = Logical.OR)
+    public List<User> getTestManagerAndTestUserList(@RequestBody QueryMemberRequest request) {
+        return userService.getTestManagerAndTestUserList(request);
+    }
+
 }
diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
index 1028f851f0..934b4bbe2a 100644
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -457,4 +457,7 @@ public class UserService {
         return extUserMapper.getDefaultLanguage(key);
     }
 
+    public List<User> getTestManagerAndTestUserList(QueryMemberRequest request) {
+        return extUserRoleMapper.getTestManagerAndTestUserList(request);
+    }
 }
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index bda46a0224..b2c5d97e64 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -409,7 +409,7 @@
       },
       getMaintainerOptions() {
         let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/list/all', {workspaceId:workspaceId}, response => {
+        this.$post('/user/ws/member/tester/list', {workspaceId:workspaceId}, response => {
           this.maintainerOptions = response.data;
         });
       },
diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
index e1aabec4cb..bbf7f22aa9 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@@ -188,7 +188,7 @@
         },
         setPrincipalOptions() {
           let workspaceId = localStorage.getItem(WORKSPACE_ID);
-          this.$post('/user/ws/member/list/all', {workspaceId:workspaceId}, response => {
+          this.$post('/user/ws/member/tester/list', {workspaceId:workspaceId}, response => {
             this.principalOptions = response.data;
           });
         },
diff --git a/frontend/src/business/components/track/plan/view/comonents/ExecutorEdit.vue b/frontend/src/business/components/track/plan/view/comonents/ExecutorEdit.vue
index 41d952ca90..29b8237af6 100644
--- a/frontend/src/business/components/track/plan/view/comonents/ExecutorEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/ExecutorEdit.vue
@@ -39,7 +39,7 @@
       methods: {
         setMaintainerOptions() {
           let workspaceId = localStorage.getItem(WORKSPACE_ID);
-          this.$post('/user/ws/member/list/all', {workspaceId:workspaceId}, response => {
+          this.$post('/user/ws/member/tester/list', {workspaceId:workspaceId}, response => {
             this.executorOptions = response.data;
           });
         },

From e3863797529de808d59589d20b135d95c1700b17 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 17 Jun 2020 09:58:36 +0800
Subject: [PATCH 23/28] setup thread bug fix

---
 .../performance/parse/xml/reader/jmx/JmeterDocumentParser.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
index 450ba4bd67..25ce59ebf9 100644
--- a/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
+++ b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
@@ -463,7 +463,7 @@ public class JmeterDocumentParser implements DocumentParser {
             elementProp.setAttribute("testname", "Loop Controller");
             elementProp.setAttribute("enabled", "true");
             elementProp.appendChild(createBoolProp(document, "LoopController.continue_forever", false));
-            elementProp.appendChild(createIntProp(document, "LoopController.loops", -1));
+            elementProp.appendChild(createIntProp(document, "LoopController.loops", 1));
             setupElement.appendChild(elementProp);
             setupElement.appendChild(createStringProp(document, "ThreadGroup.num_threads", "1"));
             setupElement.appendChild(createStringProp(document, "ThreadGroup.ramp_time", "1"));

From 0bf62d76c374dec007a133218c9f7908d62c7030 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 17 Jun 2020 10:59:30 +0800
Subject: [PATCH 24/28] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=89=8D=E6=A3=80=E6=9F=A5kafka?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/engine/docker/DockerTestEngine.java        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 a86ef92aa1..c5be3a0a13 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
@@ -86,7 +86,12 @@ public class DockerTestEngine extends AbstractEngine {
         testRequest.setTestData(context.getTestData());
         testRequest.setEnv(context.getEnv());
 
-        restTemplate.postForObject(uri, testRequest, String.class);
+        try {
+            restTemplate.postForObject(uri, testRequest, String.class);
+        } catch (Exception e) {
+            LogUtil.error(e);
+            MSException.throwException(Translator.get("load_test_kafka_invalid"));
+        }
     }
 
     @Override

From 7a7bb861ad1c4fb77e9dcfdef8fa1ff401e69609 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Wed, 17 Jun 2020 12:27:55 +0800
Subject: [PATCH 25/28] =?UTF-8?q?=E4=BF=AE=E5=A4=8DURL=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=BD=AC=E4=B9=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/test/components/ApiRequestForm.vue    | 18 ++++----
 .../business/components/api/test/model/JMX.js | 15 ++++---
 .../api/test/model/ScenarioModel.js           | 42 +++++++------------
 3 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/ApiRequestForm.vue b/frontend/src/business/components/api/test/components/ApiRequestForm.vue
index 96abed1e51..83184a8476 100644
--- a/frontend/src/business/components/api/test/components/ApiRequestForm.vue
+++ b/frontend/src/business/components/api/test/components/ApiRequestForm.vue
@@ -5,9 +5,10 @@
     </el-form-item>
 
     <el-form-item :label="$t('api_test.request.url')" prop="url">
-      <el-input :disabled="isReadOnly" v-model="request.url" maxlength="500" :placeholder="$t('api_test.request.url_description')"
-                @change="urlChange" clearable>
-        <el-select :disabled="isReadOnly" v-model="request.method" slot="prepend" class="request-method-select" @change="methodChange">
+      <el-input :disabled="isReadOnly" v-model="request.url" maxlength="500"
+                :placeholder="$t('api_test.request.url_description')" @change="urlChange" clearable>
+        <el-select :disabled="isReadOnly" v-model="request.method" slot="prepend" class="request-method-select"
+                   @change="methodChange">
           <el-option label="GET" value="GET"/>
           <el-option label="POST" value="POST"/>
           <el-option label="PUT" value="PUT"/>
@@ -22,8 +23,8 @@
 
     <el-tabs v-model="activeName">
       <el-tab-pane :label="$t('api_test.request.parameters')" name="parameters">
-        <ms-api-key-value :is-read-only="isReadOnly" :items="request.parameters" :description="$t('api_test.request.parameters_desc')"
-                          @change="parametersChange"/>
+        <ms-api-key-value :is-read-only="isReadOnly" :items="request.parameters"
+                          :description="$t('api_test.request.parameters_desc')" @change="parametersChange"/>
       </el-tab-pane>
       <el-tab-pane :label="$t('api_test.request.headers')" name="headers">
         <ms-api-key-value :is-read-only="isReadOnly" :items="request.headers"/>
@@ -96,7 +97,7 @@
           // 添加一个空的，用于填写
           parameters.push(new KeyValue());
           this.request.parameters = parameters;
-          this.request.url = url.toString();
+          this.request.url = this.getURL(url);
         } catch (e) {
           this.$error(this.$t('api_test.request.url_invalid'), 2000)
         }
@@ -116,7 +117,7 @@
             url.searchParams.append(parameter.name, parameter.value);
           }
         })
-        this.request.url = url.toString();
+        this.request.url = this.getURL(url);
       },
       addProtocol(url) {
         if (url) {
@@ -125,6 +126,9 @@
           }
         }
         return url;
+      },
+      getURL(url) {
+        return decodeURIComponent(url.origin + url.pathname) + "?" + url.searchParams.toString();
       }
     },
 
diff --git a/frontend/src/business/components/api/test/model/JMX.js b/frontend/src/business/components/api/test/model/JMX.js
index 791ac9a0a1..5a4018e4fa 100644
--- a/frontend/src/business/components/api/test/model/JMX.js
+++ b/frontend/src/business/components/api/test/model/JMX.js
@@ -33,7 +33,7 @@ export class Element {
   }
 
   commonValue(tag, name, value, defaultValue) {
-    let v = this.getDefault(value, defaultValue)
+    let v = this.getDefault(value, defaultValue);
     return this.add(new Element(tag, {name: name}, v));
   }
 
@@ -73,6 +73,11 @@ export class Element {
     return this.isEmptyValue() && this.isEmptyElement();
   }
 
+  replace(str) {
+    if (!str || !(typeof str === 'string')) return str;
+    return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/'/g, "&apos;").replace(/"/g, "&quot;");
+  }
+
   toXML(indent) {
     if (indent) {
       this.indent = indent;
@@ -85,10 +90,10 @@ export class Element {
   }
 
   start() {
-    let str = this.indent + '<' + this.name;
+    let str = this.indent + '<' + this.replace(this.name);
     for (let key in this.attributes) {
       if (this.attributes.hasOwnProperty(key)) {
-        str += ' ' + key + '="' + this.attributes[key] + '"';
+        str += ' ' + this.replace(key) + '="' + this.replace(this.attributes[key]) + '"';
       }
     }
     if (this.isEmpty()) {
@@ -101,7 +106,7 @@ export class Element {
 
   content() {
     if (!this.isEmptyValue()) {
-      return this.value;
+      return this.replace(this.value);
     }
 
     let str = '';
@@ -120,7 +125,7 @@ export class Element {
     if (this.isEmpty()) {
       return '\n';
     }
-    let str = '</' + this.name + '>\n';
+    let str = '</' + this.replace(this.name) + '>\n';
     if (!this.isEmptyValue()) {
       return str;
     }
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index e1dc1c4a41..8455e4eceb 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -388,8 +388,8 @@ class JMXRequest {
     if (request && request instanceof Request && request.url) {
       let url = new URL(request.url);
       this.method = request.method;
-      this.hostname = url.hostname;
-      this.pathname = url.pathname;
+      this.hostname = decodeURIComponent(url.hostname);
+      this.pathname = decodeURIComponent(url.pathname);
       this.port = url.port;
       this.protocol = url.protocol.split(":")[0];
       if (this.method.toUpperCase() !== "GET") {
@@ -429,7 +429,6 @@ class JMXGenerator {
   addScenarios(testPlan, scenarios) {
     scenarios.forEach(s => {
       let scenario = s.clone();
-      scenario.name = this.replace(scenario.name);
 
       let threadGroup = new ThreadGroup(scenario.name || "");
 
@@ -440,8 +439,6 @@ class JMXGenerator {
       scenario.requests.forEach(request => {
         if (!request.isValid()) return;
 
-        request.name = this.replace(request.name);
-
         let httpSamplerProxy = new HTTPSamplerProxy(request.name || "", new JMXRequest(request));
 
         this.addRequestHeader(httpSamplerProxy, request);
@@ -464,7 +461,7 @@ class JMXGenerator {
   }
 
   addScenarioVariables(threadGroup, scenario) {
-    let args = this.replaceKV(scenario.variables);
+    let args = this.filterKV(scenario.variables);
     if (args.length > 0) {
       let name = scenario.name + " Variables"
       threadGroup.put(new Arguments(name, args));
@@ -472,7 +469,7 @@ class JMXGenerator {
   }
 
   addScenarioHeaders(threadGroup, scenario) {
-    let headers = this.replaceKV(scenario.headers);
+    let headers = this.filterKV(scenario.headers);
     if (headers.length > 0) {
       let name = scenario.name + " Headers"
       threadGroup.put(new HeaderManager(name, headers));
@@ -481,14 +478,14 @@ class JMXGenerator {
 
   addRequestHeader(httpSamplerProxy, request) {
     let name = request.name + " Headers";
-    let headers = this.replaceKV(request.headers);
+    let headers = this.filterKV(request.headers);
     if (headers.length > 0) {
       httpSamplerProxy.put(new HeaderManager(name, headers));
     }
   }
 
   addRequestArguments(httpSamplerProxy, request) {
-    let args = this.replaceKV(request.parameters);
+    let args = this.filterKV(request.parameters);
     if (args.length > 0) {
       httpSamplerProxy.add(new HTTPSamplerArguments(args));
     }
@@ -497,10 +494,10 @@ class JMXGenerator {
   addRequestBody(httpSamplerProxy, request) {
     let body = [];
     if (request.body.isKV()) {
-      body = this.replaceKV(request.body.kvs);
+      body = this.filterKV(request.body.kvs);
     } else {
       httpSamplerProxy.boolProp('HTTPSampler.postBodyRaw', true);
-      body.push({name: '', value: this.replace(request.body.raw), encode: false});
+      body.push({name: '', value: request.body.raw, encode: false});
     }
 
     httpSamplerProxy.add(new HTTPSamplerArguments(body));
@@ -521,9 +518,9 @@ class JMXGenerator {
   }
 
   getAssertion(regex) {
-    let name = this.replace(regex.description);
+    let name = regex.description;
     let type = JMX_ASSERTION_CONDITION.CONTAINS; // 固定用Match，自己写正则
-    let value = this.replace(regex.expression);
+    let value = regex.expression;
     switch (regex.subject) {
       case ASSERTION_REGEX_SUBJECT.RESPONSE_CODE:
         return new ResponseCodeAssertion(name, type, value);
@@ -557,8 +554,8 @@ class JMXGenerator {
 
   getExtractor(extractCommon) {
     let props = {
-      name: this.replace(extractCommon.variable),
-      expression: this.replace(extractCommon.expression),
+      name: extractCommon.variable,
+      expression: extractCommon.expression,
     }
     let testName = props.name
     switch (extractCommon.type) {
@@ -580,19 +577,8 @@ class JMXGenerator {
     return config.isValid();
   }
 
-  replace(str) {
-    if (!str || !(typeof str === 'string')) return str;
-    return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/'/g, "&apos;").replace(/"/g, "&quot;");
-  }
-
-  replaceKV(kvs) {
-    let results = [];
-    kvs.filter(this.filter).forEach(kv => {
-      let name = this.replace(kv.name);
-      let value = this.replace(kv.value);
-      results.push(new KeyValue(name, value));
-    });
-    return results;
+  filterKV(kvs) {
+    return kvs.filter(this.filter);
   }
 
   toXML() {

From a6ab2813aee5c4eb1e627929deb218bc5ea7c242 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Wed, 17 Jun 2020 14:49:57 +0800
Subject: [PATCH 26/28] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/api/controller/APITestController.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 97118ba469..cb383953fe 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -9,7 +9,6 @@ import io.metersphere.api.dto.SaveAPITestRequest;
 import io.metersphere.api.service.APITestService;
 import io.metersphere.base.domain.ApiTest;
 import io.metersphere.base.domain.ApiTestWithBLOBs;
-import io.metersphere.base.domain.LoadTest;
 import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
@@ -19,10 +18,10 @@ import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
-
 import java.util.List;
 
+import javax.annotation.Resource;
+
 @RestController
 @RequestMapping(value = "/api")
 @RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER, RoleConstants.TEST_VIEWER}, logical = Logical.OR)

From aacd8df1b920f8c6955b94358dba53ca1eb0d0f1 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 17 Jun 2020 17:34:32 +0800
Subject: [PATCH 27/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/performance/engine/docker/DockerTestEngine.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c5be3a0a13..903cb29163 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
@@ -90,7 +90,7 @@ public class DockerTestEngine extends AbstractEngine {
             restTemplate.postForObject(uri, testRequest, String.class);
         } catch (Exception e) {
             LogUtil.error(e);
-            MSException.throwException(Translator.get("load_test_kafka_invalid"));
+            MSException.throwException(Translator.get("start_engine_fail"));
         }
     }
 

From d0af80d3f0c668a78434a1823f575f35f8e12079 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 17 Jun 2020 17:40:44 +0800
Subject: [PATCH 28/28] =?UTF-8?q?fix=20=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E7=82=B9=E4=BF=9D=E5=AD=98=E5=90=8E=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8D=E5=8F=8A=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan/view/comonents/TestPlanTestCaseEdit.vue     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
index ed584bdca3..8feac18a12 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
@@ -289,9 +289,21 @@
         param.issues = JSON.stringify(this.testCase.issues);
         this.$post('/test/plan/case/edit', param, () => {
           this.$success(this.$t('commons.save_success'));
+          this.updateTestCases(param);
           this.setPlanStatus(this.testCase.planId);
         });
       },
+      updateTestCases(param) {
+        for (let i = 0; i < this.testCases.length; i++) {
+          let testCase = this.testCases[i];
+          if (testCase.id === param.id) {
+            testCase.results = param.results;
+            testCase.issues = param.issues;
+            testCase.status = param.status;
+            return;
+          }
+        }
+      },
       handleNext() {
         this.index++;
         this.getTestCase(this.index);