xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 添加值对象

Browse Source
This commit is contained in:
陈淳
2024-04-22 18:06:09 +08:00
parent 58ff8f45cf
commit d389dcbedf
5 changed files with 57 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs
View File

@@ -154,7 +154,7 @@ namespace Yi.Framework.Rbac.Domain.Managers
{
userAction.Invoke(user);
}
if (user.Password == MD5Helper.SHA2Encode(password, user.Salt))
if (user.EncryPassword.Password == MD5Helper.SHA2Encode(password, user.EncryPassword.Salt))
{
return;
}
@@ -247,7 +247,7 @@ namespace Yi.Framework.Rbac.Domain.Managers
{
throw new UserFriendlyException("无效更新！原密码错误！");
}
user.Password = newPassword;
user.EncryPassword.Password = newPassword;
user.BuildPassword();
await _repository.UpdateAsync(user);
}
@@ -262,7 +262,7 @@ namespace Yi.Framework.Rbac.Domain.Managers
{
var user = await _repository.GetByIdAsync(userId);
// EntityHelper.TrySetId(user, () => GuidGenerator.Create(), true);
user.Password = password;
user.EncryPassword.Password = password;
user.BuildPassword();
return await _repository.UpdateAsync(user);
}

4
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs
View File

@@ -152,8 +152,8 @@ namespace Yi.Framework.Rbac.Domain.Managers
//{
// throw new UserFriendlyException($"数据错误，用户id：{nameof(userId)} 不存在，请重新登录");
//}
user.Password = string.Empty;
user.Salt = string.Empty;
user.EncryPassword.Password = string.Empty;
user.EncryPassword.Salt = string.Empty;
//超级管理员特殊处理
if (UserConst.Admin.Equals(user.UserName))