From f8d171d1248f2bdf21c044814212e04e103f0275 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 24 Mar 2021 16:18:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E6=8E=A5=E5=8F=A3=E5=BF=AB=E6=8D=B7=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E5=8F=A6=E5=AD=98=E6=96=B0=E7=94=A8=E4=BE=8B=20=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/definition/ApiDefinition.vue          | 11 +--
 .../components/case/ApiCaseItem.vue           |  1 +
 .../components/case/ApiCaseList.vue           |  5 +-
 .../components/debug/DebugDubboPage.vue       | 68 +++++++++---------
 .../components/debug/DebugHttpPage.vue        | 69 +++++++++---------
 .../components/debug/DebugJdbcPage.vue        | 72 ++++++++++---------
 .../components/debug/DebugTcpPage.vue         | 52 +++++++-------
 7 files changed, 147 insertions(+), 131 deletions(-)

diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index 6f7a3c3e0a..a52ef37f03 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -81,13 +81,13 @@
             </div>
             <!-- 快捷调试 -->
             <div v-else-if="item.type=== 'debug'" class="ms-api-div">
-              <ms-debug-http-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
+              <ms-debug-http-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi" @refreshModule="refreshModule"
                                   v-if="currentProtocol==='HTTP'"/>
-              <ms-debug-jdbc-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
+              <ms-debug-jdbc-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi" @refreshModule="refreshModule"
                                   v-if="currentProtocol==='SQL'"/>
-              <ms-debug-tcp-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
+              <ms-debug-tcp-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi" @refreshModule="refreshModule"
                                  v-if="currentProtocol==='TCP'"/>
-              <ms-debug-dubbo-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
+              <ms-debug-dubbo-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi" @refreshModule="refreshModule"
                                    v-if="currentProtocol==='DUBBO'"/>
             </div>
 
@@ -356,6 +356,9 @@
         }
         this.$refs.apiList[0].exportApi(type);
       },
+      refreshModule() {
+        this.$refs.nodeTree.list();
+      },
       refresh(data) {
         this.$refs.apiList[0].initTable(data);
       },
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index 2fcd266207..af12c60f6b 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -278,6 +278,7 @@
         let url = '/api/module/getModuleByName/' + getCurrentProjectID() + "/" + this.api.protocol;
         this.$get(url, response => {
           if (response.data) {
+            this.$emit('refreshModule');
             this.saveApi(row, response.data);
           }
         });
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
index 91d409047f..f63c1e8f92 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -25,6 +25,7 @@
             <api-case-item v-loading="singleLoading && singleRunId === item.id || batchLoadingIds.indexOf(item.id) > -1"
                            @refresh="refresh"
                            @singleRun="singleRun"
+                           @refreshModule="refreshModule"
                            @copyCase="copyCase"
                            @showExecResult="showExecResult"
                            @batchEditCase="batchEditCase"
@@ -181,7 +182,9 @@
         this.apiCaseList = [];
         this.visible = false;
       },
-
+      refreshModule(){
+        this.$emit('refreshModule');
+      },
       runRefresh() {
         this.batchLoadingIds = [];
         this.singleLoading = false;
diff --git a/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue
index 311f334e86..2251a35989 100644
--- a/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue
+++ b/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue
@@ -30,44 +30,44 @@
       <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{$t('commons.save')}}</el-button>
     </div>
     <!-- 加载用例 -->
-    <ms-api-case-list :loaded="false" ref="caseList"/>
+    <ms-api-case-list @refreshModule="refreshModule" :loaded="false" ref="caseList"/>
 
   </div>
 </template>
 
 <script>
-import MsResponseResult from "../response/ResponseResult";
-import MsRequestMetric from "../response/RequestMetric";
-import {getUUID} from "@/common/js/utils";
-import MsResponseText from "../response/ResponseText";
-import MsRun from "../Run";
-import {createComponent} from "../jmeter/components";
-import {REQ_METHOD} from "../../model/JsonData";
-import MsRequestResultTail from "../response/RequestResultTail";
-import MsBasisParameters from "../request/dubbo/BasisParameters";
-import MsJmxStep from "../step/JmxStep";
-import MsApiCaseList from "../case/ApiCaseList";
+  import MsResponseResult from "../response/ResponseResult";
+  import MsRequestMetric from "../response/RequestMetric";
+  import {getUUID} from "@/common/js/utils";
+  import MsResponseText from "../response/ResponseText";
+  import MsRun from "../Run";
+  import {createComponent} from "../jmeter/components";
+  import {REQ_METHOD} from "../../model/JsonData";
+  import MsRequestResultTail from "../response/RequestResultTail";
+  import MsBasisParameters from "../request/dubbo/BasisParameters";
+  import MsJmxStep from "../step/JmxStep";
+  import MsApiCaseList from "../case/ApiCaseList";
 
-export default {
-  name: "ApiConfig",
-  components: {
-    MsRequestResultTail,
-    MsResponseResult,
-    MsRequestMetric,
-    MsResponseText,
-    MsRun,
-    MsBasisParameters,
-    MsJmxStep,
-    MsApiCaseList
-  },
-  props: {
-    currentProtocol: String,
-    scenario: Boolean,
-    testCase: {},
-  },
-  data() {
-    return {
-      rules: {
+  export default {
+    name: "ApiConfig",
+    components: {
+      MsRequestResultTail,
+      MsResponseResult,
+      MsRequestMetric,
+      MsResponseText,
+      MsRun,
+      MsBasisParameters,
+      MsJmxStep,
+      MsApiCaseList
+    },
+    props: {
+      currentProtocol: String,
+      scenario: Boolean,
+      testCase: {},
+    },
+    data() {
+      return {
+        rules: {
           method: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}],
           url: [{required: true, message: this.$t('api_test.definition.request.path_all_info'), trigger: 'blur'}],
         },
@@ -122,7 +122,9 @@ export default {
           this.runDebug();
         }
       },
-
+      refreshModule() {
+        this.$emit('refreshModule');
+      },
       runDebug() {
         this.loading = true;
         this.request.name = getUUID().substring(0, 8);
diff --git a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
index 49b59552bb..0ef95b397a 100644
--- a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
+++ b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
@@ -44,44 +44,44 @@
       <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{$t('commons.save')}}</el-button>
     </div>
     <!-- 加载用例 -->
-    <ms-api-case-list :loaded="false" ref="caseList"/>
+    <ms-api-case-list @refreshModule="refreshModule" :loaded="false" ref="caseList"/>
   </div>
 </template>
 
 <script>
-import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
-import MsResponseResult from "../response/ResponseResult";
-import MsRequestMetric from "../response/RequestMetric";
-import {getCurrentUser, getUUID} from "@/common/js/utils";
-import MsResponseText from "../response/ResponseText";
-import MsRun from "../Run";
-import {createComponent} from "../jmeter/components";
-import {REQ_METHOD} from "../../model/JsonData";
-import MsRequestResultTail from "../response/RequestResultTail";
-import MsJmxStep from "../step/JmxStep";
-import {KeyValue} from "../../model/ApiTestModel";
-import MsApiCaseList from "../case/ApiCaseList";
+  import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
+  import MsResponseResult from "../response/ResponseResult";
+  import MsRequestMetric from "../response/RequestMetric";
+  import {getCurrentUser, getUUID} from "@/common/js/utils";
+  import MsResponseText from "../response/ResponseText";
+  import MsRun from "../Run";
+  import {createComponent} from "../jmeter/components";
+  import {REQ_METHOD} from "../../model/JsonData";
+  import MsRequestResultTail from "../response/RequestResultTail";
+  import MsJmxStep from "../step/JmxStep";
+  import {KeyValue} from "../../model/ApiTestModel";
+  import MsApiCaseList from "../case/ApiCaseList";
 
-export default {
-  name: "ApiConfig",
-  components: {
-    MsRequestResultTail,
-    MsResponseResult,
-    MsApiRequestForm,
-    MsRequestMetric,
-    MsResponseText,
-    MsRun,
-    MsJmxStep,
-    MsApiCaseList
-  },
-  props: {
-    currentProtocol: String,
-    testCase: {},
-    scenario: Boolean,
-  },
-  data() {
-    let validateURL = (rule, value, callback) => {
-      try {
+  export default {
+    name: "ApiConfig",
+    components: {
+      MsRequestResultTail,
+      MsResponseResult,
+      MsApiRequestForm,
+      MsRequestMetric,
+      MsResponseText,
+      MsRun,
+      MsJmxStep,
+      MsApiCaseList
+    },
+    props: {
+      currentProtocol: String,
+      testCase: {},
+      scenario: Boolean,
+    },
+    data() {
+      let validateURL = (rule, value, callback) => {
+        try {
           new URL(this.debugForm.url);
           callback();
         } catch (e) {
@@ -166,6 +166,9 @@ export default {
           }
         })
       },
+      refreshModule() {
+        this.$emit('refreshModule');
+      },
       runRefresh(data) {
         this.responseData = data;
         this.loading = false;
diff --git a/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue
index 16ca081074..4a8e9110eb 100644
--- a/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue
+++ b/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue
@@ -32,47 +32,47 @@
       <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{$t('commons.save')}}</el-button>
     </div>
     <!-- 加载用例 -->
-    <ms-api-case-list :loaded="false" ref="caseList"/>
+    <ms-api-case-list @refreshModule="refreshModule" :loaded="false" ref="caseList"/>
 
   </div>
 
 </template>
 
 <script>
-import MsResponseResult from "../response/ResponseResult";
-import MsRequestMetric from "../response/RequestMetric";
-import {getUUID} from "@/common/js/utils";
-import MsResponseText from "../response/ResponseText";
-import MsRun from "../Run";
-import {createComponent} from "../jmeter/components";
-import {REQ_METHOD} from "../../model/JsonData";
-import MsRequestResultTail from "../response/RequestResultTail";
-import MsBasisParameters from "../request/database/BasisParameters";
-import MsJmxStep from "../step/JmxStep";
-import MsApiCaseList from "../case/ApiCaseList";
+  import MsResponseResult from "../response/ResponseResult";
+  import MsRequestMetric from "../response/RequestMetric";
+  import {getUUID} from "@/common/js/utils";
+  import MsResponseText from "../response/ResponseText";
+  import MsRun from "../Run";
+  import {createComponent} from "../jmeter/components";
+  import {REQ_METHOD} from "../../model/JsonData";
+  import MsRequestResultTail from "../response/RequestResultTail";
+  import MsBasisParameters from "../request/database/BasisParameters";
+  import MsJmxStep from "../step/JmxStep";
+  import MsApiCaseList from "../case/ApiCaseList";
 
-export default {
-  name: "ApiConfig",
-  components: {
-    MsRequestResultTail,
-    MsResponseResult,
-    MsRequestMetric,
-    MsResponseText,
-    MsRun,
-    MsBasisParameters,
-    MsJmxStep,
-    MsApiCaseList
-  },
-  props: {
-    currentProtocol: String,
-    scenario: Boolean,
-    testCase: {},
-  },
-  data() {
-    return {
-      rules: {
-        method: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}],
-        url: [{required: true, message: this.$t('api_test.definition.request.path_all_info'), trigger: 'blur'}],
+  export default {
+    name: "ApiConfig",
+    components: {
+      MsRequestResultTail,
+      MsResponseResult,
+      MsRequestMetric,
+      MsResponseText,
+      MsRun,
+      MsBasisParameters,
+      MsJmxStep,
+      MsApiCaseList
+    },
+    props: {
+      currentProtocol: String,
+      scenario: Boolean,
+      testCase: {},
+    },
+    data() {
+      return {
+        rules: {
+          method: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}],
+          url: [{required: true, message: this.$t('api_test.definition.request.path_all_info'), trigger: 'blur'}],
         },
         debugForm: {method: REQ_METHOD[0].id},
         options: [],
@@ -125,7 +125,9 @@ export default {
           this.$refs['requestForm'].validate();
         }
       },
-
+      refreshModule() {
+        this.$emit('refreshModule');
+      },
       runDebug() {
         this.loading = true;
         this.request.name = getUUID().substring(0, 8);
diff --git a/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue
index f7975fcf08..b674339b6c 100644
--- a/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue
+++ b/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue
@@ -42,37 +42,37 @@
       <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{$t('commons.save')}}</el-button>
     </div>
     <!-- 加载用例 -->
-    <ms-api-case-list :loaded="false" ref="caseList"/>
+    <ms-api-case-list @refreshModule="refreshModule" :loaded="false" ref="caseList"/>
 
   </div>
 
 </template>
 
 <script>
-import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
-import MsResponseResult from "../response/ResponseResult";
-import MsRequestMetric from "../response/RequestMetric";
-import {getUUID} from "@/common/js/utils";
-import MsResponseText from "../response/ResponseText";
-import MsRun from "../Run";
-import {createComponent} from "../jmeter/components";
-import {REQ_METHOD} from "../../model/JsonData";
-import MsRequestResultTail from "../response/RequestResultTail";
-import TcpBasisParameters from "../request/tcp/TcpBasisParameters";
-import MsJmxStep from "../step/JmxStep";
-import MsApiCaseList from "../case/ApiCaseList";
+  import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
+  import MsResponseResult from "../response/ResponseResult";
+  import MsRequestMetric from "../response/RequestMetric";
+  import {getUUID} from "@/common/js/utils";
+  import MsResponseText from "../response/ResponseText";
+  import MsRun from "../Run";
+  import {createComponent} from "../jmeter/components";
+  import {REQ_METHOD} from "../../model/JsonData";
+  import MsRequestResultTail from "../response/RequestResultTail";
+  import TcpBasisParameters from "../request/tcp/TcpBasisParameters";
+  import MsJmxStep from "../step/JmxStep";
+  import MsApiCaseList from "../case/ApiCaseList";
 
-export default {
-  name: "ApiConfig",
-  components: {
-    MsJmxStep,
-    TcpBasisParameters,
-    MsRequestResultTail, MsResponseResult, MsApiRequestForm, MsRequestMetric, MsResponseText, MsRun, MsApiCaseList
-  },
-  props: {
-    currentProtocol: String,
-    scenario: Boolean,
-    testCase: {},
+  export default {
+    name: "ApiConfig",
+    components: {
+      MsJmxStep,
+      TcpBasisParameters,
+      MsRequestResultTail, MsResponseResult, MsApiRequestForm, MsRequestMetric, MsResponseText, MsRun, MsApiCaseList
+    },
+    props: {
+      currentProtocol: String,
+      scenario: Boolean,
+      testCase: {},
     },
     data() {
       return {
@@ -130,7 +130,9 @@ export default {
           this.$refs['requestForm'].validate();
         }
       },
-
+      refreshModule() {
+        this.$emit('refreshModule');
+      },
       runDebug() {
         this.loading = true;
         this.request.name = getUUID().substring(0, 8);

From bc965796384b13a4261472929b7732702b1a5377 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 24 Mar 2021 16:24:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E4=BB=8E=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=8A=A5=E5=91=8A=E5=8F=AA=E6=98=BE=E7=A4=BA=E4=BA=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95=E7=BB=93=E6=9E=9C=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/track/service/TestPlanService.java     | 3 +++
 1 file changed, 3 insertions(+)

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 a959dbf120..e7b0f49a3d 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -611,6 +611,9 @@ public class TestPlanService {
 
         List<ReportComponent> components = ReportComponentFactory.createComponents(componentIds.toJavaList(String.class), testPlan);
         List<Issues> issues = buildFunctionalCaseReport(planId, components);
+        buildApiCaseReport(planId, components);
+        buildScenarioCaseReport(planId, components);
+        buildLoadCaseReport(planId, components);
 
         TestCaseReportMetricDTO testCaseReportMetricDTO = new TestCaseReportMetricDTO();
         components.forEach(component -> {