【代码优化】S3FileClient

This commit is contained in:
puhui999 2025-02-07 18:10:03 +08:00
parent f141d64eb2
commit cf40cce552

View File

@ -9,7 +9,6 @@ import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.S3Configuration;
import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
@ -32,56 +31,6 @@ public class S3FileClient extends AbstractFileClient<S3FileClientConfig> {
super(id, config);
}
/**
* 动态创建 S3Presigner
*
* @param endpoint 节点地址
* @param accessKey 访问 Key
* @param secretKey 访问 Secret
* @return S3Presigner
*/
private static S3Presigner createPresigner(String endpoint, String accessKey, String secretKey) {
return S3Presigner.builder()
.credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKey, secretKey)))
.endpointOverride(URI.create(endpoint))
.build();
}
/**
* 生成动态的预签名上传 URL
*
* @param bucket 存储 Bucket
* @param path 相对路径
* @param duration 过期时间
* @param endpoint 节点地址
* @param accessKey 访问 Key
* @param secretKey 访问 Secret
* @return 生成的上传 URL
*/
public static String getPresignedUrl(String bucket, String path, Duration duration,
String endpoint, String accessKey, String secretKey) {
try (S3Presigner presigner = createPresigner(endpoint, accessKey, secretKey)) {
return presigner.presignPutObject(PutObjectPresignRequest.builder()
.signatureDuration(duration)
.putObjectRequest(b -> b.bucket(bucket).key(path))
.build()).url().toString();
}
}
/**
* 基于 bucket + endpoint 构建访问的 Domain 地址
*
* @return Domain 地址
*/
private String buildDomain() {
// 如果已经是 http 或者 https则不进行拼接.主要适配 MinIO
if (HttpUtil.isHttp(config.getEndpoint()) || HttpUtil.isHttps(config.getEndpoint())) {
return StrUtil.format("{}/{}", config.getEndpoint(), config.getBucket());
}
// 阿里云腾讯云华为云都适合七牛云比较特殊必须有自定义域名
return StrUtil.format("https://{}.{}", config.getBucket(), config.getEndpoint());
}
@Override
protected void doInit() {
// 补全 domain
@ -91,35 +40,12 @@ public class S3FileClient extends AbstractFileClient<S3FileClientConfig> {
// 初始化 S3 客户端
client = S3Client.builder()
.credentialsProvider(buildCredentials())
.region(Region.of(config.getEndpoint())) // 这里随便填SDK 需要
.region(Region.of("us-east-1")) // 必须填但填什么都行常见的值有 "us-east-1"不填会报错
.endpointOverride(URI.create(buildEndpoint()))
.serviceConfiguration(S3Configuration.builder().pathStyleAccessEnabled(true).build()) // Path-style 访问
//.serviceConfiguration(S3Configuration.builder().pathStyleAccessEnabled(true).build()) // Path-style 访问
.build();
}
/**
* 基于 config 秘钥构建 S3 客户端的认证信息
*
* @return S3 客户端的认证信息
*/
private StaticCredentialsProvider buildCredentials() {
return StaticCredentialsProvider.create(
AwsBasicCredentials.create(config.getAccessKey(), config.getAccessSecret()));
}
/**
* 节点地址补全协议头
*
* @return 节点地址
*/
private String buildEndpoint() {
// 如果已经是 http 或者 https则不进行拼接
if (HttpUtil.isHttp(config.getEndpoint()) || HttpUtil.isHttps(config.getEndpoint())) {
return config.getEndpoint();
}
return StrUtil.format("https://{}", config.getEndpoint());
}
@Override
public String upload(byte[] content, String path, String type) {
// 构造 PutObjectRequest
@ -157,16 +83,73 @@ public class S3FileClient extends AbstractFileClient<S3FileClientConfig> {
@Override
public FilePresignedUrlRespDTO getPresignedObjectUrl(String path) {
String presignedUrl = getPresignedUrl(
config.getBucket(),
path,
Duration.ofMinutes(10),
config.getEndpoint(),
config.getAccessKey(),
config.getAccessSecret()
);
return new FilePresignedUrlRespDTO(getPresignedUrl(path, Duration.ofMinutes(10)), config.getDomain() + "/" + path);
}
return new FilePresignedUrlRespDTO(presignedUrl, config.getDomain() + "/" + path);
/**
* 动态创建 S3Presigner
*
* @return S3Presigner
*/
private S3Presigner createPresigner() {
return S3Presigner.builder()
.credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(config.getAccessKey(), config.getAccessSecret())))
.region(Region.of("us-east-1")) // 必须填但填什么都行常见的值有 "us-east-1"不填会报错
.endpointOverride(URI.create(buildEndpoint()))
.build();
}
/**
* 生成动态的预签名上传 URL
*
* @param path 相对路径
* @param duration 过期时间
* @return 生成的上传 URL
*/
public String getPresignedUrl(String path, Duration duration) {
try (S3Presigner presigner = createPresigner()) {
return presigner.presignPutObject(PutObjectPresignRequest.builder()
.signatureDuration(duration)
.putObjectRequest(b -> b.bucket(config.getBucket()).key(path))
.build()).url().toString();
}
}
/**
* 基于 bucket + endpoint 构建访问的 Domain 地址
*
* @return Domain 地址
*/
private String buildDomain() {
// 如果已经是 http 或者 https则不进行拼接.主要适配 MinIO
if (HttpUtil.isHttp(config.getEndpoint()) || HttpUtil.isHttps(config.getEndpoint())) {
return StrUtil.format("{}/{}", config.getEndpoint(), config.getBucket());
}
// 阿里云腾讯云华为云都适合七牛云比较特殊必须有自定义域名
return StrUtil.format("https://{}.{}", config.getBucket(), config.getEndpoint());
}
/**
* 基于 config 秘钥构建 S3 客户端的认证信息
*
* @return S3 客户端的认证信息
*/
private StaticCredentialsProvider buildCredentials() {
return StaticCredentialsProvider.create(
AwsBasicCredentials.create(config.getAccessKey(), config.getAccessSecret()));
}
/**
* 节点地址补全协议头
*
* @return 节点地址
*/
private String buildEndpoint() {
// 如果已经是 http 或者 https则不进行拼接
if (HttpUtil.isHttp(config.getEndpoint()) || HttpUtil.isHttps(config.getEndpoint())) {
return config.getEndpoint();
}
return StrUtil.format("https://{}", config.getEndpoint());
}
}