From f569412165decd75ebace6425f864f8a486229c3 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 1 Jul 2020 13:56:21 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index f8ec130ecf..04c19ebdf2 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -9,7 +9,7 @@
 
       <el-table :data="tableData" style="width: 100%">
         <el-table-column prop="id" label="ID"/>
-        <el-table-column prop="name" :label="$t('commons.username')" width="200"/>
+        <el-table-column prop="name" :label="$t('commons.name')" width="200"/>
         <el-table-column :label="$t('commons.role')" width="120">
           <template v-slot:default="scope">
             <ms-roles-tag :roles="scope.row.roles"/>

From 25f7063b3747e4b27589904e7832506f0da24de0 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 1 Jul 2020 14:38:59 +0800
Subject: [PATCH 02/12] smtp

---
 .../components/settings/system/SystemParameterSetting.vue   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/settings/system/SystemParameterSetting.vue b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
index cb35f98613..7fab04bb4b 100644
--- a/frontend/src/business/components/settings/system/SystemParameterSetting.vue
+++ b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
@@ -115,6 +115,7 @@
 
     activated() {
       this.query()
+      this.change()
     },
     methods: {
       changeType() {
@@ -161,6 +162,7 @@
         })
       },
       edit() {
+        this.change()
         this.showEdit = false;
         this.showSave = true;
         this.showCancel = true;
@@ -197,11 +199,13 @@
         })
       },
       cancel() {
+        this.query();
         this.showEdit = true;
         this.showCancel = false;
         this.showSave = false;
         this.show = true;
-        this.query();
+        this.change()
+
       }
 
     }

From 6a1168a187da46d89548b3c9e2dd0b76e299be10 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 2 Jul 2020 11:42:52 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E6=AE=8B=E7=95=99=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/frontend/src/business/components/settings/system/SystemParameterSetting.vue b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
index 7fab04bb4b..8c30d63387 100644
--- a/frontend/src/business/components/settings/system/SystemParameterSetting.vue
+++ b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
@@ -95,7 +95,7 @@
           host: [
             {
               required: true,
-              message: ''
+              message: ' '
             },
           ],
           port: [

From 6ea67253565457661c348257719ac1f9713861a8 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 2 Jul 2020 18:21:28 +0800
Subject: [PATCH 04/12] =?UTF-8?q?fix=20=E7=BC=96=E8=BE=91=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=80=E6=AC=A1=E6=98=BE=E7=A4=BA=E7=9A=84=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/project/MsProject.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/project/MsProject.vue b/frontend/src/business/components/project/MsProject.vue
index f2640e214d..6ff67f70e2 100644
--- a/frontend/src/business/components/project/MsProject.vue
+++ b/frontend/src/business/components/project/MsProject.vue
@@ -39,7 +39,7 @@
       </el-card>
     </ms-main-container>
 
-    <el-dialog :title="title" :visible.sync="createVisible">
+    <el-dialog :title="title" :visible.sync="createVisible" destroy-on-close>
       <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"></el-input>

From 9cfaa9ab73094be1a1b233899c8a6d7c6ee8e56a Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 3 Jul 2020 15:31:10 +0800
Subject: [PATCH 05/12] =?UTF-8?q?fix=20=E6=96=B0=E5=BB=BA=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E5=8B=BE=E9=80=89=E4=BF=9D=E5=AD=98=E5=B9=B6=E7=BB=A7?=
 =?UTF-8?q?=E7=BB=AD=E5=88=9B=E5=BB=BA=E5=90=8E=EF=BC=8C=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=86=85=E5=AE=B9=E6=B2=A1=E6=9C=89=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/track/case/components/TestCaseEdit.vue      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 811a5e328e..e33534999b 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -355,6 +355,13 @@
                 this.$success(this.$t('commons.save_success'));
                 if (this.operationType == 'add' && this.isCreateContinue) {
                   this.form.name = '';
+                  this.form.prerequisite = '';
+                  this.form.steps = [{
+                    num: 1,
+                    desc: '',
+                    result: ''
+                  }];
+                  this.form.remark = '';
                   this.$emit("refresh");
                   return;
                 }

From 44dd7ca6531ac7b1c07c6381b7b231be24d1bd2e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 6 Jul 2020 15:26:44 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/report/components/RequestStatistics.vue        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/business/components/performance/report/components/RequestStatistics.vue b/frontend/src/business/components/performance/report/components/RequestStatistics.vue
index 907eb7abea..0bc7d644c2 100644
--- a/frontend/src/business/components/performance/report/components/RequestStatistics.vue
+++ b/frontend/src/business/components/performance/report/components/RequestStatistics.vue
@@ -131,12 +131,15 @@
         let transactions = data.reduce(function (total, currentValue) {
           return total + parseFloat(currentValue.transactions);
         }, 0);
+        transactions = transactions.toFixed(2);
         let received = data.reduce(function (total, currentValue) {
           return total + parseFloat(currentValue.received);
         }, 0);
+        received = received.toFixed(2);
         let sent = data.reduce(function (total, currentValue) {
           return total + parseFloat(currentValue.sent);
         }, 0);
+        sent = sent.toFixed(2);
 
         let error = (Math.round(failSize / allSamples * 10000) / 100) + '%';
         let averageTime = (averageTimeTotal / allSamples).toFixed(2);

From 0652e2906d7ccd2e1e5e6df7cea0dd2fcba4c4f4 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 6 Jul 2020 15:32:05 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=B6=E7=9A=84=E5=AF=B9=E8=AF=9D=E6=A1=86?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 04c19ebdf2..3bbf45d3f8 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -162,7 +162,7 @@
     </el-dialog>
 
     <!--Modify user information in system settings-->
-    <el-dialog :title="$t('user.modify')" :visible.sync="updateVisible" width="30%" :destroy-on-close="true"
+    <el-dialog :title="$t('user.modify')" :visible.sync="updateVisible" width="35%" :destroy-on-close="true"
                @close="handleClose">
       <el-form :model="form" label-position="right" label-width="120px" size="small" :rules="rule" ref="updateUserForm">
         <el-form-item label="ID" prop="id">

From fbc688697230c21af9fb3c53387619f272dfa7e4 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 7 Jul 2020 13:48:18 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=89=8D=E6=A3=80=E6=9F=A5=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=9C=89=E7=9B=B8=E5=85=B3=E8=81=94=E7=9A=84=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/api/service/APITestService.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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 9c1cdec6e0..91a4af8dcb 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -8,6 +8,7 @@ import io.metersphere.api.jmeter.JMeterService;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiTestFileMapper;
 import io.metersphere.base.mapper.ApiTestMapper;
+import io.metersphere.base.mapper.TestCaseMapper;
 import io.metersphere.base.mapper.ext.ExtApiTestMapper;
 import io.metersphere.commons.constants.APITestStatus;
 import io.metersphere.commons.exception.MSException;
@@ -46,6 +47,8 @@ public class APITestService {
     private JMeterService jMeterService;
     @Resource
     private APIReportService apiReportService;
+    @Resource
+    private TestCaseMapper testCaseMapper;
 
     public List<APITestResult> list(QueryAPITestRequest request) {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
@@ -110,6 +113,20 @@ public class APITestService {
     }
 
     public void delete(String testId) {
+
+        // 是否关联测试用例
+        TestCaseExample testCaseExample = new TestCaseExample();
+        testCaseExample.createCriteria().andTestIdEqualTo(testId);
+        List<TestCase> testCases = testCaseMapper.selectByExample(testCaseExample);
+        if (testCases.size() > 0) {
+            String caseName = "";
+            for (int i = 0; i < testCases.size(); i++) {
+                caseName = caseName + testCases.get(i).getName() + ",";
+            }
+            caseName = caseName.substring(0, caseName.length() - 1);
+            MSException.throwException(Translator.get("related_case_del_fail_prefix") + caseName + Translator.get("related_case_del_fail_suffix"));
+        }
+
         deleteFileByTestId(testId);
         apiReportService.deleteByTestId(testId);
         apiTestMapper.deleteByPrimaryKey(testId);

From a0483661bd2092ea55dddde9b27167db119a29b4 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 7 Jul 2020 16:29:01 +0800
Subject: [PATCH 09/12] =?UTF-8?q?smtp=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/SystemParameterService.java       | 26 +++++++++++++------
 .../system/SystemParameterSetting.vue         | 12 ++++++---
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/service/SystemParameterService.java b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
index 6f60b47dda..7ee18ac83a 100644
--- a/backend/src/main/java/io/metersphere/service/SystemParameterService.java
+++ b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
@@ -40,17 +40,24 @@ public class SystemParameterService {
 
     public void editMail(List<SystemParameter> parameters) {
         List<SystemParameter> paramList = this.getParamList(ParamConstants.Classify.MAIL.getValue());
-        boolean empty = paramList.size() < 2;
+        boolean empty = paramList.size() <= 0;
+
         parameters.forEach(parameter -> {
+            SystemParameterExample example = new SystemParameterExample();
             if (parameter.getParamKey().equals(ParamConstants.MAIL.PASSWORD.getKey())) {
-                String string = EncryptUtils.aesEncrypt(parameter.getParamValue()).toString();
-                parameter.setParamValue(string);
+                if (!StringUtils.isBlank(parameter.getParamValue())) {
+                    String string = EncryptUtils.aesEncrypt(parameter.getParamValue()).toString();
+                    parameter.setParamValue(string);
+                }
             }
-            if (empty) {
-                systemParameterMapper.insert(parameter);
-            } else {
+            example.createCriteria().andParamKeyEqualTo(parameter.getParamKey());
+            if (systemParameterMapper.countByExample(example) > 0) {
                 systemParameterMapper.updateByPrimaryKey(parameter);
+            } else {
+                systemParameterMapper.insert(parameter);
             }
+            example.clear();
+
         });
     }
 
@@ -105,8 +112,11 @@ public class SystemParameterService {
             }
         } else {
             paramList.stream().filter(param -> param.getParamKey().equals(ParamConstants.MAIL.PASSWORD.getKey())).forEach(param -> {
-                String string = EncryptUtils.aesDecrypt(param.getParamValue()).toString();
-                param.setParamValue(string);
+                if (!StringUtils.isBlank(param.getParamValue())) {
+                    String string = EncryptUtils.aesDecrypt(param.getParamValue()).toString();
+                    param.setParamValue(string);
+                }
+
             });
         }
         paramList.sort(Comparator.comparingInt(SystemParameter::getSort));
diff --git a/frontend/src/business/components/settings/system/SystemParameterSetting.vue b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
index 8c30d63387..2d9ade2b79 100644
--- a/frontend/src/business/components/settings/system/SystemParameterSetting.vue
+++ b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
@@ -127,9 +127,15 @@
           this.$set(this.formInline, "port", response.data[1].paramValue);
           this.$set(this.formInline, "account", response.data[2].paramValue);
           this.$set(this.formInline, "password", response.data[3].paramValue);
-          this.$set(this.formInline, "SSL", JSON.parse(response.data[4].paramValue));
-          this.$set(this.formInline, "TLS", JSON.parse(response.data[5].paramValue));
-          this.$set(this.formInline, "SMTP", JSON.parse(response.data[6].paramValue));
+          if(response.data[4].paramValue!=""){
+            this.$set(this.formInline, "SSL", JSON.parse(response.data[4].paramValue));
+          }
+          if(response.data[5].paramValue!=""){
+            this.$set(this.formInline, "TLS", JSON.parse(response.data[5].paramValue));
+          }
+          if(response.data[6].paramValue!=""){
+            this.$set(this.formInline, "SMTP", JSON.parse(response.data[6].paramValue));
+          }
         })
       },
       change() {

From 8903fc80b3a9b733098c1fbc5c770e10be82dab3 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 7 Jul 2020 17:44:43 +0800
Subject: [PATCH 10/12] =?UTF-8?q?smtp=E8=B6=85=E6=97=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/service/SystemParameterService.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/service/SystemParameterService.java b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
index 7ee18ac83a..ecd15b6431 100644
--- a/backend/src/main/java/io/metersphere/service/SystemParameterService.java
+++ b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
@@ -75,6 +75,8 @@ public class SystemParameterService {
         javaMailSender.setUsername(hashMap.get(ParamConstants.MAIL.ACCOUNT.getKey()));
         javaMailSender.setPassword(hashMap.get(ParamConstants.MAIL.PASSWORD.getKey()));
         Properties props = new Properties();
+        props.put("mail.smtp.timeout", "5000");
+        props.put("mail.smtp.connectiontimeout", "5000");
         props.put("mail.smtp.auth", "true");
         if (BooleanUtils.toBoolean(hashMap.get(ParamConstants.MAIL.SSL.getKey()))) {
             props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");

From 024304d0185efb279c9b30a14bacd789e816abe7 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 7 Jul 2020 17:52:37 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=A1=86=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/settings/personal/PersonSetting.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
index 07050c3259..70935ad8ce 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="35%" left>
+    <el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="35%" :before-close='closeDialog' 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/>
@@ -68,7 +68,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
            <ms-dialog-footer
-             @cancel="editPasswordVisible = false"
+             @cancel="cancel()"
              @confirm="updatePassword('editPasswordForm')"/>
         </span>
     </el-dialog>
@@ -156,6 +156,16 @@
       editPassword(row) {
         this.editPasswordVisible = true;
       },
+      cancel(){
+        this.editPasswordVisible = false;
+        this.ruleForm.password="";
+        this.ruleForm.newpassword="";
+      },
+      closeDialog(){
+        this.editPasswordVisible = false;
+        this.ruleForm.password="";
+        this.ruleForm.newpassword="";
+      },
       updateUser(updateUserForm) {
         this.$refs[updateUserForm].validate(valid => {
           if (valid) {

From 3c797c645eb3fd89dd26703f2c2399684fc33c67 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 9 Jul 2020 14:12:42 +0800
Subject: [PATCH 12/12] =?UTF-8?q?fix=20post=E8=AF=B7=E6=B1=82url=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=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/ApiRequestForm.vue     | 5 ++---
 .../business/components/api/test/model/ScenarioModel.js   | 8 +++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/ApiRequestForm.vue b/frontend/src/business/components/api/test/components/ApiRequestForm.vue
index 83184a8476..6143c8adf1 100644
--- a/frontend/src/business/components/api/test/components/ApiRequestForm.vue
+++ b/frontend/src/business/components/api/test/components/ApiRequestForm.vue
@@ -91,12 +91,11 @@
           let url = new URL(this.addProtocol(this.request.url));
           url.searchParams.forEach((value, key) => {
             if (key && value) {
-              parameters.push(new KeyValue(key, value));
+              this.request.parameters.splice(0, 0, new KeyValue(key, value));
             }
           });
           // 添加一个空的，用于填写
           parameters.push(new KeyValue());
-          this.request.parameters = parameters;
           this.request.url = this.getURL(url);
         } catch (e) {
           this.$error(this.$t('api_test.request.url_invalid'), 2000)
@@ -128,7 +127,7 @@
         return url;
       },
       getURL(url) {
-        return decodeURIComponent(url.origin + url.pathname) + "?" + url.searchParams.toString();
+        return decodeURIComponent(url.origin + url.pathname);
       }
     },
 
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index 8b84423be5..ecc02724f6 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -394,7 +394,13 @@ class JMXRequest {
       this.port = url.port;
       this.protocol = url.protocol.split(":")[0];
       if (this.method.toUpperCase() !== "GET") {
-        this.pathname += url.search.replace('&', '&amp;');
+        // this.pathname += url.search.replace('&', '&amp;');
+        this.pathname += '?';
+        request.parameters.forEach(parameter => {
+          if (parameter.name) {
+            this.pathname += (parameter.name + '=' + parameter.value + '&');
+          }
+        });
       }
     }
   }