wanjia950611
/
smart-doc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Roll back the fix for #I4IIC4 issue .

This commit is contained in:
shalousun 2021-11-21 20:30:23 +08:00
parent a4abc7866f
commit 228cffc6ea
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>smart-doc</artifactId> <artifactId>smart-doc</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>2.3.1</version> <version>2.3.2</version>
<name>smart-doc</name> <name>smart-doc</name>
<url>https://github.com/smart-doc-group/smart-doc.git</url> <url>https://github.com/smart-doc-group/smart-doc.git</url>

14
src/main/java/com/power/doc/template/IDocBuildTemplate.java vendored
View File

@ -116,21 +116,19 @@ public interface IDocBuildTemplate<T> {
return apiDocList; return apiDocList;
} }
List<ApiGroup> groups = apiConfig.getGroups(); List<ApiGroup> groups = apiConfig.getGroups();
List<ApiDoc> finalApiDocs = new ArrayList<>();
ApiDoc defaultGroup = ApiDoc.buildGroupApiDoc("default"); ApiDoc defaultGroup = ApiDoc.buildGroupApiDoc("default");
// show default group List<ApiDoc> finalApiDocs = new ArrayList<>();
AtomicInteger order = new AtomicInteger(1);
finalApiDocs.add(defaultGroup); finalApiDocs.add(defaultGroup);
AtomicInteger order = new AtomicInteger(1);
if (CollectionUtil.isEmpty(groups)) {
defaultGroup.setOrder(order.getAndIncrement()); defaultGroup.setOrder(order.getAndIncrement());
if (CollectionUtil.isEmpty(groups)) {
defaultGroup.getChildrenApiDocs().addAll(apiDocList); defaultGroup.getChildrenApiDocs().addAll(apiDocList);
return finalApiDocs; return finalApiDocs;
} }
Map<String, String> hasInsert = new HashMap<>(); Map<String, String> hasInsert = new HashMap<>();
for (ApiGroup group : groups) { for (ApiGroup group : groups) {
ApiDoc groupApiDoc = ApiDoc.buildGroupApiDoc(group.getName()); ApiDoc groupApiDoc = ApiDoc.buildGroupApiDoc(group.getName());
groupApiDoc.setOrder(order.getAndIncrement());
finalApiDocs.add(groupApiDoc); finalApiDocs.add(groupApiDoc);
for (ApiDoc doc : apiDocList) { for (ApiDoc doc : apiDocList) {
if (hasInsert.containsKey(doc.getAlias())) { if (hasInsert.containsKey(doc.getAlias())) {
@ -161,10 +159,6 @@ public interface IDocBuildTemplate<T> {
hasInsert.put(doc.getAlias(), null); hasInsert.put(doc.getAlias(), null);
} }
} }
if (CollectionUtil.isEmpty(defaultGroup.getChildrenApiDocs())) {
finalApiDocs.remove(defaultGroup);
}
finalApiDocs.forEach(group -> group.setOrder(order.getAndIncrement()));
return finalApiDocs; return finalApiDocs;
} }