修改控制器

Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs

@@ -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();

Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs

@@ -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();
 
         }

Yi.Framework/Yi.Framework.Interface/IMenuService.cs

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

Yi.Framework/Yi.Framework.Interface/IUserService.cs

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

Yi.Framework/Yi.Framework.Service/MenuService.cs

@@ -13,10 +13,9 @@ namespace Yi.Framework.Service
     {
         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)
-                .Where(u=>u.id==_menuId&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();          
+            var menu_data = await _Db.Set<menu>().Include(u => u.children).Where(u => u.id == _menu.id).FirstOrDefaultAsync();
             menu_data.children.Add(_children);
             await UpdateAsync(menu_data);
             return menu_data;
@@ -43,7 +42,7 @@ namespace Yi.Framework.Service
 
         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;
         }
 

Yi.Framework/Yi.Framework.Service/UserService.cs

@@ -63,15 +63,12 @@ namespace Yi.Framework.Service
             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&& 
-            u.is_delete == (short)Common.Enum.DelFlagEnum.Normal);
-            if (user_data == null)
-            {
-                return false;
-            }
-            return true;
+            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).FirstOrDefaultAsync();
+            
+            return user_data;
 
         }