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.4' into master

This commit is contained in:
Captain.B 2020-11-03 14:42:12 +08:00
parent ce0a688130 7e9afdac38
commit 8cb881fe42
2 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@
export default { export default {
name: "MsApiRequestForm", name: "MsApiRequestForm",
components: {MsApiSqlRequestForm, MsRequestResultTail, MsScenarioResults, MsApiDubboRequestForm, MsApiHttpRequestForm}, components: {MsApiSqlRequestForm, MsRequestResultTail, MsScenarioResults, MsApiDubboRequestForm, MsApiHttpRequestForm, MsApiTcpRequestForm},
props: { props: {
scenario: Scenario, scenario: Scenario,
request: Request, request: Request,

44
frontend/src/business/components/api/test/model/ScenarioModel.js
View File

@ -1139,17 +1139,18 @@ class JMXGenerator {
sampler = new DubboSample(request.name || "", new JMXDubboRequest(request, scenario.dubboConfig)); sampler = new DubboSample(request.name || "", new JMXDubboRequest(request, scenario.dubboConfig));
} else if (request instanceof HttpRequest) { } else if (request instanceof HttpRequest) {
sampler = new HTTPSamplerProxy(request.name || "", new JMXHttpRequest(request, scenario.environment)); sampler = new HTTPSamplerProxy(request.name || "", new JMXHttpRequest(request, scenario.environment));
this.addRequestHeader(sampler, request); this.addRequestHeader(sampler, request, scenario);
this.addRequestArguments(sampler, request); this.addRequestArguments(sampler, request);
this.addRequestBody(sampler, request, testId); this.addRequestBody(sampler, request, testId);
} else if (request instanceof SqlRequest) { } else if (request instanceof SqlRequest) {
request.dataSource = scenario.databaseConfigMap.get(request.dataSource); request.dataSource = scenario.databaseConfigMap.get(request.dataSource);
sampler = new JDBCSampler(request.name || "", request); sampler = new JDBCSampler(request.name || "", request);
this.addRequestVariables(sampler, request);
} else if (request instanceof TCPRequest) { } else if (request instanceof TCPRequest) {
sampler = new TCPSampler(request.name || "", new JMXTCPRequest(request, scenario)); sampler = new TCPSampler(request.name || "", new JMXTCPRequest(request, scenario));
} }
this.addRequestVariables(sampler, request, scenario);
this.addDNSCacheManager(sampler, scenario.environment, request.useEnvironment); this.addDNSCacheManager(sampler, scenario.environment, request.useEnvironment);
this.addRequestExtractor(sampler, request); this.addRequestExtractor(sampler, request);
@ -1186,20 +1187,13 @@ class JMXGenerator {
envArray = JSON.parse(environments); envArray = JSON.parse(environments);
} }
envArray.forEach(item => { envArray.forEach(item => {
if (item.name && !keys.has(item.name)) { if (item.enable != false && item.name && !keys.has(item.name)) {
target.push(new KeyValue({name: item.name, value: item.value})); target.push(new KeyValue({name: item.name, value: item.value}));
} }
}) })
} }
addScenarioVariables(threadGroup, scenario) { addScenarioVariables(threadGroup, scenario) {
if (scenario.environment) {
let config = scenario.environment.config;
if (!(scenario.environment.config instanceof Object)) {
config = JSON.parse(scenario.environment.config);
}
this.addEnvironments(config.commonConfig.variables, scenario.variables)
}
let args = this.filterKV(scenario.variables); let args = this.filterKV(scenario.variables);
if (args.length > 0) { if (args.length > 0) {
let name = scenario.name + " Variables"; let name = scenario.name + " Variables";
@ -1207,13 +1201,25 @@ class JMXGenerator {
} }
} }
addRequestVariables(httpSamplerProxy, request) { addRequestVariables(httpSamplerProxy, request, scenario) {
if (request.useEnvironment && scenario.environment) {
let config = scenario.environment.config;
if (!(scenario.environment.config instanceof Object)) {
config = JSON.parse(scenario.environment.config);
}
if (!request.variables) {
request.variables = [];
}
this.addEnvironments(config.commonConfig.variables, request.variables)
}
let name = request.name + " Variables"; let name = request.name + " Variables";
if (request.variables) {
let variables = this.filterKV(request.variables); let variables = this.filterKV(request.variables);
if (variables && variables.length > 0) { if (variables && variables.length > 0) {
httpSamplerProxy.put(new Arguments(name, variables)); httpSamplerProxy.put(new Arguments(name, variables));
} }
} }
}
addScenarioCookieManager(threadGroup, scenario) { addScenarioCookieManager(threadGroup, scenario) {
if (scenario.enableCookieShare) { if (scenario.enableCookieShare) {
@ -1272,13 +1278,6 @@ class JMXGenerator {
} }
addScenarioHeaders(threadGroup, scenario) { addScenarioHeaders(threadGroup, scenario) {
if (scenario.environment) {
let config = scenario.environment.config;
if (!(scenario.environment.config instanceof Object)) {
config = JSON.parse(scenario.environment.config);
}
this.addEnvironments(config.httpConfig.headers, scenario.headers)
}
let headers = this.filterKV(scenario.headers); let headers = this.filterKV(scenario.headers);
if (headers.length > 0) { if (headers.length > 0) {
let name = scenario.name + " Headers"; let name = scenario.name + " Headers";
@ -1286,7 +1285,14 @@ class JMXGenerator {
} }
} }
addRequestHeader(httpSamplerProxy, request) { addRequestHeader(httpSamplerProxy, request, scenario) {
if (request.useEnvironment && scenario.environment) {
let config = scenario.environment.config;
if (!(scenario.environment.config instanceof Object)) {
config = JSON.parse(scenario.environment.config);
}
this.addEnvironments(config.httpConfig.headers, request.headers)
}
let name = request.name + " Headers"; let name = request.name + " Headers";
this.addBodyFormat(request); this.addBodyFormat(request);
let headers = this.filterKV(request.headers); let headers = this.filterKV(request.headers);