From ad668a8aeb840e7fb1a32aa66e550c9ce7bb89f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 13 Apr 2018 09:16:22 +0300 Subject: [PATCH] Add CurrentTenant to DomainService. --- .../Volo/Abp/Domain/Services/DomainService.cs | 3 +++ .../MultiTenancy/MultiTenantConnectionStringResolver.cs | 7 +------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Services/DomainService.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Services/DomainService.cs index a74445e4f5..ea94690d61 100644 --- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Services/DomainService.cs +++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Services/DomainService.cs @@ -2,6 +2,7 @@ using System; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Guids; +using Volo.Abp.MultiTenancy; using Volo.Abp.Timing; namespace Volo.Abp.Domain.Services @@ -13,6 +14,8 @@ namespace Volo.Abp.Domain.Services public IGuidGenerator GuidGenerator { get; set; } public ILoggerFactory LoggerFactory { get; set; } + + public ICurrentTenant CurrentTenant { get; set; } protected ILogger Logger => _lazyLogger.Value; private Lazy _lazyLogger => new Lazy(() => LoggerFactory?.CreateLogger(GetType().FullName) ?? NullLogger.Instance, true); diff --git a/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs index aad2150b8a..af5674a9b4 100644 --- a/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs +++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs @@ -40,12 +40,7 @@ namespace Volo.Abp.MultiTenancy var tenant = AsyncHelper.RunSync(() => tenantStore.FindAsync(_currentTenant.Id.Value)); //TODO: Can we avoid from RunSync? - if (tenant == null) - { - return base.Resolve(connectionStringName); - } - - if (tenant.ConnectionStrings == null) + if (tenant?.ConnectionStrings == null) { return base.Resolve(connectionStringName); }