From c561c0c00c4cc3cad5337ddb856ff38bae7becc1 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: Sun, 28 Jan 2024 23:15:37 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=A7=82=E6=B5=8B=E7=94=A8=E6=97=A5=E5=BF=97=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../redis/manager/CaffeineCacheDecorator.java | 15 ++++++-----
 .../satoken/core/dao/PlusSaTokenDao.java      |  2 --
 .../service/impl/SysUserServiceImpl.java      | 26 -------------------
 3 files changed, 8 insertions(+), 35 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 1d02efda7..7d3ab4266 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 @@ public class CaffeineCacheDecorator implements Cache {
         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 class CaffeineCacheDecorator implements Cache {
     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 @@ public class CaffeineCacheDecorator implements Cache {
     @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;
     }
 
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 2cfc927c5..0664755a4 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
@@ -37,7 +37,6 @@ public class PlusSaTokenDao implements SaTokenDao {
     @Override
     public String get(String key) {
         Object o = CAFFEINE.get(key, k -> RedisUtils.getCacheObject(key));
-        Console.log("caffeine -> key:" + key + ",value:" + o);
         return (String) o;
     }
 
@@ -101,7 +100,6 @@ public class PlusSaTokenDao implements SaTokenDao {
     @Override
     public Object getObject(String key) {
         Object o = CAFFEINE.get(key, k -> RedisUtils.getCacheObject(key));
-        Console.log("caffeine -> key:" + key + ",value:" + o);
         return o;
     }
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
index d3a9a0dac..a133060ea 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
@@ -579,30 +579,4 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         return ObjectUtil.isNull(sysUser) ? null : sysUser.getNickName();
     }
 
-    /**
-     * 通过用户ID查询用户手机号
-     *
-     * @param userId 用户id
-     * @return 用户手机号
-     */
-    @Override
-    public String selectPhonenumberById(Long userId) {
-        SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
-            .select(SysUser::getPhonenumber).eq(SysUser::getUserId, userId));
-        return ObjectUtil.isNull(sysUser) ? null : sysUser.getPhonenumber();
-    }
-
-    /**
-     * 通过用户ID查询用户邮箱
-     *
-     * @param userId 用户id
-     * @return 用户邮箱
-     */
-    @Override
-    public String selectEmailById(Long userId) {
-        SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
-            .select(SysUser::getEmail).eq(SysUser::getUserId, userId));
-        return ObjectUtil.isNull(sysUser) ? null : sysUser.getEmail();
-    }
-
 }