ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-31 22:57:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复：修复在线用户缺失昵称信息的问题

Browse Source
This commit is contained in:
Charles7c
2023-03-26 20:50:17 +08:00
parent d88d712d18
commit 8a843ad94c
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/OnlineUserVO.java
View File

@@ -35,6 +35,12 @@ public class OnlineUserVO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* ID
*/
@Schema(description = "ID")
private Long id;
/** /**
* 令牌 * 令牌
*/ */

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java
View File

@@ -54,7 +54,9 @@ public class OnlineUserServiceImpl implements OnlineUserService {
public PageDataVO<OnlineUserVO> page(OnlineUserQuery query, PageQuery pageQuery) { public PageDataVO<OnlineUserVO> page(OnlineUserQuery query, PageQuery pageQuery) {
List<LoginUser> loginUserList = this.list(query); List<LoginUser> loginUserList = this.list(query);
List<OnlineUserVO> list = BeanUtil.copyToList(loginUserList, OnlineUserVO.class); List<OnlineUserVO> list = BeanUtil.copyToList(loginUserList, OnlineUserVO.class);
return PageDataVO.build(pageQuery.getPage(), pageQuery.getSize(), list); PageDataVO<OnlineUserVO> pageDataVO = PageDataVO.build(pageQuery.getPage(), pageQuery.getSize(), list);
pageDataVO.getList().forEach(u -> u.setNickname(LoginHelper.getNickname(u.getId())));
return pageDataVO;
} }
@Override @Override

8
continew-admin-ui/src/hooks/permission.ts
View File

@@ -9,9 +9,15 @@ export default function usePermission() {
!route.meta?.requiresAuth || !route.meta?.requiresAuth ||
!route.meta?.roles || !route.meta?.roles ||
route.meta?.roles?.includes('*') || route.meta?.roles?.includes('*') ||
route.meta?.roles?.includes(loginStore.roles[0]) this.includeRole(route.meta?.roles, loginStore.roles)
); );
}, },
includeRole(arr1: Array<string>, arr2: Array<string>) {
const temp = arr1.filter((item) => {
return arr2.includes(item);
});
return !!temp.length;
},
findFirstPermissionRoute(_routers: any, role = 'admin') { findFirstPermissionRoute(_routers: any, role = 'admin') {
const cloneRouters = [..._routers]; const cloneRouters = [..._routers];
while (cloneRouters.length) { while (cloneRouters.length) {