-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #148 from UMC5th-bias/develop
[DEPLOY] main <- develop 병합
- Loading branch information
Showing
10 changed files
with
207 additions
and
12 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
src/main/java/com/favoriteplace/global/config/AsyncConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package com.favoriteplace.global.config; | ||
|
|
||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.scheduling.annotation.EnableAsync; | ||
| import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; | ||
|
|
||
| import java.util.concurrent.Executor; | ||
|
|
||
| @EnableAsync | ||
| @Configuration | ||
| public class AsyncConfig { | ||
|
|
||
| /** | ||
| corePoolSize = CPU 코어수 * CPU 사용률 * (1 + I/O입력시간대기효율) | ||
| */ | ||
| @Bean(name = "S3imageUploadExecutor") | ||
| public Executor getAsyncExecutor() { | ||
| ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); | ||
|
|
||
| int numOfCores = Runtime.getRuntime().availableProcessors(); | ||
| float targetCpuUtilization = 0.3f; // CPU 사용률 | ||
| float blockingCoefficient = 0.1f; // I/O 입력시간 대기효율 | ||
| int corePoolSize = (int) (numOfCores * targetCpuUtilization * (1 + blockingCoefficient)); | ||
| executor.setCorePoolSize(corePoolSize); | ||
| executor.initialize(); | ||
| return executor; | ||
| } | ||
| } |
51 changes: 51 additions & 0 deletions
51
src/main/java/com/favoriteplace/global/config/S3Config.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package com.favoriteplace.global.config; | ||
|
|
||
| import com.amazonaws.auth.AWSCredentials; | ||
| import com.amazonaws.auth.AWSStaticCredentialsProvider; | ||
| import com.amazonaws.auth.BasicAWSCredentials; | ||
| import com.amazonaws.services.s3.AmazonS3Client; | ||
| import com.amazonaws.services.s3.AmazonS3ClientBuilder; | ||
| import lombok.Getter; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
|
|
||
| import javax.annotation.PostConstruct; | ||
|
|
||
|
|
||
| @Configuration | ||
| @Getter | ||
| public class S3Config { | ||
|
|
||
| private AWSCredentials awsCredentials; | ||
|
|
||
| @Value("${cloud.aws.s3.bucket}") | ||
| private String bucket; | ||
|
|
||
| @Value("${cloud.aws.credentials.accessKey}") | ||
| private String accessKey; | ||
|
|
||
| @Value("${cloud.aws.credentials.secretKey}") | ||
| private String secretKey; | ||
|
|
||
| @Value("${cloud.aws.region.static}") | ||
| private String region; | ||
|
|
||
| @Value("${cloud.aws.s3.path}") | ||
| private String filePath; | ||
|
|
||
| @PostConstruct | ||
| public void init() { | ||
| this.awsCredentials = new BasicAWSCredentials(accessKey, secretKey); | ||
| } | ||
|
|
||
| @Bean | ||
| public AmazonS3Client amazonS3Client() { | ||
| AWSCredentials awsCredentials = new BasicAWSCredentials(accessKey, secretKey); | ||
|
|
||
| return (AmazonS3Client) AmazonS3ClientBuilder.standard() | ||
| .withRegion(region) | ||
| .withCredentials(new AWSStaticCredentialsProvider(awsCredentials)) | ||
| .build(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
src/main/java/com/favoriteplace/global/s3Image/AmazonS3ImageManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| package com.favoriteplace.global.s3Image; | ||
|
|
||
| import com.amazonaws.services.s3.AmazonS3Client; | ||
| import com.amazonaws.services.s3.model.CannedAccessControlList; | ||
| import com.amazonaws.services.s3.model.PutObjectRequest; | ||
| import com.favoriteplace.global.config.S3Config; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.scheduling.annotation.Async; | ||
| import org.springframework.stereotype.Component; | ||
| import org.springframework.web.multipart.MultipartFile; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileOutputStream; | ||
| import java.io.IOException; | ||
| import java.util.*; | ||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| @Slf4j | ||
| @Component | ||
| @RequiredArgsConstructor | ||
| public class AmazonS3ImageManager { | ||
|
|
||
| private final AmazonS3Client amazonS3Client; | ||
| private final S3Config s3Config; | ||
|
|
||
| @Async("S3imageUploadExecutor") | ||
| public CompletableFuture<String> upload(MultipartFile multipartFile) throws IOException { | ||
| CompletableFuture<String> future = new CompletableFuture<>(); | ||
|
|
||
| String s3FileName = UUID.randomUUID().toString().substring(0, 10) + multipartFile.getOriginalFilename(); | ||
|
|
||
| File uploadFile = convert(multipartFile) | ||
| .orElseThrow(() -> new IllegalArgumentException("MultipartFile -> File 전환 실패")); | ||
|
|
||
| future.complete(upload(uploadFile, s3FileName)); | ||
|
|
||
| return future; | ||
| } | ||
|
|
||
| @Async("S3imageUploadExecutor") | ||
| public List<CompletableFuture<String>>upload(List<MultipartFile> multipartFiles) throws IOException { | ||
| List<CompletableFuture<String>> futures = new ArrayList<CompletableFuture<String>>(); | ||
| CompletableFuture<String> future = new CompletableFuture<>(); | ||
|
|
||
| for (MultipartFile file : multipartFiles) { | ||
| String s3FileName = UUID.randomUUID().toString().substring(0, 10) + file.getOriginalFilename(); | ||
|
|
||
| File uploadFile = convert(file) | ||
| .orElseThrow(() -> new IllegalArgumentException("MultipartFile -> File 전환 실패")); | ||
| future.complete((upload(uploadFile, s3FileName))); | ||
| } | ||
| futures.add(future); | ||
|
|
||
| return futures; | ||
| } | ||
|
|
||
| private String upload(File uploadFile, String s3FileName) { | ||
| String fileName = s3Config.getFilePath()+ "/" + s3FileName + uploadFile.getName(); | ||
| String uploadImageUrl = putS3(uploadFile, fileName); | ||
| removeNewFile(uploadFile); // 로컬에 생성된 File 삭제 (MultipartFile -> File 전환 하며 로컬에 파일 생성됨) | ||
| return uploadImageUrl; // 업로드된 파일의 S3 URL 주소 반환 | ||
| } | ||
|
|
||
| private String putS3(File uploadFile, String fileName) { | ||
| amazonS3Client.putObject( | ||
| new PutObjectRequest(s3Config.getBucket(), fileName, uploadFile) | ||
| .withCannedAcl(CannedAccessControlList.PublicRead) // PublicRead 권한으로 업로드 됨 | ||
| ); | ||
| return amazonS3Client.getUrl(s3Config.getBucket(), fileName).toString(); | ||
| } | ||
|
|
||
| private void removeNewFile(File targetFile) { | ||
| if (targetFile.delete()) { | ||
| log.info("파일이 삭제되었습니다."); | ||
| } else { | ||
| log.info("파일이 삭제되지 못했습니다."); | ||
| } | ||
| } | ||
|
|
||
| private Optional<File> convert(MultipartFile file) throws IOException { | ||
| File convertFile = new File(Objects.requireNonNull(file.getOriginalFilename())); | ||
| if (convertFile.createNewFile()) { | ||
| try (FileOutputStream fos = new FileOutputStream(convertFile)) { | ||
| fos.write(file.getBytes()); | ||
| } | ||
| return Optional.of(convertFile); | ||
| } | ||
| return Optional.empty(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters