feat: 调整filter加载机制

xiaoymin · Jul 11, 2024 · 1cb9f37 · 1cb9f37
1 parent 840926f
commit 1cb9f37
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.../main/java/com/github/xiaoymin/knife4j/spring/configuration/Knife4jAutoConfiguration.java b/.../main/java/com/github/xiaoymin/knife4j/spring/configuration/Knife4jAutoConfiguration.java
@@ -28,6 +28,7 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springdoc.core.properties.SpringDocConfigProperties;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -51,10 +52,10 @@
 @EnableConfigurationProperties({Knife4jProperties.class, Knife4jSetting.class, Knife4jHttpBasic.class})
 @ConditionalOnProperty(name = "knife4j.enable", havingValue = "true")
 public class Knife4jAutoConfiguration {
-    
+
     private final Knife4jProperties properties;
     private final Environment environment;
-    
+
     /**
      * 增强自定义配置
      * @return
@@ -65,7 +66,7 @@ public Knife4jOpenApiCustomizer knife4jOpenApiCustomizer(SpringDocConfigProperti
         log.debug("Register Knife4jOpenApiCustomizer");
         return new Knife4jOpenApiCustomizer(this.properties, docProperties);
     }
-    
+
     @Bean
     @ConditionalOnMissingBean
     public Knife4jJakartaOperationCustomizer knife4jJakartaOperationCustomizer() {
@@ -93,15 +94,15 @@ public CorsFilter corsFilter() {
         CorsFilter corsFilter = new CorsFilter(source);
         return corsFilter;
     }
-    
+
     /**
      * Security with Basic Http
      * @param knife4jProperties Basic Properties
      * @return BasicAuthFilter
      */
     @Bean
     @ConditionalOnMissingBean(JakartaServletSecurityBasicAuthFilter.class)
-    @ConditionalOnProperty(name = "knife4j.basic.enable", havingValue = "true")
+    @ConditionalOnExpression("${knife4j.production:false} && ${knife4j.basic.enable:true}")
     public FilterRegistrationBean<JakartaServletSecurityBasicAuthFilter> securityBasicAuthFilter(Knife4jProperties knife4jProperties) {
         JakartaServletSecurityBasicAuthFilter authFilter = new JakartaServletSecurityBasicAuthFilter();
         if (knife4jProperties == null) {
@@ -127,7 +128,7 @@ public FilterRegistrationBean<JakartaServletSecurityBasicAuthFilter> securityBas
         registration.setOrder(AbstractSecurityFilter.SPRING_FILTER_ORDER);
         return registration;
     }
-    
+
     @Bean
     @ConditionalOnMissingBean(JakartaProductionSecurityFilter.class)
     @ConditionalOnProperty(name = "knife4j.production", havingValue = "true")
@@ -152,5 +153,5 @@ public FilterRegistrationBean<JakartaProductionSecurityFilter> productionSecurit
         registration.setOrder(AbstractSecurityFilter.SPRING_FILTER_ORDER - 1);
         return registration;
     }
-    
+
 }
diff --git a/.../main/java/com/github/xiaoymin/knife4j/spring/configuration/Knife4jAutoConfiguration.java b/.../main/java/com/github/xiaoymin/knife4j/spring/configuration/Knife4jAutoConfiguration.java
@@ -28,6 +28,7 @@
 import org.slf4j.LoggerFactory;
 import org.springdoc.core.SpringDocConfigProperties;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -105,7 +106,7 @@ public CorsFilter corsFilter() {
      */
     @Bean
     @ConditionalOnMissingBean(ServletSecurityBasicAuthFilter.class)
-    @ConditionalOnProperty(name = "knife4j.basic.enable", havingValue = "true")
+    @ConditionalOnExpression("${knife4j.production:false} && ${knife4j.basic.enable:true}")
     public FilterRegistrationBean<ServletSecurityBasicAuthFilter> securityBasicAuthFilter(Knife4jProperties knife4jProperties) {
         ServletSecurityBasicAuthFilter authFilter = new ServletSecurityBasicAuthFilter();
         if (knife4jProperties == null) {