Merge branch 'dev_New' into jtwy

zss

10 天以前 8d41b81fa9570be2baf29a1251751047266b149d

 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);