From a1716f59df7bfad70f44aa547952af57b377be96 Mon Sep 17 00:00:00 2001 From: seungzzok <123801984+seungzzok@users.noreply.github.com> Date: Mon, 7 Apr 2025 21:44:29 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20uuid=EB=A1=9C=20=EA=B0=81=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=EB=B3=84=20=EA=B3=A0=EC=9C=A0ID=20?= =?UTF-8?q?=EB=B6=80=EC=97=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 기존 파일명으로 이미지 ID를 관리할 때에 한글 깨짐현상으로 이미지 매칭이 잘 이루어지지 않는 문제 해결 - 이미지 ID 중복문제로 원치않은 이미지 삭제의 문제 해결 --- .../com/writon/admin/domain/service/ImageService.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/writon/admin/domain/service/ImageService.java b/src/main/java/com/writon/admin/domain/service/ImageService.java index f671e1e..c8ea07a 100644 --- a/src/main/java/com/writon/admin/domain/service/ImageService.java +++ b/src/main/java/com/writon/admin/domain/service/ImageService.java @@ -4,16 +4,16 @@ import com.amazonaws.services.s3.model.CannedAccessControlList; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; -import com.writon.admin.domain.entity.organization.Organization; -import com.writon.admin.domain.repository.organization.PositionRepository; import com.writon.admin.domain.util.TokenUtil; import com.writon.admin.global.error.CustomException; import com.writon.admin.global.error.ErrorCode; import java.io.IOException; +import java.util.Objects; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import java.util.UUID; @Service @RequiredArgsConstructor @@ -33,7 +33,11 @@ public String uploadImage(MultipartFile file) { metadata.setContentType(file.getContentType()); metadata.setSSEAlgorithm(ObjectMetadata.AES_256_SERVER_SIDE_ENCRYPTION); - String fileName = "logo/" + file.getOriginalFilename(); + // 2. 파일명 생성 + String uuid = UUID.randomUUID().toString(); + String[] parts = Objects.requireNonNull(file.getOriginalFilename()).split("\\."); + String extension = parts[parts.length - 1]; + String fileName = "logo/" + uuid + "." + extension; // 2. Amazon S3에 이미지 등록 try { From d70a45657f01a873b49637da31256aed43dc0353 Mon Sep 17 00:00:00 2001 From: seungzzok <123801984+seungzzok@users.noreply.github.com> Date: Mon, 7 Apr 2025 21:45:15 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20default-logo=20url=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 이미지의 고유 ID 부여로 인해 default-logo url 변경 --- .../writon/admin/domain/controller/OrganizationController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/writon/admin/domain/controller/OrganizationController.java b/src/main/java/com/writon/admin/domain/controller/OrganizationController.java index 88ccaa7..7d199b8 100644 --- a/src/main/java/com/writon/admin/domain/controller/OrganizationController.java +++ b/src/main/java/com/writon/admin/domain/controller/OrganizationController.java @@ -30,7 +30,7 @@ public class OrganizationController { private final ImageService imageService; private final TokenUtil tokenUtil; - private static final String DEFAULT_LOGO_URL = "https://writon-data.s3.ap-northeast-2.amazonaws.com/logo/default-logo.png"; + private static final String DEFAULT_LOGO_URL = "https://writon-data2.s3.ap-northeast-2.amazonaws.com/logo/d4fdaf92-eb71-4f3a-979e-75211814d364.png"; @PostMapping public SuccessDto createOrganization(