From 5c79c49b846866bf4b2ea8579ba2bce98be44ff1 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Mon, 8 Nov 2021 16:41:59 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?= =?UTF-8?q?=E5=AF=BC=E5=85=A5swagger=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= =?UTF-8?q?=20--bug=3D1007229=20--user=3D=E8=B5=B5=E5=8B=87=20[github#6835?= =?UTF-8?q?]=E6=8E=A5=E5=8F=A3=E5=AF=BC=E5=87=BA=E5=90=8E=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=EF=BC=8C=E5=93=8D=E5=BA=94=E5=86=85=E5=AE=B9=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=8F=8F=E8=BF=B0=E4=BF=A1=E6=81=AF=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E4=BA=86=EF=BC=8C=E5=90=8C=E6=97=B6=E8=AF=B7=E6=B1=82=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=B8=AD=E7=9A=84=E5=80=BC=E6=B2=A1=E6=9C=89=E4=BA=86?= =?UTF-8?q?=20https://www.tapd.cn/55049933/s/1065451?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dto/definition/parse/Swagger3Parser.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java index fe3a3b5783..8b5400bc40 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java @@ -368,8 +368,14 @@ public class Swagger3Parser extends SwaggerAbstractParser { return jsonArray; } else if (schema instanceof BinarySchema) { return getDefaultValueByPropertyType(schema); + } else if (schema instanceof ObjectSchema) { + Object propertiesResult = parseSchemaProperties(schema, refSet, infoMap); + return propertiesResult == null ? getDefaultValueByPropertyType(schema) : propertiesResult; } else { - if (schema.getType() != null) { // 特判属性不是对象的情况，直接将基本类型赋值进去 + if (schema instanceof StringSchema) { + StringSchema stringSchema = (StringSchema) schema; + return stringSchema.getExample(); + } else if (schema.getType() != null) { // 特判属性不是对象的情况，直接将基本类型赋值进去 return schema; } Object propertiesResult = parseSchemaProperties(schema, refSet, infoMap);