Merge remote-tracking branch 'origin/master'

Administrator

2023-08-03 4ffbcc75927f1a6335f57cc52214f6e0b0fedf9e

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

@@ -144,7 +144,6 @@
        loginUser.setLoginTime(System.currentTimeMillis());
        if(StringUtils.isNull(loginUser.getIsApp()))
        {

            loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
            // 根据uuid将loginUser缓存
            String userKey = getTokenKey(loginUser.getToken());