Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BE] hotfix: image 문자열 자르기 에러 수정 #604

Merged
merged 7 commits into from
Sep 12, 2023
Merged

[BE] hotfix: image 문자열 자르기 에러 수정 #604

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c83751e
fix: s3 path 를 file full path 로 수정
wugawuga Sep 12, 2023
1537995
fix: 파일 확장자 앞에 . 추가
wugawuga Sep 12, 2023
a1b9e5d
fix: 권한 추가 삭제
wugawuga Sep 12, 2023
f1984e7
fix: cloudfront path 더해서 이미지 패스 지정
wugawuga Sep 12, 2023
d63279f
refactor: prod yml cloudfrontPath 변수 수정
wugawuga Sep 12, 2023
1858e0d
refactor: 문자열 자르기 에러 수정
wugawuga Sep 12, 2023
f5a6057
Merge branch 'develop' into hotfix/issue-600
wugawuga Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions backend/src/main/java/com/funeat/common/s3/S3Uploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public String upload(final MultipartFile image) {
final String key = folder + randomImageName;
amazonS3.putObject(getPutObjectRequest(image, key, metadata));

return getCloudfrontImagePath(key);
return getCloudfrontImagePath(randomImageName);
} catch (IOException e) {
throw new S3UploadFailException(UNKNOWN_SERVER_ERROR_CODE);
}
Expand All @@ -61,8 +61,7 @@ private void validateExtension(final MultipartFile image) {
}

private String getRandomImageName(final MultipartFile image) {
final String randomImageName = UUID.randomUUID() + image.getOriginalFilename();
return randomImageName.substring(0, randomImageName.lastIndexOf("."));
return UUID.randomUUID() + image.getOriginalFilename();
}

private ObjectMetadata getMetadata(final MultipartFile image) {
Expand All @@ -77,8 +76,7 @@ private PutObjectRequest getPutObjectRequest(final MultipartFile image, final St
return new PutObjectRequest(bucket, key, image.getInputStream(), metadata);
}

private String getCloudfrontImagePath(final String key) {
final String s3Url = amazonS3.getUrl(bucket, key).toString();
return cloudfrontPath + s3Url.substring(s3Url.lastIndexOf("/"));
private String getCloudfrontImagePath(final String imageName) {
return cloudfrontPath + imageName;
}
}