From 0c8f727bd89677feb4c08b781af72807f4bd143a Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 24 一月 2022 13:03:42 +0800 Subject: [PATCH] update maven-jar-plugin 3.2.0 => 3.2.2 update maven-war-plugin 3.2.0 => 3.2.2 update maven-compiler-plugin 3.1 => 3.9.0 update hutool 5.7.18 => 5.7.20 update springboot-admin 2.6.0 => 2.6.2 update redisson 3.16.7 => 3.16.8 update qiniu 7.9.0 => 7.9.2 update aliyun 3.13.1 => 3.14.0 update qcloud 5.6.58 => 5.6.68 update minio 8.3.4 => 8.3.5 --- ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java index 556133c..f78e814 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java @@ -2,7 +2,7 @@ import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.util.SaFoxUtil; -import com.ruoyi.common.utils.RedisUtils; +import com.ruoyi.common.utils.redis.RedisUtils; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -31,11 +31,11 @@ */ @Override public void set(String key, String value, long timeout) { - if(timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { + if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { return; } // 鍒ゆ柇鏄惁涓烘案涓嶈繃鏈� - if(timeout == SaTokenDao.NEVER_EXPIRE) { + if (timeout == SaTokenDao.NEVER_EXPIRE) { RedisUtils.setCacheObject(key, value); } else { RedisUtils.setCacheObject(key, value, timeout, TimeUnit.SECONDS); @@ -49,7 +49,7 @@ public void update(String key, String value) { long expire = getTimeout(key); // -2 = 鏃犳閿� - if(expire == SaTokenDao.NOT_VALUE_EXPIRE) { + if (expire == SaTokenDao.NOT_VALUE_EXPIRE) { return; } this.set(key, value, expire); @@ -77,9 +77,9 @@ @Override public void updateTimeout(String key, long timeout) { // 鍒ゆ柇鏄惁鎯宠璁剧疆涓烘案涔� - if(timeout == SaTokenDao.NEVER_EXPIRE) { + if (timeout == SaTokenDao.NEVER_EXPIRE) { long expire = getTimeout(key); - if(expire == SaTokenDao.NEVER_EXPIRE) { + if (expire == SaTokenDao.NEVER_EXPIRE) { // 濡傛灉鍏跺凡缁忚璁剧疆涓烘案涔咃紝鍒欎笉浣滀换浣曞鐞� } else { // 濡傛灉灏氭湭琚缃负姘镐箙锛岄偅涔堝啀娆et涓�娆� @@ -89,7 +89,6 @@ } RedisUtils.expire(key, timeout, TimeUnit.SECONDS); } - /** @@ -105,11 +104,11 @@ */ @Override public void setObject(String key, Object object, long timeout) { - if(timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { + if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { return; } // 鍒ゆ柇鏄惁涓烘案涓嶈繃鏈� - if(timeout == SaTokenDao.NEVER_EXPIRE) { + if (timeout == SaTokenDao.NEVER_EXPIRE) { RedisUtils.setCacheObject(key, object); } else { RedisUtils.setCacheObject(key, object, timeout, TimeUnit.SECONDS); @@ -123,7 +122,7 @@ public void updateObject(String key, Object object) { long expire = getObjectTimeout(key); // -2 = 鏃犳閿� - if(expire == SaTokenDao.NOT_VALUE_EXPIRE) { + if (expire == SaTokenDao.NOT_VALUE_EXPIRE) { return; } this.setObject(key, object, expire); @@ -151,9 +150,9 @@ @Override public void updateObjectTimeout(String key, long timeout) { // 鍒ゆ柇鏄惁鎯宠璁剧疆涓烘案涔� - if(timeout == SaTokenDao.NEVER_EXPIRE) { + if (timeout == SaTokenDao.NEVER_EXPIRE) { long expire = getObjectTimeout(key); - if(expire == SaTokenDao.NEVER_EXPIRE) { + if (expire == SaTokenDao.NEVER_EXPIRE) { // 濡傛灉鍏跺凡缁忚璁剧疆涓烘案涔咃紝鍒欎笉浣滀换浣曞鐞� } else { // 濡傛灉灏氭湭琚缃负姘镐箙锛岄偅涔堝啀娆et涓�娆� -- Gitblit v1.9.3