From 9833839798123721d7ade949e1aa4fd38a518033 Mon Sep 17 00:00:00 2001 From: soulmate Date: Wed, 28 Aug 2024 00:18:39 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8DToken=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=8C=E6=A0=B9=E6=8D=AEmessage=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E8=BF=94=E5=9B=9E401=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../satoken/core/service/SaPermissionImpl.java | 4 ++++ .../common/web/handler/GlobalExceptionHandler.java | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java index 1cef9a773..5855014a3 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java @@ -1,8 +1,12 @@ package org.dromara.common.satoken.core.service; import cn.dev33.satoken.stp.StpInterface; +import cn.hutool.http.HttpStatus; +import org.apache.commons.lang3.ObjectUtils; +import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.enums.UserType; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.satoken.utils.LoginHelper; import java.util.ArrayList; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java index 061d3aa45..c1afc27fe 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java @@ -156,4 +156,17 @@ public class GlobalExceptionHandler { return R.fail(message); } + /** + * 拦截空指针异常异常 + */ + @ExceptionHandler(NullPointerException.class) + public R handleNullPointerException(NullPointerException e) { + log.error(e.getMessage()); + String message = e.getMessage(); + if (message.contains("because \"loginUser\" is null")) { + return R.fail(HttpStatus.HTTP_UNAUTHORIZED, "认证失败，无法访问系统资源"); + } + return R.fail(message); + } + }