diff --git a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java index 474101374..9b712058f 100644 --- a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -3,8 +3,10 @@ package com.iformall.aop; import com.alibaba.fastjson.JSONObject; import com.iformall.annotation.RedisCache; +import com.iformall.common.ErrorCode; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.base.BaseCUserEntity; +import com.iformall.exception.MallinkException; import com.iformall.service.CUserTokenService; import com.iformall.utils.HashUtil; import com.iformall.utils.RedisLock; @@ -65,6 +67,9 @@ public class RedisCacheAspect { if (StringUtils.isBlank(token)) { token = request.getParameter("token"); } + if(StringUtils.isBlank(token) || "null".equals(token) || "undefined".equals(token)){ + throw new MallinkException(ErrorCode.NET_TOKEN_EMPTY.getCode(),"token为空["+token+"]"); + } log.info("token>>>>>>>>>>>>>>>"+token); String tenantId; BaseCUserEntity cUser = null ; diff --git a/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java b/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java index da09118ea..8e922ecee 100644 --- a/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -1,8 +1,10 @@ package com.iformall.resolver; import com.iformall.annotation.LoginUser; +import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.base.BaseCUserEntity; import com.iformall.service.CUserTokenService; +import com.iformall.service.WxCUserBasicInfoService; import com.iformall.utils.Constant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.MethodParameter; @@ -21,8 +23,9 @@ import org.springframework.web.method.support.ModelAndViewContainer; */ @Component public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver { + @Autowired - private CUserTokenService cUserTokenService; + private WxCUserBasicInfoService wxCUserBasicInfoService; @Override public boolean supportsParameter(MethodParameter parameter) { @@ -32,15 +35,13 @@ public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgu @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer container, NativeWebRequest request, WebDataBinderFactory factory) throws Exception { - //获取用户ID - Object object = request.getAttribute(Constant.LOGIN_USER_KEY, RequestAttributes.SCOPE_REQUEST); + //获取会员ID + Object object = request.getAttribute(Constant.LOGIN_MEMBER_KEY, RequestAttributes.SCOPE_REQUEST); if(object == null){ return null; } - //获取用户信息 - BaseCUserEntity user = cUserTokenService.getByToken((String)object); - + WxCUserBasicInfo user = wxCUserBasicInfoService.getById((Long) object); return user; } } diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index 62f26e393..26c1f6619 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -372,6 +372,8 @@ update wx_c_user set update_date=now(), + token = null, + expire_time=now(), tenant_id = IF(tenant_id is null ,null,CONCAT(tenant_id,"_del")), parent_tenant_id = IF(parent_tenant_id is null ,null,CONCAT(parent_tenant_id,"_del")), open_id = IF(open_id is null ,null,CONCAT(open_id,"_del")), diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/interceptor/AuthHandshakeInterceptor.java b/mallinkWebSocketServer/src/main/java/com/iformall/interceptor/AuthHandshakeInterceptor.java index 43190f805..1793afeaa 100644 --- a/mallinkWebSocketServer/src/main/java/com/iformall/interceptor/AuthHandshakeInterceptor.java +++ b/mallinkWebSocketServer/src/main/java/com/iformall/interceptor/AuthHandshakeInterceptor.java @@ -47,8 +47,8 @@ public class AuthHandshakeInterceptor implements HandshakeInterceptor { token = serverHttpRequest.getServletRequest().getParameter("token"); } //token为空 - if(StringUtils.isBlank(token)){ - throw new MallinkException(ErrorCode.NET_TOKEN_EMPTY); + if(StringUtils.isBlank(token) || "null".equals(token) || "undefined".equals(token)){ + throw new MallinkException(ErrorCode.NET_TOKEN_EMPTY.getCode(),"token为空["+token+"]"); } // 查询token信息