From 9ad4830edb2463b659749ae4932eb91589bd2e34 Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Tue, 21 Apr 2026 01:06:50 +0700 Subject: [PATCH] dev fix file public endpoint --- .../ru/soune/nocopy/controller/ApiController.java | 3 +-- .../ru/soune/nocopy/controller/FileController.java | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/controller/ApiController.java b/src/main/java/ru/soune/nocopy/controller/ApiController.java index 2544f33..6ec431a 100644 --- a/src/main/java/ru/soune/nocopy/controller/ApiController.java +++ b/src/main/java/ru/soune/nocopy/controller/ApiController.java @@ -505,8 +505,7 @@ public class ApiController { } Path filePath = Paths.get(entityResponse.getProtectedFilePath()); - File file = cloudStorageService.readFileFromStorageByPath( - entityResponse.getProtectedFilePath()); + File file = cloudStorageService.readFileFromStorageByPath(entityResponse.getProtectedFilePath()); long fileSize = Files.size(filePath); if (!file.exists()) { diff --git a/src/main/java/ru/soune/nocopy/controller/FileController.java b/src/main/java/ru/soune/nocopy/controller/FileController.java index 4063e77..0754fd1 100644 --- a/src/main/java/ru/soune/nocopy/controller/FileController.java +++ b/src/main/java/ru/soune/nocopy/controller/FileController.java @@ -63,11 +63,11 @@ public class FileController { FileEntity fileEntity = fileRepository.findById(fileId) .orElseThrow(() -> new FileNotFoundException("Not found: " + fileId)); - Path filePath = Paths.get(fileEntity.getFilePath()); - if (!Files.exists(filePath)) { - log.error("Not on disk: {}", fileEntity.getFilePath()); - return ResponseEntity.notFound().build(); - } +// Path filePath = Paths.get(fileEntity.getFilePath()); +// if (!Files.exists(filePath)) { +// log.error("Not on disk: {}", fileEntity.getFilePath()); +// return ResponseEntity.notFound().build(); +// } File file = cloudStorageService.readFileFromStorageByPath(fileEntity.getFilePath()); @@ -86,7 +86,7 @@ public class FileController { return ResponseEntity.ok() .contentType(mediaType) - .contentLength(Files.size(filePath)) + .contentLength(file.length()) .header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString()) .header(HttpHeaders.CACHE_CONTROL, "public, max-age=3600") .body(resource);