Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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<CreateOrganizationResponseDto> createOrganization(
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/com/writon/admin/domain/service/ImageService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down