7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-11 21:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

2.1.0

Browse Source
This commit is contained in:
tanghc
2019-09-10 15:51:29 +08:00
parent b859e8b88f
commit d32d3931a1
4 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sop-website/src/main/java/com/gitee/sop/websiteserver/manager/SwaggerDocParser.java
View File

@@ -18,6 +18,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -170,7 +171,7 @@ public class SwaggerDocParser implements DocParser {
List<DocParameter> respParameterList = Collections.emptyList();
if (refInfo != null) {
String responseRef = refInfo.ref;
respParameterList = this.buildDocParameters(responseRef, docRoot);
respParameterList = this.buildDocParameters(responseRef, docRoot, true);
// 如果返回数组
if (refInfo.isArray) {
DocParameter docParameter = new DocParameter();
@@ -183,7 +184,7 @@ public class SwaggerDocParser implements DocParser {
return respParameterList;
}
protected List<DocParameter> buildDocParameters(String ref, JSONObject docRoot) {
protected List<DocParameter> buildDocParameters(String ref, JSONObject docRoot, boolean doSubRef) {
JSONObject responseObject = docRoot.getJSONObject("definitions").getJSONObject(ref);
JSONObject properties = responseObject.getJSONObject("properties");
Set<String> fieldNames = properties.keySet();
@@ -200,8 +201,11 @@ public class SwaggerDocParser implements DocParser {
docParameter.setName(fieldName);
docParameterList.add(docParameter);
RefInfo refInfo = this.getRefInfo(fieldInfo);
if (refInfo != null) {
List<DocParameter> refs = buildDocParameters(refInfo.ref, docRoot);
if (refInfo != null && doSubRef) {
// 如果是树状菜单的话，这里可能触发死循环
String subRef = refInfo.ref;
boolean nextDoRef = !Objects.equals(ref, subRef);
List<DocParameter> refs = buildDocParameters(subRef, docRoot, nextDoRef);
docParameter.setRefs(refs);
}
}