admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修复 TenantSaTokenDao 内部调用导致 key 错误问题

Browse Source
This commit is contained in:
疯狂的狮子Li 2023-02-17 22:45:08 +08:00
parent 70b8340a5f
commit c1036a3df2
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/core/TenantSaTokenDao.java
View File

@ -1,8 +1,10 @@
package com.ruoyi.common.tenant.core; package com.ruoyi.common.tenant.core;
import com.ruoyi.common.core.constant.GlobalConstants; import com.ruoyi.common.core.constant.GlobalConstants;
import com.ruoyi.common.redis.utils.RedisUtils;
import com.ruoyi.common.satoken.core.dao.PlusSaTokenDao; import com.ruoyi.common.satoken.core.dao.PlusSaTokenDao;
import java.time.Duration;
import java.util.List; import java.util.List;
/** /**
@ -27,7 +29,12 @@ public class TenantSaTokenDao extends PlusSaTokenDao {
*/ */
@Override @Override
public void update(String key, String value) { public void update(String key, String value) {
super.update(GlobalConstants.GLOBAL_REDIS_KEY + key, value); long expire = getTimeout(key);
// -2 = 无此键
if (expire == NOT_VALUE_EXPIRE) {
return;
}
this.set(key, value, expire);
} }
/** /**
@ -51,7 +58,18 @@ public class TenantSaTokenDao extends PlusSaTokenDao {
*/ */
@Override @Override
public void updateTimeout(String key, long timeout) { public void updateTimeout(String key, long timeout) {
super.updateTimeout(GlobalConstants.GLOBAL_REDIS_KEY + key, timeout); // 判断是否想要设置为永久
if (timeout == NEVER_EXPIRE) {
long expire = getTimeout(key);
if (expire == NEVER_EXPIRE) {
// 如果其已经被设置为永久，则不作任何处理
} else {
// 如果尚未被设置为永久，那么再次set一次
this.set(key, this.get(key), timeout);
}
return;
}
RedisUtils.expire(GlobalConstants.GLOBAL_REDIS_KEY + key, Duration.ofSeconds(timeout));
} }
@ -76,7 +94,12 @@ public class TenantSaTokenDao extends PlusSaTokenDao {
*/ */
@Override @Override
public void updateObject(String key, Object object) { public void updateObject(String key, Object object) {
super.updateObject(GlobalConstants.GLOBAL_REDIS_KEY + key, object); long expire = getObjectTimeout(key);
// -2 = 无此键
if (expire == NOT_VALUE_EXPIRE) {
return;
}
this.setObject(key, object, expire);
} }
/** /**
@ -100,7 +123,18 @@ public class TenantSaTokenDao extends PlusSaTokenDao {
*/ */
@Override @Override
public void updateObjectTimeout(String key, long timeout) { public void updateObjectTimeout(String key, long timeout) {
super.updateObjectTimeout(GlobalConstants.GLOBAL_REDIS_KEY + key, timeout); // 判断是否想要设置为永久
if (timeout == NEVER_EXPIRE) {
long expire = getObjectTimeout(key);
if (expire == NEVER_EXPIRE) {
// 如果其已经被设置为永久，则不作任何处理
} else {
// 如果尚未被设置为永久，那么再次set一次
this.setObject(key, this.getObject(key), timeout);
}
return;
}
RedisUtils.expire(GlobalConstants.GLOBAL_REDIS_KEY + key, Duration.ofSeconds(timeout));
} }