Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

3 天以前 bee04140fad1310e3d2e66ccbeb6f8b649bff6e8

 src/main/java/com/ruoyi/framework/security/service/TokenService.java

@@ -160,6 +160,7 @@
        loginUser.setLoginTime(System.currentTimeMillis());

        loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);

        loginUser.setDeptIds(getDeptIdsByUserId(loginUser.getUserId()));

        loginUser.setCurrentDeptId(loginUser.getDeptIds()[0]);

        // 根据uuid将loginUser缓存

        String userKey = getTokenKey(loginUser.getToken());

        redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);