|
@@ -28,15 +28,11 @@ public class UserContextInterceptor implements HandlerInterceptor {
|
|
|
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
|
|
|
// 保存用户信息到threadLocal
|
|
|
String userInfo = request.getHeader("userInfo");
|
|
|
- if (StringUtils.isEmpty(userInfo)) {
|
|
|
- throw new CommonException(CodeMsg.UNAUTHORIZED);
|
|
|
+ if (StringUtils.isNotBlank(userInfo)) {
|
|
|
+ UserBean userBean = JSON.parseObject(userInfo, UserBean.class);
|
|
|
+ LOGGER.info("currentUser: [{}]", userInfo);
|
|
|
+ UserContextUtil.saveUser(UserContextBO.builderBO(userBean.getUserId(), request.getHeader("appVersion"), request.getHeader("appPackage")));
|
|
|
}
|
|
|
- UserBean userBean = JSON.parseObject(userInfo, UserBean.class);
|
|
|
- if (Objects.isNull(userBean)) {
|
|
|
- throw new CommonException(CodeMsg.UNAUTHORIZED);
|
|
|
- }
|
|
|
- LOGGER.info("currentUser: [{}]", userInfo);
|
|
|
- UserContextUtil.saveUser(UserContextBO.builderBO(userBean.getUserId(), request.getHeader("appVersion"), request.getHeader("appPackage")));
|
|
|
return true;
|
|
|
}
|
|
|
|