From a1736215e6984fae3a0189126aef6362f0a742d4 Mon Sep 17 00:00:00 2001 From: zhangpeihang <948869991@qq.com> Date: Sat, 29 Jan 2022 14:59:58 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=20=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/MenusController.cs | 69 ------------------- .../Controllers/RolesController.cs | 68 ------------------ .../Controllers/UsersController.cs | 4 +- 3 files changed, 2 insertions(+), 139 deletions(-) diff --git a/src/vue/api/BootstrapAdmin.Api/Controllers/MenusController.cs b/src/vue/api/BootstrapAdmin.Api/Controllers/MenusController.cs index bb96555c..4883094b 100644 --- a/src/vue/api/BootstrapAdmin.Api/Controllers/MenusController.cs +++ b/src/vue/api/BootstrapAdmin.Api/Controllers/MenusController.cs @@ -2,10 +2,7 @@ // Licensed under the LGPL License, Version 3.0. See License.txt in the project root for license information. // Website: https://admin.blazor.zone -using Bootstrap.Admin.Query; -using Bootstrap.DataAccess; using Bootstrap.Security; -using Longbow.Web.Mvc; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; @@ -21,72 +18,6 @@ namespace Bootstrap.Admin.Controllers.Api [ApiController] public class MenusController : ControllerBase { - /// - /// 获得所有菜单列表调用 - /// - /// - /// - [HttpGet] - public QueryData Get([FromQuery]QueryMenuOption value) - { - return value.RetrieveData(User.Identity!.Name); - } - /// - /// 保存菜单调用 - /// - /// - [HttpPost] - [ButtonAuthorize(Url = "~/Admin/Menus", Auth = "add,edit")] - public bool Post([FromBody]BootstrapMenu value) - { - return MenuHelper.Save(value); - } - - /// - /// 删除菜单调用 - /// - /// - [HttpDelete] - [ButtonAuthorize(Url = "~/Admin/Menus", Auth = "del")] - public bool Delete([FromBody]IEnumerable value) - { - return MenuHelper.Delete(value); - } - - /// - /// 角色管理菜单授权按钮调用 - /// - /// 角色ID - /// type=role时，角色管理菜单授权调用；type=user时，菜单管理编辑页面父类菜单按钮调用 - /// - [HttpPost("{id}")] - public IEnumerable Post(string id, [FromQuery]string type) - { - IEnumerable ret = new List(); - switch (type) - { - case "role": - ret = MenuHelper.RetrieveMenusByRoleId(id); - break; - case "user": - ret = MenuHelper.RetrieveMenus(User.Identity!.Name); - break; - } - return ret; - } - - /// - /// 角色管理菜单授权保存按钮调用 - /// - /// 菜单ID - /// 角色ID集合 - /// - [HttpPut("{id}")] - [ButtonAuthorize(Url = "~/Admin/Menus", Auth = "assignRole")] - public bool Put(string id, [FromBody]IEnumerable roleIds) - { - return RoleHelper.SavaByMenuId(id, roleIds); - } } } diff --git a/src/vue/api/BootstrapAdmin.Api/Controllers/RolesController.cs b/src/vue/api/BootstrapAdmin.Api/Controllers/RolesController.cs index 71b1f64b..59ad933d 100644 --- a/src/vue/api/BootstrapAdmin.Api/Controllers/RolesController.cs +++ b/src/vue/api/BootstrapAdmin.Api/Controllers/RolesController.cs @@ -2,9 +2,6 @@ // Licensed under the LGPL License, Version 3.0. See License.txt in the project root for license information. // Website: https://admin.blazor.zone -using Bootstrap.Admin.Query; -using Bootstrap.DataAccess; -using Longbow.Web.Mvc; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; @@ -22,70 +19,5 @@ namespace Bootstrap.Admin.Controllers.Api [ApiController] public class RolesController : ControllerBase { - /// - /// 获取所有角色数据 - /// - /// - /// - [HttpGet] - public QueryData Get([FromQuery]QueryRoleOption value) - { - return value.RetrieveData(); - } - /// - /// 通过指定用户ID/部门ID/菜单ID获得所有角色集合，已经授权的有checked标记 - /// - /// 用户ID/部门ID/菜单ID - /// 类型 - /// - [HttpPost("{id}")] - public IEnumerable Post(string id, [FromQuery]string type) - { - var ret = type switch - { - "user" => RoleHelper.RetrievesByUserId(id), - "group" => RoleHelper.RetrievesByGroupId(id), - "menu" => RoleHelper.RetrievesByMenuId(id), - _ => new Role[0] - }; - return ret.Select(m => new { m.Id, m.Checked, m.RoleName, m.Description }); - } - /// - /// 保存角色授权方法 - /// - /// 角色ID - /// 选中的ID集合 - /// type=menu时，菜单维护页面对角色授权弹框保存按钮调用 - /// - [HttpPut("{id}")] - [ButtonAuthorize(Url = "~/Admin/Roles", Auth = "assignUser,assignGroup,assignMenu,assignApp")] - public bool Put(string id, [FromBody]IEnumerable values, [FromQuery]string type) => type switch - { - "user" => UserHelper.SaveByRoleId(id, values), - "group" => GroupHelper.SaveByRoleId(id, values), - "menu" => MenuHelper.SaveMenusByRoleId(id, values), - "app" => AppHelper.SaveByRoleId(id, values), - _ => false - }; - /// - /// 保存角色方法 - /// - /// - [HttpPost] - [ButtonAuthorize(Url = "~/Admin/Roles", Auth = "add,edit")] - public bool Post([FromBody]Role value) - { - return RoleHelper.Save(value); - } - /// - /// 删除角色方法 - /// - /// - [HttpDelete] - [ButtonAuthorize(Url = "~/Admin/Roles", Auth = "del")] - public bool Delete([FromBody]IEnumerable value) - { - return RoleHelper.Delete(value); - } } } diff --git a/src/vue/api/BootstrapAdmin.Api/Controllers/UsersController.cs b/src/vue/api/BootstrapAdmin.Api/Controllers/UsersController.cs index c62ccb05..c1f06bc4 100644 --- a/src/vue/api/BootstrapAdmin.Api/Controllers/UsersController.cs +++ b/src/vue/api/BootstrapAdmin.Api/Controllers/UsersController.cs @@ -30,9 +30,9 @@ namespace BootstrapAdmin.Api.Controllers /// /// [HttpGet] - public ActionResult> Get() + public IActionResult Get() { - return UserService.GetAll(); + return new JsonResult(new { Code = "0", Message = "login successed!", Result = new { roles = Array.Empty() } }) ; } ///