修改获取用户信息接口

src/main/java/cn/qg/holmes/aspect/PermissionAspect.java

@@ -34,7 +34,7 @@ public class PermissionAspect {
         log.debug("开始执行权限检查");
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
-        String token = request.getHeader("x-auth-token");
+        String token = request.getHeader("token");
         if (token == null) {
             throw new UnauthorizedException();
         }

src/main/java/cn/qg/holmes/controller/auth/UserController.java

@@ -57,7 +57,7 @@ public class UserController {
         String token = tokenService.generateToken(user.getId());
         Map<String, Object> map = new HashMap<>();
         map.put("token", token);
-        map.put("data", userService.getUserInfoByUsername(username));
+//        map.put("data", userService.getUserInfoByUsername(username));
         return JsonResult.buildSuccessResult(map);
     }
 
@@ -74,12 +74,11 @@ public class UserController {
 
     /**
      * 获取用户信息
-     * @param username 用户名
      * @return
      */
     @GetMapping("/info")
-    public JsonResult getInfo(String username) {
-        UserInfoVo userInfoVo = userService.getUserInfoByUsername(username);
+    public JsonResult getInfo(@RequestHeader String token) {
+        UserInfoVo userInfoVo = tokenService.getUserInfoFromCache(token);
         return JsonResult.buildSuccessResult(userInfoVo);
     }
 

src/main/java/cn/qg/holmes/service/auth/impl/TokenServiceImpl.java

@@ -65,7 +65,13 @@ public class TokenServiceImpl implements TokenService {
         permissionCodeList.forEach(permissionCode -> {
             permissionCodeSet.add(permissionCode);
         });
+        Set<String> menuSet = new HashSet<>();
+        List<String> menuList = (List<String>) redisValue.get("menuList");
+        menuList.forEach(menu -> {
+            menuSet.add(menu);
+        });
         userInfoVo.setPermissionCodeList(permissionCodeSet);
+        userInfoVo.setMenuList(menuSet);
         return userInfoVo;
     }