From ca10109318f09bb0dbd3e8a9051fd17506db8068 Mon Sep 17 00:00:00 2001 From: gulnaz Date: Wed, 2 Oct 2024 09:31:47 +0300 Subject: [PATCH] change url --- src/main/java/ru/micord/ervu/av/s3/S3Service.java | 10 +++------- .../ru/micord/ervu/av/service/FileUploadService.java | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/ru/micord/ervu/av/s3/S3Service.java b/src/main/java/ru/micord/ervu/av/s3/S3Service.java index a1f537a..8537eed 100644 --- a/src/main/java/ru/micord/ervu/av/s3/S3Service.java +++ b/src/main/java/ru/micord/ervu/av/s3/S3Service.java @@ -30,18 +30,14 @@ public class S3Service { } } - public void putFile(Path filePath, String key) throws FileUploadException { + public String putFile(Path filePath, String key) throws FileUploadException { try { - outClient.putObject(outBucketName, generateResourceName(outBucketName, key), - filePath.toFile()); + outClient.putObject(outBucketName, key, filePath.toFile()); + return String.join("/", "s3:/", outBucketName, key); } catch (AmazonServiceException e) { // todo message throw new FileUploadException(e); } } - - private static String generateResourceName(String bucketName, String key) { - return String.join("/", bucketName, key); - } } diff --git a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java index dcdba75..5d52d0d 100644 --- a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java +++ b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java @@ -118,9 +118,9 @@ public class FileUploadService { sendMessage(outErrorTopic.name(), downloadRequest, kafkaTemplate); } else { - s3Service.putFile(filePath, fileUrl.fileName()); + String fileRef = s3Service.putFile(filePath, fileUrl.fileName()); - downloadRequest.fileInfo().setFileUrl(fileUrl.fileName()); + downloadRequest.fileInfo().setFileUrl(fileRef); downloadRequest.fileInfo().setFileStatus(FileStatus.FILE_STATUS_03); sendMessage(outSuccessTopic.name(), downloadRequest, kafkaTemplate); }