fromValues;
}
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/http/body/WWWFormKV.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/http/body/WWWFormKV.java
index 71b46cfc5c..44d83064cf 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/http/body/WWWFormKV.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/http/body/WWWFormKV.java
@@ -1,9 +1,13 @@
package io.metersphere.api.dto.request.http.body;
import io.metersphere.api.dto.request.http.KeyValueEnableParam;
+import io.metersphere.system.valid.EnumValue;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
import lombok.Data;
/**
+ * x-www-form-urlencoded 请求体键值对
* @Author: jianxing
* @CreateTime: 2023-11-06 18:11
*/
@@ -11,28 +15,33 @@ import lombok.Data;
public class WWWFormKV extends KeyValueEnableParam {
/**
* 参数类型
- *
- * @see WWWFormParamType
+ * 取值参考 {@link BodyParamType} 中的 value 属性
*/
+ @NotBlank
+ @Size(max = 20)
+ @EnumValue(enumClass = BodyParamType.class)
private String paramType;
+ /**
+ * 是否必填
+ * 默认为 false
+ */
private Boolean required = false;
+ /**
+ * 最小长度
+ */
private Integer minLength;
+ /**
+ * 最大长度
+ */
private Integer maxLength;
+ /**
+ * 参数的 contentType
+ */
+ @Size(max = 100)
private String contentType;
+ /**
+ * 是否对参数进行编码
+ * 默认 false
+ */
private Boolean encode = false;
-
- enum WWWFormParamType {
- /**
- * 默认 application/text
- */
- STRING, INTEGER, NUMBER, ARRAY,
- /**
- * 默认 application/octet-stream
- */
- FILE,
- /**
- * 默认 application/json
- */
- JSON
- }
}
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/http/body/XmlBody.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/http/body/XmlBody.java
index d1efe49014..037ec072d5 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/http/body/XmlBody.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/http/body/XmlBody.java
@@ -3,10 +3,14 @@ package io.metersphere.api.dto.request.http.body;
import lombok.Data;
/**
+ * xml 请求体
* @Author: jianxing
* @CreateTime: 2023-11-06 18:25
*/
@Data
public class XmlBody {
+ /**
+ * 请求体值
+ */
private String value;
}
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/ExtractPostProcessor.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/ExtractPostProcessor.java
index d48cdd4ea3..9ddb699404 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/ExtractPostProcessor.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/ExtractPostProcessor.java
@@ -7,6 +7,7 @@ import lombok.Data;
import java.util.List;
/**
+ * 提取处理器配置
* @Author: jianxing
* @CreateTime: 2023-11-22 11:08
*/
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/MsProcessor.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/MsProcessor.java
index a9769b6997..f8b00f5256 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/MsProcessor.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/MsProcessor.java
@@ -2,9 +2,20 @@ package io.metersphere.api.dto.request.processors;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
import lombok.Data;
/**
+ * 前后置处理器配置
+ *
+ * 该参数传参时，需要传入 processorType 字段，用于区分是哪种认证处理器
+ * processorType 取值为：
+ * SCRIPT {@link ScriptProcessor}
+ * SQL {@link SQLProcessor}
+ * TIME_WAITING {@link TimeWaitingProcessor}
+ * EXTRACT {@link ExtractPostProcessor}
+ *
* @Author: jianxing
* @CreateTime: 2023-11-07 10:17
*/
@@ -20,6 +31,8 @@ public abstract class MsProcessor {
/**
* 名称
*/
+ @NotBlank
+ @Size(max = 100)
private String name;
/**
* 是否启用
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/MsProcessorConfig.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/MsProcessorConfig.java
index 27a35b8a29..b6b2866d2f 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/MsProcessorConfig.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/MsProcessorConfig.java
@@ -1,10 +1,12 @@
package io.metersphere.api.dto.request.processors;
+import jakarta.validation.Valid;
import lombok.Data;
import java.util.List;
/**
+ * 前后置处理器配置
* @Author: jianxing
* @CreateTime: 2023-11-07 10:17
*/
@@ -12,10 +14,12 @@ import java.util.List;
public class MsProcessorConfig {
/**
* 是否启用全局前置
+ * 默认为 false
*/
- private Boolean enableGlobal;
+ private Boolean enableGlobal = false;
/**
- * 处理器
+ * 处理器列表
*/
+ @Valid
private List processors;
}
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/SQLProcessor.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/SQLProcessor.java
index 8a4b647805..8b13f372e1 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/SQLProcessor.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/SQLProcessor.java
@@ -3,11 +3,15 @@ package io.metersphere.api.dto.request.processors;
import com.fasterxml.jackson.annotation.JsonTypeName;
import io.metersphere.api.dto.request.http.KeyValueEnableParam;
import io.metersphere.api.dto.request.http.KeyValueParam;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
import lombok.Data;
import java.util.List;
/**
+ * SQL 处理器
* @Author: jianxing
* @CreateTime: 2023-11-06 21:12
*/
@@ -25,25 +29,32 @@ public class SQLProcessor extends MsProcessor {
/**
* 存储结果
*/
+ @Size(max = 200)
private String resultVariable;
/**
* 按列存储
*/
+ @Size(max = 200)
private String variableNames;
/**
* 变量列表
*/
+ @Valid
private List variables;
/**
* 环境ID
*/
+ @Size(max = 50)
private String environmentId;
/**
* 数据源ID
*/
+ @NotBlank
+ @Size(max = 50)
private String dataSourceId;
/**
* 提取参数
*/
+ @Valid
private List extractParams;
}
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/ScriptProcessor.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/ScriptProcessor.java
index 7807899d82..e76787a3d3 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/ScriptProcessor.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/ScriptProcessor.java
@@ -3,6 +3,8 @@ package io.metersphere.api.dto.request.processors;
import com.fasterxml.jackson.annotation.JsonTypeName;
import io.metersphere.api.dto.request.http.KeyValueParam;
import io.metersphere.project.constants.ScriptLanguageType;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Size;
import lombok.Data;
import java.util.List;
@@ -20,19 +22,23 @@ public class ScriptProcessor extends MsProcessor {
private String script;
/**
* 脚本语言
- * @see ScriptLanguageType
+ * {@link ScriptLanguageType}
*/
+ @Size(max = 20)
private String scriptLanguage;
/**
* 是否启用公共脚本
+ * 默认为 false
*/
private Boolean enableCommonScript = false;
/**
- * 脚本ID
+ * 公共脚本ID
*/
+ @Size(max = 50)
private String scriptId;
/**
* 公共脚本入参
*/
+ @Valid
private List params;
}
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/TimeWaitingProcessor.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/TimeWaitingProcessor.java
index 881892550f..972e414334 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/TimeWaitingProcessor.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/TimeWaitingProcessor.java
@@ -4,11 +4,16 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
import lombok.Data;
/**
+ * 等待时间处理器
* @Author: jianxing
* @CreateTime: 2023-11-07 09:59
*/
@Data
@JsonTypeName("TIME_WAITING")
public class TimeWaitingProcessor extends MsProcessor {
+ /**
+ * 等待时间
+ * 单位：毫秒
+ */
private Integer delay;
}
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/MsExtract.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/MsExtract.java
index 16d7155b2a..9ea7926bca 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/MsExtract.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/MsExtract.java
@@ -2,9 +2,21 @@ package io.metersphere.api.dto.request.processors.extract;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.metersphere.system.valid.EnumValue;
+import jakarta.validation.constraints.Size;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
+/**
+ * 提取处理器
+ *
+ * 该参数传参时，需要传入 extractType 字段，用于区分是哪种提取
+ * extractType 取值为:
+ * REGEX {@link RegexExtract}
+ * JSON_PATH {@link JSONPathExtract}
+ * X_PATH {@link XPathExtract}
+ *
+ */
@Data
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "extractType")
@JsonSubTypes({
@@ -16,14 +28,19 @@ public abstract class MsExtract {
/**
* 变量名
*/
+ @Size(max = 100)
private String variableName;
/**
* 参数类型
+ * 取值参考 {@link MsExtractType}
*/
+ @Size(max = 100)
+ @EnumValue(enumClass = MsExtractType.class)
private String variableType;
/**
* 表达式
*/
+ @Size(max = 200)
private String expression;
/**
* 是否启用
@@ -33,4 +50,19 @@ public abstract class MsExtract {
public boolean isValid() {
return StringUtils.isNotBlank(variableName) && StringUtils.isNotBlank(expression);
}
+
+ public enum MsExtractType {
+ /**
+ * 临时参数
+ */
+ TEMPORARY,
+ /**
+ * 环境参数
+ */
+ ENVIRONMENT,
+ /**
+ * 全局参数
+ */
+ GLOBAL;
+ }
}
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/RegexExtract.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/RegexExtract.java
index c1e15354a4..fb58122c98 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/RegexExtract.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/RegexExtract.java
@@ -1,6 +1,7 @@
package io.metersphere.api.dto.request.processors.extract;
import com.fasterxml.jackson.annotation.JsonTypeName;
+import io.metersphere.system.valid.EnumValue;
import lombok.Data;
@Data
@@ -8,54 +9,43 @@ import lombok.Data;
public class RegexExtract extends ResultMatchingExtract {
/**
* 表达式匹配规则
- * @see ExpressionRuleType
+ * 取值参考 {@link ExpressionRuleType} 中的 value
+ * 默认为表达式匹配
*/
- private String expressionMatchingRule;
+ @EnumValue(enumClass = ExpressionRuleType.class)
+ private String expressionMatchingRule = ExpressionRuleType.EXPRESSION.name();
/**
* 提取范围
- * @see ExtractScope
+ * 取值参考 {@link ExtractScope}
*/
+ @EnumValue(enumClass = ExtractScope.class)
private String extractScope;
+ /**
+ * 表达式匹配规则
+ */
public enum ExpressionRuleType {
/**
* 匹配表达式
*/
- EXPRESSION("$1$"),
+ EXPRESSION,
/**
* 匹配组
*/
- GROUP("$0$");
-
- private String value;
-
- ExpressionRuleType(String value) {
- this.value = value;
- }
-
- public String getValue() {
- return value;
- }
+ GROUP;
}
+ /**
+ * 提取对象
+ */
public enum ExtractScope {
- BODY("false"),
- REQUEST_HEADERS("request_headers"),
- UNESCAPED_BODY("unescaped"),
- BODY_AS_DOCUMENT("as_document"),
- RESPONSE_HEADERS("true"),
- URL("URL"),
- RESPONSE_CODE("code"),
- RESPONSE_MESSAGE("message");
-
- private String value;
-
- ExtractScope(String value) {
- this.value = value;
- }
-
- public String getValue() {
- return value;
- }
+ BODY,
+ REQUEST_HEADERS,
+ UNESCAPED_BODY,
+ BODY_AS_DOCUMENT,
+ RESPONSE_HEADERS,
+ URL,
+ RESPONSE_CODE,
+ RESPONSE_MESSAGE;
}
}
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/ResultMatchingExtract.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/ResultMatchingExtract.java
index ab2bfa7bf2..4df858bdbb 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/ResultMatchingExtract.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/ResultMatchingExtract.java
@@ -1,19 +1,27 @@
package io.metersphere.api.dto.request.processors.extract;
+import io.metersphere.system.valid.EnumValue;
+import jakarta.validation.constraints.Size;
import lombok.Data;
@Data
public abstract class ResultMatchingExtract extends MsExtract {
/**
* 结果匹配规则
- * 值为 ResultMatchingRuleType
+ * 取值参考 {@link ResultMatchingRuleType}
+ * 默认随机匹配
*/
- private String resultMatchingRule;
+ @Size(max = 100)
+ @EnumValue(enumClass = ResultMatchingRuleType.class)
+ private String resultMatchingRule = ResultMatchingRuleType.RANDOM.name();
/**
* 匹配第几条结果
*/
private Integer resultMatchingRuleNum;
+ /**
+ * 结果匹配规则
+ */
public enum ResultMatchingRuleType {
/**
* 随机匹配
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/XPathExtract.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/XPathExtract.java
index ce920a7741..649499351e 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/XPathExtract.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/request/processors/extract/XPathExtract.java
@@ -1,6 +1,7 @@
package io.metersphere.api.dto.request.processors.extract;
import com.fasterxml.jackson.annotation.JsonTypeName;
+import io.metersphere.system.valid.EnumValue;
import lombok.Data;
/**
@@ -9,6 +10,11 @@ import lombok.Data;
@Data
@JsonTypeName("X_PATH")
public class XPathExtract extends ResultMatchingExtract {
+ /**
+ * 提取范围
+ * 取值参考 {@link ResponseFormat}
+ */
+ @EnumValue(enumClass = ResponseFormat.class)
private String responseFormat;
public enum ResponseFormat {
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/schema/JsonSchemaItem.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/schema/JsonSchemaItem.java
index 6fd5c16f60..5afeaa4cfa 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/schema/JsonSchemaItem.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/schema/JsonSchemaItem.java
@@ -1,6 +1,11 @@
package io.metersphere.api.dto.schema;
+import io.metersphere.sdk.constants.ValueEnum;
+import io.metersphere.system.valid.EnumValue;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
import lombok.Data;
import java.math.BigDecimal;
@@ -8,22 +13,63 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+/**
+ * json-schema 参数项
+ */
@Data
public class JsonSchemaItem {
+ /**
+ * 示例
+ */
private Object example;
+ /**
+ * 参数ID
+ */
+ @NotBlank
+ @Size(max = 50)
private String id;
+ /**
+ * 参数名称
+ */
+ @Size(max = 200)
private String title;
- private String type = "string";
+ /**
+ * 参数类型
+ * 取值范围，参考 {@link JsonSchemaItemType}
+ * 默认为 string
+ */
+ @EnumValue(enumClass = JsonSchemaItemType.class)
+ private String type = JsonSchemaItemType.STRING.value;
+ /**
+ * 参数描述
+ */
private String description;
+ /**
+ * 子级参数
+ * 当 type 为 object 或者 array 时，使用该值
+ */
+ @Valid
private JsonSchemaItem items;
private Map mock;
private Map properties;
private JsonSchemaItem additionalProperties;
private List required;
private String pattern;
+ /**
+ * 最大长度
+ */
private Integer maxLength;
+ /**
+ * 最小长度
+ */
private Integer minLength;
+ /**
+ * 最小值
+ */
private BigDecimal minimum;
+ /**
+ * 最大值
+ */
private BigDecimal maximum;
private String schema;
private String format;
@@ -55,4 +101,28 @@ public class JsonSchemaItem {
this.items = new JsonSchemaItem();
}
}
+
+ /**
+ * json-schema 参数类型
+ */
+ enum JsonSchemaItemType implements ValueEnum {
+ STRING("string"),
+ NUMBER("number"),
+ INTEGER("integer"),
+ BOOLEAN("boolean"),
+ OBJECT("object"),
+ ARRAY("array"),
+ NULL("null");
+
+ private String value;
+
+ JsonSchemaItemType(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String getValue() {
+ return value;
+ }
+ }
}
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/body/MsBinaryBodyConverter.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/body/MsBinaryBodyConverter.java
index 4a331cbc68..83886f49c7 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/body/MsBinaryBodyConverter.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/body/MsBinaryBodyConverter.java
@@ -14,8 +14,7 @@ import org.apache.jmeter.protocol.http.util.HTTPFileArg;
public class MsBinaryBodyConverter extends MsBodyConverter {
@Override
public void parse(HTTPSamplerProxy sampler, BinaryBody body, ParameterConfig config) {
- ApiFile bodyFile = body.getBodyFile();
- HTTPFileArg httpFileArg = getHttpFileArg(bodyFile);
+ HTTPFileArg httpFileArg = getHttpFileArg(body);
sampler.setHTTPFiles(new HTTPFileArg[]{httpFileArg});
}
}
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/extract/RegexExtractConverter.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/extract/RegexExtractConverter.java
index 540f091bc6..11e0d83284 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/extract/RegexExtractConverter.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/extract/RegexExtractConverter.java
@@ -8,6 +8,8 @@ import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jorphan.collections.HashTree;
+import java.util.HashMap;
+
import static io.metersphere.api.parser.jmeter.constants.JmeterAlias.REGEX_EXTRACTOR_GUI;
/**
@@ -23,18 +25,42 @@ public class RegexExtractConverter extends ExtractConverter {
extractor.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass(REGEX_EXTRACTOR_GUI));
extractor.setRefName(msExtract.getVariableName());
extractor.setRegex(msExtract.getExpression());
- extractor.setUseField(msExtract.getExtractScope());
extractor.setEnabled(msExtract.getEnable());
-
+ extractor.setUseField(getUseField(msExtract.getExtractScope()));
+ extractor.setTemplate(getTemplate(msExtract.getExpressionMatchingRule()));
// 处理匹配多条等匹配规则
extractor.setMatchNumber(parseResultMatchingRule(msExtract));
-
- // $1$提取 JSON 响应中的第一个匹配项 $0$用于提取整个 JSON 响应
- if (StringUtils.isBlank(msExtract.getExpressionMatchingRule())) {
- extractor.setTemplate(RegexExtract.ExpressionRuleType.EXPRESSION.getValue());
- } else {
- extractor.setTemplate(msExtract.getExpressionMatchingRule());
- }
hashTree.add(extractor);
}
+
+ private String getTemplate(String expressionMatchingRule) {
+ // $1$提取 JSON 响应中的第一个匹配项 $0$用于提取整个 JSON 响应
+ HashMap ruleValueMap = new HashMap<>() {{
+ put(RegexExtract.ExpressionRuleType.EXPRESSION.name(), "$1$");
+ put(RegexExtract.ExpressionRuleType.GROUP.name(), "$0$");
+ }};
+ if (StringUtils.isBlank(expressionMatchingRule)) {
+ return ruleValueMap.get(RegexExtract.ExpressionRuleType.EXPRESSION.name());
+ } else {
+ return ruleValueMap.get(expressionMatchingRule);
+ }
+ }
+
+ private String getUseField(String extractScope) {
+ HashMap extractScopeMap = new HashMap<>() {{
+ put(RegexExtract.ExtractScope.BODY.name(), "false");
+ put(RegexExtract.ExtractScope.REQUEST_HEADERS.name(), "request_headers");
+ put(RegexExtract.ExtractScope.UNESCAPED_BODY.name(), "unescaped");
+ put(RegexExtract.ExtractScope.BODY_AS_DOCUMENT.name(), "as_document");
+ put(RegexExtract.ExtractScope.RESPONSE_HEADERS.name(), "true");
+ put(RegexExtract.ExtractScope.URL.name(), "URL");
+ put(RegexExtract.ExtractScope.RESPONSE_CODE.name(), "code");
+ put(RegexExtract.ExtractScope.RESPONSE_MESSAGE.name(), "message");
+ }};
+ if (StringUtils.isNotBlank(extractScope)) {
+ return extractScopeMap.get(extractScope);
+ } else {
+ return RegexExtract.ExtractScope.BODY.name();
+ }
+ }
}
diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/controller/MsHTTPElementTest.java b/backend/services/api-test/src/test/java/io/metersphere/api/controller/MsHTTPElementTest.java
index e00a30ec0e..d00944de6a 100644
--- a/backend/services/api-test/src/test/java/io/metersphere/api/controller/MsHTTPElementTest.java
+++ b/backend/services/api-test/src/test/java/io/metersphere/api/controller/MsHTTPElementTest.java
@@ -24,6 +24,7 @@ import io.metersphere.plugin.api.dto.ParameterConfig;
import io.metersphere.plugin.api.spi.AbstractMsTestElement;
import io.metersphere.project.constants.ScriptLanguageType;
import io.metersphere.sdk.constants.MsAssertionCondition;
+import io.metersphere.sdk.util.BeanUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -93,10 +94,7 @@ public class MsHTTPElementTest {
xmlBody.setValue("");
body.setXmlBody(xmlBody);
- BinaryBody binaryBody = new BinaryBody();
- binaryBody.setBodyFile(bodyFile);
- body.setBinaryBody(binaryBody);
-
+ body.setBinaryBody(BeanUtils.copyBean(new BinaryBody(), bodyFile));
return body;
}