|
|
@@ -3,10 +3,12 @@ package com.fdkankan.fyun.s3.config;
|
|
|
import com.amazonaws.ClientConfiguration;
|
|
|
import com.amazonaws.auth.AWSStaticCredentialsProvider;
|
|
|
import com.amazonaws.auth.BasicAWSCredentials;
|
|
|
+import com.amazonaws.client.builder.AwsClientBuilder;
|
|
|
import com.amazonaws.regions.Regions;
|
|
|
import com.amazonaws.services.s3.AmazonS3;
|
|
|
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
|
|
|
import com.fdkankan.fyun.config.FYunFileConfig;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
|
|
@@ -33,10 +35,12 @@ public class S3Config {
|
|
|
AmazonS3ClientBuilder builder = AmazonS3ClientBuilder.standard();
|
|
|
builder.withCredentials(new AWSStaticCredentialsProvider(awsCreds));
|
|
|
builder.withClientConfiguration(clientConfiguration);
|
|
|
- builder.withRegion(fYunFileConfig.getRegion());
|
|
|
if(fYunFileConfig.getPathStyleAccessEnabled() != null){
|
|
|
builder.withPathStyleAccessEnabled(fYunFileConfig.getPathStyleAccessEnabled());
|
|
|
}
|
|
|
+ if(StringUtils.isNotBlank(fYunFileConfig.getEndPoint())){
|
|
|
+ builder.withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(fYunFileConfig.getEndPoint(),fYunFileConfig.getRegion()));
|
|
|
+ }
|
|
|
return builder.build();
|
|
|
}
|
|
|
}
|