Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
discovery
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
谢捷峰
discovery
Commits
937eaa3f
Commit
937eaa3f
authored
Jan 22, 2019
by
Nepxion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复Swagger小Bug
parent
870bc5f6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
8 deletions
+21
-8
discovery-console-starter-apollo/src/main/resources/META-INF/spring.factories
+0
-2
discovery-console-starter-nacos/src/main/resources/META-INF/spring.factories
+0
-2
discovery-console-starter-redis/src/main/resources/META-INF/spring.factories
+0
-2
discovery-console/src/main/java/com/nepxion/discovery/console/configuration/SwaggerConfiguration.java
+9
-1
discovery-console/src/main/resources/META-INF/spring.factories
+3
-0
discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/configuration/SwaggerConfiguration.java
+9
-1
No files found.
discovery-console-starter-apollo/src/main/resources/META-INF/spring.factories
View file @
937eaa3f
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
discovery-console-starter-nacos/src/main/resources/META-INF/spring.factories
View file @
937eaa3f
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
discovery-console-starter-redis/src/main/resources/META-INF/spring.factories
View file @
937eaa3f
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
discovery-console/src/main/java/com/nepxion/discovery/console/configuration/SwaggerConfiguration.java
View file @
937eaa3f
...
@@ -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
()
{
...
...
discovery-console/src/main/resources/META-INF/spring.factories
0 → 100644
View file @
937eaa3f
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.nepxion.discovery.console.configuration.ConsoleAutoConfiguration
\ No newline at end of file
discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/configuration/SwaggerConfiguration.java
View file @
937eaa3f
...
@@ -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
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment