Merge pull request #68 from rhkr8521/refac/#change-bucket-server

[REFAC] S3 버킷 서버 변경

Author: rhkr8521

src/main/java/com/rhkr8521/mapping/api/aws/s3/S3Service.java

@@ -58,7 +58,10 @@ public List<String> uploadMemoImages(String userIdentifier, List<MultipartFile>
                     .build();
 
             s3Client.putObject(putObjectRequest, RequestBody.fromInputStream(file.getInputStream(), file.getSize()));
-            imageUrls.add(domain + "/" + fileKey);
+            // AWS S3
+            //imageUrls.add(domain + "/" + fileKey);
+            // rhkr8521-Bucket
+            imageUrls.add(domain + "/" + bucketName + "/" + fileKey);
         }
 
         return imageUrls;
@@ -87,12 +90,19 @@ public String uploadProfileImage(String email, MultipartFile file) throws IOExce
                 .acl("public-read")
                 .build();
         s3Client.putObject(putObjectRequest, RequestBody.fromInputStream(file.getInputStream(), file.getSize()));
-        return domain + "/" + fileKey;
+        // AWS S3
+        //return domain + "/" + fileKey;
+        // rhkr8521-Bucket
+        return domain + "/" + bucketName + "/" + fileKey;
+
     }
 
     public void deleteFile(String imageUrl) {
         if (imageUrl != null && imageUrl.startsWith(domain)) {
-            String fileKey = imageUrl.replace(domain + "/", "");
+            // AWS S3
+            //String fileKey = imageUrl.replace(domain + "/", "");
+            // rhkr8521-Bucket
+            String fileKey = imageUrl.replace(domain + "/" + bucketName + "/", "");
             DeleteObjectRequest deleteObjectRequest = DeleteObjectRequest.builder()
                     .bucket(bucketName)
                     .key(fileKey)

src/main/java/com/rhkr8521/mapping/common/config/aws/MinioConfig.java

@@ -0,0 +1,46 @@
+package com.rhkr8521.mapping.common.config.aws;
+
+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.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.S3Configuration;
+
+import java.net.URI;
+
+@Configuration
+public class MinioConfig {
+
+    @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.domain}")
+    private String minioEndpoint;
+
+    @Bean
+    public S3Client s3Client() {
+        S3Configuration s3Configuration = S3Configuration.builder()
+                .pathStyleAccessEnabled(true)
+                .build();
+
+        return S3Client.builder()
+                .credentialsProvider(
+                        StaticCredentialsProvider.create(
+                                AwsBasicCredentials.create(accessKey, secretKey)
+                        )
+                )
+                .region(Region.of(region))
+                .endpointOverride(URI.create(minioEndpoint))
+                .serviceConfiguration(s3Configuration)
+                .build();
+    }
+}

src/main/java/com/rhkr8521/mapping/common/config/aws/S3Config.java

@@ -20,12 +20,12 @@ public class S3Config {
     @Value("${cloud.aws.region.static}")
     private String region;
 
-    @Bean
-    public S3Client s3Client() {
-        AwsBasicCredentials awsCreds = AwsBasicCredentials.create(accessKey, secretKey);
-        return S3Client.builder()
-                .region(Region.of(region))
-                .credentialsProvider(StaticCredentialsProvider.create(awsCreds))
-                .build();
-    }
+//    @Bean
+//    public S3Client s3Client() {
+//        AwsBasicCredentials awsCreds = AwsBasicCredentials.create(accessKey, secretKey);
+//        return S3Client.builder()
+//                .region(Region.of(region))
+//                .credentialsProvider(StaticCredentialsProvider.create(awsCreds))
+//                .build();
+//    }
 }