From a800457f7ac5f723d92a05b40d43cf937c03ab1a Mon Sep 17 00:00:00 2001 From: pig666 Date: Sat, 30 May 2020 12:26:28 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig4cloud/pigx/common/oss/OssAutoConfiguration.java | 8 ++++---- .../java/com/pig4cloud/pigx/common/oss/OssProperties.java | 2 +- .../pigx/gateway/filter/ValidateCodeGatewayFilter.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/oss/OssAutoConfiguration.java b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/oss/OssAutoConfiguration.java index e147164d1..67c1001fc 100755 --- a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/oss/OssAutoConfiguration.java +++ b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/oss/OssAutoConfiguration.java @@ -38,14 +38,14 @@ public class OssAutoConfiguration { @Bean @ConditionalOnMissingBean(OssTemplate.class) - @ConditionalOnProperty(name = "oss.endpoint") - OssTemplate awsTemplate() { + @ConditionalOnProperty(name = "oss.enable", havingValue = "true", matchIfMissing = true) + public OssTemplate ossTemplate() { return new OssTemplate(properties); } @Bean - @ConditionalOnProperty(name = "oss.enable", havingValue = "true") - public OssEndpoint awsEndpoint(OssTemplate template) { + @ConditionalOnProperty(name = "oss.public", havingValue = "true", matchIfMissing = true) + public OssEndpoint ossEndpoint(OssTemplate template) { return new OssEndpoint(template); } diff --git a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/oss/OssProperties.java b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/oss/OssProperties.java index ee1700769..bd4189f84 100755 --- a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/oss/OssProperties.java +++ b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/oss/OssProperties.java @@ -58,7 +58,7 @@ public class OssProperties { * false supports virtual-hosted-style 阿里云等需要配置为 * virtual-hosted-style 模式{http://bucketname.endpoint} */ - private Boolean pathStyleAccess; + private Boolean pathStyleAccess = true; /** * 应用ID diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ValidateCodeGatewayFilter.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ValidateCodeGatewayFilter.java index fafa2877f..28da83469 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ValidateCodeGatewayFilter.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ValidateCodeGatewayFilter.java @@ -81,7 +81,7 @@ public class ValidateCodeGatewayFilter extends AbstractGatewayFilterFactory { try { String header = request.getHeaders().getFirst(HttpHeaders.AUTHORIZATION); String clientId = WebUtils.extractClientId(header).orElse(null); - if (clientId != null && filterIgnorePropertiesConfig.getClients().contains(clientId)) { + if (StrUtil.isNotBlank(clientId) && filterIgnorePropertiesConfig.getClients().contains(clientId)) { return chain.filter(exchange); }