From e2603295c7bc87f514f3756d39fb91420e09f072 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Mon, 1 Apr 2024 06:18:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=88=E6=9C=AC=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E5=99=A8=E6=A0=A1=E9=AA=8C=E4=B8=8D=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpringBootVersionCompatibilityChecker.java | 12 +++++++++++- .../SpringBootVersionCompatibilityChecker.java | 12 +++++++++++- ...work.boot.autoconfigure.AutoConfiguration.imports | 1 - 3 files changed, 22 insertions(+), 3 deletions(-) delete mode 100644 sa-token-starter/sa-token-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SpringBootVersionCompatibilityChecker.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SpringBootVersionCompatibilityChecker.java index 913e8e99..266fa7e4 100644 --- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SpringBootVersionCompatibilityChecker.java +++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SpringBootVersionCompatibilityChecker.java @@ -1,8 +1,15 @@ package cn.dev33.satoken.reactor.spring; +import cn.dev33.satoken.exception.SaTokenException; import cn.dev33.satoken.util.SaFoxUtil; import org.springframework.boot.SpringBootVersion; +/** + * SpringBoot 版本与 Sa-Token 版本兼容检查器 + * + * @author Uncarbon + * @since 1.38.0 + */ public class SpringBootVersionCompatibilityChecker { public SpringBootVersionCompatibilityChecker() { @@ -10,6 +17,9 @@ public class SpringBootVersionCompatibilityChecker { if (SaFoxUtil.isEmpty(version) || version.startsWith("1.") || version.startsWith("2.")) { return; } - throw new BootstrapMethodError("当前Spring-Boot版本为" + version + ",请尝试改用:sa-token-reactor-spring-boot3-starter"); + String str = "当前 SpringBoot 版本(" + version + ")与 Sa-Token 依赖不兼容," + + "请将依赖 sa-token-reactor-spring-boot-starter 修改为:sa-token-reactor-spring-boot3-starter"; + System.err.println(str); + throw new SaTokenException(str); } } diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringBootVersionCompatibilityChecker.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringBootVersionCompatibilityChecker.java index 64e44fed..755c274c 100644 --- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringBootVersionCompatibilityChecker.java +++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringBootVersionCompatibilityChecker.java @@ -1,8 +1,15 @@ package cn.dev33.satoken.spring; +import cn.dev33.satoken.exception.SaTokenException; import cn.dev33.satoken.util.SaFoxUtil; import org.springframework.boot.SpringBootVersion; +/** + * SpringBoot 版本与 Sa-Token 版本兼容检查器 + * + * @author Uncarbon + * @since 1.38.0 + */ public class SpringBootVersionCompatibilityChecker { public SpringBootVersionCompatibilityChecker() { @@ -10,6 +17,9 @@ public class SpringBootVersionCompatibilityChecker { if (SaFoxUtil.isEmpty(version) || version.startsWith("1.") || version.startsWith("2.")) { return; } - throw new BootstrapMethodError("当前Spring-Boot版本为" + version + ",请尝试改用:sa-token-spring-boot3-starter"); + String str = "当前 SpringBoot 版本(" + version + ")与 Sa-Token 依赖不兼容," + + "请将依赖 sa-token-spring-boot-starter 修改为:sa-token-spring-boot3-starter"; + System.err.println(str); + throw new SaTokenException(str); } } diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-starter/sa-token-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 9001ea5d..00000000 --- a/sa-token-starter/sa-token-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.dev33.satoken.spring.SpringBootVersionCompatibilityChecker