更新修改密码

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

@@ -8,6 +8,7 @@ using Yi.Framework.Common;
 using Yi.Framework.Common.Helper;
 using Yi.Framework.Common.Models;
 using Yi.Framework.Core;
+using Yi.Framework.DTOModel;
 using Yi.Framework.Interface;
 using Yi.Framework.Model.Models;
 
@@ -100,5 +101,18 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             }
             //  邮箱和验证码都要被记住，然后注册时候比对邮箱和验证码是不是都和现在生成的一样
         }
+        [HttpPut]
+
+        public async Task<Result> ChangePassword(ChangePwdDto pwdDto)
+        {
+            var user_data = await _userService.GetEntityById(pwdDto.id);
+            if (user_data.password == pwdDto.newPassword)
+            {
+                user_data.password = pwdDto.newPassword;
+                await _userService.UpdateAsync(user_data);
+                return Result.Success();
+            }
+            return Result.Error();
+        }
     }
 }

Yi.Framework/Yi.Framework.DTOModel/ChangePwdDto.cs

@@ -9,6 +9,6 @@ namespace Yi.Framework.DTOModel
 {
     public class ChangePwdDto:user
     {
-        public string oldPassword { get; set; }
+        public string newPassword { get; set; }
     }
 }

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

@@ -62,8 +62,6 @@ namespace Yi.Framework.Interface
         /// </summary>
         /// <param name="_user"></param>
         /// <returns></returns>
-        Task<List<List<menu>>> GetMenuByUser(user _user);
+        Task<List<menu>> GetMenuByUser(user _user);
-      
-
     }
 }

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

@@ -99,20 +99,20 @@ namespace Yi.Framework.Service
             
             return await UpdateListAsync(user_data);
         }
-        public async Task <List<List<menu>>> GetMenuByUser(user _user)
+        public async Task <List<menu>> GetMenuByUser(user _user)
         {
             var user_data =await _Db.Set<user>().Include(u => u.roles).ThenInclude(u => u.menus)
                 .Where(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
-           var roleList= user_data.roles.ToList();
+           var role_data= user_data.roles.ToList();
-            var menuList = new List<List<menu>>();
+            List<menu> menu_data = new ();
-            foreach (var role in roleList)
+            foreach (var role in role_data)
             {
-              var menu= await _roleService.GetMenusByRole(role);
+                var menu = await _roleService.GetMenusByRole(role);
-                menu.ForEach(u => u.roles = null);
+                menu.ForEach(u=>u.roles=null);
-                menuList.Add(menu);
+                menu_data = menu_data.Concat(menu).OrderByDescending(u=>u.sort).ToList();               
-            }
+            }                  
-            return menuList;
+            return menu_data;
         }
-
+       
     }
 }