From ac9e3f2ca4d2255739f8b60165f5b51b31ccd3e6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:04:08 +0800
Subject: [PATCH] update 适配 springdoc 新版本配置方式

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 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 174cd0f..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
@@ -5,10 +5,10 @@
 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);
@@ -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;
     }
 
     /**
@@ -77,9 +78,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 +88,8 @@
             }
             return;
         }
-        RedisUtils.expire(key, timeout, TimeUnit.SECONDS);
+        RedisUtils.expire(key, Duration.ofSeconds(timeout));
     }
-
 
 
     /**
@@ -105,14 +105,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 +123,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);
@@ -142,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;
     }
 
     /**
@@ -151,9 +152,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 +162,7 @@
             }
             return;
         }
-        RedisUtils.expire(key, timeout, TimeUnit.SECONDS);
+        RedisUtils.expire(key, Duration.ofSeconds(timeout));
     }
 
 
@@ -169,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