From 1e9fb7d195ffa2d7fcf2c6381daff662841b6127 Mon Sep 17 00:00:00 2001 From: luoyunchong Date: Thu, 2 Sep 2021 23:28:12 +0800 Subject: [PATCH] update package --- .../IGeekFan.AspNetCore.Knife4jUI.csproj | 23 ++-- .../Knife4UIOptions.cs | 2 + .../Knife4jUIMiddleware.cs | 12 +-- src/IGeekFan.AspNetCore.Knife4jUI/index.html | 28 +++-- .../knife4j/css/app.284871fa.css | 15 +++ .../knife4j/css/app.284871fa.css.gz | Bin 0 -> 87543 bytes .../knife4j/css/app.8efd8010.css | 15 --- .../knife4j/css/app.8efd8010.css.gz | Bin 86794 -> 0 bytes .../knife4j/css/chunk-51277dbe.57225f85.css | 1 + .../knife4j/css/chunk-vendors.3f2387de.css | 1 + .../knife4j/css/chunk-vendors.3f2387de.css.gz | Bin 0 -> 36820 bytes .../knife4j/js/app.703cb2b2.js | 1 + .../knife4j/js/app.703cb2b2.js.gz | Bin 0 -> 98426 bytes .../knife4j/js/app.d4cb69c0.js | 2 - .../knife4j/js/app.d4cb69c0.js.gz | Bin 96651 -> 0 bytes .../knife4j/js/chunk-069eb437.0b47243d.js | 2 + ...=> chunk-069eb437.0b47243d.js.LICENSE.txt} | 0 .../knife4j/js/chunk-069eb437.0b47243d.js.gz | Bin 0 -> 14056 bytes .../knife4j/js/chunk-0fd67716.d57e2c41.js | 1 + .../knife4j/js/chunk-0fd67716.d57e2c41.js.gz | Bin 0 -> 63486 bytes .../knife4j/js/chunk-2d0af44e.c299c1d4.js | 1 + .../knife4j/js/chunk-2d0bd799.cc91c520.js | 1 + .../knife4j/js/chunk-2d0d0b98.cb1dea78.js | 1 + .../knife4j/js/chunk-2d0da532.dd3c929c.js | 1 + .../knife4j/js/chunk-2d22269d.bd9173e1.js | 1 + .../knife4j/js/chunk-3b888a65.8737ce4f.js | 1 + .../knife4j/js/chunk-3b888a65.8737ce4f.js.gz | Bin 0 -> 11644 bytes .../knife4j/js/chunk-3ec4aaa8.a79d19f8.js | 1 + .../knife4j/js/chunk-3ec4aaa8.a79d19f8.js.gz | Bin 0 -> 35308 bytes .../knife4j/js/chunk-51277dbe.4335d8bb.js | 2 + .../js/chunk-51277dbe.4335d8bb.js.LICENSE.txt | 6 ++ .../knife4j/js/chunk-51277dbe.4335d8bb.js.gz | Bin 0 -> 9836 bytes .../knife4j/js/chunk-589faee0.b24e5f3d.js | 2 + .../js/chunk-589faee0.b24e5f3d.js.LICENSE.txt | 6 ++ .../knife4j/js/chunk-589faee0.b24e5f3d.js.gz | Bin 0 -> 5532 bytes .../knife4j/js/chunk-735c675c.76ef1019.js | 1 + .../knife4j/js/chunk-735c675c.76ef1019.js.gz | Bin 0 -> 112749 bytes .../knife4j/js/chunk-adb9e944.b888f4bd.js | 2 + .../js/chunk-adb9e944.b888f4bd.js.LICENSE.txt | 6 ++ .../knife4j/js/chunk-adb9e944.b888f4bd.js.gz | Bin 0 -> 4189 bytes .../knife4j/js/chunk-vendors.90e8ba20.js | 2 + .../js/chunk-vendors.90e8ba20.js.LICENSE.txt | 77 +++++++++++++ .../knife4j/js/chunk-vendors.90e8ba20.js.gz | Bin 0 -> 675564 bytes .../knife4j/js/chunk-vendors.e86fea24.js | 2 - .../js/chunk-vendors.e86fea24.js.LICENSE.txt | 91 ---------------- .../knife4j/js/chunk-vendors.e86fea24.js.gz | Bin 1208788 -> 0 bytes test/Basic/Controllers/FilesController.cs | 14 +++ test/Basic/Startup.cs | 10 +- .../Controllers/WeatherForecastController.cs | 56 +++++++++- test/Knife4jUIDemo/ErrorCode.cs | 81 ++++++++++++++ test/Knife4jUIDemo/Knife4jUIDemo.xml | 102 ++++++++++++++++++ test/Knife4jUIDemo/Startup.cs | 8 +- 52 files changed, 434 insertions(+), 144 deletions(-) create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/css/app.284871fa.css create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/css/app.284871fa.css.gz delete mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/css/app.8efd8010.css delete mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/css/app.8efd8010.css.gz create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/css/chunk-51277dbe.57225f85.css create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/css/chunk-vendors.3f2387de.css create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/css/chunk-vendors.3f2387de.css.gz create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/app.703cb2b2.js create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/app.703cb2b2.js.gz delete mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/app.d4cb69c0.js delete mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/app.d4cb69c0.js.gz create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-069eb437.0b47243d.js rename src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/{app.d4cb69c0.js.LICENSE.txt => chunk-069eb437.0b47243d.js.LICENSE.txt} (100%) create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-069eb437.0b47243d.js.gz create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-0fd67716.d57e2c41.js create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-0fd67716.d57e2c41.js.gz create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-2d0af44e.c299c1d4.js create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-2d0bd799.cc91c520.js create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-2d0d0b98.cb1dea78.js create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-2d0da532.dd3c929c.js create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-2d22269d.bd9173e1.js create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-3b888a65.8737ce4f.js create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-3b888a65.8737ce4f.js.gz create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-3ec4aaa8.a79d19f8.js create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-3ec4aaa8.a79d19f8.js.gz create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-51277dbe.4335d8bb.js create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-51277dbe.4335d8bb.js.LICENSE.txt create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-51277dbe.4335d8bb.js.gz create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-589faee0.b24e5f3d.js create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-589faee0.b24e5f3d.js.LICENSE.txt create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-589faee0.b24e5f3d.js.gz create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-735c675c.76ef1019.js create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-735c675c.76ef1019.js.gz create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-adb9e944.b888f4bd.js create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-adb9e944.b888f4bd.js.LICENSE.txt create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-adb9e944.b888f4bd.js.gz create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-vendors.90e8ba20.js create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-vendors.90e8ba20.js.LICENSE.txt create mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-vendors.90e8ba20.js.gz delete mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-vendors.e86fea24.js delete mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-vendors.e86fea24.js.LICENSE.txt delete mode 100644 src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-vendors.e86fea24.js.gz create mode 100644 test/Knife4jUIDemo/ErrorCode.cs diff --git a/src/IGeekFan.AspNetCore.Knife4jUI/IGeekFan.AspNetCore.Knife4jUI.csproj b/src/IGeekFan.AspNetCore.Knife4jUI/IGeekFan.AspNetCore.Knife4jUI.csproj index fcda3f7..7f566c5 100644 --- a/src/IGeekFan.AspNetCore.Knife4jUI/IGeekFan.AspNetCore.Knife4jUI.csproj +++ b/src/IGeekFan.AspNetCore.Knife4jUI/IGeekFan.AspNetCore.Knife4jUI.csproj @@ -1,39 +1,46 @@  - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1;net5.0 Middleware to expose an embedded version of the knife4j-vue-v3 from an ASP.NET Core application $(NoWarn);1591 true - + IGeekFan.AspNetCore.Knife4jUI swagger;documentation;discovery;help;webapi;aspnet;aspnetcore https://github.com/luoyunchong/IGeekFan.AspNetCore.Knife4jUI git https://github.com/luoyunchong/IGeekFan.AspNetCore.Knife4jUI.git IGeekFan.AspNetCore.Knife4jUI - 0.0.7 + 0.0.9 igeekfan;xiaoym; true Apache License 2.0 - 0.0.8.0 - 0.0.8.0 + 0.0.9.0 + 0.0.9.0 + + + + + true + snupkg true true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + - + - + - + diff --git a/src/IGeekFan.AspNetCore.Knife4jUI/Knife4UIOptions.cs b/src/IGeekFan.AspNetCore.Knife4jUI/Knife4UIOptions.cs index b87d81e..ac971c1 100644 --- a/src/IGeekFan.AspNetCore.Knife4jUI/Knife4UIOptions.cs +++ b/src/IGeekFan.AspNetCore.Knife4jUI/Knife4UIOptions.cs @@ -136,6 +136,8 @@ namespace IGeekFan.AspNetCore.Knife4jUI public string Url { get; set; } public string Name { get; set; } + + public string SwaggerVersion { get; set; } = "3.0"; } public enum ModelRendering diff --git a/src/IGeekFan.AspNetCore.Knife4jUI/Knife4jUIMiddleware.cs b/src/IGeekFan.AspNetCore.Knife4jUI/Knife4jUIMiddleware.cs index 7b2bb6b..de12ba7 100644 --- a/src/IGeekFan.AspNetCore.Knife4jUI/Knife4jUIMiddleware.cs +++ b/src/IGeekFan.AspNetCore.Knife4jUI/Knife4jUIMiddleware.cs @@ -14,8 +14,8 @@ using System.Text.Json; using System.Text.Json.Serialization; using Microsoft.AspNetCore.Hosting; using System.Collections.Generic; -#if NETCOREAPP3_0 -using IHostingEnvironment = Microsoft.AspNetCore.Hosting.IWebHostEnvironment; +#if NETSTANDARD2_0 +using IWebHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment; #endif namespace IGeekFan.AspNetCore.Knife4jUI { @@ -29,7 +29,7 @@ namespace IGeekFan.AspNetCore.Knife4jUI public Knife4jUIMiddleware( RequestDelegate next, - IHostingEnvironment hostingEnv, + IWebHostEnvironment hostingEnv, ILoggerFactory loggerFactory, Knife4UIOptions options) { @@ -66,7 +66,7 @@ namespace IGeekFan.AspNetCore.Knife4jUI return; } - if (httpMethod == "GET" && Regex.IsMatch(path, $"^/v3/api-docs/swagger-config$")) + if (httpMethod == "GET" && Regex.IsMatch(path, $"^/swagger-resources$")) { await RespondWithConfig(httpContext.Response); return; @@ -77,12 +77,12 @@ namespace IGeekFan.AspNetCore.Knife4jUI private async Task RespondWithConfig(HttpResponse response) { - await response.WriteAsync(JsonSerializer.Serialize(_options.ConfigObject, _jsonSerializerOptions)); + await response.WriteAsync(JsonSerializer.Serialize(_options.ConfigObject.Urls, _jsonSerializerOptions)); } private StaticFileMiddleware CreateStaticFileMiddleware( RequestDelegate next, - IHostingEnvironment hostingEnv, + IWebHostEnvironment hostingEnv, ILoggerFactory loggerFactory, Knife4UIOptions options) { diff --git a/src/IGeekFan.AspNetCore.Knife4jUI/index.html b/src/IGeekFan.AspNetCore.Knife4jUI/index.html index 06b2a46..fc75ae8 100644 --- a/src/IGeekFan.AspNetCore.Knife4jUI/index.html +++ b/src/IGeekFan.AspNetCore.Knife4jUI/index.html @@ -6,17 +6,33 @@ %(DocumentTitle) - - - - + + + + + + + + + + + + + + + + + + + + %(HeadContent)
- - + +