登录控制器
This commit is contained in:
@@ -35,12 +35,12 @@ namespace Yi.Framework.ApiMicroservice.Controllers
|
||||
[HttpPost]
|
||||
public async Task<Result> Login(user _user)
|
||||
{
|
||||
if (await _userService.Login(_user))
|
||||
{
|
||||
_user.roles = await _userService.GetRolesByUser(_user);
|
||||
var toke = MakeJwt.app(_user);
|
||||
return Result.Success().SetData(new { user = new { _user.id, _user.username, _user.introduction, _user.icon, _user.nick }, toke });
|
||||
}
|
||||
//if (await _userService.Login(_user))
|
||||
//{
|
||||
// _user.roles = await _userService.GetRolesByUser(_user);
|
||||
// var toke = MakeJwt.app(_user);
|
||||
// return Result.Success().SetData(new { user = new { _user.id, _user.username, _user.introduction, _user.icon, _user.nick }, toke });
|
||||
//}
|
||||
return Result.Error();
|
||||
}
|
||||
|
||||
|
||||
@@ -66,6 +66,13 @@
|
||||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:Yi.Framework.ApiMicroservice.Controllers.MenuController.AddChildrenMenu(Yi.Framework.DTOModel.ChildrenDto{Yi.Framework.Model.Models.menu})">
|
||||
<summary>
|
||||
给一个菜单添加子节点(注意:添加,不是覆盖)
|
||||
</summary>
|
||||
<param name="childrenDto"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:Yi.Framework.ApiMicroservice.Controllers.MouldController.UpdateMould(Yi.Framework.Model.Models.mould)">
|
||||
<summary>
|
||||
更
|
||||
|
||||
Binary file not shown.
@@ -47,9 +47,9 @@ namespace Yi.Framework.Service
|
||||
{
|
||||
return false;
|
||||
}
|
||||
var menuList = _Db.Set<menu>().Where(u => menuIds.Contains(u.id)&&u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync();
|
||||
var menuList = await _Db.Set<menu>().Where(u => menuIds.Contains(u.id)&&u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync();
|
||||
|
||||
role_data.menus = (ICollection<menu>)menuList;
|
||||
role_data.menus =menuList;
|
||||
return await AddAsync(role_data);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user