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

修改控制器

Browse Source
This commit is contained in:
lzw
2021-10-16 17:50:55 +08:00
parent 6a492168ed
commit 0860e05d17
9 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,10 +35,11 @@ namespace Yi.Framework.ApiMicroservice.Controllers
[HttpPost]
public async Task<Result> Login(user _user)
{
if (await _userService.Login(_user))
var user_data = await _userService.Login(_user);
if( user_data!=null)
{
_user.roles = await _userService.GetRolesByUser(_user);
var toke = MakeJwt.app(_user);
var toke = MakeJwt.app(user_data);
return Result.Success().SetData(new { user = new { _user.id, _user.username, _user.introduction, _user.icon, _user.nick }, toke });
}
return Result.Error();

6
Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs
View File

@@ -26,7 +26,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
[HttpGet]
public async Task<Result> GetMenu()
{
return Result.Success().SetData(await _menuService.GetAllEntitiesTrueAsync());
return Result.Success().SetData(await _menuService.GetMenuMouldByMenu( new menu()));
}
/// <summary>
@@ -101,8 +101,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
[HttpPost]
public async Task<Result> AddChildrenMenu(ChildrenDto<menu> childrenDto)
{
//var _menu = await _menuService.GetEntityById(childrenDto.parentId);
var _children= await _menuService.AddChildrenMenu(childrenDto.parentId,childrenDto.data);
var _children= await _menuService.AddChildrenMenu(new menu() { id=childrenDto.parentId}, childrenDto.data);
return Result.Success();
}