diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java index 68228dba..7c91715a 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java @@ -265,15 +265,16 @@ public class SaTokenEventCenter { } /** - * 事件发布:指定 Token 续期成功 - * - * @param tokenValue token 值 - * @param loginId 账号id - * @param timeout 续期时间 + * 每次 Token 续期时触发(注意:是 timeout 续期,而不是 active-timeout 续期) + * + * @param loginType 账号类别 + * @param loginId 账号id + * @param tokenValue token 值 + * @param timeout 续期时间 */ - public static void doRenewTimeout(String tokenValue, Object loginId, long timeout) { + public static void doRenewTimeout(String loginType, Object loginId, String tokenValue, long timeout) { for (SaTokenListener listener : listenerList) { - listener.doRenewTimeout(tokenValue, loginId, timeout); + listener.doRenewTimeout(loginType, loginId, tokenValue, timeout); } } diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java index ed0ca42a..899a1c7d 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java @@ -112,12 +112,13 @@ public interface SaTokenListener { /** * 每次 Token 续期时触发(注意:是 timeout 续期,而不是 active-timeout 续期) - * - * @param tokenValue token 值 - * @param loginId 账号id + * + * @param loginType 账号类别 + * @param loginId 账号id + * @param tokenValue token 值 * @param timeout 续期时间 */ - void doRenewTimeout(String tokenValue, Object loginId, long timeout); + void doRenewTimeout(String loginType, Object loginId, String tokenValue, long timeout); /** * 全局组件载入 diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java index cb770e83..af4b1dcd 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java @@ -17,8 +17,8 @@ package cn.dev33.satoken.listener; import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface; import cn.dev33.satoken.config.SaTokenConfig; -import cn.dev33.satoken.stp.parameter.SaLoginParameter; import cn.dev33.satoken.stp.StpLogic; +import cn.dev33.satoken.stp.parameter.SaLoginParameter; import cn.dev33.satoken.util.SaFoxUtil; import static cn.dev33.satoken.SaManager.log; @@ -112,14 +112,13 @@ public class SaTokenListenerForLog implements SaTokenListener { } /** - * 每次Token续期时触发 + * 每次 Token 续期时触发 */ @Override - public void doRenewTimeout(String tokenValue, Object loginId, long timeout) { + public void doRenewTimeout(String loginType, Object loginId, String tokenValue, long timeout) { log.info("token 续期成功, {} 秒后到期, 帐号={}, token值={} ", timeout, loginId, tokenValue); } - /** * 全局组件载入 * @param compName 组件名称 diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java index f7e30f5c..71cc8470 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java @@ -78,7 +78,7 @@ public class SaTokenListenerForSimple implements SaTokenListener { } @Override - public void doRenewTimeout(String tokenValue, Object loginId, long timeout) { + public void doRenewTimeout(String loginType, Object loginId, String tokenValue, long timeout) { } diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java index f6842561..539b4497 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java @@ -2002,7 +2002,7 @@ public class StpLogic { } // 7、$$ 发布事件:某某 token 被续期了 - SaTokenEventCenter.doRenewTimeout(tokenValue, loginId, timeout); + SaTokenEventCenter.doRenewTimeout(loginType, loginId, tokenValue, timeout); } diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/MySaTokenListener.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/MySaTokenListener.java index 811e963b..72524572 100644 --- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/MySaTokenListener.java +++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/MySaTokenListener.java @@ -74,7 +74,7 @@ public class MySaTokenListener implements SaTokenListener { /** 每次Token续期时触发 */ @Override - public void doRenewTimeout(String tokenValue, Object loginId, long timeout) { + public void doRenewTimeout(String loginType, Object loginId, String tokenValue, long timeout) { System.out.println("---------- 自定义侦听器实现 doRenewTimeout"); }