优化登录权限存储jwt
This commit is contained in:
@@ -73,15 +73,15 @@ namespace ZR.Admin.WebApi.Controllers.System
|
||||
}
|
||||
|
||||
var user = sysLoginService.Login(loginBody, AsyncFactory.RecordLogInfo(httpContextAccessor.HttpContext, "0", "login"));
|
||||
|
||||
#region 存入cookie Action校验权限使用
|
||||
//角色集合 eg: admin,yunying,common
|
||||
//List<string> roles = permissionService.GetRolePermission(user);
|
||||
List<SysRole> roles = roleService.SelectRolePermissionByUserId(user.UserId);
|
||||
List<SysRole> roles = roleService.SelectUserRoleListByUserId(user.UserId);
|
||||
//权限集合 eg *:*:*,system:user:list
|
||||
List<string> permissions = permissionService.GetMenuPermission(user);
|
||||
#endregion
|
||||
LoginUser loginUser = new LoginUser(user, roles, permissions);
|
||||
|
||||
LoginUser loginUser = new(user, roles, permissions);
|
||||
CacheHelper.SetCache(GlobalConstant.UserPermKEY + user.UserId, loginUser);
|
||||
return SUCCESS(JwtUtil.GenerateJwtToken(HttpContext.AddClaims(loginUser)));
|
||||
}
|
||||
|
||||
@@ -98,7 +98,9 @@ namespace ZR.Admin.WebApi.Controllers.System
|
||||
// //注销登录的用户,相当于ASP.NET中的FormsAuthentication.SignOut
|
||||
// await HttpContext.SignOutAsync();
|
||||
//}).Wait();
|
||||
var id = HttpContext.GetUId();
|
||||
|
||||
CacheHelper.Remove(GlobalConstant.UserPermKEY + id);
|
||||
return SUCCESS(1);
|
||||
}
|
||||
|
||||
|
||||
@@ -91,9 +91,9 @@ namespace ZR.Admin.WebApi.Extensions
|
||||
}
|
||||
else if ("2".Equals(dataScope))
|
||||
{
|
||||
var roleDepts = db0.Queryable<SysRoleDept>()
|
||||
.Where(f => f.RoleId == role.RoleId).Select(f => f.DeptId).ToList();
|
||||
var filter1 = new TableFilterItem<SysDept>(it => roleDepts.Contains(it.DeptId));
|
||||
//var roleDepts = db0.Queryable<SysRoleDept>()
|
||||
//.Where(f => f.RoleId == role.RoleId).Select(f => f.DeptId).ToList();
|
||||
//var filter1 = new TableFilterItem<SysDept>(it => roleDepts.Contains(it.DeptId));
|
||||
}
|
||||
else if ("3".Equals(dataScope))
|
||||
{
|
||||
|
||||
@@ -137,14 +137,6 @@ namespace ZR.Admin.WebApi.Extensions
|
||||
new Claim(ClaimTypes.Name, user.UserName),
|
||||
new Claim(ClaimTypes.UserData, JsonConvert.SerializeObject(user))
|
||||
};
|
||||
if (user.RoleIds != null)
|
||||
{
|
||||
claims.Add(new Claim(ClaimTypes.Role, string.Join(",", user.RoleIds)));
|
||||
}
|
||||
if (user.Permissions != null)
|
||||
{
|
||||
claims.Add(new Claim("perm", string.Join(",", user.Permissions)));
|
||||
}
|
||||
|
||||
//写入Cookie
|
||||
//WhiteCookie(context, claims);
|
||||
|
||||
@@ -67,7 +67,7 @@ namespace ZR.Admin.WebApi.Filters
|
||||
}
|
||||
if (!HasPermi && !Permission.Equals("common"))
|
||||
{
|
||||
logger.Info($"用户{info.NickName}没有权限访问{context.HttpContext.Request.Path},当前权限[{Permission}]");
|
||||
logger.Info($"用户{info.UserName}没有权限访问{context.HttpContext.Request.Path},当前权限[{Permission}]");
|
||||
context.Result = new JsonResult(new { code = ResultCode.FORBIDDEN, msg = "你没有权限访问" });
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user