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/resources/application.yaml b/src/main/resources/application.yaml index f087418..1dd8dbe 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -16,29 +16,22 @@ spring: servlet: multipart: + max-file-size: 10MB + max-request-size: 100MB enabled: true - resolve-lazily: true - file-size-threshold: 0 - max-file-size: 10GB - max-request-size: 10GB + 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} # 15MB max-file-size: ${MAX_FILE_SIZE:10737418240} # 10GB max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3} - chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000} - temp-ttl-hours: ${TEMP_TTL_HOURS:72} + 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 - max-http-form-post-size: -1 - connection-timeout: 300000 - security: cors: allowed-origins: "*" @@ -46,12 +39,15 @@ 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 org.hibernate.SQL: DEBUG file: - name: logs/application.log \ No newline at end of file + name: logs/application.log + pattern: + console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n" \ No newline at end of file