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

fix(接口测试): 解决接口导入jsonschema时没有properties属性数据会错乱问题 

--user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001017370
This commit is contained in:
guoyuqi 2022-10-13 17:21:39 +08:00 committed by 建国
parent 04daa53a00
commit 66f79de62e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,6 +328,11 @@ public class Swagger3Parser extends SwaggerAbstractParser {
Set<String> refSet = new HashSet<>();
Map<String, Schema> infoMap = new HashMap();
Schema schema = mediaType.getSchema();
if (StringUtils.isBlank(schema.get$ref()) && schema.getItems()==null && StringUtils.isNotBlank(schema.getType()) && StringUtils.equals(schema.getType(),"string")) {
ObjectSchema objectSchema = new ObjectSchema();
objectSchema.setExample(schema.getExample());
schema = objectSchema;
}
Object bodyData = null;
if (!StringUtils.equals(contentType, org.springframework.http.MediaType.APPLICATION_JSON_VALUE)) {
bodyData = parseSchemaToJson(schema, refSet, infoMap);
@ -341,7 +346,11 @@ public class Swagger3Parser extends SwaggerAbstractParser {
} else if (StringUtils.equals(contentType, org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE)) {
parseKvBody(schema, body, bodyData, infoMap);
} else if (StringUtils.equals(contentType, org.springframework.http.MediaType.APPLICATION_JSON_VALUE)) {
body.setJsonSchema(parseSchema(schema, refSet));
JsonSchemaItem jsonSchemaItem = parseSchema(schema, refSet);
if (MapUtils.isEmpty(jsonSchemaItem.getProperties())) {
jsonSchemaItem.setProperties(new HashMap<>());
}
body.setJsonSchema(jsonSchemaItem);
body.setFormat("JSON-SCHEMA");
} else if (StringUtils.equals(contentType, org.springframework.http.MediaType.APPLICATION_XML_VALUE)) {
body.setRaw(parseXmlBody(schema, bodyData));
@ -513,7 +522,6 @@ public class Swagger3Parser extends SwaggerAbstractParser {
} else {
item.getMock().put(PropertyConstant.MOCK, "");
}
item.setDescription(schema.getDescription());
item.setPattern(schema.getPattern());
item.setMaxLength(schema.getMaxLength());