From b06215f5821ae7c9679aef158b342e1b6ff7ac57 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Wed, 3 Jun 2020 18:07:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E9=9B=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/api/jmeter/APIBackendListenerClient.java     | 2 +-
 backend/src/main/resources/jmeter/bin/jmeter.properties         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
index ee3867c40c..ec7ac7f713 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
@@ -126,7 +126,7 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
         }
 
         ResponseResult responseResult = requestResult.getResponseResult();
-        responseResult.setBody(new String(result.getResponseData(), StandardCharsets.UTF_8));
+        responseResult.setBody(result.getResponseDataAsString());
         responseResult.setHeaders(result.getResponseHeaders());
         responseResult.setLatency(result.getLatency());
         responseResult.setResponseCode(result.getResponseCode());
diff --git a/backend/src/main/resources/jmeter/bin/jmeter.properties b/backend/src/main/resources/jmeter/bin/jmeter.properties
index a002245bd1..ba00ca8276 100644
--- a/backend/src/main/resources/jmeter/bin/jmeter.properties
+++ b/backend/src/main/resources/jmeter/bin/jmeter.properties
@@ -1081,7 +1081,7 @@ csvdataset.file.encoding_list=UTF-8|UTF-16|ISO-8859-15|US-ASCII
 #httpsampler.user_defined_methods=VERSION-CONTROL,REPORT,CHECKOUT,CHECKIN,UNCHECKOUT,MKWORKSPACE,UPDATE,LABEL,MERGE,BASELINE-CONTROL,MKACTIVITY
 
 # The encoding to be used if none is provided (default ISO-8859-1)
-#sampleresult.default.encoding=ISO-8859-1
+sampleresult.default.encoding=UTF-8
 
 # CookieManager behaviour - should cookies with null/empty values be deleted?
 # Default is true. Use false to revert to original behaviour

From f83e2a69cc6d540e7c8a913b2f7db3a799d59029 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Wed, 3 Jun 2020 18:15:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/frontend/src/business/components/api/test/ApiTestList.vue b/frontend/src/business/components/api/test/ApiTestList.vue
index 30f157b31a..b232428c18 100644
--- a/frontend/src/business/components/api/test/ApiTestList.vue
+++ b/frontend/src/business/components/api/test/ApiTestList.vue
@@ -139,7 +139,7 @@
       },
       handleCopy(test) {
         this.result = this.$post("/api/copy", {id: test.id}, () => {
-          this.$success(this.$t('commons.delete_success'));
+          this.$success(this.$t('commons.copy_success'));
           this.search();
         });
       },

From 22fb6855abe06967712fabaacfb6c32d3dbe1ab5 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Wed, 3 Jun 2020 18:16:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/performance/test/PerformanceTestPlan.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/performance/test/PerformanceTestPlan.vue b/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
index 47c65d24d4..9e4419a759 100644
--- a/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
+++ b/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
@@ -174,7 +174,7 @@
       },
       handleCopy(testPlan) {
         this.result = this.$post("/performance/copy", {id: testPlan.id}, () => {
-          this.$success(this.$t('commons.save_success'));
+          this.$success(this.$t('commons.copy_success'));
           this.search();
         });
       },