From 0d297aada9850e6eceb418e07d5d1610817f0bef Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 24 Mar 2021 10:30:11 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E6=89=B9=E9=87=8F=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/commons/utils/ScriptEngineUtils.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/commons/utils/ScriptEngineUtils.java b/backend/src/main/java/io/metersphere/commons/utils/ScriptEngineUtils.java
index 599d1b5234..2e2431d32d 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/ScriptEngineUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/ScriptEngineUtils.java
@@ -22,7 +22,8 @@ public class ScriptEngineUtils {
         }
     }
 
-    public static String calculate(String input) {
+    // graal.js 禁止多线程同时访问，加上 synchronized
+    public synchronized static String calculate(String input) {
         try {
             return engine.eval("calculate('" + input + "')").toString();
         } catch (ScriptException e) {

From bfe6e732d572c329ce479d66d31d3546e9d13c43 Mon Sep 17 00:00:00 2001
From: BugKing <wangzhen@fit2cloud.com>
Date: Wed, 24 Mar 2021 10:32:15 +0800
Subject: [PATCH 2/8] =?UTF-8?q?style(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=94=A8=E5=8A=9B=E5=88=97=E8=A1=A8=E6=A0=87=E7=AD=BE=E5=88=97?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan/view/comonents/functional/FunctionalTestCaseList.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index 9fbc3cafb5..0be1a249c8 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -93,7 +93,7 @@
                            :key="index"
           >
             <template v-slot:default="scope">
-                <ms-tag v-for="(tag, index) in scope.row.showTags" :key="tag + '_' + index" type="success" effect="plain" :content="tag" style="margin-left: 5px"/>
+                <ms-tag v-for="(tag, index) in scope.row.showTags" :key="tag + '_' + index" type="success" effect="plain" :content="tag" style="margin-left: 0px; margin-right: 2px"/>
             </template>
           </el-table-column>
 

From 53fb641a10aef6d9bffe1f308bf19a255dc0bbae Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Wed, 24 Mar 2021 11:09:54 +0800
Subject: [PATCH 3/8] =?UTF-8?q?refactor:=20=E8=A7=A3=E5=86=B3=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8B=96=E6=8B=BD=E5=AF=BC=E8=87=B4esb=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=93=8D=E5=BA=94=E8=A1=A8=E6=A0=BC=E6=96=AD=E8=A1=8C?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

解决页面拖拽导致esb请求响应表格断行的问题  参数名的宽度稍微增加；取消描述字段的长度限制，改为最小长度
---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 07951ba17a..95a9d5c21a 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd
+Subproject commit 95a9d5c21af6a664b22ecc85cda6935ea706f623

From d4f813decda53189b170c63da3a19c2f01f1ac17 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 24 Mar 2021 11:15:16 +0800
Subject: [PATCH 4/8] =?UTF-8?q?refactor:=20=E5=85=B3=E8=81=94=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=94=A8=E4=BE=8B=E6=90=9C=E7=B4=A2=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/automation/scenario/api/RelevanceApiList.vue | 2 +-
 .../track/plan/view/comonents/api/TestPlanCaseListHeader.vue    | 2 +-
 frontend/src/i18n/en-US.js                                      | 1 +
 frontend/src/i18n/zh-CN.js                                      | 1 +
 frontend/src/i18n/zh-TW.js                                      | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
index d41d84b82a..4e706b04ed 100644
--- a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
@@ -6,7 +6,7 @@
 
       <ms-environment-select :project-id="projectId" v-if="isTestPlan" :is-read-only="isReadOnly" @setEnvironment="setEnvironment"/>
 
-      <el-input :placeholder="$t('api_monitor.please_search')" @blur="initTable" class="search-input" size="small" @keyup.enter.native="initTable" v-model="condition.name"/>
+      <el-input :placeholder="$t('api_test.definition.request.select_api')" @blur="initTable" class="search-input" size="small" @keyup.enter.native="initTable" v-model="condition.name"/>
 
       <el-table v-loading="result.loading"
                 border
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanCaseListHeader.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanCaseListHeader.vue
index d5da2e47e2..f705258aee 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanCaseListHeader.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanCaseListHeader.vue
@@ -5,7 +5,7 @@
                    :show-create="false"
                    :tip="$t('commons.search_by_id_name_tag')">
     <template v-slot:title>
-       接口用例
+      {{ $t('api_test.home_page.failed_case_list.table_value.case_type.api') }}
     </template>
     <template v-slot:button>
       <ms-table-button :is-tester-permission="true" icon="el-icon-connection"
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 080a830a8a..7a16c7cfcd 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -602,6 +602,7 @@ export default {
         update_time_order_desc: "from back to front by update time",
         run_env: "Operating environment",
         select_case: "Search use cases",
+        select_api: "Search api",
         case: "Case",
         title: "Create api",
         path_info: "Please enter the URL of the interface, such as /api/demo/#{id}, where id is the path parameter",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index be06b88245..8e326a6249 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -602,6 +602,7 @@ export default {
         update_time_order_desc: "按更新时间从后到前",
         run_env: "运行环境",
         select_case: "搜索用例",
+        select_api: "搜索接口",
         case: "用例",
         responsible: "责任人",
         title: "创建接口",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index a0a0fcc566..1fc005652d 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -601,6 +601,7 @@ export default {
         update_time_order_desc: "按更新時間從後到前",
         run_env: "運行環境",
         select_case: "搜索用例",
+        select_api: "搜索接口",
         case: "用例",
         responsible: "責任人",
         title: "創建接口",

From 00e2932148b49e4842b69e009cca9569cb76a17a Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Wed, 24 Mar 2021 11:18:38 +0800
Subject: [PATCH 5/8] =?UTF-8?q?refactor:=20=E8=A7=A3=E5=86=B3=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E5=8F=82=E6=95=B0=E5=AF=BC=E8=87=B4=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

解决无效参数导致的页面报错
---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 95a9d5c21a..2115bd28a9 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 95a9d5c21af6a664b22ecc85cda6935ea706f623
+Subproject commit 2115bd28a90854d2b6276a90878934715498c584

From 1b5288756a645325a8755b01528b3a236c01783e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 24 Mar 2021 11:27:38 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?=
 =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=97=B6=E6=9C=AA=E6=98=BE=E7=A4=BA=E6=B5=8B=E8=AF=95=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functional/FunctionalTestCaseEdit.vue     | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
index da8facdcb8..b218fdd4ca 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
@@ -90,26 +90,26 @@
                     </el-col>
                   </el-row>
 
-                  <el-row v-if="testCase.method === 'auto' && testCase.testId && testCase.testId != 'other'">
-                    <el-col class="test-detail" :span="20" :offset="1">
-                      <el-tabs v-model="activeTab" type="border-card" @tab-click="testTabChange">
-                        <el-tab-pane name="detail" :label="$t('test_track.plan_view.test_detail')">
-                          <api-test-detail :is-read-only="isReadOnly" v-if="testCase.type === 'api'" @runTest="testRun"
-                                           :id="testCase.testId" ref="apiTestDetail"/>
-                          <performance-test-detail :is-read-only="isReadOnly" v-if="testCase.type === 'performance'"
-                                                   @runTest="testRun" :id="testCase.testId" ref="performanceTestDetail"/>
-                        </el-tab-pane>
-                        <el-tab-pane name="result" :label="$t('test_track.plan_view.test_result')">
-                          <api-test-result :report-id="testCase.reportId" v-if=" testCase.type === 'api'"
-                                           ref="apiTestResult"/>
-                          <performance-test-result :is-read-only="isReadOnly" :report-id="testCase.reportId"
-                                                   v-if="testCase.type === 'performance'" ref="performanceTestResult"/>
-                        </el-tab-pane>
-                      </el-tabs>
-                    </el-col>
-                  </el-row>
+<!--                  <el-row v-if="testCase.method === 'auto' && testCase.testId && testCase.testId != 'other'">-->
+<!--                    <el-col class="test-detail" :span="20" :offset="1">-->
+<!--                      <el-tabs v-model="activeTab" type="border-card" @tab-click="testTabChange">-->
+<!--                        <el-tab-pane name="detail" :label="$t('test_track.plan_view.test_detail')">-->
+<!--                          <api-test-detail :is-read-only="isReadOnly" v-if="testCase.type === 'api'" @runTest="testRun"-->
+<!--                                           :id="testCase.testId" ref="apiTestDetail"/>-->
+<!--                          <performance-test-detail :is-read-only="isReadOnly" v-if="testCase.type === 'performance'"-->
+<!--                                                   @runTest="testRun" :id="testCase.testId" ref="performanceTestDetail"/>-->
+<!--                        </el-tab-pane>-->
+<!--                        <el-tab-pane name="result" :label="$t('test_track.plan_view.test_result')">-->
+<!--                          <api-test-result :report-id="testCase.reportId" v-if=" testCase.type === 'api'"-->
+<!--                                           ref="apiTestResult"/>-->
+<!--                          <performance-test-result :is-read-only="isReadOnly" :report-id="testCase.reportId"-->
+<!--                                                   v-if="testCase.type === 'performance'" ref="performanceTestResult"/>-->
+<!--                        </el-tab-pane>-->
+<!--                      </el-tabs>-->
+<!--                    </el-col>-->
+<!--                  </el-row>-->
 
-                  <el-row v-if="testCase.method && testCase.method !== 'auto'">
+                  <el-row>
                     <el-col :span="22" :offset="1">
                       <div>
                         <span class="cast_label">{{ $t('test_track.case.steps') }}：</span>
@@ -641,7 +641,7 @@ export default {
       this.$post('/test/plan/edit/status/' + planId);
     },
     stepResultChange() {
-      if (this.testCase.method === 'manual') {
+      if (this.testCase.method === 'manual' || !this.testCase.method) {
         this.isFailure = this.testCase.steptResults.filter(s => {
           return s.executeResult === 'Failure' || s.executeResult === 'Blocking';
         }).length > 0;

From faafaba718762be2ae106546ec530131239ef10a Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Wed, 24 Mar 2021 12:48:46 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3Har=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=AF=BC=E5=85=A5=E5=90=8E=E4=B8=8D=E8=83=BD=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

解决Har文件导入后不能编辑的问题
---
 .../java/io/metersphere/api/dto/definition/parse/HarParser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/HarParser.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/HarParser.java
index 5d84a6ec2a..2d017c14bf 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/parse/HarParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/HarParser.java
@@ -173,7 +173,7 @@ public class HarParser extends HarAbstractParser {
             return;
         }
         HarPostData content = requestBody.postData;
-        if (!StringUtils.equalsIgnoreCase("GET", requestBody.method) || requestBody.postData == null) {
+        if (StringUtils.equalsIgnoreCase("GET", requestBody.method) || requestBody.postData == null) {
             return;
         }
         String contentType = content.mimeType;

From b6ec991ce7f4fa1eb528a64f6cd28f323400fa7c Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 24 Mar 2021 13:20:32 +0800
Subject: [PATCH 8/8] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E6=96=B0=E5=BB=BA=E5=92=8C=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtLoadTestMapper.xml     |  1 +
 .../test/components/ExistFiles.vue            | 37 +++++++------------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
index 8580002eff..2eb995b3d8 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
@@ -148,5 +148,6 @@
         <if test="request.name!=null">
             AND file_metadata.name LIKE CONCAT('%', #{request.name}, '%')
         </if>
+        order by update_time DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/frontend/src/business/components/performance/test/components/ExistFiles.vue b/frontend/src/business/components/performance/test/components/ExistFiles.vue
index 224c874960..53f7541e98 100644
--- a/frontend/src/business/components/performance/test/components/ExistFiles.vue
+++ b/frontend/src/business/components/performance/test/components/ExistFiles.vue
@@ -221,15 +221,6 @@ export default {
       f().then(res => {
         let response = res.data;
         if (response.data.length === 0) {
-          let type = file.name.substring(file.name.lastIndexOf(".") + 1);
-
-          this.tableData.push({
-            name: file.name,
-            size: (file.size / 1024).toFixed(2) + ' KB',
-            type: type.toUpperCase(),
-            updateTime: file.lastModified,
-          });
-
           callback();
         } else {
           this.$error(this.$t('load_test.project_file_exist') + ', name: ' + file.name);
@@ -241,21 +232,21 @@ export default {
 
       let file = uploadResources.file;
       this.checkFileExist(file, () => {
-        self.uploadList.push(file);
-        let type = file.name.substring(file.name.lastIndexOf(".") + 1);
-        if (type.toLowerCase() !== 'jmx') {
-          return;
+        let formData = new FormData();
+        let url = '/project/upload/files/' + getCurrentProjectID()
+        formData.append("file", file);
+        let options = {
+          method: 'POST',
+          url: url,
+          data: formData,
+          headers: {
+            'Content-Type': undefined
+          }
         }
-        let jmxReader = new FileReader();
-        jmxReader.onload = (event) => {
-          let threadGroups = findThreadGroup(event.target.result, file.name);
-          threadGroups.forEach(tg => {
-            tg.options = {};
-            self.scenarios.push(tg);
-          });
-          self.$emit('fileChange', self.scenarios);
-        };
-        jmxReader.readAsText(file);
+        self.$request(options, (response) => {
+          self.$success(this.$t('commons.save_success'));
+          self.getProjectFiles();
+        });
       })
     },
     handleExceed() {