From 1952d50b4542ea63a2c69458b66cb1ca978b8016 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Thu, 18 Mar 2021 17:33:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20swagger2.0=E5=AF=BC=E5=85=A5=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=AF=B7=E6=B1=82=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dto/definition/parse/Swagger2Parser.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java index 3701079c1e..3b05aefa87 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java @@ -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 properties = model.getProperties(); + if (model != null && properties != null) { + JSONObject bodyParameters = getBodyParameters(properties, new HashSet<>()); + return bodyParameters.toJSONString(); } } return "";