From 8dc92383d9d2763ec6231e37f49673d74a67b6fc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 21 十一月 2022 15:22:42 +0800
Subject: [PATCH] update spring-doc 1.6.12 => 1.6.13 update easyexcel 3.1.1 => 3.1.3 update hutool 5.8.8 => 5.8.10 update redisson 3.17.7 => 3.18.0
---
ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 a08503d..83c3d54 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
@@ -68,7 +68,8 @@
*/
@Override
public long getTimeout(String key) {
- return RedisUtils.getTimeToLive(key) / 1000;
+ long timeout = RedisUtils.getTimeToLive(key);
+ return timeout < 0 ? timeout : timeout / 1000;
}
/**
@@ -141,7 +142,8 @@
*/
@Override
public long getObjectTimeout(String key) {
- return RedisUtils.getTimeToLive(key) / 1000;
+ long timeout = RedisUtils.getTimeToLive(key);
+ return timeout < 0 ? timeout : timeout / 1000;
}
/**
@@ -168,10 +170,9 @@
* 鎼滅储鏁版嵁
*/
@Override
- public List<String> searchData(String prefix, String keyword, int start, int size) {
+ public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
Collection<String> keys = RedisUtils.keys(prefix + "*" + keyword + "*");
List<String> list = new ArrayList<>(keys);
- return SaFoxUtil.searchList(list, start, size);
+ return SaFoxUtil.searchList(list, start, size, sortType);
}
-
}
--
Gitblit v1.9.3