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; }