From c636e6909b8ed1dc1dba18bceca2554d5adde7f9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 21 一月 2022 18:29:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
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