diff --git a/pom.xml b/pom.xml
index 23d3d3c25..0f1cc5fd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
5.2.2
3.1.1
2.3
- 1.30.0
+ 1.31.0
3.5.2
3.9.1
5.8.5
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
index c43055f45..786214712 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
@@ -42,7 +42,7 @@ public class SysUserOnlineController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(String ipaddr, String userName) {
// 获取所有未过期的 token
- List keys = StpUtil.searchTokenValue("", -1, 0);
+ List keys = StpUtil.searchTokenValue("", -1, 0, false);
List userOnlineDTOList = new ArrayList<>();
for (String key : keys) {
String token = key.replace(CacheConstants.LOGIN_TOKEN_KEY, "");
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java
index a5be2678e..f53dc0678 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java
@@ -1,7 +1,6 @@
package com.ruoyi.framework.config;
-import cn.dev33.satoken.interceptor.SaAnnotationInterceptor;
-import cn.dev33.satoken.interceptor.SaRouteInterceptor;
+import cn.dev33.satoken.interceptor.SaInterceptor;
import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
import cn.dev33.satoken.router.SaRouter;
import cn.dev33.satoken.stp.StpLogic;
@@ -34,7 +33,7 @@ public class SaTokenConfig implements WebMvcConfigurer {
@Override
public void addInterceptors(InterceptorRegistry registry) {
// 注册路由拦截器,自定义验证规则
- registry.addInterceptor(new SaRouteInterceptor((request, response, handler) -> {
+ registry.addInterceptor(new SaInterceptor(handler -> {
ExcludeUrlProperties excludeUrlProperties = SpringUtils.getBean(ExcludeUrlProperties.class);
// 登录验证 -- 排除多个路径
SaRouter
@@ -56,7 +55,6 @@ public class SaTokenConfig implements WebMvcConfigurer {
});
})).addPathPatterns("/**");
- registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
}
@Bean
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
index 1e3c22c35..0f29c9c4b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
@@ -88,14 +88,14 @@ public class UserActionListener implements SaTokenListener {
* 每次被封禁时触发
*/
@Override
- public void doDisable(String loginType, Object loginId, long disableTime) {
+ public void doDisable(String loginType, Object loginId, String service, int level, long disableTime) {
}
/**
* 每次被解封时触发
*/
@Override
- public void doUntieDisable(String loginType, Object loginId) {
+ public void doUntieDisable(String loginType, Object loginId, String service) {
}
/**
@@ -112,5 +112,10 @@ public class UserActionListener implements SaTokenListener {
public void doLogoutSession(String id) {
}
-
+ /**
+ * 每次Token续期时触发
+ */
+ @Override
+ public void doRenewTimeout(String tokenValue, Object loginId, long timeout) {
+ }
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java
index 68df5a646..83c3d5455 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java
@@ -170,10 +170,9 @@ public class PlusSaTokenDao implements SaTokenDao {
* 搜索数据
*/
@Override
- public List searchData(String prefix, String keyword, int start, int size) {
+ public List searchData(String prefix, String keyword, int start, int size, boolean sortType) {
Collection keys = RedisUtils.keys(prefix + "*" + keyword + "*");
List list = new ArrayList<>(keys);
- return SaFoxUtil.searchList(list, start, size);
+ return SaFoxUtil.searchList(list, start, size, sortType);
}
-
}