From 05ff6ba1e2ee63d3f5d3d36907da74e4110d678d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 17 十二月 2021 16:43:49 +0800
Subject: [PATCH] 细节调整
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index 4d05c6c..2d9a184 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.controller;
import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.map.MapUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -22,6 +23,7 @@
import com.sandu.ximon.dao.domain.Admin;
import com.sandu.ximon.dao.domain.Menu;
import com.sandu.ximon.dao.domain.Role;
+import com.sandu.ximon.dao.enums.AdministratorEnums;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -68,7 +70,10 @@
return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
UserDetails userJwtUser = new AdminJwtUser(admin, roleService.mapToGrantedAuthorities(admin.getId()));
- UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userJwtUser, admin.getId(), userJwtUser.getAuthorities());
+ if(!userJwtUser.isEnabled()){
+ return ResponseUtil.error(ResponseStatusEnums.DISABLE_ACCOUNT.getCode(), ResponseStatusEnums.DISABLE_ACCOUNT.getMessage());
+ }
+ UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userJwtUser, AdministratorEnums.ADMIN.getCode(), userJwtUser.getAuthorities());
SecurityContextHolder.getContext().setAuthentication(authentication);
@@ -96,13 +101,17 @@
@GetMapping(value = "/info")
public ResponseVO<Object> getUserInfo() {
+ Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();
Long userId = SecurityUtils.getUserId();
Admin admin = adminService.getById(userId);
List<Role> roles = roleService.listByAdminId(admin.getId());
List<Menu> menus = menuService.listByRoleIds(roles.stream().map(Role::getId).collect(Collectors.toList()));
+ MapBuilder<Object, Object> builder = MapUtil.builder().put("info", admin);
+ if(CollectionUtil.isNotEmpty(menus)){
List<Menu> collect = menus.stream().filter(menu -> menu.getType() == 0).collect(Collectors.toList());
- Map<Object, Object> build = MapUtil.builder().put("info", admin).put("menus", collect).build();
- return ResponseUtil.success(build);
+ builder.put("menus", collect);
+ }
+ return ResponseUtil.success(builder.build());
}
@GetMapping(value = "/list")
--
Gitblit v1.9.3