diff --git a/pom.xml b/pom.xml index 026dfc7..8ae8a54 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 smart-doc jar - 2.3.1 + 2.3.2 smart-doc https://github.com/smart-doc-group/smart-doc.git diff --git a/src/main/java/com/power/doc/template/IDocBuildTemplate.java b/src/main/java/com/power/doc/template/IDocBuildTemplate.java index 330a3ff..d34327f 100644 --- a/src/main/java/com/power/doc/template/IDocBuildTemplate.java +++ b/src/main/java/com/power/doc/template/IDocBuildTemplate.java @@ -116,21 +116,19 @@ public interface IDocBuildTemplate { return apiDocList; } List groups = apiConfig.getGroups(); - List finalApiDocs = new ArrayList<>(); - ApiDoc defaultGroup = ApiDoc.buildGroupApiDoc("default"); - // show default group - AtomicInteger order = new AtomicInteger(1); + List finalApiDocs = new ArrayList<>(); finalApiDocs.add(defaultGroup); - + AtomicInteger order = new AtomicInteger(1); + defaultGroup.setOrder(order.getAndIncrement()); if (CollectionUtil.isEmpty(groups)) { - defaultGroup.setOrder(order.getAndIncrement()); defaultGroup.getChildrenApiDocs().addAll(apiDocList); return finalApiDocs; } Map hasInsert = new HashMap<>(); for (ApiGroup group : groups) { ApiDoc groupApiDoc = ApiDoc.buildGroupApiDoc(group.getName()); + groupApiDoc.setOrder(order.getAndIncrement()); finalApiDocs.add(groupApiDoc); for (ApiDoc doc : apiDocList) { if (hasInsert.containsKey(doc.getAlias())) { @@ -161,10 +159,6 @@ public interface IDocBuildTemplate { hasInsert.put(doc.getAlias(), null); } } - if (CollectionUtil.isEmpty(defaultGroup.getChildrenApiDocs())) { - finalApiDocs.remove(defaultGroup); - } - finalApiDocs.forEach(group -> group.setOrder(order.getAndIncrement())); return finalApiDocs; }