From f673fd85f198a8d99f531ae6ca16246bcc3bdea9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 26 一月 2025 14:53:02 +0800
Subject: [PATCH] 12.18
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
index 8f95678..a5735e6 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
@@ -5,6 +5,7 @@
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest;
+import com.ruoyi.common.core.exception.auth.NotPermissionException;
import com.ruoyi.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -90,7 +91,7 @@
public LoginUser getLoginUserApplet() {
LoginUser loginUserAppletToken = getLoginUserAppletToken(ServletUtils.getRequest());
if (loginUserAppletToken == null) {
- throw new RuntimeException("令牌已过期，请重新登录！");
+ throw new NotPermissionException("令牌已过期，请重新登录！");
}
return loginUserAppletToken;
}
@@ -128,7 +129,10 @@
public LoginUser getLoginUser() {
LoginUser loginUser = getLoginUser(ServletUtils.getRequest());
if (loginUser == null) {
- throw new RuntimeException("令牌已过期，请重新登录！");
+ throw new NotPermissionException("令牌已过期，请重新登录！");
+ }
+ if(null == loginUser.getUserid()){
+ loginUser.setUserid(loginUser.getSysUser().getUserId());
}
return loginUser;
}
--
Gitblit v1.7.1