Merge remote-tracking branch 'origin/master'

Administrator

2023-08-10 44f2a0a32c096bdb05d4cc0ac162cdc1eb14c3ed

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

@@ -142,10 +142,22 @@
    public void refreshToken(LoginUser loginUser)
    {
        loginUser.setLoginTime(System.currentTimeMillis());
        loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
        // 根据uuid将loginUser缓存
        String userKey = getTokenKey(loginUser.getToken());
        redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
        String appUserType = loginUser.getUser().getAppUserType();
        if(StringUtils.isNull(appUserType))
        {
            loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
            // 根据uuid将loginUser缓存
            String userKey = getTokenKey(loginUser.getToken());
            redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
        }
        else
        {
            loginUser.setExpireTime(loginUser.getLoginTime() + 365*24*60 * MILLIS_MINUTE);
            // 根据uuid将loginUser缓存
            String userKey = getTokenKey(loginUser.getToken());
            redisCache.setCacheObject(userKey, loginUser, 365*24*60, TimeUnit.MINUTES);
        }

    }

    /**