From 574837a92aede1973fdceda0169efd37cff0673d Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期日, 18 九月 2022 22:14:11 +0800 Subject: [PATCH] !229 升级sa-token到最新版1.31.0 Merge pull request !229 from Charles7c/dev --- ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java | 6 ++---- ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java | 11 ++++++++--- ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java | 2 +- ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java | 5 ++--- pom.xml | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index beeada1..8e75241 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ <poi.version>5.2.2</poi.version> <easyexcel.version>3.1.1</easyexcel.version> <velocity.version>2.3</velocity.version> - <satoken.version>1.30.0</satoken.version> + <satoken.version>1.31.0</satoken.version> <mybatis-plus.version>3.5.2</mybatis-plus.version> <p6spy.version>3.9.1</p6spy.version> <hutool.version>5.8.6</hutool.version> 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 c43055f..7862147 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 @@ @GetMapping("/list") public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) { // 鑾峰彇鎵�鏈夋湭杩囨湡鐨� token - List<String> keys = StpUtil.searchTokenValue("", -1, 0); + List<String> keys = StpUtil.searchTokenValue("", -1, 0, false); List<UserOnlineDTO> 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 a5be267..f53dc06 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 @@ @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 @@ }); })).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 1e3c22c..0f29c9c 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 @@ * 姣忔琚皝绂佹椂瑙﹀彂 */ @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 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 68df5a6..83c3d54 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 @@ * 鎼滅储鏁版嵁 */ @Override - public List<String> searchData(String prefix, String keyword, int start, int size) { + public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) { Collection<String> keys = RedisUtils.keys(prefix + "*" + keyword + "*"); List<String> list = new ArrayList<>(keys); - return SaFoxUtil.searchList(list, start, size); + return SaFoxUtil.searchList(list, start, size, sortType); } - } -- Gitblit v1.9.3