优化包结构

dromara · Oct 17, 2023 · da22832 · da22832
1 parent 6977d3d
commit da22832
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 5 deletions.
diff --git a/...starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java b/...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/...starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java b/...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/...r/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java b/...r/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java
@@ -17,6 +17,7 @@
 
 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/...3/satoken/spring/SaPathMatcherHolder.java → ...spring/pathmatch/SaPathMatcherHolder.java b/...3/satoken/spring/SaPathMatcherHolder.java → ...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/...token/spring/SaPathPatternParserUtil.java → ...ng/pathmatch/SaPathPatternParserUtil.java b/...token/spring/SaPathPatternParserUtil.java → ...ng/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/...ing/SaPatternsRequestConditionHolder.java → ...tch/SaPatternsRequestConditionHolder.java b/...ing/SaPatternsRequestConditionHolder.java → ...tch/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/...en-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java b/...en-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java
@@ -22,6 +22,7 @@
 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/...tarter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java b/...tarter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java
@@ -22,6 +22,7 @@
 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 时，必须注入此实现类，否则会出现上下文无效异常