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

fix(接口测试)：修复接口导出swagger3.0部分响应体丢失问题 

--bug=1024644 --user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001024644
This commit is contained in:
guoyuqi 2023-03-22 11:26:20 +08:00 committed by fit2-zhao
parent 22b3c05213
commit 7e4d494393
1 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -808,13 +808,32 @@ public class Swagger3Parser extends SwaggerAbstractParser {
} }
if (StringUtils.isNotBlank(type)) { if (StringUtils.isNotBlank(type)) {
if (StringUtils.equals(type, PropertyConstant.ARRAY)) { if (StringUtils.equals(type, PropertyConstant.ARRAY)) {
JSONObject items = requestBody.optJSONObject(PropertyConstant.ITEMS); JSONArray items = requestBody.optJSONArray(PropertyConstant.ITEMS);
JSONObject itemProperties = new JSONObject();
parsedParam.put(PropertyConstant.TYPE, PropertyConstant.ARRAY); parsedParam.put(PropertyConstant.TYPE, PropertyConstant.ARRAY);
JSONObject item = buildJsonSchema(items, required); if (items != null) {
JSONObject itemsObject = new JSONObject();
if (items.length() > 0) {
items.forEach(item -> {
if (item instanceof JSONObject) {
JSONObject itemJson = buildJsonSchema((JSONObject) item, required);
if (itemJson != null) {
Set<String> keys = itemJson.keySet();
for (String key : keys) {
itemProperties.put(key, itemJson.get(key));
}
}
}
});
}
itemsObject.put(PropertyConstant.PROPERTIES, itemProperties);
parsedParam.put(PropertyConstant.ITEMS, itemsObject.optJSONObject(PropertyConstant.PROPERTIES));
} else {
parsedParam.put(PropertyConstant.ITEMS, new JSONObject());
}
if (StringUtils.isNotBlank(requestBody.optString("description"))) { if (StringUtils.isNotBlank(requestBody.optString("description"))) {
parsedParam.put("description", requestBody.optString("description")); parsedParam.put("description", requestBody.optString("description"));
} }
parsedParam.put(PropertyConstant.ITEMS, item);
} else if (StringUtils.equals(type, PropertyConstant.OBJECT)) { } else if (StringUtils.equals(type, PropertyConstant.OBJECT)) {
parsedParam.put(PropertyConstant.TYPE, PropertyConstant.OBJECT); parsedParam.put(PropertyConstant.TYPE, PropertyConstant.OBJECT);
JSONObject properties = requestBody.optJSONObject(PropertyConstant.PROPERTIES); JSONObject properties = requestBody.optJSONObject(PropertyConstant.PROPERTIES);
@ -1004,8 +1023,23 @@ public class Swagger3Parser extends SwaggerAbstractParser {
property.put("description", obj.optString("description")); property.put("description", obj.optString("description"));
property.put(PropertyConstant.REQUIRED, obj.optString(PropertyConstant.REQUIRED)); property.put(PropertyConstant.REQUIRED, obj.optString(PropertyConstant.REQUIRED));
if (obj.optJSONObject(PropertyConstant.REQUIRED) != null) { if (obj.optJSONObject(PropertyConstant.REQUIRED) != null) {
JSONObject properties1 = buildFormDataSchema(obj.optJSONObject(PropertyConstant.REQUIRED)); JSONObject childProperties = buildFormDataSchema(obj.optJSONObject(PropertyConstant.REQUIRED));
property.put(PropertyConstant.REQUIRED, properties1.optJSONObject(PropertyConstant.REQUIRED)); property.put(PropertyConstant.REQUIRED, childProperties.optJSONObject(PropertyConstant.REQUIRED));
}
if (obj.optJSONObject(PropertyConstant.PROPERTIES) != null) {
JSONObject childProperties = buildFormDataSchema(obj.optJSONObject(PropertyConstant.PROPERTIES));
property.put(PropertyConstant.PROPERTIES, childProperties.optJSONObject(PropertyConstant.PROPERTIES));
} else {
JSONObject childProperties = buildJsonSchema(obj, new JSONArray());
if (StringUtils.equalsIgnoreCase(obj.optString(PropertyConstant.TYPE), PropertyConstant.ARRAY)) {
if (childProperties.optJSONObject(PropertyConstant.ITEMS) != null) {
property.put(PropertyConstant.ITEMS, childProperties.optJSONObject(PropertyConstant.ITEMS));
}
} else {
if (childProperties.optJSONObject(PropertyConstant.PROPERTIES) != null) {
property.put(PropertyConstant.PROPERTIES, childProperties.optJSONObject(PropertyConstant.PROPERTIES));
}
}
} }
properties.put(key, property); properties.put(key, property);
} }
@ -1146,9 +1180,16 @@ public class Swagger3Parser extends SwaggerAbstractParser {
required = jsonObject.optJSONArray(PropertyConstant.REQUIRED); required = jsonObject.optJSONArray(PropertyConstant.REQUIRED);
} }
if (required == null) { if (required == null) {
JSONObject items = jsonObject.optJSONObject(PropertyConstant.ITEMS); JSONArray items = jsonObject.optJSONArray(PropertyConstant.ITEMS);
if (items != null) { if (items != null && items.length() > 0) {
required = items.optJSONArray(PropertyConstant.REQUIRED); JSONArray finalRequired = new JSONArray();
items.forEach(item -> {
if (item instanceof JSONObject) {
JSONObject itemRequired = ((JSONObject) item).optJSONObject(PropertyConstant.REQUIRED);
finalRequired.put(itemRequired);
}
});
required = finalRequired;
} }
} }
bodyInfo = buildJsonSchema(jsonObject, required); bodyInfo = buildJsonSchema(jsonObject, required);