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

fix(接口测试): 修复特殊格式的swagger3导入，rest参数不显示的缺陷 

--bug=1034157 --user=王孝刚 【接口测试】swagger3版本导入，Rest参数不显示 https://www.tapd.cn/55049933/s/1451867
This commit is contained in:
wxg0103 2024-01-16 13:46:15 +08:00 committed by 刘瑞斌
parent 0802afcb34
commit d454efb85f
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
api-test/backend/src/main/java/io/metersphere/api/parse/api/Swagger3Parser.java
View File

@ -16,6 +16,7 @@ import io.metersphere.base.domain.ApiDefinitionWithBLOBs;
import io.metersphere.base.domain.Project;
import io.metersphere.commons.constants.PropertyConstant;
import io.metersphere.commons.constants.RequestTypeConstants;
import io.metersphere.commons.constants.SwaggerParameterType;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.JSON;
import io.metersphere.commons.utils.JSONUtil;
@ -165,6 +166,7 @@ public class Swagger3Parser extends SwaggerAbstractParser {
ApiDefinitionWithBLOBs apiDefinition = buildApiDefinition(request.getId(), operation, pathName, method, importRequest);
apiDefinition.setDescription(operation.getDescription());
parseParameters(operation, request);
parseParameters(pathItem, request);
parseRequestBody(operation.getRequestBody(), request.getBody());
addBodyHeader(request);
if (request.getBody().getKvs().size() > 1 && request.getBody().getKvs().get(0).getName() == null) {
@ -235,6 +237,25 @@ public class Swagger3Parser extends SwaggerAbstractParser {
});
}
private void parseParameters(PathItem path, MsHTTPSamplerProxy request) {
if (path.getParameters() == null) {
return;
}
List<Parameter> parameters = path.getParameters();
// 处理特殊格式 rest参数是和请求平级的情况
for (Parameter parameter : parameters) {
if (StringUtils.isNotBlank(parameter.getIn())) {
switch (parameter.getIn()) {
case SwaggerParameterType.PATH -> parsePathParameters(parameter, request.getRest());
case SwaggerParameterType.QUERY -> parseQueryParameters(parameter, request.getArguments());
case SwaggerParameterType.HEADER -> parseHeaderParameters(parameter, request.getHeaders());
case SwaggerParameterType.COOKIE -> parseCookieParameters(parameter, request.getHeaders());
}
}
}
}
private void parsePathParameters(Parameter parameter, List<KeyValue> rests) {
PathParameter pathParameter = (PathParameter) parameter;
rests.add(new KeyValue(pathParameter.getName(),
@ -568,7 +589,7 @@ public class Swagger3Parser extends SwaggerAbstractParser {
}
if (schema.getExample() != null) {
item.getMock().put(PropertyConstant.MOCK, schema.getExample());
} else if (StringUtils.isNotBlank(item.getMock().get(PropertyConstant.MOCK).toString())){
} else if (StringUtils.isNotBlank(item.getMock().get(PropertyConstant.MOCK).toString())) {
item.getMock().put(PropertyConstant.MOCK, item.getMock().get(PropertyConstant.MOCK));
} else {
item.getMock().put(PropertyConstant.MOCK, StringUtils.EMPTY);
@ -1276,7 +1297,7 @@ public class Swagger3Parser extends SwaggerAbstractParser {
String xml = XMLUtil.delXmlHeader(xmlText);
int startIndex = xml.indexOf("<", 0);
int endIndex = xml.indexOf(">", 0);
if (endIndex > startIndex+ 1 ) {
if (endIndex > startIndex + 1) {
String substring = xml.substring(startIndex + 1, endIndex);
bodyInfo = buildRefSchema(substring);
}