From 6c350f327c6cb105855e4c491acd3855cfe617a4 Mon Sep 17 00:00:00 2001 From: hetao Date: Sun, 27 Sep 2020 21:03:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dopenapi=203=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=20=E4=BF=AE=E5=A4=8Dhttp=20response=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E5=90=8E=E4=B9=B1=E7=A0=81=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8Drequest=20url=E5=B8=A6=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E6=97=B6host=E5=AD=97=E6=AE=B5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../swaggeradmin/controller/DocController.java | 6 ++++++ .../com/gitee/swaggeradmin/service/DocService.java | 13 ++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) 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 83b1104..7c39d93 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,12 @@ 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); 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 bbc0636..ad9343f 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 { -- Gitee From cc4074618b16914717bd2d86f745a0d4dc88f071 Mon Sep 17 00:00:00 2001 From: hetao Date: Sun, 27 Sep 2020 21:15:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gitee/swaggeradmin/controller/DocController.java | 1 - 1 file changed, 1 deletion(-) 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 7c39d93..01bd6d3 100644 --- a/admin/src/main/java/com/gitee/swaggeradmin/controller/DocController.java +++ b/admin/src/main/java/com/gitee/swaggeradmin/controller/DocController.java @@ -127,7 +127,6 @@ public class DocController { headers.remove("host"); headers.remove("accept-encoding"); HttpTool.addHeader(requestBuilder, headers); - HttpTool.addHeader(requestBuilder, headers); switch (method.toUpperCase()) { case "GET": -- Gitee