代码优化

master
xiaochanghai 1 year ago
parent 8ea12c84a3
commit 37ebb4a1f0
  1. 62
      Tiobon.Core.Extensions/Authorizations/Policys/PermissionHandler.cs
  2. 4
      Tiobon.Core/Tiobon.Core.xml

@ -55,38 +55,38 @@ namespace Tiobon.Core.AuthHelper
var httpContext = _accessor.HttpContext;
// 获取系统中所有的角色和菜单的关系集合
if (!requirement.Permissions.Any())
{
var data = await _roleModulePermissionServices.RoleModuleMaps();
var list = new List<PermissionItem>();
// ids4和jwt切换
// ids4
if (Permissions.IsUseIds4)
{
list = (from item in data
where item.IsDeleted == false
orderby item.Id
select new PermissionItem
{
Url = item.Module?.LinkUrl,
Role = item.Role?.Id.ObjToString(),
}).ToList();
}
// jwt
else
{
list = (from item in data
where item.IsDeleted == false
orderby item.Id
select new PermissionItem
{
Url = item.Module?.LinkUrl,
Role = item.Role?.Name.ObjToString(),
}).ToList();
}
//if (!requirement.Permissions.Any())
//{
// var data = await _roleModulePermissionServices.RoleModuleMaps();
// var list = new List<PermissionItem>();
// // ids4和jwt切换
// // ids4
// if (Permissions.IsUseIds4)
// {
// list = (from item in data
// where item.IsDeleted == false
// orderby item.Id
// select new PermissionItem
// {
// Url = item.Module?.LinkUrl,
// Role = item.Role?.Id.ObjToString(),
// }).ToList();
// }
// // jwt
// else
// {
// list = (from item in data
// where item.IsDeleted == false
// orderby item.Id
// select new PermissionItem
// {
// Url = item.Module?.LinkUrl,
// Role = item.Role?.Name.ObjToString(),
// }).ToList();
// }
requirement.Permissions = list;
}
// requirement.Permissions = list;
//}
if (httpContext != null)
{

@ -278,11 +278,11 @@
登录管理【无权限】
</summary>
</member>
<member name="M:Tiobon.Core.Controllers.LoginController.#ctor(Tiobon.Core.IServices.ISysUserInfoServices,Tiobon.Core.IServices.IUserRoleServices,Tiobon.Core.IServices.IRoleServices,Tiobon.Core.AuthHelper.PermissionRequirement,Tiobon.Core.IServices.IRoleModulePermissionServices,Microsoft.Extensions.Logging.ILogger{Tiobon.Core.Controllers.LoginController})">
<member name="M:Tiobon.Core.Controllers.LoginController.#ctor(Tiobon.Core.IServices.IGhrs_UserServices,Tiobon.Core.IServices.IUserRoleServices,Tiobon.Core.IServices.IRoleServices,Tiobon.Core.AuthHelper.PermissionRequirement,Tiobon.Core.IServices.IRoleModulePermissionServices,Microsoft.Extensions.Logging.ILogger{Tiobon.Core.Controllers.LoginController})">
<summary>
构造函数注入
</summary>
<param name="sysUserInfoServices"></param>
<param name="ghrs_UserServices"></param>
<param name="userRoleServices"></param>
<param name="roleServices"></param>
<param name="requirement"></param>

Loading…
Cancel
Save