From 637ca491ea4b7c8286a0e987e48e37a7f73e35b4 Mon Sep 17 00:00:00 2001
From: goodsWox <33800760+fooooxxxx@users.noreply.github.com>
Date: Fri, 12 Jul 2024 16:22:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20SaLoginModel=20?=
 =?UTF-8?q?=E7=9A=84=20timeout=20=E8=B6=85=E5=87=BA=E6=95=B4=E5=9E=8B?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=97=B6=E8=BF=94=E5=9B=9E=E8=B4=9F=E6=95=B0?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/dev33/satoken/stp/SaLoginModel.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
index b724837a..f865b869 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
@@ -15,14 +15,14 @@
  */
 package cn.dev33.satoken.stp;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.config.SaTokenConfig;
 import cn.dev33.satoken.dao.SaTokenDao;
 import cn.dev33.satoken.util.SaTokenConsts;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 /**
  * 在调用 `StpUtil.login()` 时的 配置参数 Model，决定登录的一些细节行为 <br>
  *
@@ -300,6 +300,9 @@ public class SaLoginModel {
 		if(getTimeoutOrGlobalConfig() == SaTokenDao.NEVER_EXPIRE) {
 			return Integer.MAX_VALUE;
 		}
+		if (timeout > Integer.MAX_VALUE) {
+			return Integer.MAX_VALUE;
+		}
 		return (int)(long)timeout;
 	}
 

From 61c1ed221b701e0397b1ca4657121a75992414cb Mon Sep 17 00:00:00 2001
From: goodsWox <33800760+fooooxxxx@users.noreply.github.com>
Date: Wed, 14 Aug 2024 09:46:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?squash!=20=E4=BF=AE=E5=A4=8D=20SaLoginModel?=
 =?UTF-8?q?=20=E7=9A=84=20timeout=20=E8=B6=85=E5=87=BA=E6=95=B4=E5=9E=8B?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=97=B6=E8=BF=94=E5=9B=9E=E8=B4=9F=E6=95=B0?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/dev33/satoken/stp/SaLoginModel.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
index f865b869..db019fed 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
@@ -15,14 +15,14 @@
  */
 package cn.dev33.satoken.stp;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.config.SaTokenConfig;
 import cn.dev33.satoken.dao.SaTokenDao;
 import cn.dev33.satoken.util.SaTokenConsts;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 /**
  * 在调用 `StpUtil.login()` 时的 配置参数 Model，决定登录的一些细节行为 <br>
  *