From c5f6342f9eb2130886417c2769f91483fba527c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=82=E6=A2=A6=E6=8A=80=E6=9C=AF?= <596392129@qq.com> Date: Mon, 24 Dec 2018 12:47:07 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../swagger/SwaggerAutoConfiguration.java | 2 + .../spring-configuration-metadata.json | 136 ------------------ 2 files changed, 2 insertions(+), 136 deletions(-) delete mode 100644 blade-core-swagger/src/main/resources/META-INF/spring-configuration-metadata.json diff --git a/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerAutoConfiguration.java b/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerAutoConfiguration.java index f92a732..dcefce2 100644 --- a/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerAutoConfiguration.java +++ b/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerAutoConfiguration.java @@ -20,6 +20,7 @@ import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrap import com.google.common.base.Predicate; import com.google.common.base.Predicates; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; @@ -43,6 +44,7 @@ import java.util.List; @EnableSwagger2 @EnableSwaggerBootstrapUI @Profile({"dev", "test"}) +@EnableConfigurationProperties(SwaggerProperties.class) public class SwaggerAutoConfiguration { private static final String DEFAULT_EXCLUDE_PATH = "/error"; diff --git a/blade-core-swagger/src/main/resources/META-INF/spring-configuration-metadata.json b/blade-core-swagger/src/main/resources/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 5bbb770..0000000 --- a/blade-core-swagger/src/main/resources/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties", - "name": "swagger", - "type": "org.springblade.core.swagger.SwaggerProperties" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties", - "name": "swagger.authorization", - "type": "org.springblade.core.swagger.SwaggerProperties$Authorization" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties", - "name": "swagger.contact", - "type": "org.springblade.core.swagger.SwaggerProperties$Contact" - } - ], - "properties": [ - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties$Authorization", - "defaultValue": "^.*$", - "name": "swagger.authorization.auth-regex", - "description": "需要开启鉴权URL的正则", - "type": "java.lang.String" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties$Authorization", - "name": "swagger.authorization.authorization-scope-list", - "description": "鉴权作用域列表", - "type": "java.util.List" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties$Authorization", - "defaultValue": "", - "name": "swagger.authorization.name", - "description": "鉴权策略ID，需要和SecurityReferences ID保持一致", - "type": "java.lang.String" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties$Authorization", - "name": "swagger.authorization.token-url-list", - "type": "java.util.List" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties", - "defaultValue": "org.springblade", - "name": "swagger.base-package", - "description": "swagger会解析的包路径", - "type": "java.lang.String" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties", - "name": "swagger.base-path", - "description": "swagger会解析的url规则", - "type": "java.util.List" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties$Contact", - "defaultValue": "smallchill@163.com", - "name": "swagger.contact.email", - "description": "联系人email", - "type": "java.lang.String" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties$Contact", - "defaultValue": "chillzhuang", - "name": "swagger.contact.name", - "description": "联系人", - "type": "java.lang.String" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties$Contact", - "defaultValue": "", - "name": "swagger.contact.url", - "description": "联系人url", - "type": "java.lang.String" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties", - "defaultValue": "SpringBlade 接口文档系统", - "name": "swagger.description", - "description": "描述", - "type": "java.lang.String" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties", - "name": "swagger.exclude-path", - "description": "在basePath基础上需要排除的url规则", - "type": "java.util.List" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties", - "defaultValue": "", - "name": "swagger.host", - "description": "host信息", - "type": "java.lang.String" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties", - "defaultValue": "", - "name": "swagger.license", - "description": "许可证", - "type": "java.lang.String" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties", - "defaultValue": "", - "name": "swagger.license-url", - "description": "许可证URL", - "type": "java.lang.String" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties", - "defaultValue": "", - "name": "swagger.terms-of-service-url", - "description": "服务条款URL", - "type": "java.lang.String" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties", - "defaultValue": "SpringBlade 接口文档系统", - "name": "swagger.title", - "description": "标题", - "type": "java.lang.String" - }, - { - "sourceType": "org.springblade.core.swagger.SwaggerProperties", - "defaultValue": "1.0.0", - "name": "swagger.version", - "description": "版本", - "type": "java.lang.String" - } - ] -}