Merge branch 'template' into develop
This commit is contained in:
commit
70433f1224
|
|
@ -3,6 +3,7 @@ package com.nflg.wms.starter.config;
|
|||
import io.minio.BucketExistsArgs;
|
||||
import io.minio.MakeBucketArgs;
|
||||
import io.minio.MinioClient;
|
||||
import io.minio.SetBucketPolicyArgs;
|
||||
import jakarta.annotation.PreDestroy;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
|
|
@ -39,6 +40,9 @@ public class MinIOConfig {
|
|||
if (!client.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build())) {
|
||||
client.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build());
|
||||
}
|
||||
String policyJsonString = """
|
||||
{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":"*","Action":"s3:GetObject","Resource":"arn:aws:s3:::%s/*"}]}""".formatted(bucketName);
|
||||
client.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucketName).config(policyJsonString).build());
|
||||
return client;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,12 @@ public class MinIOServiceImpl implements FileUploadService {
|
|||
.object(filePath)
|
||||
.stream(stream, stream.available(), -1)
|
||||
.build());
|
||||
return StrUtil.format("{}/{}", domain, filePath);
|
||||
// return minioClient.getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder()
|
||||
// .method(Method.GET)
|
||||
// .bucket(bucketName)
|
||||
// .object(filePath)
|
||||
// .expiry(7, TimeUnit.DAYS)
|
||||
// .build());
|
||||
return StrUtil.format("{}/{}/{}", domain,bucketName, filePath);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue