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

修复状态问题、用户中心页面查询及修改

Browse Source
This commit is contained in:
陈淳
2022-09-14 19:53:53 +08:00
parent 011d9d639b
commit ea2be7609c
17 changed files with 90 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
View File

@@ -41,13 +41,6 @@
</summary>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.AccountController.UpdatePassword(Yi.Framework.DTOModel.UpdatePasswordDto)">
<summary>
更新登录的用户密码
</summary>
<param name="updatePasswordDto"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.AccountController.UpdateUserByHttp(Yi.Framework.Model.Models.UserEntity)">
<summary>
更新已登录用户的用户信息
@@ -55,6 +48,13 @@
<param name="user"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.AccountController.UpdatePassword(Yi.Framework.DTOModel.UpdatePasswordDto)">
<summary>
自己更新密码
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="T:Yi.Framework.ApiMicroservice.Controllers.BaseCrudController`1">
<summary>
Json To Sql 类比模式，通用模型

41
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
View File

@@ -111,34 +111,12 @@ namespace Yi.Framework.ApiMicroservice.Controllers
{
var userId = HttpContext.GetCurrentUserEntityInfo(out _).Id;
var data = await _iUserService.GetUserAllInfo(userId);
//将后端菜单转换成前端路由，组件级别需要过滤
List<VueRouterModel> routers = MenuEntity.RouterBuild(data.Menus.ToList());
return Result.Success().SetData(routers);
}
/// <summary>
/// 更新登录的用户密码
/// </summary>
/// <param name="updatePasswordDto"></param>
/// <returns></returns>
[HttpPut]
public async Task<Result> UpdatePassword(UpdatePasswordDto updatePasswordDto)
{
var userId = HttpContext.GetCurrentUserEntityInfo(out _).Id;
var userEntiy = await _iUserService._repository.GetByIdAsync(userId);
//判断输入的老密码是否和原密码相同
if (userEntiy.JudgePassword(updatePasswordDto.OldPassword))
{
userEntiy.Password = updatePasswordDto.NewPassword;
userEntiy.BuildPassword();
return Result.Success().SetStatus(await _iUserService._repository.UpdateAsync(userEntiy));
}
return Result.SuccessError("原密码错误！");
}
/// <summary>
/// 更新已登录用户的用户信息
/// </summary>
@@ -155,5 +133,22 @@ namespace Yi.Framework.ApiMicroservice.Controllers
user.Id = HttpContext.GetCurrentUserEntityInfo(out _).Id;
return Result.Success().SetStatus(await _iUserService._repository.UpdateIgnoreNullAsync(user));
}
/// <summary>
/// 自己更新密码
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPut]
public async Task<Result> UpdatePassword(UpdatePasswordDto dto)
{
long userId = HttpContext.GetCurrentUserEntityInfo(out _).Id;
if (await _iUserService.UpdatePassword(dto, userId))
{
return Result.Success();
}
return Result.Error("更新失败！");
}
}
}

BIN
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
View File

Binary file not shown.

19
Yi.Framework.Net6/Yi.Framework.Interface/IUserService.cs
View File

@@ -68,8 +68,6 @@ namespace Yi.Framework.Interface
/// <returns></returns>
Task<UserRoleMenuDto> GetUserAllInfo(long userId);
/// <summary>
/// 动态条件分页查询
/// </summary>
@@ -100,6 +98,23 @@ namespace Yi.Framework.Interface
/// <param name="password"></param>
/// <returns></returns>
Task<bool> RestPassword(long userId,string password );
/// <summary>
/// 给用户设置岗位
/// </summary>
/// <param name="userIds"></param>
/// <param name="postIds"></param>
/// <returns></returns>
Task<bool> GiveUserSetPost(List<long> userIds, List<long> postIds);
/// <summary>
/// 更新密码
/// </summary>
/// <param name="dto"></param>
/// <param name="userId"></param>
/// <returns></returns>
Task<bool> UpdatePassword(UpdatePasswordDto dto, long userId);
}
}

1
Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs
View File

@@ -41,6 +41,7 @@ namespace Yi.Framework.Model.Models
/// <returns></returns>
public bool JudgePassword(string password)
{
var p = MD5Helper.SHA2Encode(password, this.Salt);
if (this.Password == MD5Helper.SHA2Encode(password, this.Salt))
{
return true;

22
Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
View File

@@ -202,7 +202,7 @@ namespace Yi.Framework.Service
{
//如果deptId不为空，部门id以下及自己都可以
List<long> deptIds = (await _repository._Db.Queryable<DeptEntity>().ToChildListAsync(it => it.ParentId, deptId)).Select(d => d.Id).ToList();
query = query.Where(u => u.DeptId!=null&& deptIds.Contains((long)u.DeptId));
query = query.Where(u => u.DeptId != null && deptIds.Contains((long)u.DeptId));
}
data = await query.OrderBy(u => u.OrderNum, OrderByType.Desc)
@@ -248,5 +248,25 @@ namespace Yi.Framework.Service
}
public async Task<bool> UpdatePassword(UpdatePasswordDto dto, long userId)
{
var user = await _repository.GetByIdAsync(userId);
if (dto.OldPassword.Equals(dto.NewPassword))
{
return false;
}
if (!user.JudgePassword(dto.OldPassword))
{
return false;
}
var newUser = new UserEntity();
newUser.Password = dto.NewPassword;
newUser.Id = userId;
newUser.BuildPassword();
return await _repository.UpdateIgnoreNullAsync(newUser);
}
}
}