diff --git a/src/org/redkale/boot/RestDocs.java b/src/org/redkale/boot/RestDocs.java index 75ac6cc79..553337a2a 100644 --- a/src/org/redkale/boot/RestDocs.java +++ b/src/org/redkale/boot/RestDocs.java @@ -35,7 +35,7 @@ public class RestDocs extends HttpBaseServlet { serverList.add(map); HttpServer server = node.getServer(); map.put("address", server.getSocketAddress()); - List servletsList = new ArrayList<>(); + List> servletsList = new ArrayList<>(); map.put("servlets", servletsList); for (HttpServlet servlet : server.getPrepareServlet().getServlets()) { if (!(servlet instanceof HttpServlet)) continue; @@ -109,8 +109,14 @@ public class RestDocs extends HttpBaseServlet { } actionsList.add(actionmap); } + actionsList.sort((o1, o2) -> ((String) o1.get("url")).compareTo((String) o2.get("url"))); servletsList.add(servletmap); } + servletsList.sort((o1, o2) -> { + String[] mappings1 = (String[]) o1.get("mappings"); + String[] mappings2 = (String[]) o2.get("mappings"); + return mappings1.length > 0 ? (mappings2.length > 0 ? mappings1[0].compareTo(mappings2[0]) : 1) : -1; + }); } Map resultmap = new LinkedHashMap<>(); resultmap.put("servers", serverList); diff --git a/src/org/redkale/net/http/Rest.java b/src/org/redkale/net/http/Rest.java index a4095d132..af263077a 100644 --- a/src/org/redkale/net/http/Rest.java +++ b/src/org/redkale/net/http/Rest.java @@ -303,6 +303,7 @@ public final class Rest { String url = "/" + defmodulename.toLowerCase() + "/" + entry.name + (reqpath ? "/" : ""); av0.visit("url", url); av0.visit("actionid", entry.actionid); + av0.visit("comment", entry.comment); AnnotationVisitor av1 = av0.visitArray("methods"); for (String m : entry.methods) { @@ -330,6 +331,7 @@ public final class Rest { av0.visitEnd(); actionMap.put("url", url); actionMap.put("actionid", entry.actionid); + actionMap.put("comment", entry.comment); actionMap.put("methods", entry.methods); }