diff --git a/src/main/java/site/katchup/katchupserver/api/card/service/Impl/CardServiceImpl.java b/src/main/java/site/katchup/katchupserver/api/card/service/Impl/CardServiceImpl.java index 565b464..9838ba0 100644 --- a/src/main/java/site/katchup/katchupserver/api/card/service/Impl/CardServiceImpl.java +++ b/src/main/java/site/katchup/katchupserver/api/card/service/Impl/CardServiceImpl.java @@ -195,6 +195,7 @@ public void updateCard(Long memberId, Long cardId, CardUpdateRequestDto requestD screenshotInfo.getScreenshotName())) .url(screenshotService.findUrl(memberId, screenshotInfo)) .uploadDate(screenshotInfo.getScreenshotUploadDate()) + .screenshotName(screenshotInfo.getScreenshotName()) .card(card) .build(); diff --git a/src/main/java/site/katchup/katchupserver/external/s3/AWSConfig.java b/src/main/java/site/katchup/katchupserver/external/s3/AWSConfig.java index 4e79dd7..37c2903 100644 --- a/src/main/java/site/katchup/katchupserver/external/s3/AWSConfig.java +++ b/src/main/java/site/katchup/katchupserver/external/s3/AWSConfig.java @@ -1,14 +1,11 @@ package site.katchup.katchupserver.external.s3; -import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider; import software.amazon.awssdk.auth.credentials.SystemPropertyCredentialsProvider; 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.presigner.S3Presigner; @@ -22,9 +19,9 @@ public class AWSConfig { private final String secretKey; private final String regionString; - public AWSConfig(@Value("${cloud.aws.credentials.accessKey}") final String accessKey, - @Value("${cloud.aws.credentials.secretKey}") final String secretKey, - @Value("${cloud.aws.region.static}") final String regionString) { + public AWSConfig(@Value("${aws-property.access-key}") final String accessKey, + @Value("${aws-property.secret-key}") final String secretKey, + @Value("${aws-property.aws-region}") final String regionString) { this.accessKey = accessKey; this.secretKey = secretKey; this.regionString = regionString; diff --git a/src/main/java/site/katchup/katchupserver/external/s3/S3Service.java b/src/main/java/site/katchup/katchupserver/external/s3/S3Service.java index acded33..aafeb03 100644 --- a/src/main/java/site/katchup/katchupserver/external/s3/S3Service.java +++ b/src/main/java/site/katchup/katchupserver/external/s3/S3Service.java @@ -29,7 +29,7 @@ @RequiredArgsConstructor public class S3Service { - @Value("${cloud.aws.s3.bucket}") + @Value("${aws-property.s3-bucket-name}") private String bucketName; private final AWSConfig awsConfig;