From 617c72771dfa22c17c9ae68fde3499b3ad75bc44 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Thu, 27 Jan 2022 01:15:12 +0800 Subject: [PATCH] =?UTF-8?q?revert:=20=E7=A7=BB=E9=99=A4=20swagger=20?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BootstrapAdmin.Web.csproj | 3 - .../ApplicationBuilderExtensions.cs | 2 - .../Extensions/ServiceCollectionExtensions.cs | 3 - .../Extensions/SwaggerExtensions.cs | 72 ------------------- 4 files changed, 80 deletions(-) delete mode 100644 src/blazor/admin/BootstrapAdmin.Web/Extensions/SwaggerExtensions.cs diff --git a/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj index 419eca4f..144d8eb0 100644 --- a/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj +++ b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj @@ -2,15 +2,12 @@ true - True - \bin\Debug\net6.0\BootstrapAdmin.xml - diff --git a/src/blazor/admin/BootstrapAdmin.Web/Extensions/ApplicationBuilderExtensions.cs b/src/blazor/admin/BootstrapAdmin.Web/Extensions/ApplicationBuilderExtensions.cs index 20e08505..ce21afb4 100644 --- a/src/blazor/admin/BootstrapAdmin.Web/Extensions/ApplicationBuilderExtensions.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Extensions/ApplicationBuilderExtensions.cs @@ -26,8 +26,6 @@ public static class ApplicationBuilderExtensions builder.UseAuthentication(); builder.UseAuthorization(); - builder.UseSwagger(builder.Configuration["SwaggerPathBase"].TrimEnd('/')); - // 激活 ICacheManager builder.Services.GetRequiredService(); diff --git a/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServiceCollectionExtensions.cs b/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServiceCollectionExtensions.cs index 6ebe22aa..852c4ce7 100644 --- a/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServiceCollectionExtensions.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServiceCollectionExtensions.cs @@ -28,7 +28,6 @@ namespace Microsoft.Extensions.DependencyInjection services.AddLogging(logging => logging.AddFileLogger().AddCloudLogger().AddDBLogger(ExceptionsHelper.Log)); services.AddCors(); services.AddResponseCompression(); - services.AddControllers(); // 增加后台任务 services.AddTaskServices(); @@ -49,8 +48,6 @@ namespace Microsoft.Extensions.DependencyInjection // 增加认证授权服务 services.AddBootstrapAdminSecurity(); - services.AddSwagger(); - // 增加 BootstrapApp 上下文服务 services.AddScoped(); diff --git a/src/blazor/admin/BootstrapAdmin.Web/Extensions/SwaggerExtensions.cs b/src/blazor/admin/BootstrapAdmin.Web/Extensions/SwaggerExtensions.cs deleted file mode 100644 index 2837bbae..00000000 --- a/src/blazor/admin/BootstrapAdmin.Web/Extensions/SwaggerExtensions.cs +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) Argo Zhang (argo@163.com). All rights reserved. -// Licensed under the LGPL License, Version 3.0. See License.txt in the project root for license information. -// Website: https://admin.blazor.zone - -using Microsoft.OpenApi.Models; - -namespace BootstrapAdmin.Web -{ - /// - /// Swagger 扩展方法 - /// - internal static class SwaggerExtensions - { - /// - /// Swagger 中间件 - /// - /// - /// - public static void UseSwagger(this IApplicationBuilder app, string pathBase) - { - app.UseSwagger(); - app.UseSwaggerUI(c => - { - c.SwaggerEndpoint($"{pathBase}/swagger/v1/swagger.json", "BootstrapAdmin API V1"); - }); - } - - /// - /// 注入 Swagger 服务到容器内 - /// - /// - public static void AddSwagger(this IServiceCollection services) - { - services.AddSwaggerGen(options => - { - options.SwaggerDoc("v1", new OpenApiInfo - { - Version = "v1", - Title = "BootstrapAdmin API" - }); - - //Set the comments path for the swagger json and ui. - var xmlPath = Path.Combine(AppContext.BaseDirectory, "BootstrapAdmin.xml"); - options.IncludeXmlComments(xmlPath); - - options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme - { - Name = "Authorization", - Type = SecuritySchemeType.ApiKey, - Scheme = "Bearer", - BearerFormat = "JWT", - In = ParameterLocation.Header, - Description = "JWT Authorization header using the Bearer scheme." - }); - options.AddSecurityRequirement(new OpenApiSecurityRequirement - { - { - new OpenApiSecurityScheme - { - Reference = new OpenApiReference - { - Type = ReferenceType.SecurityScheme, - Id = "Bearer" - } - }, - new string[]{ } - } - }); - }); - } - } -}