Skip to content

Commit 9dbb477

Browse files
committed
fixed:springboot3环境下的错误#667
1 parent eadb0b3 commit 9dbb477

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

knife4j/knife4j-openapi3-jakarta-spring-boot-starter/src/main/java/com/github/xiaoymin/knife4j/spring/configuration/Knife4jAutoConfiguration.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919

2020
import com.github.xiaoymin.knife4j.core.conf.GlobalConstants;
2121
import com.github.xiaoymin.knife4j.extend.filter.basic.JakartaServletSecurityBasicAuthFilter;
22-
import com.github.xiaoymin.knife4j.extend.filter.basic.ServletSecurityBasicAuthFilter;
2322
import com.github.xiaoymin.knife4j.spring.extension.Knife4jJakartaOperationCustomizer;
2423
import com.github.xiaoymin.knife4j.spring.extension.Knife4jOpenApiCustomizer;
25-
import com.github.xiaoymin.knife4j.spring.filter.ProductionSecurityFilter;
24+
import com.github.xiaoymin.knife4j.spring.filter.JakartaProductionSecurityFilter;
2625
import com.github.xiaoymin.knife4j.spring.util.EnvironmentUtils;
2726
import lombok.AllArgsConstructor;
2827
import lombok.extern.slf4j.Slf4j;
@@ -97,7 +96,7 @@ public CorsFilter corsFilter() {
9796
* @return BasicAuthFilter
9897
*/
9998
@Bean
100-
@ConditionalOnMissingBean(ServletSecurityBasicAuthFilter.class)
99+
@ConditionalOnMissingBean(JakartaServletSecurityBasicAuthFilter.class)
101100
@ConditionalOnProperty(name = "knife4j.basic.enable", havingValue = "true")
102101
public JakartaServletSecurityBasicAuthFilter securityBasicAuthFilter(Knife4jProperties knife4jProperties) {
103102
JakartaServletSecurityBasicAuthFilter authFilter = new JakartaServletSecurityBasicAuthFilter();
@@ -122,11 +121,11 @@ public JakartaServletSecurityBasicAuthFilter securityBasicAuthFilter(Knife4jProp
122121
}
123122

124123
@Bean
125-
@ConditionalOnMissingBean(ProductionSecurityFilter.class)
124+
@ConditionalOnMissingBean(JakartaProductionSecurityFilter.class)
126125
@ConditionalOnProperty(name = "knife4j.production", havingValue = "true")
127-
public ProductionSecurityFilter productionSecurityFilter(Environment environment) {
126+
public JakartaProductionSecurityFilter productionSecurityFilter(Environment environment) {
128127
boolean prod = false;
129-
ProductionSecurityFilter p = null;
128+
JakartaProductionSecurityFilter p = null;
130129
if (properties == null) {
131130
if (environment != null) {
132131
String prodStr = environment.getProperty("knife4j.production");
@@ -135,9 +134,9 @@ public ProductionSecurityFilter productionSecurityFilter(Environment environment
135134
}
136135
prod = Boolean.valueOf(prodStr);
137136
}
138-
p = new ProductionSecurityFilter(prod);
137+
p = new JakartaProductionSecurityFilter(prod);
139138
} else {
140-
p = new ProductionSecurityFilter(properties.isProduction());
139+
p = new JakartaProductionSecurityFilter(properties.isProduction());
141140
}
142141

143142
return p;
+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* @author <a href="mailto:[email protected]">[email protected]</a>
3737
* 2019/01/18 17:15
3838
*/
39-
public class ProductionSecurityFilter extends BasicFilter implements Filter {
39+
public class JakartaProductionSecurityFilter extends BasicFilter implements Filter {
4040

4141
/***
4242
* 是否生产环境,如果是生成环境,过滤Swagger的相关资源请求
@@ -76,11 +76,11 @@ public void destroy() {
7676

7777
}
7878

79-
public ProductionSecurityFilter(boolean production) {
79+
public JakartaProductionSecurityFilter(boolean production) {
8080
this.production = production;
8181
}
8282

83-
public ProductionSecurityFilter() {
83+
public JakartaProductionSecurityFilter() {
8484
}
8585

8686
public boolean isProduction() {

0 commit comments

Comments
 (0)