diff --git a/admin/src/main/java/com/gitee/swaggeradmin/controller/DocController.java b/admin/src/main/java/com/gitee/swaggeradmin/controller/DocController.java index 83b11042e504d45953aa5bbb3fd361b8c42e7c91..01bd6d3ae56f18dd0039530edb9db36e734aeac1 100644 --- a/admin/src/main/java/com/gitee/swaggeradmin/controller/DocController.java +++ b/admin/src/main/java/com/gitee/swaggeradmin/controller/DocController.java @@ -121,6 +121,11 @@ public class DocController { Request.Builder requestBuilder = new Request.Builder().url(url); // 添加header + for (Map.Entry entry : headers.entrySet()) { + System.out.println(entry.getKey() + " :" + entry.getValue()); + } + headers.remove("host"); + headers.remove("accept-encoding"); HttpTool.addHeader(requestBuilder, headers); switch (method.toUpperCase()) { diff --git a/admin/src/main/java/com/gitee/swaggeradmin/service/DocService.java b/admin/src/main/java/com/gitee/swaggeradmin/service/DocService.java index bbc06363ff2cf91e9461aaad62063d8b11f95612..ad9343fc7af5134b50c7c54e62a1cfd0f4d52980 100644 --- a/admin/src/main/java/com/gitee/swaggeradmin/service/DocService.java +++ b/admin/src/main/java/com/gitee/swaggeradmin/service/DocService.java @@ -358,7 +358,7 @@ public class DocService { private DocInfo parseDoc(String docContent, SwaggerInfo swaggerInfo) { String url = swaggerInfo.getUrl(); - DocParser docParser = this.getSwaggerDocParser(url); + DocParser docParser = this.getSwaggerDocParser(url, docContent); DocInfo docInfo = docParser.parseJson(docContent); this.storeItems(docInfo); docInfo.setSwaggerId(swaggerInfo.getId()); @@ -374,14 +374,9 @@ public class DocService { }); } - private DocParser getSwaggerDocParser(String url) { - if (url.contains("v2/api-docs")) { - return docParserV2; - } else if (url.contains("v3/api-docs")) { - return docParserV3; - } else { - return docParserV2; - } + private DocParser getSwaggerDocParser(String url,String json) { + JSONObject docRoot = JSON.parseObject(json, Feature.OrderedField, Feature.DisableCircularReferenceDetect); + return docRoot.containsKey("openapi") ? docParserV3 : docParserV2; } private static class SwaggerResource {