gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '权限管理功能小改' (#287) from koy07555/Admin.NET.Pro:小改权限相关 into v2

Browse Source 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/287
This commit is contained in:
zuohuaijun 2025-03-05 10:54:32 +08:00
commit 3d50990047
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs
View File

@ -60,6 +60,12 @@ public class SysAuthService : IDynamicApiController, ITransient
// 判断是否开启验证码并校验 // 判断是否开启验证码并校验
var tenant = _sysCacheService.Get<List<SysTenant>>(CacheConst.KeyTenant)?.WhereIF(input.TenantId > 0, u => u.Id == input.TenantId).FirstOrDefault(); var tenant = _sysCacheService.Get<List<SysTenant>>(CacheConst.KeyTenant)?.WhereIF(input.TenantId > 0, u => u.Id == input.TenantId).FirstOrDefault();
// 缓存被清服务不重启这里tenant会为空,出错
if (tenant==null && input.TenantId==0)
{
await App.GetRequiredService<SysTenantService>().CacheTenant();
tenant = _sysCacheService.Get<List<SysTenant>>(CacheConst.KeyTenant)?.WhereIF(input.TenantId > 0, u => u.Id == input.TenantId).FirstOrDefault();
}
if (tenant.Captcha == true && !_captcha.Validate(input.CodeId.ToString(), input.Code)) if (tenant.Captcha == true && !_captcha.Validate(input.CodeId.ToString(), input.Code))
throw Oops.Oh(ErrorCodeEnum.D0008); throw Oops.Oh(ErrorCodeEnum.D0008);

2
Admin.NET/Admin.NET.Core/Service/Role/SysRoleService.cs
View File

@ -394,6 +394,8 @@ public class SysRoleService : IDynamicApiController, ITransient
apiList[1].AddRange(roleApiList); apiList[1].AddRange(roleApiList);
} }
_sysCacheService.Set(CacheConst.KeyUserApi + userId, apiList, TimeSpan.FromDays(7)); // 缓存7天 _sysCacheService.Set(CacheConst.KeyUserApi + userId, apiList, TimeSpan.FromDays(7)); // 缓存7天
foreach (var lst in apiList)
lst.Sort();
return apiList; return apiList;
} }