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

fix(接口测试): 修复HTTP请求Body参数携带多出其他类型参数问题 

https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001013658
This commit is contained in:
fit2-zhao 2022-06-01 11:17:07 +08:00 committed by f2c-ci-robot[bot]
parent f62d9287df
commit 2a0da62698
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/api/dto/scenario/Body.java
View File

@ -70,9 +70,11 @@ public class Body {
public List<KeyValue> getBodyParams(HTTPSamplerProxy sampler, String requestId) { public List<KeyValue> getBodyParams(HTTPSamplerProxy sampler, String requestId) {
List<KeyValue> body = new ArrayList<>(); List<KeyValue> body = new ArrayList<>();
if (this.isKV() || this.isBinary()) { if (this.isKV() || this.isBinary()) {
if (StringUtils.equalsAnyIgnoreCase(this.type, WWW_FROM, FORM_DATA)) {
body = this.getKvs().stream().filter(KeyValue::isValid).collect(Collectors.toList()); body = this.getKvs().stream().filter(KeyValue::isValid).collect(Collectors.toList());
}
// 处理上传文件
HTTPFileArg[] httpFileArgs = httpFileArgs(requestId); HTTPFileArg[] httpFileArgs = httpFileArgs(requestId);
// 文件上传
if (ArrayUtils.isNotEmpty(httpFileArgs)) { if (ArrayUtils.isNotEmpty(httpFileArgs)) {
sampler.setHTTPFiles(httpFileArgs(requestId)); sampler.setHTTPFiles(httpFileArgs(requestId));
sampler.setDoMultipart(!StringUtils.equalsIgnoreCase(this.type, "BINARY")); sampler.setDoMultipart(!StringUtils.equalsIgnoreCase(this.type, "BINARY"));
@ -127,12 +129,12 @@ public class Body {
private HTTPFileArg[] httpFileArgs(String requestId) { private HTTPFileArg[] httpFileArgs(String requestId) {
List<HTTPFileArg> list = new ArrayList<>(); List<HTTPFileArg> list = new ArrayList<>();
if (CollectionUtils.isNotEmpty(this.getKvs())) { if (StringUtils.equalsAnyIgnoreCase(this.type, WWW_FROM, FORM_DATA) && CollectionUtils.isNotEmpty(this.getKvs())) {
this.getKvs().stream().filter(KeyValue::isFile).filter(KeyValue::isEnable).forEach(keyValue -> { this.getKvs().stream().filter(KeyValue::isFile).filter(KeyValue::isEnable).forEach(keyValue -> {
setFileArg(list, keyValue.getFiles(), keyValue, requestId, false); setFileArg(list, keyValue.getFiles(), keyValue, requestId, false);
}); });
} }
if (CollectionUtils.isNotEmpty(this.getBinary())) { if (StringUtils.equalsIgnoreCase(this.type, BINARY) && CollectionUtils.isNotEmpty(this.getBinary())) {
this.getBinary().stream().filter(KeyValue::isFile).filter(KeyValue::isEnable).forEach(keyValue -> { this.getBinary().stream().filter(KeyValue::isFile).filter(KeyValue::isEnable).forEach(keyValue -> {
setFileArg(list, keyValue.getFiles(), keyValue, requestId, true); setFileArg(list, keyValue.getFiles(), keyValue, requestId, true);
}); });