From 76743b009ca5ea67557fcab597b332f8d1947813 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 24 十二月 2024 14:09:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/auth/AuthController.java | 75 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 14 deletions(-)
diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/auth/AuthController.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/auth/AuthController.java
index fc005c4..2fcd758 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/auth/AuthController.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/auth/AuthController.java
@@ -1,6 +1,7 @@
package com.iailab.module.system.controller.admin.auth;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.StrUtil;
import com.iailab.framework.common.enums.CommonStatusEnum;
import com.iailab.framework.common.enums.UserTypeEnum;
@@ -101,6 +102,19 @@
return success(authService.refreshToken(refreshToken));
}
+ @PostMapping("/client-refresh-token")
+ @PermitAll
+ @Operation(summary = "刷新令牌")
+ @Parameter(name = "refreshToken", description = "刷新令牌", required = true)
+ public Map<String, Object> refreshToken(@RequestParam("refreshToken") String refreshToken, @RequestParam("clientId") String clientId) {
+ AuthLoginRespVO authLoginRespVO = authService.refreshToken(refreshToken, clientId);
+ Map<String, Object> map = new HashMap<>();
+ map.put("access_token", authLoginRespVO.getAccessToken());
+ map.put("refresh_token", authLoginRespVO.getRefreshToken());
+ map.put("expires_time", LocalDateTimeUtil.toEpochMilli(authLoginRespVO.getExpiresTime()) / 1000L);
+ return map;
+ }
+
@GetMapping("/get-permission-info")
@Operation(summary = "获取登录用户的权限信息")
public CommonResult<AuthPermissionInfoRespVO> getPermissionInfo() {
@@ -122,6 +136,34 @@
Set<Long> menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId));
List<MenuDO> menuList = menuService.getMenuList(menuIds);
menuList = menuService.filterDisableMenus(menuList);
+ menuList = menuService.filterMenus(menuList, "system");
+
+ // 2. 拼接结果返回
+ return success(AuthConvert.INSTANCE.convert(user, roles, menuList));
+ }
+
+ @GetMapping("/get-app-permission-info")
+ @Operation(summary = "脚手架获取登录用户的权限信息")
+ public CommonResult<AuthPermissionInfoRespVO> getAppPermissionInfo() {
+ // 1.1 获得用户信息
+ AdminUserDO user = userService.getUser(getLoginUserId());
+ if (user == null) {
+ return success(null);
+ }
+
+ // 1.2 获得角色列表
+ Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(getLoginUserId());
+ if (CollUtil.isEmpty(roleIds)) {
+ return success(AuthConvert.INSTANCE.convert(user, Collections.emptyList(), Collections.emptyList()));
+ }
+ List<RoleDO> roles = roleService.getRoleList(roleIds);
+ roles.removeIf(role -> !CommonStatusEnum.ENABLE.getStatus().equals(role.getStatus())); // 移除禁用的角色
+
+ // 1.3 获得菜单列表
+ Set<Long> menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId));
+ List<MenuDO> menuList = menuService.getMenuList(menuIds);
+ menuList = menuService.filterDisableMenus(menuList);
+ menuList = menuService.filterMenus(menuList, "app");
// 2. 拼接结果返回
return success(AuthConvert.INSTANCE.convert(user, roles, menuList));
@@ -197,22 +239,27 @@
}
children.retainAll(menuList);
List<MenuDO> tempChildren = new LinkedList<>();
- //为每一个二级菜单增加一个隐藏父级目录
+ //为每一个二级菜单（非外链菜单）增加一个隐藏父级目录
children.stream().forEach(menu -> {
- if (menu.getType().equals(MenuTypeEnum.MENU.getType()) && menu.getParentId().equals(menuDO.getId())) {
- MenuDO parentMenu = BeanUtils.toBean(menu, MenuDO.class);
- parentMenu.setId(System.currentTimeMillis() + (int) (Math.random() * (99999 - 10000 + 1)) + 10000);
- parentMenu.setType(MenuTypeEnum.DIR.getType());
- parentMenu.setVisible(true);
- parentMenu.setAlwaysShow(false);
- parentMenu.setParentId(menuDO.getId());
- parentMenu.setPath("/");
- menu.setParentId(parentMenu.getId());
- tempChildren.add(parentMenu);
- tempChildren.add(menu);
- } else {
- tempChildren.add(menu);
+ if (menu.getParentId().equals(menuDO.getId())) {
+ if(menu.getType().equals(MenuTypeEnum.MENU.getType())) {
+ MenuDO parentMenu = BeanUtils.toBean(menu, MenuDO.class);
+ parentMenu.setId(System.currentTimeMillis() + (int) (Math.random() * (99999 - 10000 + 1)) + 10000);
+ parentMenu.setType(MenuTypeEnum.DIR.getType());
+ parentMenu.setVisible(true);
+ parentMenu.setAlwaysShow(false);
+ parentMenu.setParentId(menuDO.getId());
+ parentMenu.setPath("/");
+ menu.setParentId(parentMenu.getId());
+ tempChildren.add(parentMenu);
+ } else if(menu.getType().equals(MenuTypeEnum.DIR.getType())) {
+ // 为应用菜单二级目录前增加“/” (不处理外链菜单path)
+ if(!menu.getPath().contains("http:") && !menu.getPath().contains("https:")) {
+ menu.setPath("/" + menu.getPath());
+ }
+ }
}
+ tempChildren.add(menu);
});
menuVOS = AuthConvert.INSTANCE.buildMenuTree(tempChildren, menuDO.getId(), menuDO.getPath(), info.getType());
// 2. 拼接结果返回
--
Gitblit v1.9.3