From cb85569c26fab18c8fefb1c7ffb6bc8709f5a790 Mon Sep 17 00:00:00 2001 From: lzw <605106923@qq.com> Date: Wed, 20 Oct 2021 18:09:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9=E5=AF=86?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AccountController.cs | 32 ++++++++++++------- .../Yi.Framework.DTOModel/ChangePwdDto.cs | 3 +- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs index c33b0d52..2e6e70ed 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs @@ -109,26 +109,36 @@ namespace Yi.Framework.ApiMicroservice.Controllers [HttpPut] public async Task ChangePassword(ChangePwdDto pwdDto) { + var user_data = await _userService.GetUserInfoById(pwdDto.user.id); + if (pwdDto.newPassword != null) - { - var user_data = await _userService.GetEntityById(pwdDto.id); - if (user_data.password == pwdDto.password) + { + if (user_data.password == pwdDto.user.password) { user_data.password = pwdDto.newPassword; - user_data.phone = pwdDto.phone; - user_data.introduction = pwdDto.introduction; - user_data.email = pwdDto.email; - user_data.age = pwdDto.age; - user_data.address = pwdDto.address; - user_data.is_delete = pwdDto.is_delete; - user_data.nick = pwdDto.nick; + user_data.phone = pwdDto.user.phone; + user_data.introduction = pwdDto.user.introduction; + user_data.email = pwdDto.user.email; + user_data.age = pwdDto.user.age; + user_data.address = pwdDto.user.address; + + user_data.nick = pwdDto.user.nick; await _userService.UpdateAsync(user_data); user_data.password = null; return Result.Success().SetData(user_data); } } - return Result.Error(); + user_data.phone = pwdDto.user.phone; + user_data.introduction = pwdDto.user.introduction; + user_data.email = pwdDto.user.email; + user_data.age = pwdDto.user.age; + user_data.address = pwdDto.user.address; + user_data.is_delete = pwdDto.user.is_delete; + user_data.nick = pwdDto.user.nick; + await _userService.UpdateAsync(user_data); + user_data.password = null; + return Result.Success().SetData(user_data); } } } \ No newline at end of file diff --git a/Yi.Framework/Yi.Framework.DTOModel/ChangePwdDto.cs b/Yi.Framework/Yi.Framework.DTOModel/ChangePwdDto.cs index 3ee64bb3..d8db8c1e 100644 --- a/Yi.Framework/Yi.Framework.DTOModel/ChangePwdDto.cs +++ b/Yi.Framework/Yi.Framework.DTOModel/ChangePwdDto.cs @@ -7,8 +7,9 @@ using Yi.Framework.Model.Models; namespace Yi.Framework.DTOModel { - public class ChangePwdDto:user + public class ChangePwdDto { + public user user { get; set; } public string newPassword { get; set; } } }