lsm/sa-token
1
0
Fork 0
mirror of https://gitee.com/dromara/sa-token.git synced 2026-02-27 16:50:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!246 升级 redisx 为 1.4.7（set 指令改为 setex）

Browse Source 
Merge pull request !246 from 西东/dev
This commit is contained in:
孔明
2023-04-14 04:09:55 +00:00
committed by Gitee
parent 1c4cc85cc7 87b9c4a435
commit 731b1ba307
6 changed files with 35 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pom.xml
View File

@@ -22,10 +22,11 @@
<module>sa-token-core</module> <module>sa-token-core</module>
<module>sa-token-starter</module> <module>sa-token-starter</module>
<module>sa-token-plugin</module> <module>sa-token-plugin</module>
<!-- <module>sa-token-test</module> --> <module>sa-token-demo/sa-token-demo-sso-server-solon</module>
<!-- <module>sa-token-demo/sa-token-demo-solon</module> --> <module>sa-token-demo/sa-token-demo-sso1-client-solon</module>
<!-- <module>sa-token-demo/sa-token-demo-sso-server-solon</module> --> <module>sa-token-demo/sa-token-demo-sso2-client-solon</module>
</modules> <module>sa-token-demo/sa-token-demo-sso3-client-solon</module>
</modules>
<!-- 开源协议 apache 2.0 --> <!-- 开源协议 apache 2.0 -->
<licenses> <licenses>

4
sa-token-dependencies/pom.xml
View File

@@ -24,8 +24,8 @@
<jakarta-servlet-api.version>6.0.0</jakarta-servlet-api.version> <jakarta-servlet-api.version>6.0.0</jakarta-servlet-api.version>
<thymeleaf.version>3.0.9.RELEASE</thymeleaf.version> <thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
<solon.version>2.2.3</solon.version> <solon.version>2.2.3</solon.version>
<noear-redisx.version>1.4.5</noear-redisx.version> <noear-redisx.version>1.4.7</noear-redisx.version>
<noear-snack3.version>3.2.54</noear-snack3.version> <noear-snack3.version>3.2.65</noear-snack3.version>
<jfinal.version>4.9.17</jfinal.version> <jfinal.version>4.9.17</jfinal.version>
<jboot.version>3.14.4</jboot.version> <jboot.version>3.14.4</jboot.version>
<commons-pool2.version>2.5.0</commons-pool2.version> <commons-pool2.version>2.5.0</commons-pool2.version>

50
sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
View File

@@ -40,13 +40,7 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
*/ */
@Override @Override
public void set(String key, String value, long timeout) { public void set(String key, String value, long timeout) {
if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { if (timeout > 0 || timeout == SaTokenDao.NEVER_EXPIRE) {
return;
}
// 判断是否为永不过期
if (timeout == SaTokenDao.NEVER_EXPIRE) {
redisBucket.store(key, value, (int) SaTokenDao.NEVER_EXPIRE);
} else {
redisBucket.store(key, value, (int) timeout); redisBucket.store(key, value, (int) timeout);
} }
} }
@@ -57,10 +51,6 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
@Override @Override
public void update(String key, String value) { public void update(String key, String value) {
long expire = getTimeout(key); long expire = getTimeout(key);
// -2 = 无此键
if (expire == SaTokenDao.NOT_VALUE_EXPIRE) {
return;
}
this.set(key, value, expire); this.set(key, value, expire);
} }
@@ -85,18 +75,9 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
*/ */
@Override @Override
public void updateTimeout(String key, long timeout) { public void updateTimeout(String key, long timeout) {
// 判断是否想要设置为永久 if (redisBucket.exists(key)) {
if (timeout == SaTokenDao.NEVER_EXPIRE) { redisBucket.delay(key, (int) timeout);
long expire = getTimeout(key);
if (expire == SaTokenDao.NEVER_EXPIRE) {
// 如果其已经被设置为永久，则不作任何处理
} else {
// 如果尚未被设置为永久，那么再次set一次
this.set(key, this.get(key), timeout);
}
return;
} }
redisBucket.delay(key, (int) timeout);
} }
@@ -113,13 +94,7 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
*/ */
@Override @Override
public void setObject(String key, Object object, long timeout) { public void setObject(String key, Object object, long timeout) {
if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { if (timeout > 0 || timeout == SaTokenDao.NEVER_EXPIRE) {
return;
}
// 判断是否为永不过期
if (timeout == SaTokenDao.NEVER_EXPIRE) {
redisBucket.storeAndSerialize(key, object);
} else {
redisBucket.storeAndSerialize(key, object, (int) timeout); redisBucket.storeAndSerialize(key, object, (int) timeout);
} }
} }
@@ -130,10 +105,6 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
@Override @Override
public void updateObject(String key, Object object) { public void updateObject(String key, Object object) {
long expire = getObjectTimeout(key); long expire = getObjectTimeout(key);
// -2 = 无此键
if (expire == SaTokenDao.NOT_VALUE_EXPIRE) {
return;
}
this.setObject(key, object, expire); this.setObject(key, object, expire);
} }
@@ -158,18 +129,9 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
*/ */
@Override @Override
public void updateObjectTimeout(String key, long timeout) { public void updateObjectTimeout(String key, long timeout) {
// 判断是否想要设置为永久 if (redisBucket.exists(key)) {
if (timeout == SaTokenDao.NEVER_EXPIRE) { redisBucket.delay(key, (int) timeout);
long expire = getObjectTimeout(key);
if (expire == SaTokenDao.NEVER_EXPIRE) {
// 如果其已经被设置为永久，则不作任何处理
} else {
// 如果尚未被设置为永久，那么再次set一次
this.setObject(key, this.getObject(key), timeout);
}
return;
} }
redisBucket.delay(key, (int) timeout);
} }

50
sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
View File

@@ -56,13 +56,7 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
*/ */
@Override @Override
public void set(String key, String value, long timeout) { public void set(String key, String value, long timeout) {
if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { if (timeout > 0 || timeout == SaTokenDao.NEVER_EXPIRE) {
return;
}
// 判断是否为永不过期
if (timeout == SaTokenDao.NEVER_EXPIRE) {
redisBucket.store(key, value, (int) SaTokenDao.NEVER_EXPIRE);
} else {
redisBucket.store(key, value, (int) timeout); redisBucket.store(key, value, (int) timeout);
} }
} }
@@ -73,10 +67,6 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
@Override @Override
public void update(String key, String value) { public void update(String key, String value) {
long expire = getTimeout(key); long expire = getTimeout(key);
// -2 = 无此键
if (expire == SaTokenDao.NOT_VALUE_EXPIRE) {
return;
}
this.set(key, value, expire); this.set(key, value, expire);
} }
@@ -101,18 +91,9 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
*/ */
@Override @Override
public void updateTimeout(String key, long timeout) { public void updateTimeout(String key, long timeout) {
// 判断是否想要设置为永久 if (redisBucket.exists(key)) {
if (timeout == SaTokenDao.NEVER_EXPIRE) { redisBucket.delay(key, (int) timeout);
long expire = getTimeout(key);
if (expire == SaTokenDao.NEVER_EXPIRE) {
// 如果其已经被设置为永久，则不作任何处理
} else {
// 如果尚未被设置为永久，那么再次set一次
this.set(key, this.get(key), timeout);
}
return;
} }
redisBucket.delay(key, (int) timeout);
} }
@@ -129,12 +110,10 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
*/ */
@Override @Override
public void setObject(String key, Object object, long timeout) { public void setObject(String key, Object object, long timeout) {
if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { if (timeout > 0 || timeout == SaTokenDao.NEVER_EXPIRE) {
return; String value = ONode.serialize(object);
set(key, value, timeout);
} }
String value = ONode.serialize(object);
set(key, value, timeout);
} }
/** /**
@@ -143,10 +122,6 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
@Override @Override
public void updateObject(String key, Object object) { public void updateObject(String key, Object object) {
long expire = getObjectTimeout(key); long expire = getObjectTimeout(key);
// -2 = 无此键
if (expire == SaTokenDao.NOT_VALUE_EXPIRE) {
return;
}
this.setObject(key, object, expire); this.setObject(key, object, expire);
} }
@@ -171,18 +146,9 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
*/ */
@Override @Override
public void updateObjectTimeout(String key, long timeout) { public void updateObjectTimeout(String key, long timeout) {
// 判断是否想要设置为永久 if (redisBucket.exists(key)) {
if (timeout == SaTokenDao.NEVER_EXPIRE) { redisBucket.delay(key, (int) timeout);
long expire = getObjectTimeout(key);
if (expire == SaTokenDao.NEVER_EXPIRE) {
// 如果其已经被设置为永久，则不作任何处理
} else {
// 如果尚未被设置为永久，那么再次set一次
this.setObject(key, this.getObject(key), timeout);
}
return;
} }
redisBucket.delay(key, (int) timeout);
} }

50
sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java
View File

@@ -41,13 +41,7 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
*/ */
@Override @Override
public void set(String key, String value, long timeout) { public void set(String key, String value, long timeout) {
if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { if (timeout > 0 || timeout == SaTokenDao.NEVER_EXPIRE) {
return;
}
// 判断是否为永不过期
if (timeout == SaTokenDao.NEVER_EXPIRE) {
redisBucket.store(key, value, (int) SaTokenDao.NEVER_EXPIRE);
} else {
redisBucket.store(key, value, (int) timeout); redisBucket.store(key, value, (int) timeout);
} }
} }
@@ -58,10 +52,6 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
@Override @Override
public void update(String key, String value) { public void update(String key, String value) {
long expire = getTimeout(key); long expire = getTimeout(key);
// -2 = 无此键
if (expire == SaTokenDao.NOT_VALUE_EXPIRE) {
return;
}
this.set(key, value, expire); this.set(key, value, expire);
} }
@@ -86,18 +76,9 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
*/ */
@Override @Override
public void updateTimeout(String key, long timeout) { public void updateTimeout(String key, long timeout) {
// 判断是否想要设置为永久 if (redisBucket.exists(key)) {
if (timeout == SaTokenDao.NEVER_EXPIRE) { redisBucket.delay(key, (int) timeout);
long expire = getTimeout(key);
if (expire == SaTokenDao.NEVER_EXPIRE) {
// 如果其已经被设置为永久，则不作任何处理
} else {
// 如果尚未被设置为永久，那么再次set一次
this.set(key, this.get(key), timeout);
}
return;
} }
redisBucket.delay(key, (int) timeout);
} }
@@ -114,13 +95,7 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
*/ */
@Override @Override
public void setObject(String key, Object object, long timeout) { public void setObject(String key, Object object, long timeout) {
if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { if (timeout > 0 || timeout == SaTokenDao.NEVER_EXPIRE) {
return;
}
// 判断是否为永不过期
if (timeout == SaTokenDao.NEVER_EXPIRE) {
redisBucket.storeAndSerialize(key, object);
} else {
redisBucket.storeAndSerialize(key, object, (int) timeout); redisBucket.storeAndSerialize(key, object, (int) timeout);
} }
} }
@@ -131,10 +106,6 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
@Override @Override
public void updateObject(String key, Object object) { public void updateObject(String key, Object object) {
long expire = getObjectTimeout(key); long expire = getObjectTimeout(key);
// -2 = 无此键
if (expire == SaTokenDao.NOT_VALUE_EXPIRE) {
return;
}
this.setObject(key, object, expire); this.setObject(key, object, expire);
} }
@@ -159,18 +130,9 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
*/ */
@Override @Override
public void updateObjectTimeout(String key, long timeout) { public void updateObjectTimeout(String key, long timeout) {
// 判断是否想要设置为永久 if (redisBucket.exists(key)) {
if (timeout == SaTokenDao.NEVER_EXPIRE) { redisBucket.delay(key, (int) timeout);
long expire = getObjectTimeout(key);
if (expire == SaTokenDao.NEVER_EXPIRE) {
// 如果其已经被设置为永久，则不作任何处理
} else {
// 如果尚未被设置为永久，那么再次set一次
this.setObject(key, this.getObject(key), timeout);
}
return;
} }
redisBucket.delay(key, (int) timeout);
} }

50
sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java
View File

@@ -57,13 +57,7 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
*/ */
@Override @Override
public void set(String key, String value, long timeout) { public void set(String key, String value, long timeout) {
if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { if (timeout > 0 || timeout == SaTokenDao.NEVER_EXPIRE) {
return;
}
// 判断是否为永不过期
if (timeout == SaTokenDao.NEVER_EXPIRE) {
redisBucket.store(key, value, (int) SaTokenDao.NEVER_EXPIRE);
} else {
redisBucket.store(key, value, (int) timeout); redisBucket.store(key, value, (int) timeout);
} }
} }
@@ -74,10 +68,6 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
@Override @Override
public void update(String key, String value) { public void update(String key, String value) {
long expire = getTimeout(key); long expire = getTimeout(key);
// -2 = 无此键
if (expire == SaTokenDao.NOT_VALUE_EXPIRE) {
return;
}
this.set(key, value, expire); this.set(key, value, expire);
} }
@@ -102,18 +92,9 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
*/ */
@Override @Override
public void updateTimeout(String key, long timeout) { public void updateTimeout(String key, long timeout) {
// 判断是否想要设置为永久 if (redisBucket.exists(key)) {
if (timeout == SaTokenDao.NEVER_EXPIRE) { redisBucket.delay(key, (int) timeout);
long expire = getTimeout(key);
if (expire == SaTokenDao.NEVER_EXPIRE) {
// 如果其已经被设置为永久，则不作任何处理
} else {
// 如果尚未被设置为永久，那么再次set一次
this.set(key, this.get(key), timeout);
}
return;
} }
redisBucket.delay(key, (int) timeout);
} }
@@ -130,12 +111,10 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
*/ */
@Override @Override
public void setObject(String key, Object object, long timeout) { public void setObject(String key, Object object, long timeout) {
if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { if (timeout > 0 || timeout == SaTokenDao.NEVER_EXPIRE) {
return; String value = ONode.serialize(object);
set(key, value, timeout);
} }
String value = ONode.serialize(object);
set(key, value, timeout);
} }
/** /**
@@ -144,10 +123,6 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
@Override @Override
public void updateObject(String key, Object object) { public void updateObject(String key, Object object) {
long expire = getObjectTimeout(key); long expire = getObjectTimeout(key);
// -2 = 无此键
if (expire == SaTokenDao.NOT_VALUE_EXPIRE) {
return;
}
this.setObject(key, object, expire); this.setObject(key, object, expire);
} }
@@ -172,18 +147,9 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
*/ */
@Override @Override
public void updateObjectTimeout(String key, long timeout) { public void updateObjectTimeout(String key, long timeout) {
// 判断是否想要设置为永久 if (redisBucket.exists(key)) {
if (timeout == SaTokenDao.NEVER_EXPIRE) { redisBucket.delay(key, (int) timeout);
long expire = getObjectTimeout(key);
if (expire == SaTokenDao.NEVER_EXPIRE) {
// 如果其已经被设置为永久，则不作任何处理
} else {
// 如果尚未被设置为永久，那么再次set一次
this.setObject(key, this.getObject(key), timeout);
}
return;
} }
redisBucket.delay(key, (int) timeout);
} }