blade/blade-tool
1
0
Fork 0
mirror of https://github.com/chillzhuang/blade-tool synced 2024-12-12 12:19:27 +08:00
Code Issues Projects Releases Wiki Activity

⚡ 代码优化

Browse Source
This commit is contained in:
smallchill 2018-12-24 13:07:47 +08:00
parent c5f6342f9e
commit 474db1b5ec
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blade-core-boot/src/main/java/org/springblade/core/boot/resolver/TokenArgumentResolver.java
View File

@ -24,8 +24,6 @@ import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.method.support.ModelAndViewContainer;
import javax.servlet.http.HttpServletRequest;
/** /**
* Token转化BladeUser * Token转化BladeUser
*/ */
@ -56,8 +54,7 @@ public class TokenArgumentResolver implements HandlerMethodArgumentResolver {
ModelAndViewContainer modelAndViewContainer, ModelAndViewContainer modelAndViewContainer,
NativeWebRequest nativeWebRequest, NativeWebRequest nativeWebRequest,
WebDataBinderFactory webDataBinderFactory) { WebDataBinderFactory webDataBinderFactory) {
HttpServletRequest request = nativeWebRequest.getNativeRequest(HttpServletRequest.class); return SecureUtil.getUser();
return SecureUtil.getUser(request);
} }
} }

2
blade-core-secure/src/main/java/org/springblade/core/secure/utils/SecureUtil.java
View File

@ -75,7 +75,7 @@ public class SecureUtil {
public static BladeUser getUser(HttpServletRequest request) { public static BladeUser getUser(HttpServletRequest request) {
Claims claims = getClaims(request); Claims claims = getClaims(request);
if (claims == null) { if (claims == null) {
return new BladeUser(); return null;
} }
Integer userId = Func.toInt(claims.get(SecureUtil.userId)); Integer userId = Func.toInt(claims.get(SecureUtil.userId));
String roleId = Func.toStr(claims.get(SecureUtil.roleId)); String roleId = Func.toStr(claims.get(SecureUtil.roleId));