From c57cc47218cdd84616524960141970f394719592 Mon Sep 17 00:00:00 2001
From: lishuyan <1206770390@qq.com>
Date: Thu, 10 Nov 2022 11:40:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=BF=E6=8D=A2Sa-Token#SaIdUtil?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E7=9A=84=E4=BB=A3=E7=A0=81=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9B=BF=E6=8D=A2=E5=90=8E=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=99=BD?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/dev/application-common.yml                             | 4 ++--
 .../ruoyi/common/security/config/SecurityConfiguration.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/dev/application-common.yml b/config/dev/application-common.yml
index 2dce6aa5..96e54969 100644
--- a/config/dev/application-common.yml
+++ b/config/dev/application-common.yml
@@ -172,8 +172,8 @@ sa-token:
   activity-timeout: 1800
   # 开启内网服务调用鉴权
   check-same-token: true
-  # Id-Token的有效期 (单位: 秒)
-  id-token-timeout: 600
+  # Same-Token的有效期 (单位: 秒)
+  same-token-timeout: 600
   # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
   is-concurrent: true
   # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfiguration.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfiguration.java
index 5be8754d..bfc00e84 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfiguration.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfiguration.java
@@ -1,8 +1,8 @@
 package com.ruoyi.common.security.config;
 
 import cn.dev33.satoken.filter.SaServletFilter;
-import cn.dev33.satoken.id.SaIdUtil;
 import cn.dev33.satoken.interceptor.SaInterceptor;
+import cn.dev33.satoken.same.SaSameUtil;
 import cn.dev33.satoken.util.SaResult;
 import com.ruoyi.common.core.constant.HttpStatus;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -35,7 +35,7 @@ public class SecurityConfiguration implements WebMvcConfigurer {
         return new SaServletFilter()
             .addInclude("/**")
             .addExclude("/actuator/**")
-            .setAuth(obj -> SaIdUtil.checkCurrentRequestToken())
+            .setAuth(obj -> SaSameUtil.checkCurrentRequestToken())
             .setError(e -> SaResult.error("认证失败，无法访问系统资源").setCode(HttpStatus.UNAUTHORIZED));
     }