renun/zfile
1
0
Fork 0
mirror of https://github.com/zfile-dev/zfile.git synced 2025-04-19 05:34:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 修复 S3 协议新增时的 BUG

Browse Source
This commit is contained in:
zhaojun1998
2021-02-03 22:01:56 +08:00
parent e208dc7c4c
commit 537e3e0563
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/im/zhaojun/zfile/service/impl/S3ServiceImpl.java
View File

@@ -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
}};
}
}
}