test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of github.com:metersphere/metersphere into dev

This commit is contained in:
王振 2020-06-04 10:49:53 +08:00
parent ee306e720e 22fb6855ab
commit a40d3056aa
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
View File

@ -126,7 +126,7 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
} }
ResponseResult responseResult = requestResult.getResponseResult(); ResponseResult responseResult = requestResult.getResponseResult();
responseResult.setBody(new String(result.getResponseData(), StandardCharsets.UTF_8)); responseResult.setBody(result.getResponseDataAsString());
responseResult.setHeaders(result.getResponseHeaders()); responseResult.setHeaders(result.getResponseHeaders());
responseResult.setLatency(result.getLatency()); responseResult.setLatency(result.getLatency());
responseResult.setResponseCode(result.getResponseCode()); responseResult.setResponseCode(result.getResponseCode());

2
backend/src/main/resources/jmeter/bin/jmeter.properties
View File

@ -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 #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) # 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? # CookieManager behaviour - should cookies with null/empty values be deleted?
# Default is true. Use false to revert to original behaviour # Default is true. Use false to revert to original behaviour

2
frontend/src/business/components/api/test/ApiTestList.vue
View File

@ -139,7 +139,7 @@
}, },
handleCopy(test) { handleCopy(test) {
this.result = this.$post("/api/copy", {id: test.id}, () => { 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(); this.search();
}); });
}, },

2
frontend/src/business/components/performance/test/PerformanceTestPlan.vue
View File

@ -174,7 +174,7 @@
}, },
handleCopy(testPlan) { handleCopy(testPlan) {
this.result = this.$post("/performance/copy", {id: testPlan.id}, () => { 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(); this.search();
}); });
}, },