From 25836328835ca4f017658ab546b654a5e5b92c09 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 25 四月 2024 12:50:42 +0800
Subject: [PATCH] update springboot 3.2.4 => 3.2.5 update mybatis-plus 3.5.5 => 3.5.6 适配更改代码 update springdoc 2.4.0 => 2.5.0 update easyexcel 3.3.3 => 3.3.4 update redisson 3.27.2 => 3.29.0 update lombok 1.18.30 => 1.18.32 update sms4j 3.2.0 => 3.2.1
---
ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java
index 1d02efd..7d3ab42 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java
@@ -32,17 +32,19 @@
return cache.getNativeCache();
}
+ public String getUniqueKey(Object key) {
+ return cache.getName() + ":" + key;
+ }
+
@Override
public ValueWrapper get(Object key) {
- Object o = CAFFEINE.get(key, k -> cache.get(key));
- Console.log("redisson caffeine -> key: " + key + ",value:" + o);
+ Object o = CAFFEINE.get(getUniqueKey(key), k -> cache.get(key));
return (ValueWrapper) o;
}
@SuppressWarnings("unchecked")
public <T> T get(Object key, Class<T> type) {
- Object o = CAFFEINE.get(key, k -> cache.get(key, type));
- Console.log("redisson caffeine -> key: " + key + ",value:" + o);
+ Object o = CAFFEINE.get(getUniqueKey(key), k -> cache.get(key, type));
return (T) o;
}
@@ -63,7 +65,7 @@
public boolean evictIfPresent(Object key) {
boolean b = cache.evictIfPresent(key);
if (b) {
- CAFFEINE.invalidate(key);
+ CAFFEINE.invalidate(getUniqueKey(key));
}
return b;
}
@@ -80,8 +82,7 @@
@SuppressWarnings("unchecked")
@Override
public <T> T get(Object key, Callable<T> valueLoader) {
- Object o = CAFFEINE.get(key, k -> cache.get(key, valueLoader));
- Console.log("redisson caffeine -> key: " + key + ",value:" + o);
+ Object o = CAFFEINE.get(getUniqueKey(key), k -> cache.get(key, valueLoader));
return (T) o;
}
--
Gitblit v1.9.3