feat(core): 新增 OrderedConstants 统一登记过滤器和拦截器相关顺序常量，并调整相关过滤器和拦截器顺序

continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenAutoConfiguration.java

@@ -36,6 +36,7 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import top.continew.starter.auth.satoken.autoconfigure.dao.SaTokenDaoConfiguration;
+import top.continew.starter.core.constant.OrderedConstants;
 import top.continew.starter.core.constant.PropertiesConstants;
 import top.continew.starter.core.constant.StringConstants;
 import top.continew.starter.core.util.GeneralPropertySourceFactory;
@@ -61,7 +62,9 @@ public class SaTokenAutoConfiguration implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(SpringUtil.getBean(SaInterceptor.class)).addPathPatterns(StringConstants.PATH_PATTERN);
+        registry.addInterceptor(SpringUtil.getBean(SaInterceptor.class))
+            .addPathPatterns(StringConstants.PATH_PATTERN)
+            .order(OrderedConstants.Interceptor.AUTH_INTERCEPTOR);
     }
 
     /**

continew-starter-core/src/main/java/top/continew/starter/core/constant/OrderedConstants.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package top.continew.starter.core.constant;
+
+import org.springframework.core.Ordered;
+
+/**
+ * 过滤器和拦截器相关顺序常量
+ *
+ * @author Charles7c
+ * @since 2.13.3
+ */
+public class OrderedConstants {
+
+    /**
+     * 过滤器顺序
+     */
+    public static final class Filter {
+
+        /**
+         * 链路追踪过滤器顺序
+         */
+        public static final int TRACE_FILTER = Ordered.HIGHEST_PRECEDENCE + 100;
+
+        /**
+         * XSS 过滤器顺序
+         */
+        public static final int XSS_FILTER = Ordered.HIGHEST_PRECEDENCE + 200;
+
+        /**
+         * 日志过滤器顺序
+         */
+        public static final int LOG_FILTER = Ordered.LOWEST_PRECEDENCE - 100;
+
+        private Filter() {
+        }
+    }
+
+    /**
+     * 拦截器顺序
+     */
+    public static final class Interceptor {
+
+        /**
+         * 租户拦截器顺序
+         */
+        public static final int TENANT_INTERCEPTOR = Ordered.HIGHEST_PRECEDENCE + 100;
+
+        /**
+         * 认证拦截器顺序
+         */
+        public static final int AUTH_INTERCEPTOR = Ordered.HIGHEST_PRECEDENCE + 200;
+
+        /**
+         * 日志拦截器顺序
+         */
+        public static final int LOG_INTERCEPTOR = Ordered.LOWEST_PRECEDENCE - 100;
+
+        private Interceptor() {
+        }
+    }
+
+    private OrderedConstants() {
+    }
+}

continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantWebMvcAutoConfiguration.java

@@ -19,9 +19,9 @@ package top.continew.starter.extension.tenant.autoconfigure;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.core.Ordered;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import top.continew.starter.core.constant.OrderedConstants;
 import top.continew.starter.extension.tenant.annotation.ConditionalOnEnabledTenant;
 import top.continew.starter.extension.tenant.config.TenantProvider;
 import top.continew.starter.extension.tenant.interceptor.TenantInterceptor;
@@ -49,6 +49,6 @@ public class TenantWebMvcAutoConfiguration implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(new TenantInterceptor(tenantProperties, tenantProvider))
-            .order(Ordered.HIGHEST_PRECEDENCE);
+            .order(OrderedConstants.Interceptor.TENANT_INTERCEPTOR);
     }
 }

continew-starter-log/continew-starter-log-aop/src/main/java/top/continew/starter/log/autoconfigure/LogAutoConfiguration.java

@@ -22,8 +22,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import top.continew.starter.core.constant.OrderedConstants;
 import top.continew.starter.log.annotation.ConditionalOnEnabledLog;
 import top.continew.starter.log.aspect.AccessLogAspect;
 import top.continew.starter.log.aspect.LogAspect;
@@ -61,8 +63,11 @@ public class LogAutoConfiguration {
      */
     @Bean
     @ConditionalOnMissingBean
-    public LogFilter logFilter() {
+    public FilterRegistrationBean<LogFilter> logFilter() {
-        return new LogFilter(logProperties);
+        FilterRegistrationBean<LogFilter> registrationBean = new FilterRegistrationBean<>();
+        registrationBean.setFilter(new LogFilter(logProperties));
+        registrationBean.setOrder(OrderedConstants.Filter.LOG_FILTER);
+        return registrationBean;
     }
 
     /**

continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/filter/LogFilter.java

@@ -22,7 +22,6 @@ import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
-import org.springframework.core.Ordered;
 import org.springframework.lang.NonNull;
 import org.springframework.web.filter.OncePerRequestFilter;
 import top.continew.starter.core.wrapper.RepeatReadRequestWrapper;
@@ -40,7 +39,7 @@ import java.net.URISyntaxException;
  * @author echo
  * @since 1.1.0
  */
-public class LogFilter extends OncePerRequestFilter implements Ordered {
+public class LogFilter extends OncePerRequestFilter {
 
     private final LogProperties logProperties;
 
@@ -48,11 +47,6 @@ public class LogFilter extends OncePerRequestFilter implements Ordered {
         this.logProperties = logProperties;
     }
 
-    @Override
-    public int getOrder() {
-        return Ordered.LOWEST_PRECEDENCE - 10;
-    }
-
     @Override
     protected void doFilterInternal(@NonNull HttpServletRequest request,
                                     @NonNull HttpServletResponse response,

continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/autoconfigure/LogAutoConfiguration.java

@@ -22,10 +22,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import top.continew.starter.core.constant.OrderedConstants;
 import top.continew.starter.core.constant.StringConstants;
 import top.continew.starter.log.annotation.ConditionalOnEnabledLog;
 import top.continew.starter.log.dao.LogDao;
@@ -59,7 +61,8 @@ public class LogAutoConfiguration implements WebMvcConfigurer {
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(new LogInterceptor(logProperties, logHandler(), logDao()))
             .addPathPatterns(StringConstants.PATH_PATTERN)
-            .excludePathPatterns(logProperties.getExcludePatterns());
+            .excludePathPatterns(logProperties.getExcludePatterns())
+            .order(OrderedConstants.Interceptor.LOG_INTERCEPTOR);
     }
 
     /**
@@ -67,8 +70,11 @@ public class LogAutoConfiguration implements WebMvcConfigurer {
      */
     @Bean
     @ConditionalOnMissingBean
-    public LogFilter logFilter() {
+    public FilterRegistrationBean<LogFilter> logFilter() {
-        return new LogFilter(logProperties);
+        FilterRegistrationBean<LogFilter> registrationBean = new FilterRegistrationBean<>();
+        registrationBean.setFilter(new LogFilter(logProperties));
+        registrationBean.setOrder(OrderedConstants.Filter.LOG_FILTER);
+        return registrationBean;
     }
 
     /**

continew-starter-security/continew-starter-security-xss/src/main/java/top/continew/starter/security/xss/autoconfigure/XssAutoConfiguration.java

@@ -25,6 +25,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
+import top.continew.starter.core.constant.OrderedConstants;
 import top.continew.starter.core.constant.PropertiesConstants;
 import top.continew.starter.security.xss.filter.XssFilter;
 
@@ -43,12 +44,13 @@ public class XssAutoConfiguration {
     private static final Logger log = LoggerFactory.getLogger(XssAutoConfiguration.class);
 
     /**
-     * XSS 过滤器配置
+     * XSS 过滤器
      */
     @Bean
     public FilterRegistrationBean<XssFilter> xssFilter(XssProperties xssProperties) {
         FilterRegistrationBean<XssFilter> registrationBean = new FilterRegistrationBean<>();
         registrationBean.setFilter(new XssFilter(xssProperties));
+        registrationBean.setOrder(OrderedConstants.Filter.XSS_FILTER);
         return registrationBean;
     }
 

continew-starter-trace/src/main/java/top/continew/starter/trace/autoconfigure/TraceAutoConfiguration.java

@@ -30,7 +30,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
-import org.springframework.core.Ordered;
+import top.continew.starter.core.constant.OrderedConstants;
 import top.continew.starter.core.constant.PropertiesConstants;
 import top.continew.starter.trace.filter.TLogServletFilter;
 import top.continew.starter.trace.handler.TraceIdGenerator;
@@ -70,14 +70,14 @@ public class TraceAutoConfiguration {
     }
 
     /**
-     * TLog 过滤器配置
+     * TLog 过滤器
      */
     @Bean
     public FilterRegistrationBean<TLogServletFilter> tLogServletFilter() {
-        FilterRegistrationBean<TLogServletFilter> registration = new FilterRegistrationBean<>();
+        FilterRegistrationBean<TLogServletFilter> registrationBean = new FilterRegistrationBean<>();
-        registration.setFilter(new TLogServletFilter(traceProperties));
+        registrationBean.setFilter(new TLogServletFilter(traceProperties));
-        registration.setOrder(Ordered.HIGHEST_PRECEDENCE);
+        registrationBean.setOrder(OrderedConstants.Filter.TRACE_FILTER);
-        return registration;
+        return registrationBean;
     }
 
     /**