Skip to content

Commit 73aaa42

Browse files
zuohuaijungitee-org
authored andcommitted
!1748 扩展租户配置服务,支持指定tenantId获取配置,适配Job的使用
Merge pull request !1748 from Lzh666/N/A
2 parents d74dbc6 + 20b792f commit 73aaa42

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

Admin.NET/Admin.NET.Core/Service/Config/SysTenantConfigService.cs

+17-2
Original file line numberDiff line numberDiff line change
@@ -195,19 +195,34 @@ public async Task<string> GetConfigValueByCode(string code, string defaultValue
195195
/// <summary>
196196
/// 获取配置参数值
197197
/// </summary>
198+
/// <typeparam name="T">类型</typeparam>
198199
/// <param name="code">编码</param>
199200
/// <param name="defaultValue">默认值</param>
200201
/// <returns></returns>
201202
[NonAction]
202203
public async Task<T> GetConfigValueByCode<T>(string code, T defaultValue = default)
204+
{
205+
return await GetConfigValueByCode<T>(code, _userManager.TenantId, defaultValue);
206+
}
207+
208+
/// <summary>
209+
/// 获取配置参数值
210+
/// </summary>
211+
/// <typeparam name="T">类型</typeparam>
212+
/// <param name="code">编码</param>
213+
/// <param name="tenantId">租户Id</param>
214+
/// <param name="defaultValue">默认值</param>
215+
/// <returns></returns>
216+
[NonAction]
217+
public async Task<T> GetConfigValueByCode<T>(string code, long tenantId, T defaultValue = default)
203218
{
204219
if (string.IsNullOrWhiteSpace(code)) return defaultValue;
205220

206-
var value = _sysCacheService.Get<string>($"{CacheConst.KeyTenantConfig}{_userManager.TenantId}{code}");
221+
var value = _sysCacheService.Get<string>($"{CacheConst.KeyTenantConfig}{tenantId}{code}");
207222
if (string.IsNullOrEmpty(value))
208223
{
209224
value = (await VSysConfig.FirstAsync(u => u.Code == code))?.Value;
210-
_sysCacheService.Set($"{CacheConst.KeyTenantConfig}{_userManager.TenantId}{code}", value);
225+
_sysCacheService.Set($"{CacheConst.KeyTenantConfig}{tenantId}{code}", value);
211226
}
212227
if (string.IsNullOrWhiteSpace(value)) return defaultValue;
213228
return (T)Convert.ChangeType(value, typeof(T));

0 commit comments

Comments
 (0)