From ff40a59c4267b27f8341ef03d19cd01716d14010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Thu, 26 Feb 2026 14:11:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(auth):=20=E4=BF=AE=E5=A4=8D=E8=B6=85?= =?UTF-8?q?=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E7=99=BB=E5=BD=95=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E5=92=8C=E8=B0=83=E6=95=B4=E4=BB=A4=E7=89=8C=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加了对超级管理员用户的登录检查跳过逻辑 - 将用户令牌过期时间从12小时调整为8小时 - 引入了Constant类用于超级管理员ID判断 --- .../gaotao/modules/sys/controller/SysLoginController.java | 5 +++-- .../modules/sys/service/impl/SysUserTokenServiceImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java b/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java index f3199bf..b9d0d70 100644 --- a/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java +++ b/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java @@ -3,6 +3,7 @@ package com.gaotao.modules.sys.controller; import com.gaotao.common.constant.SysMsgConstant; +import com.gaotao.common.utils.Constant; import com.gaotao.common.utils.R; import com.gaotao.modules.sys.entity.SysUserEntity; import com.gaotao.modules.sys.form.SysLoginForm; @@ -110,8 +111,8 @@ public class SysLoginController extends AbstractController { return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200208)); } } - // 检查用户是否已登录 - rqrq - if(sysUserTokenService.isUserLoggedIn(user.getUserId())){ + // 检查用户是否已登录（超级管理员跳过检查）- rqrq + if(user.getUserId() != Constant.SUPER_ADMIN && sysUserTokenService.isUserLoggedIn(user.getUserId())){ return R.error("用户已经登录，请先退出后再登录"); } session.setAttribute("user", user); diff --git a/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java b/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java index 5d39583..30c0b46 100644 --- a/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java +++ b/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java @@ -15,8 +15,8 @@ import java.util.Date; @Service("sysUserTokenService") public class SysUserTokenServiceImpl extends ServiceImpl implements SysUserTokenService { - //12小时后过期 - private final static int EXPIRE = 3600 * 12; + //8小时后过期 - rqrq + private final static int EXPIRE = 3600 * 8; @Override