From 45ecb14c72a0675c343ce7228256f7cfe975acb2 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Fri, 12 Apr 2024 09:30:29 +0800 Subject: [PATCH] =?UTF-8?q?InvalidContextException=20=E6=9B=B4=E5=90=8D?= =?UTF-8?q?=E4=B8=BA=20SaTokenContextException?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../satoken/context/SaTokenContextDefaultImpl.java | 10 +++++----- .../context/SaTokenContextForThreadLocalStorage.java | 4 ++-- .../satoken/exception/NotPermissionException.java | 9 --------- ...textException.java => SaTokenContextException.java} | 6 ++++-- 4 files changed, 11 insertions(+), 18 deletions(-) rename sa-token-core/src/main/java/cn/dev33/satoken/exception/{InvalidContextException.java => SaTokenContextException.java} (84%) diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java index d94a409e..80991a4d 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java @@ -19,7 +19,7 @@ import cn.dev33.satoken.context.model.SaRequest; import cn.dev33.satoken.context.model.SaResponse; import cn.dev33.satoken.context.model.SaStorage; import cn.dev33.satoken.error.SaErrorCode; -import cn.dev33.satoken.exception.InvalidContextException; +import cn.dev33.satoken.exception.SaTokenContextException; /** * Sa-Token 上下文处理器 [ 默认实现类 ] @@ -46,22 +46,22 @@ public class SaTokenContextDefaultImpl implements SaTokenContext { @Override public SaRequest getRequest() { - throw new InvalidContextException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10001); + throw new SaTokenContextException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10001); } @Override public SaResponse getResponse() { - throw new InvalidContextException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10001); + throw new SaTokenContextException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10001); } @Override public SaStorage getStorage() { - throw new InvalidContextException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10001); + throw new SaTokenContextException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10001); } @Override public boolean matchPath(String pattern, String path) { - throw new InvalidContextException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10001); + throw new SaTokenContextException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10001); } } diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java index 177244db..a6179a3d 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java @@ -19,7 +19,7 @@ import cn.dev33.satoken.context.model.SaRequest; import cn.dev33.satoken.context.model.SaResponse; import cn.dev33.satoken.context.model.SaStorage; import cn.dev33.satoken.error.SaErrorCode; -import cn.dev33.satoken.exception.InvalidContextException; +import cn.dev33.satoken.exception.SaTokenContextException; /** * Sa-Token 上下文处理器 [ThreadLocal 版本] ---- 对象存储器 @@ -69,7 +69,7 @@ public class SaTokenContextForThreadLocalStorage { public static Box getBoxNotNull() { Box box = boxThreadLocal.get(); if(box == null) { - throw new InvalidContextException("未能获取有效的上下文").setCode(SaErrorCode.CODE_10002); + throw new SaTokenContextException("未能获取有效的上下文").setCode(SaErrorCode.CODE_10002); } return box; } diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java index f0299fa3..6510491f 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java @@ -64,13 +64,4 @@ public class NotPermissionException extends SaTokenException { this.loginType = loginType; } - /** - *

警告：自 v1.30+ 版本起，获取异常权限码由 getCode() 更改为 getPermission()，请及时更换！

- * @return 获得权限码 - */ - @Deprecated - public int getCode() { - return super.getCode(); - } - } diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenContextException.java similarity index 84% rename from sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java rename to sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenContextException.java index 50a44df8..48b1f47c 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenContextException.java @@ -15,13 +15,15 @@ */ package cn.dev33.satoken.exception; +import java.io.Serializable; + /** * 一个异常：代表框架未能获取有效的上下文 * * @author click33 * @since 1.33.0 */ -public class InvalidContextException extends SaTokenException { +public class SaTokenContextException extends InvalidContextException implements Serializable { /** * 序列化版本号 @@ -32,7 +34,7 @@ public class InvalidContextException extends SaTokenException { * 一个异常：代表框架未能获取有效的上下文 * @param message 异常描述 */ - public InvalidContextException(String message) { + public SaTokenContextException(String message) { super(message); }