|
|
@@ -8,11 +8,11 @@ import com.amazonaws.HttpMethod;
|
|
|
import com.amazonaws.auth.AWSStaticCredentialsProvider;
|
|
|
import com.amazonaws.auth.BasicAWSCredentials;
|
|
|
import com.amazonaws.client.builder.AwsClientBuilder;
|
|
|
-import com.amazonaws.services.s3.*;
|
|
|
+import com.amazonaws.services.s3.AmazonS3Client;
|
|
|
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
|
|
|
import com.amazonaws.services.s3.model.ObjectMetadata;
|
|
|
import com.amazonaws.services.s3.model.S3Object;
|
|
|
|
|
|
-
|
|
|
import java.io.ByteArrayInputStream;
|
|
|
import java.util.Date;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
@@ -39,58 +39,32 @@ public class S3FileClient extends AbstractFileClient<S3FileClientConfig> {
|
|
|
config.setDomain(buildDomain());
|
|
|
}
|
|
|
// 初始化客户端
|
|
|
-
|
|
|
- client = (AmazonS3Client)AmazonS3ClientBuilder.standard()
|
|
|
+ client = (AmazonS3Client)AmazonS3ClientBuilder.standard()
|
|
|
.withCredentials(buildCredentials())
|
|
|
.withEndpointConfiguration(buildEndpointConfiguration())
|
|
|
.build();
|
|
|
-
|
|
|
-// enableVirtualStyleEndpoint();
|
|
|
-
|
|
|
-// client = AmazonS3ClientBuilder.builder()
|
|
|
-// .endpoint(buildEndpointURL()) // Endpoint URL
|
|
|
-// .region(buildRegion()) // Region
|
|
|
-// .credentials(config.getAccessKey(), config.getAccessSecret()) // 认证密钥
|
|
|
-// .build();
|
|
|
-// enableVirtualStyleEndpoint();
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
- * 基于config秘钥 构建 S3 客户端的认证信息
|
|
|
+ * 基于 config 秘钥，构建 S3 客户端的认证信息
|
|
|
*
|
|
|
- * @return S3 客户端的认证信息
|
|
|
+ * @return S3 客户端的认证信息
|
|
|
*/
|
|
|
private AWSStaticCredentialsProvider buildCredentials() {
|
|
|
- AWSStaticCredentialsProvider awsStaticCredentialsProvider = new AWSStaticCredentialsProvider(
|
|
|
+ return new AWSStaticCredentialsProvider(
|
|
|
new BasicAWSCredentials(config.getAccessKey(), config.getAccessSecret()));
|
|
|
- return awsStaticCredentialsProvider;
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
- * 构建 S3 客户端的 Endpoint 配置包括 region、endpoint
|
|
|
+ * 构建 S3 客户端的 Endpoint 配置，包括 region、endpoint
|
|
|
*
|
|
|
* @return S3 客户端的 EndpointConfiguration 配置
|
|
|
*/
|
|
|
private AwsClientBuilder.EndpointConfiguration buildEndpointConfiguration() {
|
|
|
- AwsClientBuilder.EndpointConfiguration endpointConfiguration = new AwsClientBuilder.EndpointConfiguration(
|
|
|
- config.getEndpoint(), buildRegion());
|
|
|
- return endpointConfiguration;
|
|
|
+ return new AwsClientBuilder.EndpointConfiguration(config.getEndpoint(),
|
|
|
+ null); // 无需设置 region
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-// /**
|
|
|
-// * 基于 endpoint 构建调用云服务的 URL 地址
|
|
|
-// *
|
|
|
-// * @return URI 地址
|
|
|
-// */
|
|
|
-// private String buildEndpointURL() {
|
|
|
-// // 如果已经是 http 或者 https，则不进行拼接.主要适配 MinIO
|
|
|
-// if (HttpUtil.isHttp(config.getEndpoint()) || HttpUtil.isHttps(config.getEndpoint())) {
|
|
|
-// return config.getEndpoint();
|
|
|
-// }
|
|
|
-// return StrUtil.format("https://{}", config.getEndpoint());
|
|
|
-// }
|
|
|
-
|
|
|
/**
|
|
|
* 基于 bucket + endpoint 构建访问的 Domain 地址
|
|
|
*
|
|
|
@@ -105,90 +79,39 @@ public class S3FileClient extends AbstractFileClient<S3FileClientConfig> {
|
|
|
return StrUtil.format("https://{}.{}", config.getBucket(), config.getEndpoint());
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 基于 bucket 构建 region 地区
|
|
|
- *
|
|
|
- * @return region 地区
|
|
|
- */
|
|
|
- private String buildRegion() {
|
|
|
- // 阿里云必须有 region，否则会报错
|
|
|
- if (config.getEndpoint().contains(S3FileClientConfig.ENDPOINT_ALIYUN)) {
|
|
|
- return StrUtil.subBefore(config.getEndpoint(), '.', false)
|
|
|
- .replaceAll("-internal", "")// 去除内网 Endpoint 的后缀
|
|
|
- .replaceAll("https://", "");
|
|
|
- }
|
|
|
- // 腾讯云必须有 region，否则会报错
|
|
|
- if (config.getEndpoint().contains(S3FileClientConfig.ENDPOINT_TENCENT)) {
|
|
|
- return StrUtil.subAfter(config.getEndpoint(), "cos.", false)
|
|
|
- .replaceAll("." + S3FileClientConfig.ENDPOINT_TENCENT, ""); // 去除 Endpoint
|
|
|
- }
|
|
|
- return null;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 开启 PathStyle模式
|
|
|
- */
|
|
|
- private void enableVirtualStyleEndpoint() {
|
|
|
-// if (StrUtil.containsAny(config.getEndpoint(),
|
|
|
-// S3FileClientConfig.ENDPOINT_TENCENT, // 腾讯云 https://cloud.tencent.com/document/product/436/41284
|
|
|
-// S3FileClientConfig.ENDPOINT_VOLCES)) { // 火山云 https://www.volcengine.com/docs/6349/1288493
|
|
|
-//
|
|
|
-// }
|
|
|
- S3ClientOptions clientOptions = S3ClientOptions.builder()
|
|
|
- .setPathStyleAccess(true)
|
|
|
- .build();
|
|
|
- }
|
|
|
-
|
|
|
@Override
|
|
|
public String upload(byte[] content, String path, String type) throws Exception {
|
|
|
- // 执行上传
|
|
|
+ // 元数据，主要用于设置文件类型
|
|
|
ObjectMetadata objectMetadata = new ObjectMetadata();
|
|
|
objectMetadata.setContentType(type);
|
|
|
+ objectMetadata.setContentLength(content.length); // 如果不设置，会有 “ No content length specified for stream data” 警告日志
|
|
|
+ // 执行上传
|
|
|
+ client.putObject(config.getBucket(),
|
|
|
+ path, // 相对路径
|
|
|
+ new ByteArrayInputStream(content), // 文件内容
|
|
|
+ objectMetadata);
|
|
|
|
|
|
- client.putObject(config.getBucket(), path, new ByteArrayInputStream(content), objectMetadata);
|
|
|
-// client.putObject(PutObjectArgs.builder()
|
|
|
-// .bucket(config.getBucket()) // bucket 必须传递
|
|
|
-// .contentType(type)
|
|
|
-// .object(path) // 相对路径作为 key
|
|
|
-// .stream(new ByteArrayInputStream(content), content.length, -1) // 文件内容
|
|
|
-// .build());
|
|
|
// 拼接返回路径
|
|
|
return config.getDomain() + "/" + path;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public void delete(String path) throws Exception {
|
|
|
-
|
|
|
client.deleteObject(config.getBucket(), path);
|
|
|
-
|
|
|
-// client.removeObject(RemoveObjectArgs.builder()
|
|
|
-// .bucket(config.getBucket()) // bucket 必须传递
|
|
|
-// .object(path) // 相对路径作为 key
|
|
|
-// .build());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public byte[] getContent(String path) throws Exception {
|
|
|
S3Object tempS3Object = client.getObject(config.getBucket(), path);
|
|
|
-// GetObjectResponse response = client.getObject(GetObjectArgs.builder()
|
|
|
-// .bucket(config.getBucket()) // bucket 必须传递
|
|
|
-// .object(path) // 相对路径作为 key
|
|
|
-// .build());
|
|
|
return IoUtil.readBytes(tempS3Object.getObjectContent());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public FilePresignedUrlRespDTO getPresignedObjectUrl(String path) throws Exception {
|
|
|
- //设定过期时间为24小时
|
|
|
- Date expiration = new Date(System.currentTimeMillis() + TimeUnit.HOURS.toMillis(24));
|
|
|
- String uploadUrl = String.valueOf(client.generatePresignedUrl(config.getBucket(), path,expiration , HttpMethod.PUT));
|
|
|
-// String uploadUrl = client.getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder()
|
|
|
-// .method(Method.PUT)
|
|
|
-// .bucket(config.getBucket())
|
|
|
-// .object(path)
|
|
|
-// .expiry(10, TimeUnit.MINUTES) // 过期时间（秒数）取值范围：1 秒 ~ 7 天
|
|
|
-// .build()
|
|
|
-// );
|
|
|
+ // 设定过期时间为 10 分钟。取值范围：1 秒 ~ 7 天
|
|
|
+ Date expiration = new Date(System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(10));
|
|
|
+ // 生成上传 URL
|
|
|
+ String uploadUrl = String.valueOf(client.generatePresignedUrl(config.getBucket(), path, expiration , HttpMethod.PUT));
|
|
|
return new FilePresignedUrlRespDTO(uploadUrl, config.getDomain() + "/" + path);
|
|
|
}
|
|
|
|
YunaiV