From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-framework/src/main/java/com/ruoyi/framework/dao/PlusSaTokenDao.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/dao/PlusSaTokenDao.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/dao/PlusSaTokenDao.java
index 6d1c6fb..8da7a1b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/dao/PlusSaTokenDao.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/dao/PlusSaTokenDao.java
@@ -68,7 +68,7 @@
*/
@Override
public long getTimeout(String key) {
- return RedisUtils.getTimeToLive(key);
+ return RedisUtils.getTimeToLive(key) / 1000;
}
/**
@@ -142,7 +142,7 @@
*/
@Override
public long getObjectTimeout(String key) {
- return RedisUtils.getTimeToLive(key);
+ return RedisUtils.getTimeToLive(key) / 1000;
}
/**
--
Gitblit v1.9.3