opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 18:15:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 优化 删除观测用日志记录

Browse Source
This commit is contained in:
疯狂的狮子Li 2024-01-28 23:15:37 +08:00 committed by LiuHao
parent a8a9c060ea
commit c561c0c00c
3 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java
View File

@ -32,17 +32,19 @@ public class CaffeineCacheDecorator implements Cache {
return cache.getNativeCache(); return cache.getNativeCache();
} }
public String getUniqueKey(Object key) {
return cache.getName() + ":" + key;
}
@Override @Override
public ValueWrapper get(Object key) { public ValueWrapper get(Object key) {
Object o = CAFFEINE.get(key, k -> cache.get(key)); Object o = CAFFEINE.get(getUniqueKey(key), k -> cache.get(key));
Console.log("redisson caffeine -> key: " + key + ",value:" + o);
return (ValueWrapper) o; return (ValueWrapper) o;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> T get(Object key, Class<T> type) { public <T> T get(Object key, Class<T> type) {
Object o = CAFFEINE.get(key, k -> cache.get(key, type)); Object o = CAFFEINE.get(getUniqueKey(key), k -> cache.get(key, type));
Console.log("redisson caffeine -> key: " + key + ",value:" + o);
return (T) o; return (T) o;
} }
@ -63,7 +65,7 @@ public class CaffeineCacheDecorator implements Cache {
public boolean evictIfPresent(Object key) { public boolean evictIfPresent(Object key) {
boolean b = cache.evictIfPresent(key); boolean b = cache.evictIfPresent(key);
if (b) { if (b) {
CAFFEINE.invalidate(key); CAFFEINE.invalidate(getUniqueKey(key));
} }
return b; return b;
} }
@ -80,8 +82,7 @@ public class CaffeineCacheDecorator implements Cache {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public <T> T get(Object key, Callable<T> valueLoader) { public <T> T get(Object key, Callable<T> valueLoader) {
Object o = CAFFEINE.get(key, k -> cache.get(key, valueLoader)); Object o = CAFFEINE.get(getUniqueKey(key), k -> cache.get(key, valueLoader));
Console.log("redisson caffeine -> key: " + key + ",value:" + o);
return (T) o; return (T) o;
} }

2
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java
View File

@ -37,7 +37,6 @@ public class PlusSaTokenDao implements SaTokenDao {
@Override @Override
public String get(String key) { public String get(String key) {
Object o = CAFFEINE.get(key, k -> RedisUtils.getCacheObject(key)); Object o = CAFFEINE.get(key, k -> RedisUtils.getCacheObject(key));
Console.log("caffeine -> key:" + key + ",value:" + o);
return (String) o; return (String) o;
} }
@ -101,7 +100,6 @@ public class PlusSaTokenDao implements SaTokenDao {
@Override @Override
public Object getObject(String key) { public Object getObject(String key) {
Object o = CAFFEINE.get(key, k -> RedisUtils.getCacheObject(key)); Object o = CAFFEINE.get(key, k -> RedisUtils.getCacheObject(key));
Console.log("caffeine -> key:" + key + ",value:" + o);
return o; return o;
} }

26
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
View File

@ -579,30 +579,4 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
return ObjectUtil.isNull(sysUser) ? null : sysUser.getNickName(); 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();
}
} }