From 8ff7b4eca577db49f52eaf9648b98c167879dc7e Mon Sep 17 00:00:00 2001 From: lzw <605106923@qq.com> Date: Fri, 22 Oct 2021 16:48:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AccountController.cs | 19 +++++++++++------- .../Yi.Framework.ApiMicroservice/YIDB.db-shm | Bin 0 -> 32768 bytes .../Yi.Framework.ApiMicroservice/YIDB.db-wal | Bin 0 -> 206032 bytes .../Yi.Framework.Interface/IUserService.cs | 1 + .../Yi.Framework.Service/UserService.cs | 12 +++++++++-- 5 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm create mode 100644 Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-wal diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs index 2e6e70ed..8c9a7c24 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs @@ -109,36 +109,41 @@ namespace Yi.Framework.ApiMicroservice.Controllers [HttpPut] public async Task ChangePassword(ChangePwdDto pwdDto) { - var user_data = await _userService.GetUserInfoById(pwdDto.user.id); - + var uid= pwdDto.user.id; + var user_data = await _userService.GetUserById(uid); + string msg = "修改成功"; if (pwdDto.newPassword != null) { if (user_data.password == pwdDto.user.password) { + user_data.password = pwdDto.newPassword; 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.Success(msg).SetData(user_data); + } + else + { + msg = "密码错误"; + return Result.Error(msg); } } - + 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); + return Result.Success(msg).SetData(user_data); } } } \ No newline at end of file diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm new file mode 100644 index 0000000000000000000000000000000000000000..1e3a6416964e06b68d8032b22dd7da33393d5e92 GIT binary patch literal 32768 zcmeI*%S~HB6b9fQ2#**@9O4A?3It+99ymY&kx~Uq)`(JAQ2{F`ffkYmk^;geUBK8f z=*kNuFR{NPojXsBX1)T>ZT{O&HyR};lKN3;-;`{hUtIqBF?W4?eD(MDpVq<2&HtaL zw`cRsA@`S~deJH0yGrz@ADh|I>*mXnwUYJz_+fsq9o$zPSNnr!R@bWir}hoAR<11w z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PF|=z(gi9Q)-RQm0F{< z%x9t08ePuE?B)9yt9UvA0t7}|U@D8Hx^*MXtmQ+t)5_<3%fVbXoTltjTd`&0azx)XT W1PBlyK!5-N0t5&UAV6ST1nvP^ATGE7 literal 0 HcmV?d00001 diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-wal b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-wal new file mode 100644 index 0000000000000000000000000000000000000000..390fa52fbeee5fa6efef17f99aa35b812781ffc0 GIT binary patch literal 206032 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 o8-rKuq)uT5PY=3|00IagfB*srAb /// Task GetUserInfoById(int user_id); + Task GetUserById(int user_id); } } diff --git a/Yi.Framework/Yi.Framework.Service/UserService.cs b/Yi.Framework/Yi.Framework.Service/UserService.cs index 57477e71..66b2b1b7 100644 --- a/Yi.Framework/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework/Yi.Framework.Service/UserService.cs @@ -126,9 +126,17 @@ namespace Yi.Framework.Service { var user_data=await _Db.Set().Include(u=>u.roles) .Where(u => u.id == user_id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync(); - user_data.password = null; + //user_data.password = null; user_data.roles.ToList().ForEach(u => u.users = null); return user_data; } - } + public async Task GetUserById(int user_id) + { + var user_data = await _Db.Set().Include(u => u.roles) + .Where(u => u.id == user_id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync(); + + user_data.roles.ToList().ForEach(u => u.users = null); + return user_data; + } + } }