From 1d3bdc506d1dad5a03b38091c1a2c5e52f2abc93 Mon Sep 17 00:00:00 2001 From: vladp Date: Mon, 16 Feb 2026 18:16:21 +0700 Subject: [PATCH] dev delete config --- .../configuration/file/FileStorageConfig.java | 25 ------------------- .../service/file/FileStorageService.java | 12 +++++---- .../file/impl/FileUploadServiceImpl.java | 3 --- 3 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 src/main/java/ru/soune/nocopy/configuration/file/FileStorageConfig.java diff --git a/src/main/java/ru/soune/nocopy/configuration/file/FileStorageConfig.java b/src/main/java/ru/soune/nocopy/configuration/file/FileStorageConfig.java deleted file mode 100644 index c64ba5c..0000000 --- a/src/main/java/ru/soune/nocopy/configuration/file/FileStorageConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -package ru.soune.nocopy.configuration.file; - -import jakarta.annotation.PostConstruct; -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; - -@Configuration -@ConfigurationProperties(prefix = "file.storage") -@Data -public class FileStorageConfig { - private String basePath; - private long maxFileSize; - private int chunkSize; - private int authTokenLifeHours; - - @PostConstruct - public void init() throws IOException { - Files.createDirectories(Paths.get(basePath)); - } -} diff --git a/src/main/java/ru/soune/nocopy/service/file/FileStorageService.java b/src/main/java/ru/soune/nocopy/service/file/FileStorageService.java index a7d0603..421f577 100644 --- a/src/main/java/ru/soune/nocopy/service/file/FileStorageService.java +++ b/src/main/java/ru/soune/nocopy/service/file/FileStorageService.java @@ -1,11 +1,10 @@ package ru.soune.nocopy.service.file; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.Resource; import org.springframework.core.io.UrlResource; import org.springframework.stereotype.Service; -import ru.soune.nocopy.configuration.file.FileStorageConfig; import java.io.FileNotFoundException; import java.io.IOException; @@ -16,11 +15,14 @@ import java.nio.file.Paths; @Slf4j public class FileStorageService { - @Autowired - private FileStorageConfig storageConfig; +// @Autowired +// private FileStorageConfig storageConfig; + + @Value("${file.storage.base-path}") + private String basePath; public Resource loadFileAsResource(String filePath) throws IOException { - Path path = Paths.get(storageConfig.getBasePath()).resolve(filePath).normalize(); + Path path = Paths.get(basePath).resolve(filePath).normalize(); Resource resource = new UrlResource(path.toUri()); if (!resource.exists()) { diff --git a/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java b/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java index 9395adc..77a0634 100644 --- a/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java +++ b/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java @@ -57,9 +57,6 @@ public class FileUploadServiceImpl implements FileUploadService { @Value("${file.storage.max-retry-attempts:3}") private int maxRetryAttempts; - @Value("${file.storage.chunk-timeout-ms:300000}") // 5 минут - private long chunkTimeoutMs; - @Value("${file.storage.session-expiry-hours:24}") private int sessionExpiryHours;