fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserLoginKeyServiceImpl.java → zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserLoginKeyServiceImpl.java

@@ -1,29 +1,25 @@
-package com.zhongzheng.modules.user.service.impl;
+package com.zhongzheng.framework.web.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
 import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.sdk.domain.TopNuoMplatformLog;
 import com.zhongzheng.modules.user.bo.UserLoginKeyAddBo;
 import com.zhongzheng.modules.user.bo.UserLoginKeyEditBo;
 import com.zhongzheng.modules.user.bo.UserLoginKeyQueryBo;
-import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.domain.UserLoginKey;
 import com.zhongzheng.modules.user.mapper.UserLoginKeyMapper;
 import com.zhongzheng.modules.user.service.IUserLoginKeyService;
 import com.zhongzheng.modules.user.vo.UserLoginKeyVo;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxTokenService.java

@@ -152,6 +152,14 @@ public class WxTokenService
         refreshToken(loginUser);
         Map<String, Object> claims = new HashMap<>();
         claims.put(Constants.WX_LOGIN_USER_KEY, token);
+        if(Validator.isNotEmpty(token)){
+            UserLoginKeyAddBo addBo = new UserLoginKeyAddBo();
+            addBo.setUserId(loginUser.getUser().getUserId());
+            addBo.setUserKey(token);
+            addBo.setIp(loginUser.getIpaddr());
+            addBo.setBrowser(loginUser.getBrowser());
+            iUserLoginKeyService.insertByAddBo(addBo);
+        }
         return createToken(claims);
     }
 
@@ -182,12 +190,6 @@ public class WxTokenService
         loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
         // 根据uuid将loginUser缓存
         String userKey = getTokenKey(loginUser.getToken());
-        UserLoginKeyAddBo addBo = new UserLoginKeyAddBo();
-        addBo.setUserId(loginUser.getUser().getUserId());
-        addBo.setUserKey(loginUser.getToken());
-        addBo.setIp(loginUser.getIpaddr());
-        addBo.setBrowser(loginUser.getBrowser());
-        iUserLoginKeyService.insertByAddBo(addBo);
         redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
     }