From c1036a3df288855348a0e9a085f269b3037d85f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 17 Feb 2023 22:45:08 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20TenantSaTokenDao=20?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E8=B0=83=E7=94=A8=E5=AF=BC=E8=87=B4=20key=20?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/tenant/core/TenantSaTokenDao.java  | 42 +++++++++++++++++--
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/core/TenantSaTokenDao.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/core/TenantSaTokenDao.java
index db9c0258c..a84bbbd69 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/core/TenantSaTokenDao.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/core/TenantSaTokenDao.java
@@ -1,8 +1,10 @@
 package com.ruoyi.common.tenant.core;
 
 import com.ruoyi.common.core.constant.GlobalConstants;
+import com.ruoyi.common.redis.utils.RedisUtils;
 import com.ruoyi.common.satoken.core.dao.PlusSaTokenDao;
 
+import java.time.Duration;
 import java.util.List;
 
 /**
@@ -27,7 +29,12 @@ public class TenantSaTokenDao extends PlusSaTokenDao {
      */
     @Override
     public void update(String key, String value) {
-        super.update(GlobalConstants.GLOBAL_REDIS_KEY + key, value);
+        long expire = getTimeout(key);
+        // -2 = 无此键
+        if (expire == NOT_VALUE_EXPIRE) {
+            return;
+        }
+        this.set(key, value, expire);
     }
 
     /**
@@ -51,7 +58,18 @@ public class TenantSaTokenDao extends PlusSaTokenDao {
      */
     @Override
     public void updateTimeout(String key, long timeout) {
-        super.updateTimeout(GlobalConstants.GLOBAL_REDIS_KEY + key, timeout);
+        // 判断是否想要设置为永久
+        if (timeout == NEVER_EXPIRE) {
+            long expire = getTimeout(key);
+            if (expire == NEVER_EXPIRE) {
+                // 如果其已经被设置为永久，则不作任何处理
+            } else {
+                // 如果尚未被设置为永久，那么再次set一次
+                this.set(key, this.get(key), timeout);
+            }
+            return;
+        }
+        RedisUtils.expire(GlobalConstants.GLOBAL_REDIS_KEY + key, Duration.ofSeconds(timeout));
     }
 
 
@@ -76,7 +94,12 @@ public class TenantSaTokenDao extends PlusSaTokenDao {
      */
     @Override
     public void updateObject(String key, Object object) {
-        super.updateObject(GlobalConstants.GLOBAL_REDIS_KEY + key, object);
+        long expire = getObjectTimeout(key);
+        // -2 = 无此键
+        if (expire == NOT_VALUE_EXPIRE) {
+            return;
+        }
+        this.setObject(key, object, expire);
     }
 
     /**
@@ -100,7 +123,18 @@ public class TenantSaTokenDao extends PlusSaTokenDao {
      */
     @Override
     public void updateObjectTimeout(String key, long timeout) {
-        super.updateObjectTimeout(GlobalConstants.GLOBAL_REDIS_KEY + key, timeout);
+        // 判断是否想要设置为永久
+        if (timeout == NEVER_EXPIRE) {
+            long expire = getObjectTimeout(key);
+            if (expire == NEVER_EXPIRE) {
+                // 如果其已经被设置为永久，则不作任何处理
+            } else {
+                // 如果尚未被设置为永久，那么再次set一次
+                this.setObject(key, this.getObject(key), timeout);
+            }
+            return;
+        }
+        RedisUtils.expire(GlobalConstants.GLOBAL_REDIS_KEY + key, Duration.ofSeconds(timeout));
     }