合并分支

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

@@ -26,9 +26,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpGet]
         public async Task<Result> GetMenu()
         {
-            //var top =await _menuService.GetTopMenu();
-            //var children=await _menuService.get
-            return  Result.Success().SetData(await _menuService.GetTopMenu());
+                      
+            return  Result.Success().SetData(await _menuService.GetMenuMould());
         }
 
         /// <summary>

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

@@ -97,5 +97,17 @@ namespace Yi.Framework.ApiMicroservice.Controllers
           await  _userService.SetRolesByUser(idsListDto.ids2, idsListDto.ids1);
             return Result.Success();
         }
+        /// <summary>
+        /// 根据http上下文的用户得到该用户有哪些角色
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<Result> GetRolesByUser()
+        {
+            var _user = HttpContext.GetCurrentUserInfo();
+            var roleList = await _userService.GetRolesByUser(_user);
+            return Result.Success().SetData(roleList);
+        }
+
     }
 }