用户资料和用户token操作相关改造2

src/main/java/cn/quantgroup/xyqb/controller/IBaseController.java

 package cn.quantgroup.xyqb.controller;
 
+import cn.quantgroup.xyqb.Constants;
+import cn.quantgroup.xyqb.constant.UserConstant;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.model.session.SessionStruct;
 import cn.quantgroup.xyqb.util.IpUtil;
@@ -20,6 +22,8 @@ import static cn.quantgroup.xyqb.session.XyqbSessionContextHolder.*;
  */
 public interface IBaseController {
 
+
+
     @Deprecated
     default User getCurrentUser() {
         SessionStruct session = getXSession();
@@ -50,6 +54,14 @@ public interface IBaseController {
         return tenantId;
     }
 
+    default Integer getTenantId() {
+        String tenantIdStr = getRequest().getHeader(Constants.X_AUTH_TENANT);
+        if (StringUtils.isEmpty(tenantIdStr)) {
+            tenantIdStr = UserConstant.defaultTenantIdString;
+        }
+        return Integer.parseInt(tenantIdStr);
+    }
+
     default SessionStruct getCurrentSessionFromRedis() {
         return getXSessionFromRedis();
     }

src/main/java/cn/quantgroup/xyqb/service/session/impl/SessionServiceImpl.java

@@ -247,7 +247,7 @@ public class SessionServiceImpl implements ISessionService {
     }
 
     @Override
-    @CacheEvict(value = "userextinfocache", key = "'extinfo' + #userId", cacheManager = "cacheManager")
+    @CacheEvict(value = "userextinfocache", key = "'extinfo' + #userId + '-' + #tenantId", cacheManager = "cacheManager")
     public void deleteByUserId(long userId, Integer tenantId) {
         //1.删除session关联
         String setKey = getUserSessionSetKey(userId, tenantId);

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -244,6 +244,7 @@ public class UserServiceImpl implements IUserService, IBaseController {
 //        user.setPassword(PasswordUtil.MD5WithSalt(password));
         user.setCipherPassword(BctyptPasswordUtil.BCryptWithSalt(password));
         user = userRepository.save(user);
+        //cacheManager 配置的默认过期时间为3600s, 此处设置为1ms,是为了不缓存立刻过期 ？
         stringRedisTemplate.expire("usercache:xyqbuser" + phoneNo, 1L, TimeUnit.MILLISECONDS);
         sessionService.deleteByUserId(user.getId(), tenantId);
         return BctyptPasswordUtil.BCryptCheckPw(password, user.getCipherPassword());