From e05bf7ef3ae8d58ea6a59b2e4b38eec52d16b081 Mon Sep 17 00:00:00 2001 From: vladp Date: Mon, 16 Feb 2026 18:57:45 +0700 Subject: [PATCH] dev delete config --- .../java/ru/soune/nocopy/controller/FileController.java | 8 +++++++- .../ru/soune/nocopy/service/FileSimilarityService.java | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/controller/FileController.java b/src/main/java/ru/soune/nocopy/controller/FileController.java index bec838c..9b187b6 100644 --- a/src/main/java/ru/soune/nocopy/controller/FileController.java +++ b/src/main/java/ru/soune/nocopy/controller/FileController.java @@ -17,6 +17,8 @@ import ru.soune.nocopy.repository.UserRepository; import ru.soune.nocopy.service.file.CheckCounterService; import ru.soune.nocopy.service.file.FileStorageService; import org.springframework.http.ContentDisposition; + +import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.io.IOException; @@ -71,10 +73,14 @@ public class FileController { throw new RuntimeException("File is not protected"); } + String fileName = fileEntity.getOriginalFileName(); + String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8) + .replace("+", "%20"); + return ResponseEntity.ok() .contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension())) .header(HttpHeaders.CONTENT_DISPOSITION, - "inline; filename=\"" + fileEntity.getOriginalFileName() + "\"") + "inline; filename*=UTF-8''" + encodedFileName) .body(resource); } diff --git a/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java b/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java index c95e6ed..69edde1 100644 --- a/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java +++ b/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java @@ -253,10 +253,8 @@ public class FileSimilarityService { .ownerId(fileEntity.getUserId()) .originalFileName(fileEntity.getOriginalFileName()) .fileSize(fileEntity.getFileSize()) -// .supportId(Long.valueOf(fileEntity.getSupportId())) .uploadDate(fileEntity.getCreatedAt()) .status(fileEntity.getProtectionStatus()) - .url(baseUrl + "/api/files/public/" + fileEntity.getId()) .build(); } }