xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "完善登录bug"

Browse Source 
This reverts commit b59a152224.
This commit is contained in:
lzw
2021-11-01 22:06:08 +08:00
parent b59a152224
commit 21fa91ae32
7 changed files with 37 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
View File

@@ -21,12 +21,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers
private readonly ILogger<UserController> _logger;
private IUserService _userService;
private IMenuService _menuService;
public UserController(ILogger<UserController> logger, IUserService userService, IMenuService menuService)
public UserController(ILogger<UserController> logger, IUserService userService)
{
_logger = logger;
_userService = userService;
_menuService = menuService;
}
/// <summary>
@@ -122,19 +120,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
[HttpGet]
public async Task<Result> GetAxiosByRouter(string router)
{
var _user = HttpContext.GetCurrentUserInfo();
var menuList = await _menuService.GetTopMenuByUserId(_user.id);
if (menuList == null)
{
return Result.Error();
}
List<int> menuIds = new();
menuList.ForEach(u =>
{
var id = u.id;
menuIds.Add(id);
});
var childrenList = await _userService.GetAxiosByRouter(router, _user.id, menuIds);
var _user = HttpContext.GetCurrentUserInfo(out List<int> menuIds);
var menuList= await _userService.GetAxiosByRouter(router, _user.id, menuIds);
AxiosUrlsModel urlsModel = new();
menuList.ForEach(u =>
{