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

Merge branch 'master' of https://github.com/metersphere/server

This commit is contained in:
chenjianxing 2020-08-11 10:36:45 +08:00
parent e187d91c76 2f1b8e9d1a
commit f316d99141
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -871,6 +871,9 @@ class JMXGenerator {
this.addEnvironments(environment.headers, scenario.headers) this.addEnvironments(environment.headers, scenario.headers)
} }
let headers = this.filterKV(scenario.headers); let headers = this.filterKV(scenario.headers);
headers.forEach(h => {
h.value = calculate(h.value);
});
if (headers.length > 0) { if (headers.length > 0) {
let name = scenario.name + " Headers" let name = scenario.name + " Headers"
threadGroup.put(new HeaderManager(name, headers)); threadGroup.put(new HeaderManager(name, headers));
@ -881,6 +884,9 @@ class JMXGenerator {
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);
headers.forEach(h => {
h.value = calculate(h.value);
});
if (headers.length > 0) { if (headers.length > 0) {
httpSamplerProxy.put(new HeaderManager(name, headers)); httpSamplerProxy.put(new HeaderManager(name, headers));
} }
@ -931,6 +937,9 @@ class JMXGenerator {
let body = []; let body = [];
if (request.body.isKV()) { if (request.body.isKV()) {
body = this.filterKV(request.body.kvs); body = this.filterKV(request.body.kvs);
body.forEach(arg => {
arg.value = calculate(arg.value);
});
} else { } else {
httpSamplerProxy.boolProp('HTTPSampler.postBodyRaw', true); httpSamplerProxy.boolProp('HTTPSampler.postBodyRaw', true);
body.push({name: '', value: request.body.raw, encode: false}); body.push({name: '', value: request.body.raw, encode: false});