Commit 937eaa3f by Nepxion

修复Swagger小Bug

parent 870bc5f6
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.nepxion.discovery.console.configuration.ConsoleAutoConfiguration,\
com.nepxion.discovery.console.apollo.configuration.ApolloConfigAutoConfiguration com.nepxion.discovery.console.apollo.configuration.ApolloConfigAutoConfiguration
\ No newline at end of file
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.nepxion.discovery.console.configuration.ConsoleAutoConfiguration,\
com.nepxion.discovery.common.nacos.configuration.NacosAutoConfiguration,\ com.nepxion.discovery.common.nacos.configuration.NacosAutoConfiguration,\
com.nepxion.discovery.console.nacos.configuration.NacosConfigAutoConfiguration com.nepxion.discovery.console.nacos.configuration.NacosConfigAutoConfiguration
\ No newline at end of file
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.nepxion.discovery.console.configuration.ConsoleAutoConfiguration,\
com.nepxion.discovery.common.redis.configuration.RedisAutoConfiguration,\ com.nepxion.discovery.common.redis.configuration.RedisAutoConfiguration,\
com.nepxion.discovery.console.redis.configuration.RedisConfigAutoConfiguration com.nepxion.discovery.console.redis.configuration.RedisConfigAutoConfiguration
\ No newline at end of file
...@@ -14,11 +14,15 @@ import springfox.documentation.builders.ApiInfoBuilder; ...@@ -14,11 +14,15 @@ import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.PathSelectors;
import springfox.documentation.service.ApiInfo; import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Contact; import springfox.documentation.service.Contact;
import springfox.documentation.service.Parameter;
import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.List;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
...@@ -69,6 +73,9 @@ public class SwaggerConfiguration implements WebMvcConfigurer { ...@@ -69,6 +73,9 @@ public class SwaggerConfiguration implements WebMvcConfigurer {
@Value("${swagger.cors.registry.enabled:true}") @Value("${swagger.cors.registry.enabled:true}")
private Boolean corsRegistryEnabled; private Boolean corsRegistryEnabled;
@Autowired(required = false)
private List<Parameter> swaggerHeaderParameters;
@Bean @Bean
public Docket createRestApi() { public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2) return new Docket(DocumentationType.SWAGGER_2)
...@@ -76,7 +83,8 @@ public class SwaggerConfiguration implements WebMvcConfigurer { ...@@ -76,7 +83,8 @@ public class SwaggerConfiguration implements WebMvcConfigurer {
.select() .select()
.apis(SwaggerConfiguration.basePackage(BASE_PACKAGE + (StringUtils.isNotEmpty(basePackage.trim()) ? "," + basePackage.trim() : StringUtils.EMPTY))) // 扫描该包下的所有需要在Swagger中展示的API,@ApiIgnore注解标注的除外 .apis(SwaggerConfiguration.basePackage(BASE_PACKAGE + (StringUtils.isNotEmpty(basePackage.trim()) ? "," + basePackage.trim() : StringUtils.EMPTY))) // 扫描该包下的所有需要在Swagger中展示的API,@ApiIgnore注解标注的除外
.paths(PathSelectors.any()) .paths(PathSelectors.any())
.build(); .build()
.globalOperationParameters(swaggerHeaderParameters);
} }
private ApiInfo apiInfo() { private ApiInfo apiInfo() {
......
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.nepxion.discovery.console.configuration.ConsoleAutoConfiguration
\ No newline at end of file
...@@ -14,11 +14,15 @@ import springfox.documentation.builders.ApiInfoBuilder; ...@@ -14,11 +14,15 @@ import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.PathSelectors;
import springfox.documentation.service.ApiInfo; import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Contact; import springfox.documentation.service.Contact;
import springfox.documentation.service.Parameter;
import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.List;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
...@@ -71,6 +75,9 @@ public class SwaggerConfiguration implements WebMvcConfigurer { ...@@ -71,6 +75,9 @@ public class SwaggerConfiguration implements WebMvcConfigurer {
@Value("${swagger.cors.registry.enabled:true}") @Value("${swagger.cors.registry.enabled:true}")
private Boolean corsRegistryEnabled; private Boolean corsRegistryEnabled;
@Autowired(required = false)
private List<Parameter> swaggerHeaderParameters;
@Bean @Bean
public Docket createRestApi() { public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2) return new Docket(DocumentationType.SWAGGER_2)
...@@ -78,7 +85,8 @@ public class SwaggerConfiguration implements WebMvcConfigurer { ...@@ -78,7 +85,8 @@ public class SwaggerConfiguration implements WebMvcConfigurer {
.select() .select()
.apis(SwaggerConfiguration.basePackage(BASE_PACKAGE + (StringUtils.isNotEmpty(basePackage.trim()) ? "," + basePackage.trim() : StringUtils.EMPTY))) // 扫描该包下的所有需要在Swagger中展示的API,@ApiIgnore注解标注的除外 .apis(SwaggerConfiguration.basePackage(BASE_PACKAGE + (StringUtils.isNotEmpty(basePackage.trim()) ? "," + basePackage.trim() : StringUtils.EMPTY))) // 扫描该包下的所有需要在Swagger中展示的API,@ApiIgnore注解标注的除外
.paths(PathSelectors.any()) .paths(PathSelectors.any())
.build(); .build()
.globalOperationParameters(swaggerHeaderParameters);
} }
private ApiInfo apiInfo() { private ApiInfo apiInfo() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment