From 3f4125ab481c243d12730008ff18be09d5757819 Mon Sep 17 00:00:00 2001 From: rlarlgnszx Date: Fri, 27 Sep 2024 19:02:26 +0900 Subject: [PATCH] =?UTF-8?q?[fix]=20=EC=9C=A0=EC=A0=80=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=95=84=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EA=B8=B0=EB=B3=B8url=20?= =?UTF-8?q?(#kihoon)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/dateroad/s3/S3Service.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dateroad-external/src/main/java/org/dateroad/s3/S3Service.java b/dateroad-external/src/main/java/org/dateroad/s3/S3Service.java index a780148..c1bf2a1 100644 --- a/dateroad-external/src/main/java/org/dateroad/s3/S3Service.java +++ b/dateroad-external/src/main/java/org/dateroad/s3/S3Service.java @@ -5,13 +5,10 @@ import java.util.List; import java.util.Objects; import java.util.UUID; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Future; import org.dateroad.code.FailureCode; import org.dateroad.exception.BadRequestException; import org.dateroad.exception.InvalidValueException; import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; import software.amazon.awssdk.core.sync.RequestBody; @@ -27,12 +24,14 @@ public class S3Service { private final String bucketName; private final AWSConfig awsConfig; + private final String basePath; private static final List IMAGE_EXTENSIONS = Arrays.asList("image/jpeg", "image/png", "image/jpg", "image/webp", "image/heic", "image/heif"); private static final Long MAX_FILE_SIZE = 7 * 1024 * 1024L; - public S3Service(@Value("${aws-property.s3-bucket-name}") final String bucketName, AWSConfig awsConfig) { + public S3Service(@Value("${aws-property.s3-bucket-name}") final String bucketName, AWSConfig awsConfig, @Value("${cloudfront.domain}") String basePath) { this.bucketName = bucketName; this.awsConfig = awsConfig; + this.basePath = basePath; } public String uploadImage(String directoryPath, MultipartFile image) throws IOException { @@ -98,9 +97,8 @@ private void validateFileSize(MultipartFile image) { } } - private static String extractImageKeyFromImageUrl(String url) { - String basePath = "https://d2rjs92glrj91n.cloudfront.net"; - if (url.startsWith(basePath)) { + private String extractImageKeyFromImageUrl(String url) { + if (url.startsWith(this.basePath)) { return url.substring(basePath.length()); } else { throw new BadRequestException(FailureCode.WRONG_IMAGE_URL);