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] [HttpPost]
public async Task<Result> Login(user _user) 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.Success().SetData(new { user = new { _user.id, _user.username, _user.introduction, _user.icon, _user.nick }, toke });
} }
return Result.Error(); return Result.Error();

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

@@ -26,7 +26,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
[HttpGet] [HttpGet]
public async Task<Result> GetMenu() public async Task<Result> GetMenu()
{ {
return Result.Success().SetData(await _menuService.GetAllEntitiesTrueAsync()); return Result.Success().SetData(await _menuService.GetMenuMouldByMenu( new menu()));
} }
/// <summary> /// <summary>
@@ -101,8 +101,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
[HttpPost] [HttpPost]
public async Task<Result> AddChildrenMenu(ChildrenDto<menu> childrenDto) 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(); return Result.Success();
} }

BIN
Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db
View File

Binary file not shown.

BIN
Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm Normal file
View File

Binary file not shown.

BIN
Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-wal Normal file
View File

Binary file not shown.

2
Yi.Framework/Yi.Framework.Interface/IMenuService.cs
View File

@@ -45,6 +45,6 @@ namespace Yi.Framework.Interface
/// </summary> /// </summary>
/// <param name="_menu"></param> /// <param name="_menu"></param>
/// <returns></returns> /// <returns></returns>
Task<menu> AddChildrenMenu(int _menuId, menu _children); Task<menu> AddChildrenMenu(menu _menu, menu _children);
} }
} }

4
Yi.Framework/Yi.Framework.Interface/IUserService.cs
View File

@@ -13,10 +13,10 @@ namespace Yi.Framework.Interface
Task<IEnumerable<user>> GetAllEntitiesTrueAsync(); Task<IEnumerable<user>> GetAllEntitiesTrueAsync();
/// <summary> /// <summary>
/// 登录,传入_user需包含用户名与密码 /// 登录,传入_user需包含用户名与密码/角色
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
Task<bool> Login(user _user); Task<user> Login(user _user);
/// <summary> /// <summary>
/// 注册，需要检测是否用户名重复 /// 注册，需要检测是否用户名重复

7
Yi.Framework/Yi.Framework.Service/MenuService.cs
View File

@@ -13,10 +13,9 @@ namespace Yi.Framework.Service
{ {
public MenuService(DbContext Db) : base(Db) { } public MenuService(DbContext Db) : base(Db) { }
public async Task<menu> AddChildrenMenu(int _menuId, menu _children) public async Task<menu> AddChildrenMenu(menu _menu, menu _children)
{ {
var menu_data = await _Db.Set<menu>().Include(u=>u.children) var menu_data = await _Db.Set<menu>().Include(u => u.children).Where(u => u.id == _menu.id).FirstOrDefaultAsync();
.Where(u=>u.id==_menuId&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
menu_data.children.Add(_children); menu_data.children.Add(_children);
await UpdateAsync(menu_data); await UpdateAsync(menu_data);
return menu_data; return menu_data;
@@ -43,7 +42,7 @@ namespace Yi.Framework.Service
public async Task<menu> GetMenuMouldByMenu(menu _menu) public async Task<menu> GetMenuMouldByMenu(menu _menu)
{ {
var menu_data = await _Db.Set<menu>().Where(u=>u.id==_menu.id).Include(u=>u.mould).FirstOrDefaultAsync(); var menu_data = await _Db.Set<menu>().Include(u => u.children).Include(u=>u.mould).Where(u=>u.id==_menu.id).FirstOrDefaultAsync();
return menu_data; return menu_data;
} }

13
Yi.Framework/Yi.Framework.Service/UserService.cs
View File

@@ -63,15 +63,12 @@ namespace Yi.Framework.Service
return roleList; return roleList;
} }
public async Task<bool> Login(user _user) public async Task<user> Login(user _user)
{ {
var user_data =await GetEntity(u => u.username == _user.username&&u.password==_user.password&& var user_data =await _Db.Set<user>().Include(u=>u.roles).Where(u => u.username == _user.username&&u.password==_user.password&&
u.is_delete == (short)Common.Enum.DelFlagEnum.Normal); u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
if (user_data == null)
{ return user_data;
return false;
}
return true;
} }