重构接口

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

@@ -40,7 +40,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         public async Task<Result> Login(user _user)
         {
             var user_data = await _userService.Login(_user);
-            var menuList = await _userService.GetMenusByUser(user_data);
+            var menuList = await _menuService.GetTopMenuByUserId(user_data.id);
             if ( user_data!=null)
             {               
                 var token = MakeJwt.app(new jwtUser() {user=user_data,menuIds= menuList});
@@ -112,9 +112,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpPut]
         [Authorize]
         public async Task<Result> ChangePassword(ChangePwdDto pwdDto)
-        {
-            var uid= pwdDto.user.id;
-            var user_data = await _userService.GetUserById(uid);
+        {          
+            var user_data = await _userService.GetUserById(pwdDto.user.id);
             string msg = "修改成功";
             if (! string.IsNullOrEmpty( pwdDto.newPassword))
             {               

Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs

@@ -31,7 +31,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// <returns></returns>
         [HttpGet]
         public async Task<Result> GetMenuInMould()
-        {      
+        {
+            return Result.Success().SetData(await _menuService.GetMenuInMould());
         }
 
         /// <summary>
@@ -68,6 +69,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpPost]
         public async Task<Result> AddTopMenu(menu _menu)
         {
+            await _menuService.AddTopMenu(_menu);
+            return Result.Success();
         }
 
         /// <summary>
@@ -79,6 +82,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpPost]
         public async Task<Result> SetMouldByMenu(IdDto<int> idDto)
         {
+            await _menuService.SetMouldByMenu(idDto.id1, idDto.id2);
+            return Result.Success();
         }
 
 
@@ -90,6 +95,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpPost]
         public async Task<Result> AddChildrenMenu(ChildrenDto<menu> childrenDto)
         {
+            await _menuService.AddChildrenMenu(childrenDto.parentId, childrenDto.data);
+            return Result.Success();
         }
 
         /// <summary>
@@ -100,6 +107,9 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpGet]
         public async Task<Result> GetTopMenusByHttpUser()
         {
+            HttpContext.GetCurrentUserInfo(out List<int> menuIds);
+
+            return Result.Success().SetData(await _menuService.GetTopMenusByTopMenuIds(menuIds));
         }
     }
 }

Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs

@@ -65,6 +65,17 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             return Result.Success();
         }
 
+        /// <summary>
+        /// 根据用户id得到该用户有哪些角色
+        /// 用于显示用户详情中的角色说明
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<Result> GetRolesByUserId(int userId)
+        {
+           
+            return Result.Success().SetData(await _roleService.GetRolesByUserId(userId));
+        }
         /// <summary>
         /// 给角色设置菜单，多个角色与多个菜单，让每一个角色都设置，ids1为角色，ids2为菜单
         /// 用于设置角色
@@ -74,6 +85,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpPost]
         public async Task<Result> SetMenuByRole(IdsListDto<int>  idsListDto)
         {
+            await _roleService.SetMenusByRolesId(idsListDto.ids2, idsListDto.ids1);
+            return Result.Success();
         }
         /// <summary>
         /// 用于给角色设置菜单的时候，点击一个角色，显示这个角色拥有的并列的菜单
@@ -83,6 +96,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpGet]
         public async Task<Result> GetTopMenusByRoleId(int roleId)
         {
+            return Result.Success().SetData(await _roleService.GetTopMenusByRoleId(roleId) ); ;
         }       
     }
 }

Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs

@@ -120,8 +120,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpGet]
         public async Task<Result> GetAxiosByRouter(string router)
         {
-            var _user = HttpContext.GetCurrentUserInfo(out List<int> ids);
-            var menuList= await _userService.GetAxiosByRouter(router, _user.id, ids);
+            var _user = HttpContext.GetCurrentUserInfo(out List<int> menuIds);
+            var menuList= await _userService.GetAxiosByRouter(router, _user.id, menuIds);
             AxiosUrlsModel urlsModel = new();
             menuList.ForEach(u =>
             {