From 77823ad2253a374d2d7fbcd2f3088a669eede23f Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Mon, 20 Jun 2022 19:10:18 +0800 Subject: [PATCH] upgrade: upgrade abp framework to 5.3.0 --- aspnet-core/Directory.Build.props | 6 ++-- aspnet-core/common.props | 2 +- aspnet-core/configureawait.props | 2 +- .../LINGYUN.Abp.Account.Application.csproj | 2 +- .../LINGYUN.Abp.Auditing.Application.csproj | 2 +- ...YUN.Abp.Identity.OrganizaztionUnits.csproj | 2 +- .../LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj | 2 +- .../LINGYUN/Abp/EventBus/CAP/AbpCAPHeaders.cs | 2 ++ .../EventBus/CAP/CAPDistributedEventBus.cs | 21 +++++++++++ .../LINGYUN.Abp.Notifications.Emailing.csproj | 2 +- .../LINGYUN.Abp.Identity.Application.csproj | 2 +- .../LINGYUN.Abp.Identity.Domain.csproj | 2 +- ...N.Abp.Logging.Serilog.Elasticsearch.csproj | 2 +- ....LocalizationManagement.Application.csproj | 2 +- ...N.Abp.LocalizationManagement.Domain.csproj | 2 +- ...GYUN.Abp.MessageService.Application.csproj | 2 +- .../LINGYUN.Abp.MessageService.Domain.csproj | 2 +- ...NGYUN.Abp.OssManagement.Application.csproj | 2 +- ...Management.Domain.OrganizationUnits.csproj | 2 +- ...GYUN.Abp.UI.Navigation.VueVbenAdmin.csproj | 2 +- .../LINGYUN.Platform.Application.csproj | 2 +- .../LINGYUN.Platform.Domain.csproj | 2 +- .../Platform/Versions/VersionManager.cs | 2 +- .../LINGYUN.Abp.Saas.Application.csproj | 2 +- .../LINGYUN.Abp.Saas.Domain.csproj | 2 +- ...GYUN.Abp.TaskManagement.Application.csproj | 2 +- .../LINGYUN.Abp.TaskManagement.Domain.csproj | 2 +- ....Abp.WebhooksManagement.Application.csproj | 2 +- ...NGYUN.Abp.WebhooksManagement.Domain.csproj | 2 +- .../LINGYUN.Abp.Identity.WeChat.csproj | 2 +- ...NGYUN.Abp.WorkflowManagement.Domain.csproj | 2 +- .../TenantHeaderParamter.cs | 14 +++++--- .../TenantHeaderParamter.cs | 16 +++++---- .../TenantHeaderParamter.cs | 16 +++++---- .../TenantHeaderParamter.cs | 16 +++++---- ...skManagementHttpApiHostModule.Configure.cs | 13 +++---- .../TenantHeaderParamter.cs | 36 +++++++++++++++++++ .../TenantHeaderParamter.cs | 17 +++++---- .../TenantHeaderParamter.cs | 17 +++++---- .../TenantHeaderParamter.cs | 14 +++++--- common.props | 2 +- gateways/Directory.Build.props | 6 ++-- gateways/common.props | 2 +- gateways/configureawait.props | 2 +- 44 files changed, 173 insertions(+), 83 deletions(-) create mode 100644 aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TenantHeaderParamter.cs diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props index a56ab652f..084393b42 100644 --- a/aspnet-core/Directory.Build.props +++ b/aspnet-core/Directory.Build.props @@ -1,7 +1,7 @@  - 5.2.2 - 5.2.2 + 5.3.0 + 5.3.0 1.7.0 1.0.1 6.0.1 @@ -10,7 +10,7 @@ 3.0.434 1.2.1.5 2.0.3 - 1.7.28 + 1.7.29 7.15.1 1.0.0-rc8 1.2.0-rc1 diff --git a/aspnet-core/common.props b/aspnet-core/common.props index 514f4110b..3e799f4fa 100644 --- a/aspnet-core/common.props +++ b/aspnet-core/common.props @@ -1,7 +1,7 @@ latest - 5.2.2 + 5.3.0 colin $(NoWarn);CS1591;CS0436 https://github.com/colinin/abp-next-admin diff --git a/aspnet-core/configureawait.props b/aspnet-core/configureawait.props index b0cf9ef29..92f22f85f 100644 --- a/aspnet-core/configureawait.props +++ b/aspnet-core/configureawait.props @@ -1,7 +1,7 @@ - + All runtime; build; native; contentfiles; analyzers diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj index f456b833f..ed0f8353c 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + net6.0 diff --git a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj index f127cfda4..4b0a6a451 100644 --- a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj +++ b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + net6.0 diff --git a/aspnet-core/modules/authorization/LINGYUN.Abp.Identity.OrganizaztionUnits/LINGYUN.Abp.Identity.OrganizaztionUnits.csproj b/aspnet-core/modules/authorization/LINGYUN.Abp.Identity.OrganizaztionUnits/LINGYUN.Abp.Identity.OrganizaztionUnits.csproj index f9b0d8d9c..664fb3f90 100644 --- a/aspnet-core/modules/authorization/LINGYUN.Abp.Identity.OrganizaztionUnits/LINGYUN.Abp.Identity.OrganizaztionUnits.csproj +++ b/aspnet-core/modules/authorization/LINGYUN.Abp.Identity.OrganizaztionUnits/LINGYUN.Abp.Identity.OrganizaztionUnits.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj index 870ccc0ea..483321c99 100644 --- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj +++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj @@ -5,7 +5,7 @@ Exe net6.0 - 5.2.2 + 5.3.0 colin Use LINGYUN.MicroService.Templates command line true diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPHeaders.cs b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPHeaders.cs index 13ccf1b9f..fdf0f707f 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPHeaders.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPHeaders.cs @@ -7,5 +7,7 @@ public static string UserId { get; set; } = "cap-abp-user-id"; public static string TenantId { get; set; } = "cap-abp-tenant-id"; + + public static string MessageId { get; set; } = "cap-abp-message-id"; } } diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/CAPDistributedEventBus.cs b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/CAPDistributedEventBus.cs index 3f4d8fa7e..b95b3de34 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/CAPDistributedEventBus.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/CAPDistributedEventBus.cs @@ -244,5 +244,26 @@ namespace LINGYUN.Abp.EventBus.CAP }, CancellationTokenProvider.FallbackToProvider()); } + + public async override Task PublishManyFromOutboxAsync(IEnumerable outgoingEvents, OutboxConfig outboxConfig) + { + var outgoingEventArray = outgoingEvents.ToArray(); + + foreach (var outgoingEvent in outgoingEventArray) + { + await CapPublisher + .PublishAsync( + outgoingEvent.EventName, + outgoingEvent.EventData, + new Dictionary + { + { AbpCAPHeaders.MessageId, outgoingEvent.Id.ToString() }, + { AbpCAPHeaders.UserId, CurrentUser.Id?.ToString() ?? "" }, + { AbpCAPHeaders.ClientId, CurrentClient.Id ?? "" }, + { AbpCAPHeaders.TenantId, CurrentTenant.Id?.ToString() ?? "" }, + }, + CancellationTokenProvider.FallbackToProvider()); + } + } } } diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Emailing/LINGYUN.Abp.Notifications.Emailing.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Emailing/LINGYUN.Abp.Notifications.Emailing.csproj index d3e137a4e..6a9378428 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Emailing/LINGYUN.Abp.Notifications.Emailing.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Emailing/LINGYUN.Abp.Notifications.Emailing.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj index ef07c8d1f..f4b419202 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + net6.0 diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj index 1f0166f23..81b12110d 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN.Abp.Logging.Serilog.Elasticsearch.csproj b/aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN.Abp.Logging.Serilog.Elasticsearch.csproj index a83999859..3231a0a02 100644 --- a/aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN.Abp.Logging.Serilog.Elasticsearch.csproj +++ b/aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN.Abp.Logging.Serilog.Elasticsearch.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Application/LINGYUN.Abp.LocalizationManagement.Application.csproj b/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Application/LINGYUN.Abp.LocalizationManagement.Application.csproj index 0a14468e7..bb839660b 100644 --- a/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Application/LINGYUN.Abp.LocalizationManagement.Application.csproj +++ b/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Application/LINGYUN.Abp.LocalizationManagement.Application.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain/LINGYUN.Abp.LocalizationManagement.Domain.csproj b/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain/LINGYUN.Abp.LocalizationManagement.Domain.csproj index eaf0963f7..49c3cc746 100644 --- a/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain/LINGYUN.Abp.LocalizationManagement.Domain.csproj +++ b/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain/LINGYUN.Abp.LocalizationManagement.Domain.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj index 7e7df299e..e2fe9cd08 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj index 43d641e2b..85eaf4ee3 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN.Abp.OssManagement.Application.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN.Abp.OssManagement.Application.csproj index 8e63e1b4a..18df5dec1 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN.Abp.OssManagement.Application.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN.Abp.OssManagement.Application.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + net6.0 diff --git a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits.csproj b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits.csproj index 553948488..2e57486ba 100644 --- a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits.csproj +++ b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN.Abp.UI.Navigation.VueVbenAdmin.csproj b/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN.Abp.UI.Navigation.VueVbenAdmin.csproj index 5806d2a3a..efaaff97b 100644 --- a/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN.Abp.UI.Navigation.VueVbenAdmin.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN.Abp.UI.Navigation.VueVbenAdmin.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Application/LINGYUN.Platform.Application.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.Application/LINGYUN.Platform.Application.csproj index 60a2498e4..16373d1c9 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Application/LINGYUN.Platform.Application.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Application/LINGYUN.Platform.Application.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj index a3d3dff8e..6200bb511 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/Versions/VersionManager.cs b/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/Versions/VersionManager.cs index 4289b01f3..f52f15fcc 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/Versions/VersionManager.cs +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/Versions/VersionManager.cs @@ -101,7 +101,7 @@ namespace LINGYUN.Platform.Versions public virtual async Task SaveFileAsync(string version, string filePath, string fileName, string fileVersion, byte[] data) { // 计算指纹 - var sha256 = new SHA256Managed(); + var sha256 = SHA256.Create(); var checkHash = sha256.ComputeHash(data); var sha256Hash = BitConverter.ToString(checkHash).Replace("-", string.Empty); diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN.Abp.Saas.Application.csproj b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN.Abp.Saas.Application.csproj index c47f6abd1..559a74862 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN.Abp.Saas.Application.csproj +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN.Abp.Saas.Application.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + net6.0 diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN.Abp.Saas.Domain.csproj b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN.Abp.Saas.Domain.csproj index 82a7feb85..f89854954 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN.Abp.Saas.Domain.csproj +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN.Abp.Saas.Domain.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application/LINGYUN.Abp.TaskManagement.Application.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application/LINGYUN.Abp.TaskManagement.Application.csproj index df4140ea7..9fc2c5b64 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application/LINGYUN.Abp.TaskManagement.Application.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application/LINGYUN.Abp.TaskManagement.Application.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN.Abp.TaskManagement.Domain.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN.Abp.TaskManagement.Domain.csproj index 2f01d44e0..8cdcef31c 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN.Abp.TaskManagement.Domain.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN.Abp.TaskManagement.Domain.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN.Abp.WebhooksManagement.Application.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN.Abp.WebhooksManagement.Application.csproj index 24d0a91e7..832d7b91f 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN.Abp.WebhooksManagement.Application.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN.Abp.WebhooksManagement.Application.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain/LINGYUN.Abp.WebhooksManagement.Domain.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain/LINGYUN.Abp.WebhooksManagement.Domain.csproj index 5234b20c6..36f7a7d04 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain/LINGYUN.Abp.WebhooksManagement.Domain.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain/LINGYUN.Abp.WebhooksManagement.Domain.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/wechat/LINGYUN.Abp.Identity.WeChat/LINGYUN.Abp.Identity.WeChat.csproj b/aspnet-core/modules/wechat/LINGYUN.Abp.Identity.WeChat/LINGYUN.Abp.Identity.WeChat.csproj index 851267609..70c21b16c 100644 --- a/aspnet-core/modules/wechat/LINGYUN.Abp.Identity.WeChat/LINGYUN.Abp.Identity.WeChat.csproj +++ b/aspnet-core/modules/wechat/LINGYUN.Abp.Identity.WeChat/LINGYUN.Abp.Identity.WeChat.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN.Abp.WorkflowManagement.Domain.csproj b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN.Abp.WorkflowManagement.Domain.csproj index 7a89be011..6294588d9 100644 --- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN.Abp.WorkflowManagement.Domain.csproj +++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN.Abp.WorkflowManagement.Domain.csproj @@ -4,7 +4,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/TenantHeaderParamter.cs b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/TenantHeaderParamter.cs index e0dcf752d..1b3b7551e 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/TenantHeaderParamter.cs +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/TenantHeaderParamter.cs @@ -3,26 +3,30 @@ using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; using System.Collections.Generic; using Volo.Abp.MultiTenancy; +using Volo.Abp.AspNetCore.MultiTenancy; namespace LY.MicroService.BackendAdmin; public class TenantHeaderParamter : IOperationFilter { - private readonly AbpMultiTenancyOptions _options; + private readonly AbpMultiTenancyOptions _multiTenancyOptions; + private readonly AbpAspNetCoreMultiTenancyOptions _aspNetCoreMultiTenancyOptions; public TenantHeaderParamter( - IOptions options) + IOptions multiTenancyOptions, + IOptions aspNetCoreMultiTenancyOptions) { - _options = options.Value; + _multiTenancyOptions = multiTenancyOptions.Value; + _aspNetCoreMultiTenancyOptions = aspNetCoreMultiTenancyOptions.Value; } public void Apply(OpenApiOperation operation, OperationFilterContext context) { - if (_options.IsEnabled) + if (_multiTenancyOptions.IsEnabled) { operation.Parameters = operation.Parameters ?? new List(); operation.Parameters.Add(new OpenApiParameter { - Name = TenantResolverConsts.DefaultTenantKey, + Name = _aspNetCoreMultiTenancyOptions.TenantKey, In = ParameterLocation.Header, Description = "Tenant Id in http header", Required = false diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/TenantHeaderParamter.cs b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/TenantHeaderParamter.cs index 1d459d79f..22be0f5f4 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/TenantHeaderParamter.cs +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/TenantHeaderParamter.cs @@ -2,29 +2,33 @@ using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; using System.Collections.Generic; +using Volo.Abp.AspNetCore.MultiTenancy; using Volo.Abp.MultiTenancy; namespace LY.MicroService.LocalizationManagement; public class TenantHeaderParamter : IOperationFilter { - private readonly AbpMultiTenancyOptions _options; + private readonly AbpMultiTenancyOptions _multiTenancyOptions; + private readonly AbpAspNetCoreMultiTenancyOptions _aspNetCoreMultiTenancyOptions; public TenantHeaderParamter( - IOptions options) + IOptions multiTenancyOptions, + IOptions aspNetCoreMultiTenancyOptions) { - _options = options.Value; + _multiTenancyOptions = multiTenancyOptions.Value; + _aspNetCoreMultiTenancyOptions = aspNetCoreMultiTenancyOptions.Value; } public void Apply(OpenApiOperation operation, OperationFilterContext context) { - if (_options.IsEnabled) + if (_multiTenancyOptions.IsEnabled) { operation.Parameters = operation.Parameters ?? new List(); operation.Parameters.Add(new OpenApiParameter { - Name = TenantResolverConsts.DefaultTenantKey, + Name = _aspNetCoreMultiTenancyOptions.TenantKey, In = ParameterLocation.Header, - Description = "Tenant Id in http header", + Description = "Tenant Id/Name in http header", Required = false }); } diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/TenantHeaderParamter.cs b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/TenantHeaderParamter.cs index 2fc27756e..33ba350d1 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/TenantHeaderParamter.cs +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/TenantHeaderParamter.cs @@ -2,29 +2,33 @@ using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; using System.Collections.Generic; +using Volo.Abp.AspNetCore.MultiTenancy; using Volo.Abp.MultiTenancy; namespace LY.MicroService.PlatformManagement { public class TenantHeaderParamter : IOperationFilter { - private readonly AbpMultiTenancyOptions _options; + private readonly AbpMultiTenancyOptions _multiTenancyOptions; + private readonly AbpAspNetCoreMultiTenancyOptions _aspNetCoreMultiTenancyOptions; public TenantHeaderParamter( - IOptions options) + IOptions multiTenancyOptions, + IOptions aspNetCoreMultiTenancyOptions) { - _options = options.Value; + _multiTenancyOptions = multiTenancyOptions.Value; + _aspNetCoreMultiTenancyOptions = aspNetCoreMultiTenancyOptions.Value; } public void Apply(OpenApiOperation operation, OperationFilterContext context) { - if (_options.IsEnabled) + if (_multiTenancyOptions.IsEnabled) { operation.Parameters = operation.Parameters ?? new List(); operation.Parameters.Add(new OpenApiParameter { - Name = TenantResolverConsts.DefaultTenantKey, + Name = _aspNetCoreMultiTenancyOptions.TenantKey, In = ParameterLocation.Header, - Description = "Tenant Id in http header", + Description = "Tenant Id/Name in http header", Required = false }); } diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/TenantHeaderParamter.cs b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/TenantHeaderParamter.cs index ae91c580c..0639ac2eb 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/TenantHeaderParamter.cs +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/TenantHeaderParamter.cs @@ -2,29 +2,33 @@ using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; using System.Collections.Generic; +using Volo.Abp.AspNetCore.MultiTenancy; using Volo.Abp.MultiTenancy; namespace LY.MicroService.RealtimeMessage; public class TenantHeaderParamter : IOperationFilter { - private readonly AbpMultiTenancyOptions _options; + private readonly AbpMultiTenancyOptions _multiTenancyOptions; + private readonly AbpAspNetCoreMultiTenancyOptions _aspNetCoreMultiTenancyOptions; public TenantHeaderParamter( - IOptions options) + IOptions multiTenancyOptions, + IOptions aspNetCoreMultiTenancyOptions) { - _options = options.Value; + _multiTenancyOptions = multiTenancyOptions.Value; + _aspNetCoreMultiTenancyOptions = aspNetCoreMultiTenancyOptions.Value; } public void Apply(OpenApiOperation operation, OperationFilterContext context) { - if (_options.IsEnabled) + if (_multiTenancyOptions.IsEnabled) { operation.Parameters = operation.Parameters ?? new List(); operation.Parameters.Add(new OpenApiParameter { - Name = TenantResolverConsts.DefaultTenantKey, + Name = _aspNetCoreMultiTenancyOptions.TenantKey, In = ParameterLocation.Header, - Description = "Tenant Id in http header", + Description = "Tenant Id/Name in http header", Required = false }); } diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.Configure.cs index f522bcc31..9c3f4aad6 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.Configure.cs @@ -240,14 +240,15 @@ public partial class TaskManagementHttpApiHostModule }); options.AddSecurityRequirement(new OpenApiSecurityRequirement { + { + new OpenApiSecurityScheme { - new OpenApiSecurityScheme - { - Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "Bearer" } - }, - new string[] { } - } + Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "Bearer" } + }, + new string[] { } + } }); + options.OperationFilter(); }); } diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TenantHeaderParamter.cs b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TenantHeaderParamter.cs new file mode 100644 index 000000000..a586508ba --- /dev/null +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TenantHeaderParamter.cs @@ -0,0 +1,36 @@ +using Microsoft.Extensions.Options; +using Microsoft.OpenApi.Models; +using Swashbuckle.AspNetCore.SwaggerGen; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.MultiTenancy; +using Volo.Abp.MultiTenancy; + +namespace LY.MicroService.TaskManagement; + +public class TenantHeaderParamter : IOperationFilter +{ + private readonly AbpMultiTenancyOptions _multiTenancyOptions; + private readonly AbpAspNetCoreMultiTenancyOptions _aspNetCoreMultiTenancyOptions; + public TenantHeaderParamter( + IOptions multiTenancyOptions, + IOptions aspNetCoreMultiTenancyOptions) + { + _multiTenancyOptions = multiTenancyOptions.Value; + _aspNetCoreMultiTenancyOptions = aspNetCoreMultiTenancyOptions.Value; + } + + public void Apply(OpenApiOperation operation, OperationFilterContext context) + { + if (_multiTenancyOptions.IsEnabled) + { + operation.Parameters = operation.Parameters ?? new List(); + operation.Parameters.Add(new OpenApiParameter + { + Name = _aspNetCoreMultiTenancyOptions.TenantKey, + In = ParameterLocation.Header, + Description = "Tenant Id/Name in http header", + Required = false + }); + } + } +} diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/TenantHeaderParamter.cs b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/TenantHeaderParamter.cs index 492957abe..020e06ee5 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/TenantHeaderParamter.cs +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/TenantHeaderParamter.cs @@ -2,28 +2,33 @@ using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; using System.Collections.Generic; +using Volo.Abp.AspNetCore.MultiTenancy; using Volo.Abp.MultiTenancy; namespace LY.MicroService.WebhooksManagement; public class TenantHeaderParamter : IOperationFilter { - private readonly AbpMultiTenancyOptions _options; + private readonly AbpMultiTenancyOptions _multiTenancyOptions; + private readonly AbpAspNetCoreMultiTenancyOptions _aspNetCoreMultiTenancyOptions; public TenantHeaderParamter( - IOptions options) + IOptions multiTenancyOptions, + IOptions aspNetCoreMultiTenancyOptions) { - _options = options.Value; + _multiTenancyOptions = multiTenancyOptions.Value; + _aspNetCoreMultiTenancyOptions = aspNetCoreMultiTenancyOptions.Value; } + public void Apply(OpenApiOperation operation, OperationFilterContext context) { - if (_options.IsEnabled) + if (_multiTenancyOptions.IsEnabled) { operation.Parameters = operation.Parameters ?? new List(); operation.Parameters.Add(new OpenApiParameter { - Name = TenantResolverConsts.DefaultTenantKey, + Name = _aspNetCoreMultiTenancyOptions.TenantKey, In = ParameterLocation.Header, - Description = "Tenant Id/Name", + Description = "Tenant Id/Name in http header", Required = false }); } diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/TenantHeaderParamter.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/TenantHeaderParamter.cs index 4b2ac7acc..2bfb1142b 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/TenantHeaderParamter.cs +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/TenantHeaderParamter.cs @@ -2,28 +2,33 @@ using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; using System.Collections.Generic; +using Volo.Abp.AspNetCore.MultiTenancy; using Volo.Abp.MultiTenancy; namespace LY.MicroService.WorkflowManagement; public class TenantHeaderParamter : IOperationFilter { - private readonly AbpMultiTenancyOptions _options; + private readonly AbpMultiTenancyOptions _multiTenancyOptions; + private readonly AbpAspNetCoreMultiTenancyOptions _aspNetCoreMultiTenancyOptions; public TenantHeaderParamter( - IOptions options) + IOptions multiTenancyOptions, + IOptions aspNetCoreMultiTenancyOptions) { - _options = options.Value; + _multiTenancyOptions = multiTenancyOptions.Value; + _aspNetCoreMultiTenancyOptions = aspNetCoreMultiTenancyOptions.Value; } + public void Apply(OpenApiOperation operation, OperationFilterContext context) { - if (_options.IsEnabled) + if (_multiTenancyOptions.IsEnabled) { operation.Parameters = operation.Parameters ?? new List(); operation.Parameters.Add(new OpenApiParameter { - Name = TenantResolverConsts.DefaultTenantKey, + Name = _aspNetCoreMultiTenancyOptions.TenantKey, In = ParameterLocation.Header, - Description = "Tenant Id/Name", + Description = "Tenant Id/Name in http header", Required = false }); } diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/TenantHeaderParamter.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/TenantHeaderParamter.cs index bdb444f0d..e00ef044b 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/TenantHeaderParamter.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/TenantHeaderParamter.cs @@ -3,26 +3,30 @@ using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; using System.Collections.Generic; using Volo.Abp.MultiTenancy; +using Volo.Abp.AspNetCore.MultiTenancy; namespace LY.MicroService.IdentityServer; public class TenantHeaderParamter : IOperationFilter { - private readonly AbpMultiTenancyOptions _options; + private readonly AbpMultiTenancyOptions _multiTenancyOptions; + private readonly AbpAspNetCoreMultiTenancyOptions _aspNetCoreMultiTenancyOptions; public TenantHeaderParamter( - IOptions options) + IOptions multiTenancyOptions, + IOptions aspNetCoreMultiTenancyOptions) { - _options = options.Value; + _multiTenancyOptions = multiTenancyOptions.Value; + _aspNetCoreMultiTenancyOptions = aspNetCoreMultiTenancyOptions.Value; } public void Apply(OpenApiOperation operation, OperationFilterContext context) { - if (_options.IsEnabled) + if (_multiTenancyOptions.IsEnabled) { operation.Parameters = operation.Parameters ?? new List(); operation.Parameters.Add(new OpenApiParameter { - Name = TenantResolverConsts.DefaultTenantKey, + Name = _aspNetCoreMultiTenancyOptions.TenantKey, In = ParameterLocation.Header, Description = "Tenant Id in http header", Required = false diff --git a/common.props b/common.props index 2a2c3af3a..cf79ae579 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 5.2.2 + 5.3.0 LINGYUN $(NoWarn);CS1591;CS0436 https://github.com/colinin/abp-next-admin diff --git a/gateways/Directory.Build.props b/gateways/Directory.Build.props index af91d5573..b7b678b57 100644 --- a/gateways/Directory.Build.props +++ b/gateways/Directory.Build.props @@ -1,8 +1,8 @@  - 5.2.2 - 5.2.2 - 1.6.0 + 5.3.0 + 5.3.0 + 1.7.0 6.0.1 1.5.10 2.13.0 diff --git a/gateways/common.props b/gateways/common.props index a5bafd373..636058f1d 100644 --- a/gateways/common.props +++ b/gateways/common.props @@ -1,7 +1,7 @@ latest - 5.2.2 + 5.3.0 $(NoWarn);CS1591;CS0436 \ No newline at end of file diff --git a/gateways/configureawait.props b/gateways/configureawait.props index b0cf9ef29..92f22f85f 100644 --- a/gateways/configureawait.props +++ b/gateways/configureawait.props @@ -1,7 +1,7 @@ - + All runtime; build; native; contentfiles; analyzers