From 0518d1289fdc74196fea3878ccaffdd3eb56d8a9 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Fri, 23 Oct 2020 17:07:33 +0800 Subject: [PATCH] Rename abp.abp.swagger to volo.abp.swashbuckle --- framework/Volo.Abp.sln | 2 +- .../wwwroot/swagger/ui/abp.swagger.js | 14 -------------- .../Builder/AbpSwaggerUIBuilderExtensions.cs | 1 + .../Volo.Abp.Swashbuckle.csproj} | 3 +-- .../Abp/Swashbuckle/AbpSwashbuckleModule.cs} | 6 +++--- .../Abp/Swashbuckle}/ISwaggerHtmlResolver.cs | 2 +- .../Abp/Swashbuckle}/SwaggerHtmlResolver.cs | 4 ++-- .../wwwroot/swagger/ui/abp.swagger.js | 17 +++++++++++++++++ nupkg/common.ps1 | 2 +- .../MyCompanyName.MyProjectName.Web.Host.csproj | 2 +- .../MyProjectNameWebModule.cs | 3 ++- .../MyCompanyName.MyProjectName.Web.csproj | 2 +- .../MyProjectNameWebModule.cs | 3 ++- ...panyName.MyProjectName.IdentityServer.csproj | 2 +- .../MyProjectNameIdentityServerModule.cs | 3 ++- .../MyCompanyName.MyProjectName.Web.Host.csproj | 2 +- .../MyProjectNameWebHostModule.cs | 2 +- ...CompanyName.MyProjectName.Web.Unified.csproj | 2 +- .../MyProjectNameWebUnifiedModule.cs | 3 ++- 19 files changed, 41 insertions(+), 34 deletions(-) delete mode 100644 framework/src/Volo.Abp.Swagger/wwwroot/swagger/ui/abp.swagger.js rename framework/src/{Volo.Abp.Swagger => Volo.Abp.Swashbuckle}/Microsoft/AspNetCore/Builder/AbpSwaggerUIBuilderExtensions.cs (96%) rename framework/src/{Volo.Abp.Swagger/Volo.Abp.Swagger.csproj => Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj} (90%) rename framework/src/{Volo.Abp.Swagger/Volo/Abp/AbpSwaggerModule.cs => Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/AbpSwashbuckleModule.cs} (68%) rename framework/src/{Volo.Abp.Swagger/Volo/Abp => Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle}/ISwaggerHtmlResolver.cs (77%) rename framework/src/{Volo.Abp.Swagger/Volo/Abp => Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle}/SwaggerHtmlResolver.cs (82%) create mode 100644 framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln index 6980eec785..e922ac7f8d 100644 --- a/framework/Volo.Abp.sln +++ b/framework/Volo.Abp.sln @@ -351,7 +351,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.EventBus.Rebus", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.ExceptionHandling", "src\Volo.Abp.ExceptionHandling\Volo.Abp.ExceptionHandling.csproj", "{B9D1ADCB-D552-4626-A1F1-78FF72C1E822}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Swagger", "src\Volo.Abp.Swagger\Volo.Abp.Swagger.csproj", "{DD9519E0-5A68-48DC-A051-7BF2AC922F3E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Swashbuckle", "src\Volo.Abp.Swashbuckle\Volo.Abp.Swashbuckle.csproj", "{DD9519E0-5A68-48DC-A051-7BF2AC922F3E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/framework/src/Volo.Abp.Swagger/wwwroot/swagger/ui/abp.swagger.js b/framework/src/Volo.Abp.Swagger/wwwroot/swagger/ui/abp.swagger.js deleted file mode 100644 index 758a7fc959..0000000000 --- a/framework/src/Volo.Abp.Swagger/wwwroot/swagger/ui/abp.swagger.js +++ /dev/null @@ -1,14 +0,0 @@ -function AbpSwaggerUIBundle(configObject) { - configObject.requestInterceptor = function (request) { - var token = abp.auth.getToken(); - request.headers.Authorization = token ? "Bearer " + token : null; - var antiForgeryToken = abp.security.antiForgery.getToken(); - if (antiForgeryToken) { - request.headers[abp.security.antiForgery.tokenHeaderName] = antiForgeryToken; - } - return request; - }; - - return SwaggerUIBundle(configObject); -} - diff --git a/framework/src/Volo.Abp.Swagger/Microsoft/AspNetCore/Builder/AbpSwaggerUIBuilderExtensions.cs b/framework/src/Volo.Abp.Swashbuckle/Microsoft/AspNetCore/Builder/AbpSwaggerUIBuilderExtensions.cs similarity index 96% rename from framework/src/Volo.Abp.Swagger/Microsoft/AspNetCore/Builder/AbpSwaggerUIBuilderExtensions.cs rename to framework/src/Volo.Abp.Swashbuckle/Microsoft/AspNetCore/Builder/AbpSwaggerUIBuilderExtensions.cs index f562dfb202..4ea501626b 100644 --- a/framework/src/Volo.Abp.Swagger/Microsoft/AspNetCore/Builder/AbpSwaggerUIBuilderExtensions.cs +++ b/framework/src/Volo.Abp.Swashbuckle/Microsoft/AspNetCore/Builder/AbpSwaggerUIBuilderExtensions.cs @@ -2,6 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using Swashbuckle.AspNetCore.SwaggerUI; using Volo.Abp; +using Volo.Abp.Swashbuckle; namespace Microsoft.AspNetCore.Builder { diff --git a/framework/src/Volo.Abp.Swagger/Volo.Abp.Swagger.csproj b/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj similarity index 90% rename from framework/src/Volo.Abp.Swagger/Volo.Abp.Swagger.csproj rename to framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj index 62c580f0b5..d221de8ca3 100644 --- a/framework/src/Volo.Abp.Swagger/Volo.Abp.Swagger.csproj +++ b/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj @@ -4,8 +4,7 @@ netstandard2.0 - Volo.Abp.Swagger - Volo.Abp.Swagger + Volo.Abp.Swashbuckle $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false diff --git a/framework/src/Volo.Abp.Swagger/Volo/Abp/AbpSwaggerModule.cs b/framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/AbpSwashbuckleModule.cs similarity index 68% rename from framework/src/Volo.Abp.Swagger/Volo/Abp/AbpSwaggerModule.cs rename to framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/AbpSwashbuckleModule.cs index 5cd998eea4..949ac2ca2d 100644 --- a/framework/src/Volo.Abp.Swagger/Volo/Abp/AbpSwaggerModule.cs +++ b/framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/AbpSwashbuckleModule.cs @@ -1,16 +1,16 @@ using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; -namespace Volo.Abp +namespace Volo.Abp.Swashbuckle { [DependsOn(typeof(AbpVirtualFileSystemModule))] - public class AbpSwaggerModule : AbpModule + public class AbpSwashbuckleModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { Configure(options => { - options.FileSets.AddEmbedded(); + options.FileSets.AddEmbedded(); }); } } diff --git a/framework/src/Volo.Abp.Swagger/Volo/Abp/ISwaggerHtmlResolver.cs b/framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/ISwaggerHtmlResolver.cs similarity index 77% rename from framework/src/Volo.Abp.Swagger/Volo/Abp/ISwaggerHtmlResolver.cs rename to framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/ISwaggerHtmlResolver.cs index f22a03268c..8609acf418 100644 --- a/framework/src/Volo.Abp.Swagger/Volo/Abp/ISwaggerHtmlResolver.cs +++ b/framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/ISwaggerHtmlResolver.cs @@ -1,6 +1,6 @@ using System.IO; -namespace Volo.Abp +namespace Volo.Abp.Swashbuckle { public interface ISwaggerHtmlResolver { diff --git a/framework/src/Volo.Abp.Swagger/Volo/Abp/SwaggerHtmlResolver.cs b/framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/SwaggerHtmlResolver.cs similarity index 82% rename from framework/src/Volo.Abp.Swagger/Volo/Abp/SwaggerHtmlResolver.cs rename to framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/SwaggerHtmlResolver.cs index e447ddad16..7d80f5477f 100644 --- a/framework/src/Volo.Abp.Swagger/Volo/Abp/SwaggerHtmlResolver.cs +++ b/framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/SwaggerHtmlResolver.cs @@ -4,7 +4,7 @@ using System.Text; using Swashbuckle.AspNetCore.SwaggerUI; using Volo.Abp.DependencyInjection; -namespace Volo.Abp +namespace Volo.Abp.Swashbuckle { public class SwaggerHtmlResolver : ISwaggerHtmlResolver, ITransientDependency { @@ -15,7 +15,7 @@ namespace Volo.Abp var html = new StreamReader(stream) .ReadToEnd() - .Replace("SwaggerUIBundle(configObject)", "AbpSwaggerUIBundle(configObject)"); + .Replace("SwaggerUIBundle(configObject)", "abp.SwaggerUIBundle(configObject)"); return new MemoryStream(Encoding.UTF8.GetBytes(html)); } diff --git a/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js b/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js new file mode 100644 index 0000000000..b1b9614640 --- /dev/null +++ b/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js @@ -0,0 +1,17 @@ +var abp = abp || {}; + +(function () { + abp.SwaggerUIBundle = function (configObject) { + configObject.requestInterceptor = function (request) { + var token = abp.auth.getToken(); + request.headers.Authorization = token ? "Bearer " + token : null; + var antiForgeryToken = abp.security.antiForgery.getToken(); + if (antiForgeryToken) { + request.headers[abp.security.antiForgery.tokenHeaderName] = antiForgeryToken; + } + return request; + }; + + return SwaggerUIBundle(configObject); + } +})(); diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index bbf73de7bb..c3b439cee0 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -136,7 +136,7 @@ $projects = ( "framework/src/Volo.Abp.Validation", "framework/src/Volo.Abp.VirtualFileSystem", "framework/src/Volo.Abp.Kafka", - "framework/src/Volo.Abp.Swagger", + "framework/src/Volo.Abp.Swashbuckle", # modules/account "modules/account/src/Volo.Abp.Account.Application.Contracts", diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index d2a7ce6f8f..88950bed22 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -30,7 +30,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index f30cecd20b..9afb9ee4f3 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -31,6 +31,7 @@ using Volo.Abp.Identity.Web; using Volo.Abp.Modularity; using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement.Web; +using Volo.Abp.Swashbuckle; using Volo.Abp.TenantManagement.Web; using Volo.Abp.UI.Navigation.Urls; using Volo.Abp.UI; @@ -52,7 +53,7 @@ namespace MyCompanyName.MyProjectName.Web typeof(AbpIdentityWebModule), typeof(AbpTenantManagementWebModule), typeof(AbpAspNetCoreSerilogModule), - typeof(AbpSwaggerModule) + typeof(AbpSwashbuckleModule) )] public class MyProjectNameWebModule : AbpModule { diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index 7ba850973e..dc57006bca 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -43,7 +43,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index 1f508466ce..5b7a147345 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -28,6 +28,7 @@ using Volo.Abp.Identity.Web; using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.Web; +using Volo.Abp.Swashbuckle; using Volo.Abp.TenantManagement.Web; using Volo.Abp.UI.Navigation.Urls; using Volo.Abp.UI; @@ -47,7 +48,7 @@ namespace MyCompanyName.MyProjectName.Web typeof(AbpAspNetCoreAuthenticationJwtBearerModule), typeof(AbpTenantManagementWebModule), typeof(AbpAspNetCoreSerilogModule), - typeof(AbpSwaggerModule) + typeof(AbpSwashbuckleModule) )] public class MyProjectNameWebModule : AbpModule { diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj index 7d8e1359a8..48a08a0e79 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj @@ -20,7 +20,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index 973eb1f4d7..9b61558fa8 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -40,6 +40,7 @@ using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.PermissionManagement.HttpApi; using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.SettingManagement.EntityFrameworkCore; +using Volo.Abp.Swashbuckle; using Volo.Abp.TenantManagement; using Volo.Abp.TenantManagement.EntityFrameworkCore; using Volo.Abp.Threading; @@ -75,7 +76,7 @@ namespace MyCompanyName.MyProjectName typeof(AbpAspNetCoreAuthenticationJwtBearerModule), typeof(MyProjectNameApplicationContractsModule), typeof(AbpAspNetCoreSerilogModule), - typeof(AbpSwaggerModule) + typeof(AbpSwashbuckleModule) )] public class MyProjectNameIdentityServerModule : AbpModule { diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index 44702c78f6..ffd5be2342 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -20,7 +20,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs index 06e65a1192..f4c71e70d0 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs @@ -67,7 +67,7 @@ namespace MyCompanyName.MyProjectName typeof(AbpTenantManagementHttpApiClientModule), typeof(AbpPermissionManagementHttpApiClientModule), typeof(AbpAspNetCoreSerilogModule), - typeof(AbpSwaggerModule) + typeof(AbpSwashbuckleModule) )] public class MyProjectNameWebHostModule : AbpModule { diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj index 5e8df56439..a69f961797 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj @@ -18,7 +18,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs index 726b49d6d9..199fdb4fc1 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs @@ -31,6 +31,7 @@ using Volo.Abp.PermissionManagement; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.SettingManagement.EntityFrameworkCore; +using Volo.Abp.Swashbuckle; using Volo.Abp.TenantManagement; using Volo.Abp.TenantManagement.EntityFrameworkCore; using Volo.Abp.TenantManagement.Web; @@ -63,7 +64,7 @@ namespace MyCompanyName.MyProjectName typeof(AbpTenantManagementEntityFrameworkCoreModule), typeof(AbpAspNetCoreMvcUiBasicThemeModule), typeof(AbpAspNetCoreSerilogModule), - typeof(AbpSwaggerModule) + typeof(AbpSwashbuckleModule) )] public class MyProjectNameWebUnifiedModule : AbpModule {