zhusenlin/Yi.Admin
1
0
Fork 0
mirror of https://gitee.com/ccnetcore/Yi synced 2026-03-22 17:58:34 +08:00
Code Issues 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

15
Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
View File

@@ -40,11 +40,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers
public async Task<Result> Login(user _user)
{
var user_data = await _userService.Login(_user);
//var menuList = await _menuService.GetTopMenuByUserId(user_data.id);
var menuList = await _menuService.GetTopMenuByUserId(user_data.id);
if ( user_data!=null)
{
var token = MakeJwt.app(new jwtUser() {user=user_data});
{
var token = MakeJwt.app(new jwtUser() {user=user_data,menuIds= menuList});
return Result.Success().SetData(new { user = new { _user.id, _user.username, _user.introduction, _user.icon, _user.nick }, token });
}
return Result.Error();
@@ -149,16 +148,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers
user_data.nick = pwdDto.user.nick;
await _userService.UpdateAsync(user_data);
return Result.Success(msg);
}
[HttpPost]
public async Task<Result> UpdataIcon()
{
return Result.Success();
}
}
}