fix

zhanzhiqin

2022-03-31 e9231d0a290335e2ae61d9507d747b54b487437d

 sandu-common/src/main/java/com/sandu/common/security/SecurityUtils.java

@@ -29,19 +29,16 @@
 */
public class SecurityUtils {

    public static UserDetails getUserDetails() {
    public static LoginUserInfo getUserDetails() {
        final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
        if (authentication == null) {
//            throw new BusinessException(ResponseStatusEnums.TOKEN_INVALID.getCode(), ResponseStatusEnums.TOKEN_INVALID.getMessage());
            return null;
        }
        if (authentication.getPrincipal() instanceof UserDetails) {
            UserDetails userDetails = (UserDetails) authentication.getPrincipal();
            UserDetailsService userDetailsService = SpringContextHolder.getBean(UserDetailsService.class);
            return userDetailsService.loadUserByUsername(userDetails.getUsername());
        if (authentication.getPrincipal() instanceof LoginUserInfo) {
            LoginUserInfo loginUserInfo = (LoginUserInfo) authentication.getPrincipal();
            return loginUserInfo;
        }
        return null;
//        throw new BusinessException(ResponseStatusEnums.TOKEN_INVALID.getCode(), ResponseStatusEnums.TOKEN_INVALID.getMessage());
    }

    /**
@@ -52,12 +49,13 @@
    public static String getUsername() {
        final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
        if (authentication == null) {
//            throw new BusinessException(ResponseStatusEnums.TOKEN_INVALID.getCode(), ResponseStatusEnums.TOKEN_INVALID.getMessage());
            return "无登录";
        }
//        UserDetails userDetails = (UserDetails) authentication.getPrincipal();
//        return userDetails.getUsername();
        return (String)authentication.getPrincipal();
        if (authentication.getPrincipal() instanceof LoginUserInfo) {
            LoginUserInfo loginUserInfo = (LoginUserInfo) authentication.getPrincipal();
            return loginUserInfo.getUsername();
        }
        return "无登录";
    }

    /**
@@ -68,12 +66,11 @@
    public static Long getUserId() {
        SecurityProperties properties = SpringContextHolder.getBean(SecurityProperties.class);
        if (!properties.isCacheOnline()) {
            Object obj = getUserDetails();
            LoginUserInfo obj = getUserDetails();
            if (obj == null) {
                return null;
            }
            JSONObject json = new JSONObject(obj);
            return json.getJSONObject("user").get("id", Long.class);
            return obj.getUserId();
        } else {
            HttpServletRequest httpServletRequest = RequestHolder.getHttpServletRequest();
            JwtTokenProvider tokenProvider = SpringContextHolder.getBean(JwtTokenProvider.class);