Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-24 8a8a13eb80498e9b905b47b8dc4d52cd8fdb8497

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

@@ -142,7 +142,8 @@
    public void refreshToken(LoginUser loginUser)
    {
        loginUser.setLoginTime(System.currentTimeMillis());
        if(StringUtils.isNull(loginUser.getIsApp()))
        String appUserType = loginUser.getUser().getAppUserType();
        if(StringUtils.isNull(appUserType))
        {
            loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
            // 根据uuid将loginUser缓存