dromara/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2025-09-04 19:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

update sa-token 1.30.0 => 1.31.0

Browse Source
This commit is contained in:
疯狂的狮子li
2022-10-08 13:54:55 +08:00
parent 84e377dfc4
commit cd107fbef5
7 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/dev/application-common.yml
View File

@@ -178,7 +178,7 @@ sa-token:
# 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
is-share: false is-share: false
# 是否尝试从header里读取token # 是否尝试从header里读取token
is-read-head: true is-read-header: true
# 是否尝试从cookie里读取token # 是否尝试从cookie里读取token
is-read-cookie: false is-read-cookie: false
# token前缀 # token前缀

2
pom.xml
View File

@@ -36,7 +36,7 @@
<redisson.version>3.17.6</redisson.version> <redisson.version>3.17.6</redisson.version>
<lock4j.version>2.2.2</lock4j.version> <lock4j.version>2.2.2</lock4j.version>
<xxl-job.version>2.3.1</xxl-job.version> <xxl-job.version>2.3.1</xxl-job.version>
<satoken.version>1.30.0</satoken.version> <satoken.version>1.31.0</satoken.version>
<lombok.version>1.18.24</lombok.version> <lombok.version>1.18.24</lombok.version>
<logstash.version>7.1.1</logstash.version> <logstash.version>7.1.1</logstash.version>
<easy-es.version>1.0.2</easy-es.version> <easy-es.version>1.0.2</easy-es.version>

10
ruoyi-auth/src/main/java/com/ruoyi/auth/listener/UserActionListener.java
View File

@@ -95,14 +95,14 @@ public class UserActionListener implements SaTokenListener {
* 每次被封禁时触发 * 每次被封禁时触发
*/ */
@Override @Override
public void doDisable(String loginType, Object loginId, long disableTime) { public void doDisable(String loginType, Object loginId, String service, int level, long disableTime) {
} }
/** /**
* 每次被解封时触发 * 每次被解封时触发
*/ */
@Override @Override
public void doUntieDisable(String loginType, Object loginId) { public void doUntieDisable(String loginType, Object loginId, String service) {
} }
/** /**
@@ -119,5 +119,11 @@ public class UserActionListener implements SaTokenListener {
public void doLogoutSession(String id) { public void doLogoutSession(String id) {
} }
/**
* 每次Token续期时触发
*/
@Override
public void doRenewTimeout(String tokenValue, Object loginId, long timeout) {
}
} }

5
ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/core/dao/PlusSaTokenDao.java
View File

@@ -168,10 +168,9 @@ public class PlusSaTokenDao implements SaTokenDao {
* 搜索数据 * 搜索数据
*/ */
@Override @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 + "*"); Collection<String> keys = RedisUtils.keys(prefix + "*" + keyword + "*");
List<String> list = new ArrayList<>(keys); List<String> list = new ArrayList<>(keys);
return SaFoxUtil.searchList(list, start, size); return SaFoxUtil.searchList(list, start, size, sortType);
} }
} }

6
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfiguration.java
View File

@@ -2,7 +2,7 @@ package com.ruoyi.common.security.config;
import cn.dev33.satoken.filter.SaServletFilter; import cn.dev33.satoken.filter.SaServletFilter;
import cn.dev33.satoken.id.SaIdUtil; import cn.dev33.satoken.id.SaIdUtil;
import cn.dev33.satoken.interceptor.SaAnnotationInterceptor; import cn.dev33.satoken.interceptor.SaInterceptor;
import cn.dev33.satoken.util.SaResult; import cn.dev33.satoken.util.SaResult;
import com.ruoyi.common.core.constant.HttpStatus; import com.ruoyi.common.core.constant.HttpStatus;
import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -23,8 +23,8 @@ public class SecurityConfiguration implements WebMvcConfigurer {
*/ */
@Override @Override
public void addInterceptors(InterceptorRegistry registry) { public void addInterceptors(InterceptorRegistry registry) {
// 注解拦截器 // 注册路由拦截器，自定义验证规则
registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**"); registry.addInterceptor(new SaInterceptor()).addPathPatterns("/**");
} }
/** /**

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java
View File

@@ -40,7 +40,7 @@ public class SysUserOnlineController extends BaseController {
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) { public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
// 获取所有未过期的 token // 获取所有未过期的 token
List<String> keys = StpUtil.searchTokenValue("", -1, 0); List<String> keys = StpUtil.searchTokenValue("", -1, 0, false);
List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>(); List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
for (String key : keys) { for (String key : keys) {
String token = key.replace(CacheConstants.LOGIN_TOKEN_KEY, ""); String token = key.replace(CacheConstants.LOGIN_TOKEN_KEY, "");

6
ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties
View File

@@ -38,9 +38,9 @@ spring.datasource.platform=mysql
db.num=1 db.num=1
### Connect URL of DB: ### Connect URL of DB:
db.url.0=jdbc:mysql://127.0.0.1:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC db.url.0=jdbc:mysql://101.42.248.151:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
db.user.0=root db.user.0=lihongbo
db.password.0=root db.password.0=lihongbo.123
db.pool.config.connectionTimeout=30000 db.pool.config.connectionTimeout=30000
db.pool.config.validationTimeout=10000 db.pool.config.validationTimeout=10000
db.pool.config.maximumPoolSize=20 db.pool.config.maximumPoolSize=20