移除 admin-web 项目,迁移到单独的工程

This commit is contained in:
YunaiV
2020-07-11 20:56:59 +08:00
parent 40fe027753
commit 6d1a47afea
609 changed files with 77 additions and 44336 deletions

View File

@@ -32,8 +32,6 @@ public class AdminController {
@Autowired
private AdminManager adminManager;
// =========== 管理员管理 API ===========
@ApiOperation(value = "管理员分页")
@GetMapping("/page")
@RequiresPermissions("system.admin.page")

View File

@@ -39,4 +39,9 @@ GET {{baseUrl}}/resource/tree-admin-menu
Content-Type: application/x-www-form-urlencoded
Authorization: Bearer {{accessToken}}
### /resource/list-admin-permission 成功
GET {{baseUrl}}/resource/list-admin-permission
Content-Type: application/x-www-form-urlencoded
Authorization: Bearer {{accessToken}}
###

View File

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
import java.util.Set;
import static cn.iocoder.common.framework.vo.CommonResult.success;
@@ -72,10 +73,18 @@ public class ResourceController {
return success(resourceManager.treeResource());
}
// =========== 当前管理员相关 API ===========
@GetMapping("/tree-admin-menu")
@ApiOperation("获得当前登陆的管理员的菜单树")
public CommonResult<List<AdminMenuTreeNodeVO>> treeAdminMenu() {
return success(resourceManager.treeAdminMenu(AdminSecurityContextHolder.getAdminId()));
}
@GetMapping("/list-admin-permission")
@ApiOperation("获得当前登陆的管理员的权限列表")
public CommonResult<Set<String>> listAdminPermission() {
return success(resourceManager.listAdminPermission(AdminSecurityContextHolder.getAdminId()));
}
}

View File

@@ -32,5 +32,7 @@ public class ResourceCreateDTO {
private String route;
@ApiModelProperty(value = "菜单图标", example = "add")
private String icon;
@ApiModelProperty(value = "前端界面", example = "@/views/example/edit")
private String view;
}

View File

@@ -35,5 +35,7 @@ public class ResourceUpdateDTO {
private String route;
@ApiModelProperty(value = "菜单图标", example = "add")
private String icon;
@ApiModelProperty(value = "前端界面", example = "@/views/example/edit")
private String view;
}

View File

@@ -20,6 +20,8 @@ public class AdminMenuTreeNodeVO {
private String route;
@ApiModelProperty(value = "菜单图标", required = true, example = "user")
private String icon;
@ApiModelProperty(value = "前端界面", example = "@/views/example/edit")
private String view;
@ApiModelProperty(value = "父级资源编号", required = true, example = "1", notes = "如果无父资源,则值为 0")
private Integer pid;

View File

@@ -37,6 +37,8 @@ public class ResourceTreeNodeVO {
private String route;
@ApiModelProperty(value = "菜单图标", example = "add")
private String icon;
@ApiModelProperty(value = "前端界面", example = "@/views/example/edit")
private String view;
@ApiModelProperty(value = "添加时间", required = true)
private Date createTime;

View File

@@ -35,6 +35,8 @@ public class ResourceVO {
private String route;
@ApiModelProperty(value = "菜单图标", example = "add")
private String icon;
@ApiModelProperty(value = "前端界面", example = "@/views/example/edit")
private String view;
@ApiModelProperty(value = "添加时间", required = true)
private Date createTime;

View File

@@ -111,9 +111,9 @@ public class ResourceManager {
CommonResult<Set<Integer>> listAdminRoleIdsResult = roleRpc.listAdminRoleIds(adminId);
listAdminRoleIdsResult.checkError();
if (CollectionUtils.isEmpty(listAdminRoleIdsResult.getData())) {
return null;
return Collections.emptyList();
}
// 获得角色拥有的资源列表
// 获得角色拥有的资源(菜单)列表
CommonResult<List<cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO>> resourceVOResult = resourceRpc.listRoleResource(
listAdminRoleIdsResult.getData(), ResourceTypeEnum.MENU.getType());
resourceVOResult.checkError();
@@ -164,4 +164,24 @@ public class ResourceManager {
return treeNodeMap.values().stream().filter(node -> node.getPid().equals(ResourceIdEnum.ROOT.getId())).collect(Collectors.toList());
}
/**
* 获得指定管理员的权限列表
*
* @param adminId 管理员编号
* @return 权限列表
*/
public Set<String> listAdminPermission(Integer adminId) {
// 获得管理员拥有的角色编号列表
CommonResult<Set<Integer>> listAdminRoleIdsResult = roleRpc.listAdminRoleIds(adminId);
listAdminRoleIdsResult.checkError();
if (CollectionUtils.isEmpty(listAdminRoleIdsResult.getData())) {
return Collections.emptySet();
}
// 获得角色拥有的资源列表
CommonResult<List<cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO>> resourceVOResult = resourceRpc.listRoleResource(
listAdminRoleIdsResult.getData(), null);
resourceVOResult.checkError();
return CollectionUtils.convertSet(resourceVOResult.getData(), cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO::getPermission);
}
}