diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 643da3247..3728681ac 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -28,7 +28,7 @@ 8.4.1.jre8 8.1.2.79 6.2.0 - 4.3.0 + 3.0.3 2.1.0 2.2.14 4.4.0 @@ -277,10 +277,11 @@ - com.github.xiaoymin + io.springboot knife4j-openapi3-ui ${knife4j.version} + org.springdoc diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index b3d0c6791..c0639934a 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -99,7 +99,7 @@ - com.github.xiaoymin + io.springboot knife4j-openapi3-ui diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java index 8b12baf95..ba5c22198 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java @@ -10,6 +10,7 @@ import org.springdoc.core.properties.AbstractSwaggerUiConfigProperties; import org.springdoc.core.properties.SwaggerUiConfigProperties; import org.springdoc.webflux.ui.SwaggerResourceResolver; import org.springframework.beans.factory.InitializingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -31,6 +32,7 @@ import java.util.stream.Collectors; */ @RequiredArgsConstructor @Configuration(proxyBeanMethods = false) +@ConditionalOnProperty(value = "springdoc.api-docs.enabled",matchIfMissing = true) public class SpringDocConfiguration implements InitializingBean { private final SwaggerUiConfigProperties swaggerUiConfigProperties;