Merge remote-tracking branch 'origin/5.X' into 5.X

baoshiwei

2025-03-12 f1208474f771a1c233d7425c8ed13fbaa0d521ac

 ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java

@@ -51,7 +51,11 @@
        if (timeout == NEVER_EXPIRE) {
            RedisUtils.setCacheObject(key, value);
        } else {
            RedisUtils.setCacheObject(key, value, Duration.ofSeconds(timeout));
            if (RedisUtils.hasKey(key)) {
                RedisUtils.setCacheObject(key, value, true);
            } else {
                RedisUtils.setCacheObject(key, value, Duration.ofSeconds(timeout));
            }
        }
        CAFFEINE.invalidate(key);
    }
@@ -114,7 +118,11 @@
        if (timeout == NEVER_EXPIRE) {
            RedisUtils.setCacheObject(key, object);
        } else {
            RedisUtils.setCacheObject(key, object, Duration.ofSeconds(timeout));
            if (RedisUtils.hasKey(key)) {
                RedisUtils.setCacheObject(key, object, true);
            } else {
                RedisUtils.setCacheObject(key, object, Duration.ofSeconds(timeout));
            }
        }
        CAFFEINE.invalidate(key);
    }