upgrade: upgrade abp framework to 5.3.0

aspnet-core/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
-		<VoloAbpPackageVersion>5.2.2</VoloAbpPackageVersion>
+		<VoloAbpPackageVersion>5.3.0</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>5.2.2</LINGYUNAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>5.3.0</LINGYUNAbpPackageVersion>
 		<DaprPackageVersion>1.7.0</DaprPackageVersion>
 		<DistributedLockRedisPackageVersion>1.0.1</DistributedLockRedisPackageVersion>
 		<DotNetCoreCAPPackageVersion>6.0.1</DotNetCoreCAPPackageVersion>
@@ -10,7 +10,7 @@
 		<TencentCloudSDKPackageVersion>3.0.434</TencentCloudSDKPackageVersion>
 		<AgileConfigClientPackageVersion>1.2.1.5</AgileConfigClientPackageVersion>
 		<HangfireMySqlStoragePackageVersion>2.0.3</HangfireMySqlStoragePackageVersion>
-		<HangfireMSSQLStoragePackageVersion>1.7.28</HangfireMSSQLStoragePackageVersion>
+		<HangfireMSSQLStoragePackageVersion>1.7.29</HangfireMSSQLStoragePackageVersion>
 		<NESTPackageVersion>7.15.1</NESTPackageVersion>
 		<OpenTelemetryExtensionsHostingPackageVersion>1.0.0-rc8</OpenTelemetryExtensionsHostingPackageVersion>
 		<OpenTelemetryExporterZipkinPackageVersion>1.2.0-rc1</OpenTelemetryExporterZipkinPackageVersion>

aspnet-core/common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.2.2</Version>
+    <Version>5.3.0</Version>
     <Authors>colin</Authors>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>

aspnet-core/configureawait.props

@@ -1,7 +1,7 @@
 <Project>
   <ItemGroup>
       <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All" />
-      <PackageReference Include="Fody" Version="6.5.3">
+      <PackageReference Include="Fody" Version="6.6.1">
         <PrivateAssets>All</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       </PackageReference>

aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj

@@ -4,7 +4,7 @@
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace />
   </PropertyGroup>
 

aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj

@@ -4,7 +4,7 @@
     <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace />
   </PropertyGroup>
 

aspnet-core/modules/authorization/LINGYUN.Abp.Identity.OrganizaztionUnits/LINGYUN.Abp.Identity.OrganizaztionUnits.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj

@@ -5,7 +5,7 @@
     <PropertyGroup>
       <OutputType>Exe</OutputType>
       <TargetFramework>net6.0</TargetFramework>
-			<Version>5.2.2</Version>
+			<Version>5.3.0</Version>
 			<Copyright>colin</Copyright>
 			<Description>Use LINGYUN.MicroService.Templates command line</Description>
 			<PackAsTool>true</PackAsTool>

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";
     }
 }

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<OutgoingEventInfo> outgoingEvents, OutboxConfig outboxConfig)
+        {
+            var outgoingEventArray = outgoingEvents.ToArray();
+
+            foreach (var outgoingEvent in outgoingEventArray)
+            {
+                await CapPublisher
+                    .PublishAsync(
+                        outgoingEvent.EventName,
+                        outgoingEvent.EventData,
+                        new Dictionary<string, string>
+                        {
+                            { AbpCAPHeaders.MessageId, outgoingEvent.Id.ToString() },
+                            { AbpCAPHeaders.UserId, CurrentUser.Id?.ToString() ?? "" },
+                            { AbpCAPHeaders.ClientId, CurrentClient.Id ?? "" },
+                            { AbpCAPHeaders.TenantId, CurrentTenant.Id?.ToString() ?? "" },
+                        },
+                        CancellationTokenProvider.FallbackToProvider());
+            }
+        }
     }
 }

aspnet-core/modules/common/LINGYUN.Abp.Notifications.Emailing/LINGYUN.Abp.Notifications.Emailing.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN.Abp.Logging.Serilog.Elasticsearch.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Application/LINGYUN.Abp.LocalizationManagement.Application.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain/LINGYUN.Abp.LocalizationManagement.Domain.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN.Abp.OssManagement.Application.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN.Abp.UI.Navigation.VueVbenAdmin.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/platform/LINGYUN.Platform.Application/LINGYUN.Platform.Application.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/Versions/VersionManager.cs

@@ -101,7 +101,7 @@ namespace LINGYUN.Platform.Versions
         public virtual async Task<string> 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);
 

aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN.Abp.Saas.Application.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN.Abp.Saas.Domain.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application/LINGYUN.Abp.TaskManagement.Application.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN.Abp.TaskManagement.Domain.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN.Abp.WebhooksManagement.Application.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain/LINGYUN.Abp.WebhooksManagement.Domain.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/wechat/LINGYUN.Abp.Identity.WeChat/LINGYUN.Abp.Identity.WeChat.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN.Abp.WorkflowManagement.Domain.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\..\common.props" />
 	
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>
 

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<AbpMultiTenancyOptions> options)
+        IOptions<AbpMultiTenancyOptions> multiTenancyOptions,
+        IOptions<AbpAspNetCoreMultiTenancyOptions> 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<OpenApiParameter>();
             operation.Parameters.Add(new OpenApiParameter
             {
-                Name = TenantResolverConsts.DefaultTenantKey,
+                Name = _aspNetCoreMultiTenancyOptions.TenantKey,
                 In = ParameterLocation.Header,
                 Description = "Tenant Id in http header",
                 Required = false

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<AbpMultiTenancyOptions> options)
+        IOptions<AbpMultiTenancyOptions> multiTenancyOptions,
+        IOptions<AbpAspNetCoreMultiTenancyOptions> 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<OpenApiParameter>();
             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
             });
         }

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<AbpMultiTenancyOptions> options)
+            IOptions<AbpMultiTenancyOptions> multiTenancyOptions,
+            IOptions<AbpAspNetCoreMultiTenancyOptions> 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<OpenApiParameter>();
                 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
                 });
             }

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<AbpMultiTenancyOptions> options)
+        IOptions<AbpMultiTenancyOptions> multiTenancyOptions,
+        IOptions<AbpAspNetCoreMultiTenancyOptions> 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<OpenApiParameter>();
             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
             });
         }

aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.Configure.cs

@@ -248,6 +248,7 @@ public partial class TaskManagementHttpApiHostModule
                         new string[] { }
                     }
                 });
+                options.OperationFilter<TenantHeaderParamter>();
             });
     }
 

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<AbpMultiTenancyOptions> multiTenancyOptions,
+        IOptions<AbpAspNetCoreMultiTenancyOptions> aspNetCoreMultiTenancyOptions)
+    {
+        _multiTenancyOptions = multiTenancyOptions.Value;
+        _aspNetCoreMultiTenancyOptions = aspNetCoreMultiTenancyOptions.Value;
+    }
+
+    public void Apply(OpenApiOperation operation, OperationFilterContext context)
+    {
+        if (_multiTenancyOptions.IsEnabled)
+        {
+            operation.Parameters = operation.Parameters ?? new List<OpenApiParameter>();
+            operation.Parameters.Add(new OpenApiParameter
+            {
+                Name = _aspNetCoreMultiTenancyOptions.TenantKey,
+                In = ParameterLocation.Header,
+                Description = "Tenant Id/Name in http header",
+                Required = false
+            });
+        }
+    }
+}

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<AbpMultiTenancyOptions> options)
+        IOptions<AbpMultiTenancyOptions> multiTenancyOptions,
+        IOptions<AbpAspNetCoreMultiTenancyOptions> 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<OpenApiParameter>();
             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
             });
         }

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<AbpMultiTenancyOptions> options)
+        IOptions<AbpMultiTenancyOptions> multiTenancyOptions,
+        IOptions<AbpAspNetCoreMultiTenancyOptions> 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<OpenApiParameter>();
             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
             });
         }

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<AbpMultiTenancyOptions> options)
+        IOptions<AbpMultiTenancyOptions> multiTenancyOptions,
+        IOptions<AbpAspNetCoreMultiTenancyOptions> 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<OpenApiParameter>();
             operation.Parameters.Add(new OpenApiParameter
             {
-                Name = TenantResolverConsts.DefaultTenantKey,
+                Name = _aspNetCoreMultiTenancyOptions.TenantKey,
                 In = ParameterLocation.Header,
                 Description = "Tenant Id in http header",
                 Required = false

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.2.2</Version>
+    <Version>5.3.0</Version>
     <Authors>LINGYUN</Authors>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>

gateways/Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
 	<PropertyGroup>
-		<VoloAbpPackageVersion>5.2.2</VoloAbpPackageVersion>
+		<VoloAbpPackageVersion>5.3.0</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>5.2.2</LINGYUNAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>5.3.0</LINGYUNAbpPackageVersion>
-		<DaprPackageVersion>1.6.0</DaprPackageVersion>
+		<DaprPackageVersion>1.7.0</DaprPackageVersion>
 		<DotNetCoreCAPPackageVersion>6.0.1</DotNetCoreCAPPackageVersion>
 		<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>
 		<AliyunOSSSDKPackageVersion>2.13.0</AliyunOSSSDKPackageVersion>

gateways/common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.2.2</Version>
+    <Version>5.3.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
   </PropertyGroup>
 </Project>

gateways/configureawait.props

@@ -1,7 +1,7 @@
 <Project>
   <ItemGroup>
       <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All" />
-      <PackageReference Include="Fody" Version="6.5.3">
+      <PackageReference Include="Fody" Version="6.6.1">
         <PrivateAssets>All</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       </PackageReference>