同步

Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs

@@ -109,23 +109,29 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpPut]
         public async Task<Result> 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);
                 }
             }
 
@@ -134,11 +140,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             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);
         }
     }
 }

Yi.Framework/Yi.Framework.Interface/IUserService.cs

@@ -69,5 +69,6 @@ namespace Yi.Framework.Interface
         /// <param name="user_id"></param>
         /// <returns></returns>
         Task<user> GetUserInfoById(int user_id);
+        Task<user> GetUserById(int user_id);
     }
 }

Yi.Framework/Yi.Framework.Service/UserService.cs

@@ -126,9 +126,17 @@ namespace Yi.Framework.Service
         {
             var user_data=await _Db.Set<user>().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<user> GetUserById(int user_id)
+        {
+            var user_data = await _Db.Set<user>().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;
+        }
+    }
 }