Merge branch 'develop' into refactor/DDING-000

# Conflicts: # src/main/java/ddingdong/ddingdongBE/file/service/S3FileService.java
COW-dev · Jan 13, 2025 · c69c859 · c69c859
2 parents e6af970 + 27b0b94
commit c69c859
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/ddingdong/ddingdongBE/file/service/S3FileService.java b/src/main/java/ddingdong/ddingdongBE/file/service/S3FileService.java
@@ -97,7 +97,7 @@ public UploadedVideoUrlQuery getUploadedVideoUrl(String key) {
         String fileId = extractFileId(key);
         String region = amazonS3Client.getRegionName();
 
-        String thumbnailOriginUrl = generateS3Url(outputBucket, region, "thumbnails/", fileId, "0000000.jpg");
+        String thumbnailOriginUrl = generateS3Url(outputBucket, region, "thumbnails/", fileId, ".0000000.jpg");
         String thumbnailCdnUrl = generateCdnUrl("thumbnails/", fileId, ".0000000.jpg");
         String videoOriginUrl = generateS3Url(outputBucket, region, "hls/", fileId, "_720.m3u8");
         String videoCdnUrl = generateCdnUrl("hls/", fileId, "_720.m3u8");
@@ -147,6 +147,6 @@ private String generateS3Url(String bucket, String region, String prefix, String
     }
 
     private String generateCdnUrl(String prefix, String filename, String suffix) {
-        return S3FileService.VIDEO_CDN_URL + prefix + filename + suffix;
+        return S3FileService.VIDEO_CDN_URL + "/" + prefix + filename + suffix;
     }
 }