From 80d1e28d0f5b643a753a2989dbba4e123b9ad87d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 10 五月 2022 14:42:02 +0800
Subject: [PATCH] update springboot-admin 2.6.6 => 2.6.7 update springboot-mybatis 2.2.0 => 2.2.2 update sa-token 1.29.0 => 1.30.0 update hutool 5.7.22 => 5.8.0 update druid 1.2.8 => 1.2.9 update tlog 1.3.6 => 1.4.0
---
ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 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..a08503d 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,13 +2,13 @@
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.time.Duration;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.concurrent.TimeUnit;
/**
* Sa-Token鎸佷箙灞傛帴鍙�(浣跨敤妗嗘灦鑷甫RedisUtils瀹炵幇 鍗忚缁熶竴)
@@ -31,14 +31,14 @@
*/
@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);
+ RedisUtils.setCacheObject(key, value, Duration.ofSeconds(timeout));
}
}
@@ -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涓�娆�
@@ -87,9 +87,8 @@
}
return;
}
- RedisUtils.expire(key, timeout, TimeUnit.SECONDS);
+ RedisUtils.expire(key, Duration.ofSeconds(timeout));
}
-
/**
@@ -105,14 +104,14 @@
*/
@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);
+ RedisUtils.setCacheObject(key, object, Duration.ofSeconds(timeout));
}
}
@@ -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涓�娆�
@@ -161,7 +160,7 @@
}
return;
}
- RedisUtils.expire(key, timeout, TimeUnit.SECONDS);
+ RedisUtils.expire(key, Duration.ofSeconds(timeout));
}
--
Gitblit v1.9.3