diff --git a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/interceptor/HeaderInterceptor.java b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/interceptor/HeaderInterceptor.java index 64f791e..a45520d 100644 --- a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/interceptor/HeaderInterceptor.java +++ b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/interceptor/HeaderInterceptor.java @@ -3,6 +3,8 @@ package com.flossom.common.security.interceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.AsyncHandlerInterceptor; import com.flossom.common.core.constant.SecurityConstants; @@ -20,6 +22,8 @@ import com.flossom.system.api.model.LoginUser; * @author flossom */ public class HeaderInterceptor implements AsyncHandlerInterceptor { + + protected final Logger logger = LoggerFactory.getLogger(this.getClass()); @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { if (!(handler instanceof HandlerMethod)) { @@ -30,9 +34,11 @@ public class HeaderInterceptor implements AsyncHandlerInterceptor { SecurityContextHolder.setUserName(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USERNAME)); SecurityContextHolder.setWxUserId(ServletUtils.getHeader(request, SecurityConstants.WX_DETAILS_USER_ID)); SecurityContextHolder.setWxUserName(ServletUtils.getHeader(request, SecurityConstants.WX_DETAILS_USERNAME)); + logger.info("security拦截器-微信用戶ID:{}", ServletUtils.getHeader(request, SecurityConstants.WX_DETAILS_USERNAME)); SecurityContextHolder.setUserKey(ServletUtils.getHeader(request, SecurityConstants.USER_KEY)); String token = SecurityUtils.getToken(); + logger.info("security拦截器-登录token: {}", token); if (StringUtils.isNotEmpty(token)) { LoginUser loginUser = AuthUtil.getLoginUser(token); if (StringUtils.isNotNull(loginUser)) { diff --git a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/utils/SecurityUtils.java b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/utils/SecurityUtils.java index 631245d..18de3be 100644 --- a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/utils/SecurityUtils.java +++ b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/utils/SecurityUtils.java @@ -25,12 +25,12 @@ public class SecurityUtils } /** - * 获取用户ID + * TODO:获取用户ID(暂不可用,不知道为何获取不到) */ - public static Long getWxUserId() + /*public static Long getWxUserId() { return SecurityContextHolder.getWxUserId(); - } + }*/ /** * 获取用户名称 @@ -41,12 +41,12 @@ public class SecurityUtils } /** - * 获取用户名称 + * TODO:获取用户名称(暂不可用,不知道为何获取不到) */ - public static String getWxUsername() + /*public static String getWxUsername() { return SecurityContextHolder.getWxUserName(); - } + }*/ /** * 获取用户key diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserScriptLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserScriptLogServiceImpl.java index 8c84254..f091088 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserScriptLogServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserScriptLogServiceImpl.java @@ -21,7 +21,7 @@ public class WxUserScriptLogServiceImpl implements IWxUserScriptLogService { public List selectWxUserScriptLogList() { WxUserScriptLog query = new WxUserScriptLog(); // 消息归属人 - query.setWxUserId(SecurityUtils.getWxUserId()); + query.setWxUserId(SecurityUtils.getLoginUser().getWxUserid()); // 消息状态正常 query.setStatus(Status.OK.getCode()); return wxUserScriptLogMapper.selectWxUserScriptLogList(query); @@ -31,7 +31,7 @@ public class WxUserScriptLogServiceImpl implements IWxUserScriptLogService { public Integer getNoReadMessageNum() { WxUserScriptLog query = new WxUserScriptLog(); // 消息归属人 - query.setWxUserId(SecurityUtils.getWxUserId()); + query.setWxUserId(SecurityUtils.getLoginUser().getWxUserid()); // 消息状态正常 query.setStatus(Status.OK.getCode()); // 未读 @@ -43,7 +43,7 @@ public class WxUserScriptLogServiceImpl implements IWxUserScriptLogService { public void hasBeenRead() { WxUserScriptLog query = new WxUserScriptLog(); // 消息归属人 - query.setWxUserId(20L); + query.setWxUserId(SecurityUtils.getLoginUser().getWxUserid()); // 消息状态正常 query.setStatus(Status.OK.getCode()); // 未读