tsai
/
abp-next-admin
mirror of https://github.com/colinin/abp-next-admin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

The tenant connection configuration information cannot be queried at the current tenant scope

pull/122/head
cKey 5 years ago
parent
d7dfe54799
commit
01410cf238
2 changed files with 113 additions and 98 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 60
      aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.DbFinder/LINGYUN/Abp/MultiTenancy/DbFinder/TenantStore.cs
  2. 151
      aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN/Abp/MultiTenancy/RemoteService/TenantStore.cs

60
aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.DbFinder/LINGYUN/Abp/MultiTenancy/DbFinder/TenantStore.cs
View File

@ -3,7 +3,6 @@ using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Caching; using Volo.Abp.Caching;
using Volo.Abp.Data; using Volo.Abp.Data;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
@ -11,6 +10,11 @@ using Volo.Abp.MultiTenancy;
using Volo.Abp.TenantManagement; using Volo.Abp.TenantManagement;
using Volo.Abp.Threading; using Volo.Abp.Threading;
/*
* fix bug: 不能在当前租户范围下来查询租户的连接配置信息,否则只会永远执行数据库查询
*
*/
namespace LINGYUN.Abp.MultiTenancy.DbFinder namespace LINGYUN.Abp.MultiTenancy.DbFinder
{ {
[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] [Dependency(ServiceLifetime.Transient, ReplaceServices = true)]
@ -98,21 +102,21 @@ namespace LINGYUN.Abp.MultiTenancy.DbFinder
protected virtual async Task<TenantConfigurationCacheItem> GetCacheItemByIdAsync(Guid id) protected virtual async Task<TenantConfigurationCacheItem> GetCacheItemByIdAsync(Guid id)
{ {
var cacheKey = TenantConfigurationCacheItem.CalculateCacheKey(id.ToString()); using (_currentTenant.Change(null))
{
var cacheKey = TenantConfigurationCacheItem.CalculateCacheKey(id.ToString());
Logger.LogDebug($"TenantStore.GetCacheItemByIdAsync: {cacheKey}"); Logger.LogDebug($"TenantStore.GetCacheItemByIdAsync: {cacheKey}");
var cacheItem = await _cache.GetAsync(cacheKey); var cacheItem = await _cache.GetAsync(cacheKey);
if (cacheItem != null) if (cacheItem != null)
{ {
Logger.LogDebug($"Found in the cache: {cacheKey}"); Logger.LogDebug($"Found in the cache: {cacheKey}");
return cacheItem; return cacheItem;
} }
Logger.LogDebug($"Not found in the cache, getting from the repository: {cacheKey}"); Logger.LogDebug($"Not found in the cache, getting from the repository: {cacheKey}");
using (_currentTenant.Change(null))
{
var tenant = await _tenantRepository.FindAsync(id, true); var tenant = await _tenantRepository.FindAsync(id, true);
if (tenant == null) if (tenant == null)
{ {
@ -129,6 +133,10 @@ namespace LINGYUN.Abp.MultiTenancy.DbFinder
Logger.LogDebug($"Setting the cache item: {cacheKey}"); Logger.LogDebug($"Setting the cache item: {cacheKey}");
await _cache.SetAsync(cacheKey, cacheItem); await _cache.SetAsync(cacheKey, cacheItem);
// 用租户名称再次缓存,以便通过标识查询也能命中缓存
await _cache.SetAsync(TenantConfigurationCacheItem.CalculateCacheKey(tenant.Name), cacheItem);
Logger.LogDebug($"Finished setting the cache item: {cacheKey}"); Logger.LogDebug($"Finished setting the cache item: {cacheKey}");
return cacheItem; return cacheItem;
@ -136,21 +144,22 @@ namespace LINGYUN.Abp.MultiTenancy.DbFinder
} }
protected virtual async Task<TenantConfigurationCacheItem> GetCacheItemByNameAsync(string name) protected virtual async Task<TenantConfigurationCacheItem> GetCacheItemByNameAsync(string name)
{ {
var cacheKey = TenantConfigurationCacheItem.CalculateCacheKey(name); // 需要切换到最外层以解决查询无效的bug
using (_currentTenant.Change(null))
{
var cacheKey = TenantConfigurationCacheItem.CalculateCacheKey(name);
Logger.LogDebug($"TenantStore.GetCacheItemByNameAsync: {cacheKey}"); Logger.LogDebug($"TenantStore.GetCacheItemByNameAsync: {cacheKey}");
var cacheItem = await _cache.GetAsync(cacheKey); var cacheItem = await _cache.GetAsync(cacheKey);
if (cacheItem != null) if (cacheItem != null)
{ {
Logger.LogDebug($"Found in the cache: {cacheKey}"); Logger.LogDebug($"Found in the cache: {cacheKey}");
return cacheItem; return cacheItem;
} }
Logger.LogDebug($"Not found in the cache, getting from the repository: {cacheKey}"); Logger.LogDebug($"Not found in the cache, getting from the repository: {cacheKey}");
using (_currentTenant.Change(null))
{
var tenant = await _tenantRepository.FindByNameAsync(name); var tenant = await _tenantRepository.FindByNameAsync(name);
if (tenant == null) if (tenant == null)
{ {
@ -166,7 +175,12 @@ namespace LINGYUN.Abp.MultiTenancy.DbFinder
cacheItem = new TenantConfigurationCacheItem(tenant.Id, tenant.Name, connectionStrings); cacheItem = new TenantConfigurationCacheItem(tenant.Id, tenant.Name, connectionStrings);
Logger.LogDebug($"Setting the cache item: {cacheKey}"); Logger.LogDebug($"Setting the cache item: {cacheKey}");
await _cache.SetAsync(cacheKey, cacheItem); await _cache.SetAsync(cacheKey, cacheItem);
// 用租户标识再次缓存,以便通过标识查询也能命中缓存
await _cache.SetAsync(TenantConfigurationCacheItem.CalculateCacheKey(tenant.Id.ToString()), cacheItem);
Logger.LogDebug($"Finished setting the cache item: {cacheKey}"); Logger.LogDebug($"Finished setting the cache item: {cacheKey}");
return cacheItem; return cacheItem;

151
aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN/Abp/MultiTenancy/RemoteService/TenantStore.cs
View File

@ -33,115 +33,116 @@ namespace LINGYUN.Abp.MultiTenancy.RemoteService
} }
public virtual TenantConfiguration Find(string name) public virtual TenantConfiguration Find(string name)
{ {
using (_currentTenant.Change(null)) var tenantCacheItem = AsyncHelper.RunSync(async () => await
{ GetCacheItemByNameAsync(name));
var tenantCacheItem = AsyncHelper.RunSync(async () => await
GetCacheItemByNameAsync(name));
return new TenantConfiguration(tenantCacheItem.Id, tenantCacheItem.Name) return new TenantConfiguration(tenantCacheItem.Id, tenantCacheItem.Name)
{ {
ConnectionStrings = tenantCacheItem.ConnectionStrings ConnectionStrings = tenantCacheItem.ConnectionStrings
}; };
}
} }
public virtual TenantConfiguration Find(Guid id) public virtual TenantConfiguration Find(Guid id)
{ {
using (_currentTenant.Change(null)) var tenantCacheItem = AsyncHelper.RunSync(async () => await
{ GetCacheItemByIdAsync(id));
var tenantCacheItem = AsyncHelper.RunSync(async () => await
GetCacheItemByIdAsync(id));
return new TenantConfiguration(tenantCacheItem.Id, tenantCacheItem.Name) return new TenantConfiguration(tenantCacheItem.Id, tenantCacheItem.Name)
{ {
ConnectionStrings = tenantCacheItem.ConnectionStrings ConnectionStrings = tenantCacheItem.ConnectionStrings
}; };
}
} }
public virtual async Task<TenantConfiguration> FindAsync(string name) public virtual async Task<TenantConfiguration> FindAsync(string name)
{ {
using (_currentTenant.Change(null)) var tenantCacheItem = await GetCacheItemByNameAsync(name);
return new TenantConfiguration(tenantCacheItem.Id, tenantCacheItem.Name)
{ {
var tenantCacheItem = await GetCacheItemByNameAsync(name); ConnectionStrings = tenantCacheItem.ConnectionStrings
return new TenantConfiguration(tenantCacheItem.Id, tenantCacheItem.Name) };
{
ConnectionStrings = tenantCacheItem.ConnectionStrings
};
}
} }
public virtual async Task<TenantConfiguration> FindAsync(Guid id) public virtual async Task<TenantConfiguration> FindAsync(Guid id)
{ {
using (_currentTenant.Change(null)) var tenantCacheItem = await GetCacheItemByIdAsync(id);
return new TenantConfiguration(tenantCacheItem.Id, tenantCacheItem.Name)
{ {
var tenantCacheItem = await GetCacheItemByIdAsync(id); ConnectionStrings = tenantCacheItem.ConnectionStrings
return new TenantConfiguration(tenantCacheItem.Id, tenantCacheItem.Name) };
{
ConnectionStrings = tenantCacheItem.ConnectionStrings
};
}
} }
protected virtual async Task<TenantConfigurationCacheItem> GetCacheItemByIdAsync(Guid id) protected virtual async Task<TenantConfigurationCacheItem> GetCacheItemByIdAsync(Guid id)
{ {
var cacheKey = TenantConfigurationCacheItem.CalculateCacheKey(id.ToString()); using (_currentTenant.Change(null))
{
var cacheKey = TenantConfigurationCacheItem.CalculateCacheKey(id.ToString());
Logger.LogDebug($"TenantStore.GetCacheItemByIdAsync: {cacheKey}"); Logger.LogDebug($"TenantStore.GetCacheItemByIdAsync: {cacheKey}");
var cacheItem = await _cache.GetAsync(cacheKey); var cacheItem = await _cache.GetAsync(cacheKey);
if (cacheItem != null) if (cacheItem != null)
{ {
Logger.LogDebug($"Found in the cache: {cacheKey}"); Logger.LogDebug($"Found in the cache: {cacheKey}");
return cacheItem; return cacheItem;
} }
Logger.LogDebug($"Not found in the cache, getting from the remote service: {cacheKey}"); Logger.LogDebug($"Not found in the cache, getting from the remote service: {cacheKey}");
var tenantDto = await _tenantAppService.GetAsync(id);
var tenantConnectionStringsDto = await _tenantAppService.GetConnectionStringAsync(id);
var connectionStrings = new ConnectionStrings();
foreach (var tenantConnectionString in tenantConnectionStringsDto.Items)
{
connectionStrings[tenantConnectionString.Name] = tenantConnectionString.Value;
}
cacheItem = new TenantConfigurationCacheItem(tenantDto.Id, tenantDto.Name, connectionStrings);
var tenantDto = await _tenantAppService.GetAsync(id); Logger.LogDebug($"Setting the cache item: {cacheKey}");
var tenantConnectionStringsDto = await _tenantAppService.GetConnectionStringAsync(id); await _cache.SetAsync(cacheKey, cacheItem);
var connectionStrings = new ConnectionStrings();
foreach (var tenantConnectionString in tenantConnectionStringsDto.Items)
{
connectionStrings[tenantConnectionString.Name] = tenantConnectionString.Value;
}
cacheItem = new TenantConfigurationCacheItem(tenantDto.Id, tenantDto.Name, connectionStrings);
Logger.LogDebug($"Setting the cache item: {cacheKey}");
await _cache.SetAsync(cacheKey, cacheItem);
Logger.LogDebug($"Finished setting the cache item: {cacheKey}");
return cacheItem; // 通过租户名称再次缓存,以便通过租户名称查询的api能命中缓存
await _cache.SetAsync(TenantConfigurationCacheItem.CalculateCacheKey(tenantDto.Name), cacheItem);
Logger.LogDebug($"Finished setting the cache item: {cacheKey}");
return cacheItem;
}
} }
protected virtual async Task<TenantConfigurationCacheItem> GetCacheItemByNameAsync(string name) protected virtual async Task<TenantConfigurationCacheItem> GetCacheItemByNameAsync(string name)
{ {
var cacheKey = TenantConfigurationCacheItem.CalculateCacheKey(name); using (_currentTenant.Change(null))
{
var cacheKey = TenantConfigurationCacheItem.CalculateCacheKey(name);
Logger.LogDebug($"TenantStore.GetCacheItemByNameAsync: {cacheKey}"); Logger.LogDebug($"TenantStore.GetCacheItemByNameAsync: {cacheKey}");
var cacheItem = await _cache.GetAsync(cacheKey); var cacheItem = await _cache.GetAsync(cacheKey);
if (cacheItem != null) if (cacheItem != null)
{ {
Logger.LogDebug($"Found in the cache: {cacheKey}"); Logger.LogDebug($"Found in the cache: {cacheKey}");
return cacheItem; return cacheItem;
} }
Logger.LogDebug($"Not found in the cache, getting from the remote service: {cacheKey}"); Logger.LogDebug($"Not found in the cache, getting from the remote service: {cacheKey}");
var tenantDto = await _tenantAppService.GetAsync(new TenantGetByNameInputDto(name));
var tenantConnectionStringsDto = await _tenantAppService.GetConnectionStringAsync(tenantDto.Id);
var connectionStrings = new ConnectionStrings();
foreach (var tenantConnectionString in tenantConnectionStringsDto.Items)
{
connectionStrings[tenantConnectionString.Name] = tenantConnectionString.Value;
}
cacheItem = new TenantConfigurationCacheItem(tenantDto.Id, tenantDto.Name, connectionStrings);
var tenantDto = await _tenantAppService.GetAsync(new TenantGetByNameInputDto(name)); Logger.LogDebug($"Setting the cache item: {cacheKey}");
var tenantConnectionStringsDto = await _tenantAppService.GetConnectionStringAsync(tenantDto.Id); await _cache.SetAsync(cacheKey, cacheItem);
var connectionStrings = new ConnectionStrings();
foreach(var tenantConnectionString in tenantConnectionStringsDto.Items) // 通过租户标识再次缓存,以便通过租户名称查询的api能命中缓存
{ await _cache.SetAsync(TenantConfigurationCacheItem.CalculateCacheKey(tenantDto.Id.ToString()), cacheItem);
connectionStrings[tenantConnectionString.Name] = tenantConnectionString.Value;
}
cacheItem = new TenantConfigurationCacheItem(tenantDto.Id, tenantDto.Name, connectionStrings);
Logger.LogDebug($"Setting the cache item: {cacheKey}"); Logger.LogDebug($"Finished setting the cache item: {cacheKey}");
await _cache.SetAsync(cacheKey, cacheItem);
Logger.LogDebug($"Finished setting the cache item: {cacheKey}");
return cacheItem; return cacheItem;
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save