提交 37c918b2 authored 作者: mry's avatar mry

fix(web): 修复了最外层的array类型的解析不出来问题

上级 4b06ed0b
...@@ -236,13 +236,15 @@ public class SwaggerController { ...@@ -236,13 +236,15 @@ public class SwaggerController {
if ("array".equalsIgnoreCase(schemaType)) { if ("array".equalsIgnoreCase(schemaType)) {
JSONObject items = schema.getJSONObject("items"); JSONObject items = schema.getJSONObject("items");
if (items.containsKey("$ref")) { if (items.containsKey("$ref")) {
ref = schema.getString("$ref"); ref = items.getString("$ref");
param.setType(schemaType);
} else { } else {
List<ParameterVo> childParamList = new ArrayList<>(); List<ParameterVo> childParamList = new ArrayList<>();
ParameterVo childParam = new ParameterVo(); ParameterVo childParam = new ParameterVo();
childParam.setName(""); childParam.setName("");
childParam.setType(items.getString("type")); childParam.setType(items.getString("type"));
childParamList.add(childParam); childParamList.add(childParam);
param.setType(schemaType);
param.setChildParam(childParamList); param.setChildParam(childParamList);
} }
} else { } else {
...@@ -252,7 +254,9 @@ public class SwaggerController { ...@@ -252,7 +254,9 @@ public class SwaggerController {
String def = ref.substring(14); String def = ref.substring(14);
JSONObject defJson = refMap.get(def); JSONObject defJson = refMap.get(def);
if (defJson != null) { if (defJson != null) {
if (!StringUtils.isNotBlank(param.getType())) {
param.setType(defJson.getString("type")); param.setType(defJson.getString("type"));
}
JSONObject properties = defJson.getJSONObject("properties"); JSONObject properties = defJson.getJSONObject("properties");
Set<String> propertiesSet = properties.keySet(); Set<String> propertiesSet = properties.keySet();
List<ParameterVo> childParamList = new ArrayList<>(); List<ParameterVo> childParamList = new ArrayList<>();
...@@ -471,7 +475,7 @@ public class SwaggerController { ...@@ -471,7 +475,7 @@ public class SwaggerController {
String swaggerUrl; String swaggerUrl;
try { try {
swaggerUrl = String.format("%s/v2/api-docs", environment.getIp()); swaggerUrl = String.format("%s/v2/api-docs", environment.getIp());
}catch (NullPointerException e){ } catch (NullPointerException e) {
e.printStackTrace(); e.printStackTrace();
throw new GlobalException("请先选择环境"); throw new GlobalException("请先选择环境");
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论