diff --git a/IGeekFan.AspNetCore.Knife4jUI.sln b/IGeekFan.AspNetCore.Knife4jUI.sln index 10ae2d8..d8d78ba 100644 --- a/IGeekFan.AspNetCore.Knife4jUI.sln +++ b/IGeekFan.AspNetCore.Knife4jUI.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.30330.147 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{929BB2D7-C678-4BE8-8AA9-F271A2AE4545}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IGeekFan.AspNetCore.Knife4jUI", "src\IGeekFan.AspNetCore.SwaggerUI\IGeekFan.AspNetCore.Knife4jUI.csproj", "{4589D4A2-AAC0-40BD-8A8E-2EBB2B68DA22}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{75C51574-4CBD-403B-8182-8BF2A6DCFD43}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Basic", "test\Basic\Basic.csproj", "{88972F96-96D7-40A7-90DA-ED04C9ED9B33}" @@ -22,16 +20,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C146 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SwaggerUI_IndexStream_Knife4jUI_Demo", "samples\SwaggerUI_IndexStream_Knife4jUI_Demo\SwaggerUI_IndexStream_Knife4jUI_Demo.csproj", "{1D6FD5CA-5D58-4895-8545-A93099CE1AD4}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IGeekFan.AspNetCore.Knife4jUI", "src\IGeekFan.AspNetCore.Knife4jUI\IGeekFan.AspNetCore.Knife4jUI.csproj", "{6C784918-BE29-4FEF-8AC3-9D34A38DE822}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4589D4A2-AAC0-40BD-8A8E-2EBB2B68DA22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4589D4A2-AAC0-40BD-8A8E-2EBB2B68DA22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4589D4A2-AAC0-40BD-8A8E-2EBB2B68DA22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4589D4A2-AAC0-40BD-8A8E-2EBB2B68DA22}.Release|Any CPU.Build.0 = Release|Any CPU {88972F96-96D7-40A7-90DA-ED04C9ED9B33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {88972F96-96D7-40A7-90DA-ED04C9ED9B33}.Debug|Any CPU.Build.0 = Debug|Any CPU {88972F96-96D7-40A7-90DA-ED04C9ED9B33}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -44,15 +40,19 @@ Global {1D6FD5CA-5D58-4895-8545-A93099CE1AD4}.Debug|Any CPU.Build.0 = Debug|Any CPU {1D6FD5CA-5D58-4895-8545-A93099CE1AD4}.Release|Any CPU.ActiveCfg = Release|Any CPU {1D6FD5CA-5D58-4895-8545-A93099CE1AD4}.Release|Any CPU.Build.0 = Release|Any CPU + {6C784918-BE29-4FEF-8AC3-9D34A38DE822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6C784918-BE29-4FEF-8AC3-9D34A38DE822}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6C784918-BE29-4FEF-8AC3-9D34A38DE822}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6C784918-BE29-4FEF-8AC3-9D34A38DE822}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {4589D4A2-AAC0-40BD-8A8E-2EBB2B68DA22} = {929BB2D7-C678-4BE8-8AA9-F271A2AE4545} {88972F96-96D7-40A7-90DA-ED04C9ED9B33} = {75C51574-4CBD-403B-8182-8BF2A6DCFD43} {86A24FA0-E85D-4BDD-97D7-B990C50A40A9} = {75C51574-4CBD-403B-8182-8BF2A6DCFD43} {1D6FD5CA-5D58-4895-8545-A93099CE1AD4} = {C146A419-15E0-4475-9623-706C5E2DCE0B} + {6C784918-BE29-4FEF-8AC3-9D34A38DE822} = {929BB2D7-C678-4BE8-8AA9-F271A2AE4545} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9D77CCB4-F597-421B-9EF9-52D4B0AC382D} diff --git a/README.md b/README.md index a6d7d99..8b4b64c 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ CLI : dotnet add package IGeekFan.AspNetCore.Knife4jUI ``` using System.Reflection; +using Microsoft.AspNetCore.Mvc.Controllers using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; using IGeekFan.AspNetCore.Knife4jUI; diff --git a/samples/SwaggerUI_IndexStream_Knife4jUI_Demo/Startup.cs b/samples/SwaggerUI_IndexStream_Knife4jUI_Demo/Startup.cs index aaebbb7..71aaa2b 100644 --- a/samples/SwaggerUI_IndexStream_Knife4jUI_Demo/Startup.cs +++ b/samples/SwaggerUI_IndexStream_Knife4jUI_Demo/Startup.cs @@ -6,6 +6,7 @@ using System.Text.Json.Serialization; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.FileProviders; @@ -39,7 +40,8 @@ namespace Knife4jUIDemo }); c.CustomOperationIds(apiDesc => { - return apiDesc.TryGetMethodInfo(out MethodInfo methodInfo) ? methodInfo.Name : null; + var controllerAction = apiDesc.ActionDescriptor as ControllerActionDescriptor; + return controllerAction.ControllerName + "-" + controllerAction.ActionName; }); }); } diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/IGeekFan.AspNetCore.Knife4jUI.csproj b/src/IGeekFan.AspNetCore.Knife4jUI/IGeekFan.AspNetCore.Knife4jUI.csproj similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/IGeekFan.AspNetCore.Knife4jUI.csproj rename to src/IGeekFan.AspNetCore.Knife4jUI/IGeekFan.AspNetCore.Knife4jUI.csproj diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/Knife4UIBuilderExtensions.cs b/src/IGeekFan.AspNetCore.Knife4jUI/Knife4UIBuilderExtensions.cs similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/Knife4UIBuilderExtensions.cs rename to src/IGeekFan.AspNetCore.Knife4jUI/Knife4UIBuilderExtensions.cs diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/Knife4UIOptions.cs b/src/IGeekFan.AspNetCore.Knife4jUI/Knife4UIOptions.cs similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/Knife4UIOptions.cs rename to src/IGeekFan.AspNetCore.Knife4jUI/Knife4UIOptions.cs diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/Knife4UIOptionsExtensions.cs b/src/IGeekFan.AspNetCore.Knife4jUI/Knife4UIOptionsExtensions.cs similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/Knife4UIOptionsExtensions.cs rename to src/IGeekFan.AspNetCore.Knife4jUI/Knife4UIOptionsExtensions.cs diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/Knife4jUIMiddleware.cs b/src/IGeekFan.AspNetCore.Knife4jUI/Knife4jUIMiddleware.cs similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/Knife4jUIMiddleware.cs rename to src/IGeekFan.AspNetCore.Knife4jUI/Knife4jUIMiddleware.cs diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/favicon.ico b/src/IGeekFan.AspNetCore.Knife4jUI/favicon.ico similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/favicon.ico rename to src/IGeekFan.AspNetCore.Knife4jUI/favicon.ico diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/index.html b/src/IGeekFan.AspNetCore.Knife4jUI/index.html similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/index.html rename to src/IGeekFan.AspNetCore.Knife4jUI/index.html diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/css/app.8f08f96a.css b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/css/app.8f08f96a.css similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/css/app.8f08f96a.css rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/css/app.8f08f96a.css diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/css/app.8f08f96a.css.gz b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/css/app.8f08f96a.css.gz similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/css/app.8f08f96a.css.gz rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/css/app.8f08f96a.css.gz diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/fonts/fontawesome-webfont.706450d7.ttf b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/fonts/fontawesome-webfont.706450d7.ttf similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/fonts/fontawesome-webfont.706450d7.ttf rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/fonts/fontawesome-webfont.706450d7.ttf diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/fonts/fontawesome-webfont.97493d3f.woff2 b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/fonts/fontawesome-webfont.97493d3f.woff2 similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/fonts/fontawesome-webfont.97493d3f.woff2 rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/fonts/fontawesome-webfont.97493d3f.woff2 diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/fonts/fontawesome-webfont.d9ee23d5.woff b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/fonts/fontawesome-webfont.d9ee23d5.woff similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/fonts/fontawesome-webfont.d9ee23d5.woff rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/fonts/fontawesome-webfont.d9ee23d5.woff diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/fonts/fontawesome-webfont.f7c2b4b7.eot b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/fonts/fontawesome-webfont.f7c2b4b7.eot similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/fonts/fontawesome-webfont.f7c2b4b7.eot rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/fonts/fontawesome-webfont.f7c2b4b7.eot diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/fonts/iconfont.4ca3d0c0.ttf b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/fonts/iconfont.4ca3d0c0.ttf similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/fonts/iconfont.4ca3d0c0.ttf rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/fonts/iconfont.4ca3d0c0.ttf diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/fonts/iconfont.e2d2b98e.eot b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/fonts/iconfont.e2d2b98e.eot similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/fonts/iconfont.e2d2b98e.eot rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/fonts/iconfont.e2d2b98e.eot diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/img/editormd-logo.53ea80e2.svg b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/img/editormd-logo.53ea80e2.svg similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/img/editormd-logo.53ea80e2.svg rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/img/editormd-logo.53ea80e2.svg diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/img/fontawesome-webfont.29800836.svg b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/img/fontawesome-webfont.29800836.svg similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/img/fontawesome-webfont.29800836.svg rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/img/fontawesome-webfont.29800836.svg diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/img/iconfont.1d48c203.svg b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/img/iconfont.1d48c203.svg similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/img/iconfont.1d48c203.svg rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/img/iconfont.1d48c203.svg diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/img/loading.c929501e.gif b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/img/loading.c929501e.gif similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/img/loading.c929501e.gif rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/img/loading.c929501e.gif diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/img/loading@2x.695405a9.gif b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/img/loading@2x.695405a9.gif similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/img/loading@2x.695405a9.gif rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/img/loading@2x.695405a9.gif diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/img/loading@3x.65eacf61.gif b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/img/loading@3x.65eacf61.gif similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/img/loading@3x.65eacf61.gif rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/img/loading@3x.65eacf61.gif diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/js/app.c02977a4.js b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/app.c02977a4.js similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/js/app.c02977a4.js rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/app.c02977a4.js diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/js/app.c02977a4.js.LICENSE.txt b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/app.c02977a4.js.LICENSE.txt similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/js/app.c02977a4.js.LICENSE.txt rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/app.c02977a4.js.LICENSE.txt diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/js/app.c02977a4.js.gz b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/app.c02977a4.js.gz similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/js/app.c02977a4.js.gz rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/app.c02977a4.js.gz diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/js/chunk-vendors.e86fea24.js b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-vendors.e86fea24.js similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/js/chunk-vendors.e86fea24.js rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-vendors.e86fea24.js diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/js/chunk-vendors.e86fea24.js.LICENSE.txt b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-vendors.e86fea24.js.LICENSE.txt similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/js/chunk-vendors.e86fea24.js.LICENSE.txt rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-vendors.e86fea24.js.LICENSE.txt diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/knife4j/js/chunk-vendors.e86fea24.js.gz b/src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-vendors.e86fea24.js.gz similarity index 100% rename from src/IGeekFan.AspNetCore.SwaggerUI/knife4j/js/chunk-vendors.e86fea24.js.gz rename to src/IGeekFan.AspNetCore.Knife4jUI/knife4j/js/chunk-vendors.e86fea24.js.gz diff --git a/src/IGeekFan.AspNetCore.SwaggerUI/IGeekFan - Backup.AspNetCore.Knife4jUI.csproj b/src/IGeekFan.AspNetCore.SwaggerUI/IGeekFan - Backup.AspNetCore.Knife4jUI.csproj deleted file mode 100644 index 9774d86..0000000 --- a/src/IGeekFan.AspNetCore.SwaggerUI/IGeekFan - Backup.AspNetCore.Knife4jUI.csproj +++ /dev/null @@ -1,40 +0,0 @@ - - - - netstandard2.0;netcoreapp3.0 - Middleware to expose an embedded version of the knife4j-vue-v3 from an ASP.NET Core application - $(NoWarn);1591 - true - - 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.1 - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/Basic/Basic.csproj b/test/Basic/Basic.csproj index f613824..727545a 100644 --- a/test/Basic/Basic.csproj +++ b/test/Basic/Basic.csproj @@ -15,6 +15,6 @@ - + \ No newline at end of file diff --git a/test/Basic/Startup.cs b/test/Basic/Startup.cs index 4c41023..0bf3a27 100644 --- a/test/Basic/Startup.cs +++ b/test/Basic/Startup.cs @@ -17,6 +17,7 @@ using System.Text.Json.Serialization; using Swashbuckle.AspNetCore.SwaggerGen; using System.Reflection; using IGeekFan.AspNetCore.Knife4jUI; +using Microsoft.AspNetCore.Mvc.Controllers; namespace Basic { @@ -66,7 +67,8 @@ namespace Basic }); c.CustomOperationIds(apiDesc => { - return apiDesc.TryGetMethodInfo(out MethodInfo methodInfo) ? methodInfo.Name : null; + var controllerAction = apiDesc.ActionDescriptor as ControllerActionDescriptor; + return controllerAction.ControllerName + "-" + controllerAction.ActionName; }); c.OrderActionsBy((apiDesc) => $"{apiDesc.ActionDescriptor.RouteValues["controller"]}_{apiDesc.HttpMethod}"); diff --git a/test/Knife4jUIDemo/Knife4jUIDemo.csproj b/test/Knife4jUIDemo/Knife4jUIDemo.csproj index 0ae2591..cdb8dba 100644 --- a/test/Knife4jUIDemo/Knife4jUIDemo.csproj +++ b/test/Knife4jUIDemo/Knife4jUIDemo.csproj @@ -11,5 +11,9 @@ + + + + diff --git a/test/Knife4jUIDemo/Startup.cs b/test/Knife4jUIDemo/Startup.cs index 1ff2610..c28c38e 100644 --- a/test/Knife4jUIDemo/Startup.cs +++ b/test/Knife4jUIDemo/Startup.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.HttpsPolicy; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -40,7 +41,8 @@ namespace Knife4jUIDemo }); c.CustomOperationIds(apiDesc => { - return apiDesc.TryGetMethodInfo(out MethodInfo methodInfo) ? methodInfo.Name : null; + var controllerAction = apiDesc.ActionDescriptor as ControllerActionDescriptor; + return controllerAction.ControllerName + "-" + controllerAction.ActionName; }); }); }