From a2f23bc97d133bcf7b950cd269eda577be4c0cac Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期一, 17 一月 2022 17:57:44 +0800
Subject: [PATCH] token优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 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..d076174 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;
@@ -9,9 +10,11 @@
import com.sandu.common.enums.ResponseStatusEnums;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.security.LoginUserInfo;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.security.config.SecurityProperties;
-import com.sandu.common.security.jwt.JwtTokenProvider;
+import com.sandu.common.security.token.TokenProvider;
+import com.sandu.common.util.IpUtil;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.AdminJwtUser;
import com.sandu.ximon.admin.param.AdminLoginParam;
@@ -22,11 +25,9 @@
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;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.*;
@@ -46,7 +47,7 @@
@Slf4j
@RestController
@AllArgsConstructor
-@RequestMapping("v1/admin")
+@RequestMapping("/v1/admin")
public class AdminController {
private final SecurityProperties properties;
@@ -54,7 +55,7 @@
private final PasswordEncoder passwordEncoder;
private final AdminService adminService;
private final RoleService roleService;
- private final JwtTokenProvider tokenProvider;
+ private final TokenProvider tokenProvider;
@AnonymousAccess
@@ -68,13 +69,22 @@
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());
+ }
- SecurityContextHolder.getContext().setAuthentication(authentication);
+ LoginUserInfo loginUserInfo = new LoginUserInfo();
+ loginUserInfo.setUserId(admin.getId());
+ loginUserInfo.setName(admin.getNickName());
+ loginUserInfo.setAccount(admin.getUsername());
+ loginUserInfo.setStatus(admin.getStatus());
+ loginUserInfo.setIp(IpUtil.getRealIp());
+ loginUserInfo.setAdministratorType(AdministratorEnums.ADMIN.getCode());
+ loginUserInfo.setPermission("tenant");
+
// 鐢熸垚浠ょ墝
- String token = tokenProvider.createToken(authentication);
- final AdminJwtUser jwtUser = (AdminJwtUser) authentication.getPrincipal();
+ String token = tokenProvider.createToken(loginUserInfo);
// 鏇存柊鏈�鍚庣櫥褰曟椂闂�
Admin update = new Admin();
@@ -85,12 +95,8 @@
// 杩斿洖 token 涓� 鐢ㄦ埛淇℃伅
Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
put("token", properties.getTokenStartWith() + token);
- put("user", jwtUser);
+ put("user", admin);
}};
-// if (singleLogin) {
-// //韪㈡帀涔嬪墠宸茬粡鐧诲綍鐨則oken
-// onlineUserService.checkLoginOnUser(authUser.getUsername(), token);
-// }
return ResponseUtil.success(authInfo);
}
@@ -100,9 +106,12 @@
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()));
- 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);
+ 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());
+ builder.put("menus", collect);
+ }
+ return ResponseUtil.success(builder.build());
}
@GetMapping(value = "/list")
--
Gitblit v1.9.3