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

Merge branch 'v1.7'

This commit is contained in:
Captain.B 2021-02-04 12:56:43 +08:00
parent 29c30607bd 072efeaf86
commit dae7ad93a7
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
View File

@ -290,6 +290,9 @@ public class MsHTTPSamplerProxy extends MsTestElement {
Arguments arguments = new Arguments();
list.stream().filter(KeyValue::isValid).filter(KeyValue::isEnable).forEach(keyValue -> {
HTTPArgument httpArgument = new HTTPArgument(keyValue.getName(), StringUtils.isNotEmpty(keyValue.getValue()) && keyValue.getValue().startsWith("@") ? ScriptEngineUtils.calculate(keyValue.getValue()) : keyValue.getValue());
if (keyValue.getValue() == null) {
httpArgument.setValue("");
}
httpArgument.setAlwaysEncoded(keyValue.isEncode());
if (StringUtils.isNotBlank(keyValue.getContentType())) {
httpArgument.setContentType(keyValue.getContentType());

3
backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
View File

@ -387,7 +387,8 @@ public class JmeterDocumentParser implements DocumentParser {
element.appendChild(createStringProp(document, "HTTPSampler.contentEncoding", ""));
element.appendChild(createStringProp(document, "HTTPSampler.path", ""));
element.appendChild(createStringProp(document, "HTTPSampler.concurrentPool", "6"));
element.appendChild(createStringProp(document, "HTTPSampler.connect_timeout", ""));
element.appendChild(createStringProp(document, "HTTPSampler.implementation", "Java"));
element.appendChild(createStringProp(document, "HTTPSampler.connect_timeout", "60000"));
element.appendChild(createStringProp(document, "HTTPSampler.response_timeout", ""));
hashTree.appendChild(element);
// 空的 hashTree

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

@ -128,7 +128,7 @@ export default {
components: {MsTableOperatorButton},
data() {
return {
timeout: 2000,
timeout: 60000,
responseTimeout: null,
statusCode: [],
domains: [],