From edfd9a083f9a4012f004fa95b44685beb0196545 Mon Sep 17 00:00:00 2001
From: ziin <hiziying@hotmail.com>
Date: Tue, 16 Sep 2025 20:04:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=AE=BE=E7=BD=AE=E7=94=A8=E6=88=B7=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=20Token=20=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=B8=BA=E7=A7=9F=E6=88=B7=E5=AF=B9=E5=BA=94=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/vo/user/SystemUsersVO.java               |  6 ++++++
 .../springbootinit/service/impl/LoginService.java  | 14 +++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/yupi/springbootinit/model/vo/user/SystemUsersVO.java b/src/main/java/com/yupi/springbootinit/model/vo/user/SystemUsersVO.java
index 4a7931d..1ac5d78 100644
--- a/src/main/java/com/yupi/springbootinit/model/vo/user/SystemUsersVO.java
+++ b/src/main/java/com/yupi/springbootinit/model/vo/user/SystemUsersVO.java
@@ -29,4 +29,10 @@ public class SystemUsersVO {
     private String tokenName;
 
     private String tokenValue;
+
+    private Date expireTime;
+
+    private Date brotherExpireTime;
+
+    private Date aiExpireTime;
 }
\ No newline at end of file
diff --git a/src/main/java/com/yupi/springbootinit/service/impl/LoginService.java b/src/main/java/com/yupi/springbootinit/service/impl/LoginService.java
index 08cb751..3cc4f8e 100644
--- a/src/main/java/com/yupi/springbootinit/service/impl/LoginService.java
+++ b/src/main/java/com/yupi/springbootinit/service/impl/LoginService.java
@@ -95,26 +95,30 @@ public class LoginService {
             }
         }
         SystemTenant systemTenant = tenantMapper.selectById(user.getTenantId());
+        // 封装返回数据
+        SystemUsersVO vo = new SystemUsersVO();
+        BeanUtil.copyProperties(user, vo);
+        vo.setTokenName(StpUtil.getTokenName());
+        vo.setTokenValue(StpUtil.getTokenValue());
 
         // 5. Sa-Token 登录
         StpUtil.login(user.getId(), scene.getSaMode());
         switch (scene) {
             case AI_CHAT:
                 StpUtil.renewTimeout(DateUtils.dateBetween(systemTenant.getAiExpireTime(),DateUtil.date()));
+                vo.setAiExpireTime(systemTenant.getAiExpireTime());
                 break;
             case HOST:
                 StpUtil.renewTimeout(DateUtils.dateBetween(systemTenant.getExpireTime(),DateUtil.date()));
+                vo.setExpireTime(systemTenant.getExpireTime());
                 break;
             case BIG_BROTHER:
                 StpUtil.renewTimeout(DateUtils.dateBetween(systemTenant.getBrotherExpireTime(),DateUtil.date()));
+                vo.setBrotherExpireTime(systemTenant.getBrotherExpireTime());
                 break;
         }
 
-        // 6. 封装返回数据
-        SystemUsersVO vo = new SystemUsersVO();
-        BeanUtil.copyProperties(user, vo);
-        vo.setTokenName(StpUtil.getTokenName());
-        vo.setTokenValue(StpUtil.getTokenValue());
+
         return vo;
     }