From 3c8d864b5f68af5167199e0d5c9ff6c0c5852638 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:35:45 +0800
Subject: [PATCH] !639 发布 5.3.0-BETA 公测版本 Merge pull request !639 from 疯狂的狮子Li/dev
---
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java | 82 +++++++++++++++++++++-------------------
1 files changed, 43 insertions(+), 39 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java
index 8d2aac9..a2a1520 100644
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java
@@ -2,26 +2,41 @@
import cn.dev33.satoken.dao.SaTokenDao;
import cn.dev33.satoken.util.SaFoxUtil;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
import org.dromara.common.redis.utils.RedisUtils;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* Sa-Token鎸佷箙灞傛帴鍙�(浣跨敤妗嗘灦鑷甫RedisUtils瀹炵幇 鍗忚缁熶竴)
+ * <p>
+ * 閲囩敤 caffeine + redis 澶氱骇缂撳瓨 浼樺寲骞跺彂鏌ヨ鏁堢巼
*
* @author Lion Li
*/
public class PlusSaTokenDao implements SaTokenDao {
+
+ private static final Cache<String, Object> CAFFEINE = Caffeine.newBuilder()
+ // 璁剧疆鏈�鍚庝竴娆″啓鍏ユ垨璁块棶鍚庣粡杩囧浐瀹氭椂闂磋繃鏈�
+ .expireAfterWrite(5, TimeUnit.SECONDS)
+ // 鍒濆鐨勭紦瀛樼┖闂村ぇ灏�
+ .initialCapacity(100)
+ // 缂撳瓨鐨勬渶澶ф潯鏁�
+ .maximumSize(1000)
+ .build();
/**
* 鑾峰彇Value锛屽鏃犺繑绌�
*/
@Override
public String get(String key) {
- return RedisUtils.getCacheObject(key);
+ Object o = CAFFEINE.get(key, k -> RedisUtils.getCacheObject(key));
+ return (String) o;
}
/**
@@ -36,8 +51,13 @@
if (timeout == NEVER_EXPIRE) {
RedisUtils.setCacheObject(key, value);
} else {
- RedisUtils.setCacheObject(key, value, Duration.ofSeconds(timeout));
+ if (RedisUtils.hasKey(key)) {
+ RedisUtils.setCacheObject(key, value, true);
+ } else {
+ RedisUtils.setCacheObject(key, value, Duration.ofSeconds(timeout));
+ }
}
+ CAFFEINE.invalidate(key);
}
/**
@@ -45,12 +65,10 @@
*/
@Override
public void update(String key, String value) {
- long expire = getTimeout(key);
- // -2 = 鏃犳閿�
- if (expire == NOT_VALUE_EXPIRE) {
- return;
+ if (RedisUtils.hasKey(key)) {
+ RedisUtils.setCacheObject(key, value, true);
+ CAFFEINE.invalidate(key);
}
- this.set(key, value, expire);
}
/**
@@ -75,17 +93,6 @@
*/
@Override
public void updateTimeout(String key, long timeout) {
- // 鍒ゆ柇鏄惁鎯宠璁剧疆涓烘案涔�
- if (timeout == NEVER_EXPIRE) {
- long expire = getTimeout(key);
- if (expire == NEVER_EXPIRE) {
- // 濡傛灉鍏跺凡缁忚璁剧疆涓烘案涔咃紝鍒欎笉浣滀换浣曞鐞�
- } else {
- // 濡傛灉灏氭湭琚缃负姘镐箙锛岄偅涔堝啀娆et涓�娆�
- this.set(key, this.get(key), timeout);
- }
- return;
- }
RedisUtils.expire(key, Duration.ofSeconds(timeout));
}
@@ -95,7 +102,8 @@
*/
@Override
public Object getObject(String key) {
- return RedisUtils.getCacheObject(key);
+ Object o = CAFFEINE.get(key, k -> RedisUtils.getCacheObject(key));
+ return o;
}
/**
@@ -110,8 +118,13 @@
if (timeout == NEVER_EXPIRE) {
RedisUtils.setCacheObject(key, object);
} else {
- RedisUtils.setCacheObject(key, object, Duration.ofSeconds(timeout));
+ if (RedisUtils.hasKey(key)) {
+ RedisUtils.setCacheObject(key, object, true);
+ } else {
+ RedisUtils.setCacheObject(key, object, Duration.ofSeconds(timeout));
+ }
}
+ CAFFEINE.invalidate(key);
}
/**
@@ -119,12 +132,10 @@
*/
@Override
public void updateObject(String key, Object object) {
- long expire = getObjectTimeout(key);
- // -2 = 鏃犳閿�
- if (expire == NOT_VALUE_EXPIRE) {
- return;
+ if (RedisUtils.hasKey(key)) {
+ RedisUtils.setCacheObject(key, object, true);
+ CAFFEINE.invalidate(key);
}
- this.setObject(key, object, expire);
}
/**
@@ -149,17 +160,6 @@
*/
@Override
public void updateObjectTimeout(String key, long timeout) {
- // 鍒ゆ柇鏄惁鎯宠璁剧疆涓烘案涔�
- if (timeout == NEVER_EXPIRE) {
- long expire = getObjectTimeout(key);
- if (expire == NEVER_EXPIRE) {
- // 濡傛灉鍏跺凡缁忚璁剧疆涓烘案涔咃紝鍒欎笉浣滀换浣曞鐞�
- } else {
- // 濡傛灉灏氭湭琚缃负姘镐箙锛岄偅涔堝啀娆et涓�娆�
- this.setObject(key, this.getObject(key), timeout);
- }
- return;
- }
RedisUtils.expire(key, Duration.ofSeconds(timeout));
}
@@ -167,10 +167,14 @@
/**
* 鎼滅储鏁版嵁
*/
+ @SuppressWarnings("unchecked")
@Override
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, sortType);
+ String keyStr = prefix + "*" + keyword + "*";
+ return (List<String>) CAFFEINE.get(keyStr, k -> {
+ Collection<String> keys = RedisUtils.keys(keyStr);
+ List<String> list = new ArrayList<>(keys);
+ return SaFoxUtil.searchList(list, start, size, sortType);
+ });
}
}
--
Gitblit v1.9.3