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/metersphere

This commit is contained in:
fit2-zhao 2021-03-18 17:38:09 +08:00
parent 5a98df399b 3b10ebcdbd
commit 03c171e66d
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java
View File

@ -137,7 +137,7 @@ public class Swagger2Parser extends SwaggerAbstractParser {
private String getBodyType(Operation operation) {
if (CollectionUtils.isEmpty(operation.getConsumes())) {
return Body.RAW;
return Body.JSON;
}
String contentType = operation.getConsumes().get(0);
return getBodyType(contentType);
@ -238,12 +238,10 @@ public class Swagger2Parser extends SwaggerAbstractParser {
return propertyList.toString();
} else if (schema instanceof ModelImpl) {
ModelImpl model = (ModelImpl) schema;
if (StringUtils.equals("object", model.getType())) {
model.getProperties();
if (model != null) {
JSONObject bodyParameters = getBodyParameters(model.getProperties(), new HashSet<>());
return bodyParameters.toJSONString();
}
Map<String, Property> properties = model.getProperties();
if (model != null && properties != null) {
JSONObject bodyParameters = getBodyParameters(properties, new HashSet<>());
return bodyParameters.toJSONString();
}
}
return "";