微信登录不拦截2

gis_admin/src/main/java/com/gis/admin/controller/WxLoginController.java

@@ -122,7 +122,8 @@ public class WxLoginController {
      * 保存用户信息
      */
     private WxUserEntity getWxUser(String openId){
-        WxUserEntity entity = wxUserService.cacheByOpenId(openId);
+//        WxUserEntity entity = wxUserService.cacheByOpenId(openId);
+        WxUserEntity entity =  wxUserService.findByOpenId(openId);
         if (entity == null){
             log.info("需要添加新用户");
             entity = new WxUserEntity();

gis_admin/src/main/java/com/gis/admin/service/impl/WxUserServiceImpl.java

@@ -82,7 +82,12 @@ public class WxUserServiceImpl extends ServiceImpl<WxUserMapper, WxUserEntity> i
 
         // token过期
         String redisWxTokenKey = configConstant.redisPrefix + token;
-        BaseRuntimeException.isTrue(!redisUtil.hasKey(redisWxTokenKey), ErrorEnum.FAILURE_CODE_3004.code(), ErrorEnum.FAILURE_CODE_3004.message());
+//        BaseRuntimeException.isTrue(!redisUtil.hasKey(redisWxTokenKey), ErrorEnum.FAILURE_CODE_3004.code(), ErrorEnum.FAILURE_CODE_3004.message());
+
+        if (!redisUtil.hasKey(redisWxTokenKey)){
+            log.info("用户未登录");
+            return Result.failure(ErrorEnum.FAILURE_CODE_3004.code(), ErrorEnum.FAILURE_CODE_3004.message());
+        }
 
         Long userId = iBaseService.getUserId();
 //        redisUtil.getCacheObject()