From da22832ccff8071bd16eee1fce6bace832df8ed7 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Wed, 18 Oct 2023 02:26:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../satoken/reactor/spring/SaTokenContextForSpringReactor.java | 2 +- .../satoken/reactor/spring/SaTokenContextForSpringReactor.java | 2 +- .../src/main/java/cn/dev33/satoken/spring/SaBeanInject.java | 1 + .../satoken/spring/{ => pathmatch}/SaPathMatcherHolder.java | 2 +- .../satoken/spring/{ => pathmatch}/SaPathPatternParserUtil.java | 2 +- .../{ => pathmatch}/SaPatternsRequestConditionHolder.java | 2 +- .../java/cn/dev33/satoken/spring/SaTokenContextForSpring.java | 1 + .../satoken/spring/SaTokenContextForSpringInJakartaServlet.java | 1 + 8 files changed, 8 insertions(+), 5 deletions(-) rename sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/{ => pathmatch}/SaPathMatcherHolder.java (97%) rename sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/{ => pathmatch}/SaPathPatternParserUtil.java (97%) rename sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/{ => pathmatch}/SaPatternsRequestConditionHolder.java (98%) diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java index a919656e..82263785 100644 --- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java +++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java @@ -16,7 +16,7 @@ package cn.dev33.satoken.reactor.spring; import cn.dev33.satoken.context.SaTokenContextForThreadLocal; -import cn.dev33.satoken.spring.SaPathPatternParserUtil; +import cn.dev33.satoken.spring.pathmatch.SaPathPatternParserUtil; /** * Sa-Token 上下文处理器 [ Spring Reactor 版本实现 ] ，基于 SaTokenContextForThreadLocal 定制 diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java index 59a0cf1c..c02dfbac 100644 --- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java +++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java @@ -16,7 +16,7 @@ package cn.dev33.satoken.reactor.spring; import cn.dev33.satoken.context.SaTokenContextForThreadLocal; -import cn.dev33.satoken.spring.SaPathPatternParserUtil; +import cn.dev33.satoken.spring.pathmatch.SaPathPatternParserUtil; /** * Sa-Token 上下文处理器 [ Spring Reactor 版本实现 ] ，基于 SaTokenContextForThreadLocal 定制 diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java index 61f99f01..a5ccf26d 100644 --- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java +++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java @@ -17,6 +17,7 @@ package cn.dev33.satoken.spring; import java.util.List; +import cn.dev33.satoken.spring.pathmatch.SaPathMatcherHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.util.PathMatcher; diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/pathmatch/SaPathMatcherHolder.java similarity index 97% rename from sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java rename to sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/pathmatch/SaPathMatcherHolder.java index 02e02dd7..f5a92491 100644 --- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java +++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/pathmatch/SaPathMatcherHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.dev33.satoken.spring; +package cn.dev33.satoken.spring.pathmatch; import org.springframework.util.AntPathMatcher; import org.springframework.util.PathMatcher; diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathPatternParserUtil.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/pathmatch/SaPathPatternParserUtil.java similarity index 97% rename from sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathPatternParserUtil.java rename to sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/pathmatch/SaPathPatternParserUtil.java index 6dd740c2..176f9025 100644 --- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathPatternParserUtil.java +++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/pathmatch/SaPathPatternParserUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.dev33.satoken.spring; +package cn.dev33.satoken.spring.pathmatch; import org.springframework.http.server.PathContainer; import org.springframework.web.util.pattern.PathPattern; diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPatternsRequestConditionHolder.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/pathmatch/SaPatternsRequestConditionHolder.java similarity index 98% rename from sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPatternsRequestConditionHolder.java rename to sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/pathmatch/SaPatternsRequestConditionHolder.java index cf786706..bb9e503e 100644 --- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPatternsRequestConditionHolder.java +++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/pathmatch/SaPatternsRequestConditionHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.dev33.satoken.spring; +package cn.dev33.satoken.spring.pathmatch; import cn.dev33.satoken.exception.SaTokenException; import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition; diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java index 3648958f..dd826350 100644 --- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java +++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java @@ -22,6 +22,7 @@ import cn.dev33.satoken.context.model.SaStorage; import cn.dev33.satoken.servlet.model.SaRequestForServlet; import cn.dev33.satoken.servlet.model.SaResponseForServlet; import cn.dev33.satoken.servlet.model.SaStorageForServlet; +import cn.dev33.satoken.spring.pathmatch.SaPatternsRequestConditionHolder; /** * Sa-Token 上下文处理器 [ SpringMVC版本实现 ]。在 SpringMVC、SpringBoot 中使用 Sa-Token 时，必须注入此实现类，否则会出现上下文无效异常 diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java index 949429bd..22a9a169 100644 --- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java +++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java @@ -22,6 +22,7 @@ import cn.dev33.satoken.context.model.SaStorage; import cn.dev33.satoken.servlet.model.SaRequestForServlet; import cn.dev33.satoken.servlet.model.SaResponseForServlet; import cn.dev33.satoken.servlet.model.SaStorageForServlet; +import cn.dev33.satoken.spring.pathmatch.SaPathPatternParserUtil; /** * Sa-Token 上下文处理器 [ SpringBoot3 Jakarta Servlet 版 ]，在 SpringBoot3 中使用 Sa-Token 时，必须注入此实现类，否则会出现上下文无效异常