From 537e3e0563351e711179a8912033bb5fce52e6ec Mon Sep 17 00:00:00 2001 From: zhaojun1998 Date: Wed, 3 Feb 2021 22:01:56 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=20S3=20=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E6=96=B0=E5=A2=9E=E6=97=B6=E7=9A=84=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../im/zhaojun/zfile/service/impl/S3ServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/im/zhaojun/zfile/service/impl/S3ServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/S3ServiceImpl.java index f588560..bbcaeb4 100644 --- a/src/main/java/im/zhaojun/zfile/service/impl/S3ServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/S3ServiceImpl.java @@ -10,6 +10,7 @@ import im.zhaojun.zfile.model.entity.StorageConfig; import im.zhaojun.zfile.model.enums.StorageTypeEnum; import im.zhaojun.zfile.service.base.AbstractS3BaseFileService; import im.zhaojun.zfile.service.base.BaseFileService; +import im.zhaojun.zfile.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory; @@ -38,7 +39,6 @@ public class S3ServiceImpl extends AbstractS3BaseFileService implements BaseFile String accessKey = stringStorageConfigMap.get(StorageConfigConstant.ACCESS_KEY).getValue(); String secretKey = stringStorageConfigMap.get(StorageConfigConstant.SECRET_KEY).getValue(); String endPoint = stringStorageConfigMap.get(StorageConfigConstant.ENDPOINT_KEY).getValue(); - String region=endPoint.split(".")[1]; super.domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue(); super.basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue(); @@ -53,11 +53,15 @@ public class S3ServiceImpl extends AbstractS3BaseFileService implements BaseFile log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription()); isInitialized = false; } else { + String region = ""; + if (StringUtils.isNotNullOrEmpty(endPoint)) { + region = endPoint.split("\\.")[1]; + } BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey); s3Client = AmazonS3ClientBuilder.standard() .withPathStyleAccessEnabled(isPathStyle) .withCredentials(new AWSStaticCredentialsProvider(credentials)) - .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint,region)).build(); + .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, region)).build(); testConnection(); isInitialized = true; @@ -83,4 +87,4 @@ public class S3ServiceImpl extends AbstractS3BaseFileService implements BaseFile }}; } -} +} \ No newline at end of file