github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

[代码优化](v2.6): 代码优化 (#526)

pull/530/head
wuyc 2020-11-15 19:37:54 +08:00 committed by GitHub
parent f56006f68d
commit 11bf58688a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java
View File

@ -41,16 +41,8 @@ public class SecurityUtils {
* @return UserDetails * @return UserDetails
*/ */
public static UserDetails getCurrentUser() { public static UserDetails getCurrentUser() {
final Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); UserDetailsService userDetailsService = SpringContextHolder.getBean(UserDetailsService.class);
if (authentication == null) { return userDetailsService.loadUserByUsername(getCurrentUsername());
throw new BadRequestException(HttpStatus.UNAUTHORIZED, "当前登录状态过期");
}
if (authentication.getPrincipal() instanceof UserDetails) {
UserDetails userDetails = (UserDetails) authentication.getPrincipal();
UserDetailsService userDetailsService = SpringContextHolder.getBean(UserDetailsService.class);
return userDetailsService.loadUserByUsername(userDetails.getUsername());
}
throw new BadRequestException(HttpStatus.UNAUTHORIZED, "找不到当前登录的信息");
} }
/** /**
@ -63,8 +55,11 @@ public class SecurityUtils {
if (authentication == null) { if (authentication == null) {
throw new BadRequestException(HttpStatus.UNAUTHORIZED, "当前登录状态过期"); throw new BadRequestException(HttpStatus.UNAUTHORIZED, "当前登录状态过期");
} }
UserDetails userDetails = (UserDetails) authentication.getPrincipal(); if (authentication.getPrincipal() instanceof UserDetails) {
return userDetails.getUsername(); UserDetails userDetails = (UserDetails) authentication.getPrincipal();
return userDetails.getUsername();
}
throw new BadRequestException(HttpStatus.UNAUTHORIZED, "找不到当前登录的信息");
} }
/** /**