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

This commit is contained in:
王振 2020-06-04 10:49:53 +08:00
commit a40d3056aa
4 changed files with 4 additions and 4 deletions

View File

@ -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());

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
# 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

View File

@ -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();
});
},

View File

@ -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();
});
},