From 144803a8c2fc5e67c7c17b31d2e13aa86f389652 Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Tue, 20 Oct 2020 16:50:16 +0800
Subject: [PATCH 1/8] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                                    | 4 ++--
 backend/pom.xml                                               | 2 +-
 frontend/pom.xml                                              | 2 +-
 .../src/business/components/api/test/model/ScenarioModel.js   | 2 +-
 pom.xml                                                       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8b0f86e7e0..0bcbd5ea2b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,11 +6,11 @@ ARG MS_VERSION=dev
 
 RUN mkdir -p /opt/apps && mkdir -p /opt/jmeter
 
-ADD backend/target/backend-1.3.jar /opt/apps
+ADD backend/target/backend-1.4.jar /opt/apps
 
 ADD backend/target/classes/jmeter/ /opt/jmeter/
 
-ENV JAVA_APP_JAR=/opt/apps/backend-1.3.jar
+ENV JAVA_APP_JAR=/opt/apps/backend-1.4.jar
 
 ENV AB_OFF=true
 
diff --git a/backend/pom.xml b/backend/pom.xml
index dc9d501331..1bed72227a 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>metersphere-server</artifactId>
         <groupId>io.metersphere</groupId>
-        <version>1.3</version>
+        <version>1.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/frontend/pom.xml b/frontend/pom.xml
index e22139f987..f246001960 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>metersphere-server</artifactId>
     <groupId>io.metersphere</groupId>
-    <version>1.3</version>
+    <version>1.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index f79efe313e..5b101db29a 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -152,7 +152,7 @@ export class Test extends BaseConfig {
   constructor(options) {
     super();
     this.type = "MS API CONFIG";
-    this.version = '1.3.0';
+    this.version = '1.4.0';
     this.id = uuid();
     this.name = undefined;
     this.projectId = undefined;
diff --git a/pom.xml b/pom.xml
index f43ee92c7c..27f82b6fa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.metersphere</groupId>
     <artifactId>metersphere-server</artifactId>
-    <version>1.3</version>
+    <version>1.4</version>
     <packaging>pom</packaging>
 
     <parent>

From 40d217b75bb498160f68f19714ebca75fed8bfc1 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 21 Oct 2020 09:41:53 +0800
Subject: [PATCH 2/8] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4flyway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/db/migration/V33__modify_message_task.sql  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V33__modify_message_task.sql b/backend/src/main/resources/db/migration/V33__modify_message_task.sql
index 02ddd9f0c7..ef7210dce0 100644
--- a/backend/src/main/resources/db/migration/V33__modify_message_task.sql
+++ b/backend/src/main/resources/db/migration/V33__modify_message_task.sql
@@ -1,5 +1,4 @@
-alter table message_task
-	add identification varchar(255) not null;
-alter table message_task
-    add result boolean not null;
-alter table message_task change result is_Set tinyint(1) not null;
\ No newline at end of file
+ALTER TABLE message_task
+    ADD identification varchar(255) NOT NULL;
+ALTER TABLE message_task
+    ADD result tinyint(1) NOT NULL;
\ No newline at end of file

From 2b99693b3f10f0ab74b97f3f51ac2d5ede2a9ef2 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 21 Oct 2020 09:43:52 +0800
Subject: [PATCH 3/8] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4flyway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/db/migration/V33__modify_message_task.sql    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/resources/db/migration/V33__modify_message_task.sql b/backend/src/main/resources/db/migration/V33__modify_message_task.sql
index ef7210dce0..4d74aa41f9 100644
--- a/backend/src/main/resources/db/migration/V33__modify_message_task.sql
+++ b/backend/src/main/resources/db/migration/V33__modify_message_task.sql
@@ -1,4 +1,4 @@
 ALTER TABLE message_task
     ADD identification varchar(255) NOT NULL;
 ALTER TABLE message_task
-    ADD result tinyint(1) NOT NULL;
\ No newline at end of file
+    ADD is_set tinyint(1) NOT NULL;
\ No newline at end of file

From fe1bea3316c24977720b2a82ab1c0c76234d988e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 21 Oct 2020 16:04:41 +0800
Subject: [PATCH 4/8] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E7=94=A8=E4=BE=8B=E7=9B=B8=E5=85=B3=E7=9A=84=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=92=8C=E8=AF=84=E5=AE=A1=E4=B8=AD=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack    |   2 +-
 .../case/components/TestCaseAttachment.vue    | 118 ++++++++++++++++++
 .../track/case/components/TestCaseEdit.vue    |  58 ++-------
 .../track/case/components/TestCaseFile.vue    |   2 +-
 .../view/comonents/TestPlanTestCaseEdit.vue   |  39 +++++-
 .../components/TestReviewTestCaseEdit.vue     |  40 +++++-
 frontend/src/business/components/xpack        |   2 +-
 7 files changed, 205 insertions(+), 56 deletions(-)
 create mode 100644 frontend/src/business/components/track/case/components/TestCaseAttachment.vue

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index cf6b065263..ee74568be0 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit cf6b06526324326a563d933e07118fac014a63b4
+Subproject commit ee74568be0beba46da19616f5832e83f9164c688
diff --git a/frontend/src/business/components/track/case/components/TestCaseAttachment.vue b/frontend/src/business/components/track/case/components/TestCaseAttachment.vue
new file mode 100644
index 0000000000..c8dae4fa45
--- /dev/null
+++ b/frontend/src/business/components/track/case/components/TestCaseAttachment.vue
@@ -0,0 +1,118 @@
+<template>
+  <div>
+    <el-row type="flex" justify="center">
+      <el-col>
+        <el-table class="basic-config" :data="tableData">
+          <el-table-column
+            prop="name"
+            :label="$t('load_test.file_name')">
+          </el-table-column>
+          <el-table-column
+            prop="size"
+            :label="$t('load_test.file_size')">
+          </el-table-column>
+          <el-table-column
+            prop="type"
+            :label="$t('load_test.file_type')">
+          </el-table-column>
+          <el-table-column
+            :label="$t('test_track.case.upload_time')">
+            <template v-slot:default="scope">
+              <i class="el-icon-time"/>
+              <span class="last-modified">{{ scope.row.updateTime | timestampFormatDate }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            :label="$t('commons.operating')">
+            <template v-slot:default="scope">
+              <el-button @click="preview(scope.row)" :disabled="!scope.row.id || readOnly" type="primary"
+                         v-if="isPreview(scope.row)"
+                         icon="el-icon-view"
+                         size="mini" circle/>
+              <el-button @click="handleDownload(scope.row)" :disabled="!scope.row.id || readOnly" type="primary"
+                         icon="el-icon-download"
+                         size="mini" circle/>
+              <el-button :disabled="readOnly || !isDelete" @click="handleDelete(scope.row, scope.$index)" type="danger"
+                         icon="el-icon-delete" size="mini"
+                         circle/>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+
+    <test-case-file ref="testCaseFile"/>
+  </div>
+</template>
+
+<script>
+import TestCaseFile from "@/business/components/track/case/components/TestCaseFile";
+import {Message} from "element-ui";
+
+export default {
+  name: "TestCaseAttachment",
+  components: {TestCaseFile},
+  props: {
+    tableData: Array,
+    readOnly: {
+      type: Boolean,
+      default: true
+    },
+    isDelete: {
+      type: Boolean,
+      default: false
+    },
+  },
+  data() {
+    return {
+
+    }
+  },
+  methods: {
+    preview(row) {
+      this.$refs.testCaseFile.open(row);
+    },
+    isPreview(row) {
+      const fileType = row.type;
+      return fileType === 'JPG' || fileType === 'JPEG' || fileType === 'PDF' || fileType === 'PNG';
+    },
+    handleDownload(file) {
+      let data = {
+        name: file.name,
+        id: file.id,
+      };
+      let config = {
+        url: '/test/case/file/download',
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+      };
+      this.result = this.$request(config).then(response => {
+        const content = response.data;
+        const blob = new Blob([content]);
+        if ("download" in document.createElement("a")) {
+          // 非IE下载
+          //  chrome/firefox
+          let aTag = document.createElement('a');
+          aTag.download = file.name;
+          aTag.href = URL.createObjectURL(blob);
+          aTag.click();
+          URL.revokeObjectURL(aTag.href)
+        } else {
+          // IE10+下载
+          navigator.msSaveBlob(blob, this.filename)
+        }
+      }).catch(e => {
+        Message.error({message: e.message, showClose: true});
+      });
+    },
+    handleDelete(file, index) {
+      this.$emit("handleDelete", file, index);
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index ac1a3d9511..20ef8f4d09 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -226,47 +226,15 @@
               <span slot="tip" class="el-upload__tip"> {{ $t('test_track.case.upload_tip') }} </span>
             </el-upload>
           </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="20">
-            <el-table class="basic-config" :data="tableData">
-              <el-table-column
-                prop="name"
-                :label="$t('load_test.file_name')">
-              </el-table-column>
-              <el-table-column
-                prop="size"
-                :label="$t('load_test.file_size')">
-              </el-table-column>
-              <el-table-column
-                prop="type"
-                :label="$t('load_test.file_type')">
-              </el-table-column>
-              <el-table-column
-                :label="$t('test_track.case.upload_time')">
-                <template v-slot:default="scope">
-                  <i class="el-icon-time"/>
-                  <span class="last-modified">{{ scope.row.updateTime | timestampFormatDate }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                :label="$t('commons.operating')">
-                <template v-slot:default="scope">
-                  <el-button @click="preview(scope.row)" :disabled="!scope.row.id || readOnly" type="primary"
-                             v-if="isPreview(scope.row)"
-                             icon="el-icon-view"
-                             size="mini" circle/>
-                  <el-button @click="handleDownload(scope.row)" :disabled="!scope.row.id || readOnly" type="primary"
-                             icon="el-icon-download"
-                             size="mini" circle/>
-                  <el-button :disabled="readOnly" @click="handleDelete(scope.row, scope.$index)" type="danger"
-                             icon="el-icon-delete" size="mini"
-                             circle/>
-                </template>
-              </el-table-column>
-            </el-table>
+          <el-col :offset="2" :span="20">
+            <test-case-attachment :table-data="tableData"
+                                  :read-only="readOnly"
+                                  :is-delete="true"
+                                  @handleDelete="handleDelete"
+            />
           </el-col>
         </el-row>
+
       </el-form>
 
       <template v-slot:footer>
@@ -281,7 +249,6 @@
 
     </el-dialog>
 
-    <test-case-file ref="testCaseFile"/>
   </div>
 
 
@@ -294,11 +261,11 @@ import MsDialogFooter from '../../../common/components/MsDialogFooter'
 import {listenGoBack, removeGoBackListener} from "../../../../../common/js/utils";
 import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
 import {Message} from "element-ui";
-import TestCaseFile from "@/business/components/track/case/components/TestCaseFile";
+import TestCaseAttachment from "@/business/components/track/case/components/TestCaseAttachment";
 
 export default {
   name: "TestCaseEdit",
-  components: {MsDialogFooter, TestCaseFile},
+  components: {MsDialogFooter, TestCaseAttachment},
   data() {
     return {
       result: {},
@@ -723,13 +690,6 @@ export default {
     fileValidator(file) {
       /// todo: 是否需要对文件内容和大小做限制
       return file.size > 0;
-    },
-    preview(row) {
-      this.$refs.testCaseFile.open(row);
-    },
-    isPreview(row) {
-      const fileType = row.type;
-      return fileType === 'JPG' || fileType === 'JPEG' || fileType === 'PDF' || fileType === 'PNG';
     }
   }
 }
diff --git a/frontend/src/business/components/track/case/components/TestCaseFile.vue b/frontend/src/business/components/track/case/components/TestCaseFile.vue
index df4243b4df..9992518869 100644
--- a/frontend/src/business/components/track/case/components/TestCaseFile.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseFile.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogVisible" width="80%" :destroy-on-close="true" :before-close="close">
+  <el-dialog :visible.sync="dialogVisible" width="80%" :destroy-on-close="true" :before-close="close" :append-to-body="true">
     <div>
       <img :src="'/test/case/file/preview/' + file.id" :alt="$t('test_track.case.img_loading_fail')" style="width: 100%;height: 100%;"
            v-if="file.type === 'JPG' || file.type === 'JPEG' || file.type === 'PNG'">
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 077d2b9dee..b3840820da 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
@@ -299,6 +299,21 @@
                 </div>
               </el-col>
             </el-row>
+
+            <el-row>
+              <el-col :span="15" :offset="1">
+                <div>
+                  <span class="cast_label">{{ $t('test_track.case.attachment') }}:</span>
+                </div>
+                <div>
+                  <test-case-attachment :table-data="tableData"
+                                        :read-only="isReadOnly"
+                                        :is-delete="false"
+                                        @handleDelete="handleDelete"
+                  />
+                </div>
+              </el-col>
+            </el-row>
           </div>
 
         </el-scrollbar>
@@ -320,6 +335,7 @@ import ApiTestResult from "./test/ApiTestResult";
 import PerformanceTestDetail from "./test/PerformanceTestDetail";
 import PerformanceTestResult from "./test/PerformanceTestResult";
 import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import TestCaseAttachment from "@/business/components/track/case/components/TestCaseAttachment";
 
 export default {
   name: "TestPlanTestCaseEdit",
@@ -328,7 +344,8 @@ export default {
     PerformanceTestDetail,
     ApiTestResult,
     ApiTestDetail,
-    TestPlanTestCaseStatusButton
+    TestPlanTestCaseStatusButton,
+    TestCaseAttachment
   },
   data() {
     return {
@@ -348,7 +365,8 @@ export default {
       activeTab: 'detail',
       isFailure: true,
       users: [],
-      hasTapdId: false
+      hasTapdId: false,
+      tableData: [],
     };
   },
   props: {
@@ -449,6 +467,20 @@ export default {
       this.initTest();
       this.getIssues(testCase.caseId);
       this.stepResultChange();
+      this.getFileMetaData(testCase);
+    },
+    getFileMetaData(testCase) {
+      this.tableData = [];
+      this.result = this.$get("test/case/file/metadata/" + testCase.caseId, response => {
+        let files = response.data;
+        if (!files) {
+          return;
+        }
+        this.tableData = JSON.parse(JSON.stringify(files));
+        this.tableData.map(f => {
+          f.size = f.size + ' Bytes';
+        });
+      })
     },
     openTestCaseEdit(testCase) {
       this.showDialog = true;
@@ -589,6 +621,9 @@ export default {
         this.getIssues(this.testCase.caseId);
         this.$success(this.$t('commons.delete_success'));
       })
+    },
+    handleDelete() {
+
     }
   }
 }
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
index b6f459fd22..91744b384e 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
@@ -201,6 +201,22 @@
                       </div>
                     </el-col>
                   </el-row>
+
+                  <el-row>
+                    <el-col :span="20" :offset="1">
+                      <div>
+                        <span class="cast_label">{{ $t('test_track.case.attachment') }}:</span>
+                      </div>
+                      <div>
+                        <test-case-attachment :table-data="tableData"
+                                              :read-only="false"
+                                              :is-delete="false"
+                                              @handleDelete="handleDelete"
+                        />
+                      </div>
+                    </el-col>
+                  </el-row>
+
                 </div>
 
               </el-scrollbar>
@@ -234,6 +250,7 @@ import ApiTestDetail from "../../../plan/view/comonents/test/ApiTestDetail";
 import TestPlanTestCaseStatusButton from "../../../plan/common/TestPlanTestCaseStatusButton";
 import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import ReviewComment from "../../commom/ReviewComment";
+import TestCaseAttachment from "@/business/components/track/case/components/TestCaseAttachment";
 
 export default {
   name: "TestReviewTestCaseEdit",
@@ -243,7 +260,8 @@ export default {
     ApiTestResult,
     ApiTestDetail,
     TestPlanTestCaseStatusButton,
-    ReviewComment
+    ReviewComment,
+    TestCaseAttachment
   },
   data() {
     return {
@@ -258,7 +276,8 @@ export default {
       isFailure: true,
       users: [],
       activeName: 'comment',
-      comments: []
+      comments: [],
+      tableData: []
     };
   },
   props: {
@@ -332,6 +351,20 @@ export default {
       this.testCase = item;
       this.getComments(item);
       this.initTest();
+      this.getFileMetaData(testCase);
+    },
+    getFileMetaData(testCase) {
+      this.tableData = [];
+      this.result = this.$get("test/case/file/metadata/" + testCase.caseId, response => {
+        let files = response.data;
+        if (!files) {
+          return;
+        }
+        this.tableData = JSON.parse(JSON.stringify(files));
+        this.tableData.map(f => {
+          f.size = f.size + ' Bytes';
+        });
+      })
     },
     openTestCaseEdit(testCase) {
       this.showDialog = true;
@@ -406,6 +439,9 @@ export default {
         }).length > 0;
       }
     },
+    handleDelete() {
+
+    }
   }
 }
 </script>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 06d935cd1d..cc38137a69 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1
+Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9

From 92ab3f7ba30f29057d364f77075a8522232e5f1c Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 21 Oct 2020 16:15:12 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=20SQL=20=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
index fbbec25394..04b38d8783 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
@@ -100,6 +100,7 @@
             parameterType="io.metersphere.track.request.testcase.QueryTestPlanRequest">
         select test_plan.*, user.name as user_name from test_plan
         LEFT JOIN user ON user.id = test_plan.principal
+        JOIN test_plan_project on test_plan.id = test_plan_id JOIN project on project.id = project_id
         <where>
             <if test="request.combine != null">
                 <include refid="combine">

From 6fffba9976b6dd86f0c097c805e550154e4fe5c5 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 21 Oct 2020 18:06:27 +0800
Subject: [PATCH 6/8] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E7=8E=AF=E5=A2=83=E7=9A=84=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=9F=9F=E5=90=8D=E6=9C=AB=E5=B0=BE=E4=B8=8D=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/components/environment/EnvironmentHttpConfig.vue    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue b/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
index 2d7f3e4967..00f39b75e2 100644
--- a/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
+++ b/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
@@ -58,10 +58,11 @@
           this.httpConfig.domain = decodeURIComponent(url.hostname);
 
           this.httpConfig.port = url.port;
+          let path = url.pathname === '/' ? '' : url.pathname;
           if (url.port) {
-            this.httpConfig.socket = this.httpConfig.domain + ':' + url.port + url.pathname;
+            this.httpConfig.socket = this.httpConfig.domain + ':' + url.port + path;
           } else {
-            this.httpConfig.socket = this.httpConfig.domain + url.pathname;
+            this.httpConfig.socket = this.httpConfig.domain + path;
           }
           return true;
         },

From 71a54ba8bf445504edfa68b005b7c6d053410687 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 21 Oct 2020 18:26:00 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E5=85=A8=E9=80=89=E5=90=8E=E5=88=87=E6=8D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=95=B0=E9=87=8F=E5=90=8E=E6=89=B9=E9=87=8F=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack                      | 2 +-
 .../components/performance/report/PerformanceTestReport.vue     | 1 +
 frontend/src/business/components/xpack                          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index ee74568be0..cf6b065263 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit ee74568be0beba46da19616f5832e83f9164c688
+Subproject commit cf6b06526324326a563d933e07118fac014a63b4
diff --git a/frontend/src/business/components/performance/report/PerformanceTestReport.vue b/frontend/src/business/components/performance/report/PerformanceTestReport.vue
index e94b84a186..772a17bff5 100644
--- a/frontend/src/business/components/performance/report/PerformanceTestReport.vue
+++ b/frontend/src/business/components/performance/report/PerformanceTestReport.vue
@@ -166,6 +166,7 @@ export default {
         let data = response.data;
         this.total = data.itemCount;
         this.tableData = data.listObject;
+        this.selectRows = new Set();
       });
     },
     search(combine) {
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index cc38137a69..06d935cd1d 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9
+Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1

From 21983d1ccb06c2e54bfb9703fa761b9d7f4c2303 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 21 Oct 2020 18:29:11 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E7=BC=96=E8=BE=91jar=E5=8C=85=E6=8F=8F=E8=BF=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/test/components/jar/JarConfigFrom.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/test/components/jar/JarConfigFrom.vue b/frontend/src/business/components/api/test/components/jar/JarConfigFrom.vue
index 2698d8c221..ff4964b5a7 100644
--- a/frontend/src/business/components/api/test/components/jar/JarConfigFrom.vue
+++ b/frontend/src/business/components/api/test/components/jar/JarConfigFrom.vue
@@ -5,7 +5,7 @@
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input size="small" v-model="currentConfig.name" clearable show-word-limit/>
         </el-form-item>
-        <el-form-item :label="$t('commons.project')" prop="description">
+        <el-form-item :label="$t('commons.description')" prop="description">
           <el-input :disabled="readOnly" v-model="currentConfig.description"
                     type="textarea"
                     :autosize="{ minRows: 2, maxRows: 4}"