diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj index 31697d04e..9efab005a 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.1 Cap分布式事件总线 true @@ -11,7 +11,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPMessageExtensions.cs b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPMessageExtensions.cs index 08e770bcd..6c563caa0 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPMessageExtensions.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPMessageExtensions.cs @@ -16,16 +16,17 @@ namespace LINGYUN.Abp.EventBus.CAP /// public static bool TryGetTenantId( this Message message, - out Guid tenantId) + out Guid? tenantId) { if (message.Headers.TryGetValue(AbpCAPHeaders.TenantId, out string tenantStr)) { - if (Guid.TryParse(tenantStr, out tenantId)) + if (Guid.TryParse(tenantStr, out Guid id)) { + tenantId = id; return true; } } - + tenantId = null; return false; } /// @@ -36,7 +37,7 @@ namespace LINGYUN.Abp.EventBus.CAP public static Guid? GetTenantIdOrNull( this Message message) { - if (message.TryGetTenantId(out Guid tenantId)) + if (message.TryGetTenantId(out Guid? tenantId)) { return tenantId; }