diff --git a/docker-compose.yaml b/docker-compose.yaml index 91e8d40..6136ac0 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -34,7 +34,7 @@ services: environment: FILE_STORAGE_PATH: /data/uploads MAX_FILE_SIZE: 10737418240 - FILE_CHUNK_SIZE: 5242880 + FILE_CHUNK_SIZE: 1000000 POSTGRES_DB: no_copy_ POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres diff --git a/src/main/java/ru/soune/nocopy/service/file/FileUploadServiceImpl.java b/src/main/java/ru/soune/nocopy/service/file/FileUploadServiceImpl.java index 908602f..3e09822 100644 --- a/src/main/java/ru/soune/nocopy/service/file/FileUploadServiceImpl.java +++ b/src/main/java/ru/soune/nocopy/service/file/FileUploadServiceImpl.java @@ -102,7 +102,7 @@ public class FileUploadServiceImpl implements FileUploadService { int totalChunks = (int) Math.ceil((double) fileSize / chunkSize); log.debug("File will be split into {} chunks (chunk size: {} bytes)", totalChunks, chunkSize); - Long chunkSize = totalChunks == 1 ? fileSize : 5242880L; + Long chunkSize = totalChunks == 1 ? fileSize : 1000000L; FileUploadSession session = FileUploadSession.builder() .userId(userId) diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 3c96660..57b803b 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -16,29 +16,22 @@ spring: servlet: multipart: - enabled: true - resolve-lazily: true # - file-size-threshold: 2KB # max-file-size: 10MB max-request-size: 100MB + enabled: true + resolve-lazily: false file: storage: base-path: ${FILE_STORAGE_PATH:/data/uploads} - chunk-size: ${FILE_CHUNK_SIZE:5242880} # 5MB +# chunk-size: ${FILE_CHUNK_SIZE:5242880} # 5MB + chunk-size: ${FILE_CHUNK_SIZE:1000000} # 5MB max-file-size: ${MAX_FILE_SIZE:10737418240} # 10GB max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3} chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000} # 5 минут temp-ttl-hours: ${TEMP_TTL_HOURS:72} # 3 дня session-expiry-hours: ${SESSION_EXPIRY_HOURS:24} -server: - port: ${SERVER_PORT:8080} - tomcat: - max-swallow-size: -1 # - connection-timeout: 300000 # - max-http-header-size: 16KB - security: cors: allowed-origins: "*" @@ -46,12 +39,13 @@ security: allowed-headers: "*" allow-credentials: true +server: + port: ${SERVER_PORT:8080} + logging: level: com.example.fileupload: DEBUG org.springframework.web: DEBUG - org.springframework.web.multipart: TRACE # ← ДЛЯ ОТЛАДКИ - org.apache.tomcat: DEBUG # ← ЛОГИ TOMCAT org.hibernate.SQL: DEBUG file: name: logs/application.log