Compare commits
7
Commits
NCBACK-6
...
20e1ab321d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
20e1ab321d | ||
|
|
f136ac1f0a | ||
|
|
3a9a5b48a2 | ||
|
|
6fff5884d2 | ||
|
|
f8673dd581 | ||
|
|
b9a401f113 | ||
|
|
918b4894fc |
@@ -13,6 +13,13 @@ java {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//dependencyManagement {
|
||||||
|
// imports {
|
||||||
|
// mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
compileOnly {
|
compileOnly {
|
||||||
extendsFrom annotationProcessor
|
extendsFrom annotationProcessor
|
||||||
@@ -21,6 +28,9 @@ configurations {
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
flatDir {
|
||||||
|
dirs 'libs'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -45,6 +55,11 @@ dependencies {
|
|||||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||||
testImplementation 'org.mockito:mockito-core:5.3.1'
|
testImplementation 'org.mockito:mockito-core:5.3.1'
|
||||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||||
|
|
||||||
|
// implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.21'
|
||||||
|
// implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
|
||||||
|
// implementation 'io.insert-koin:koin-core:3.5.0'
|
||||||
|
implementation name: 'testlib-fat-0.1.2-all (1)'
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('test') {
|
tasks.named('test') {
|
||||||
|
|||||||
+3
-3
@@ -120,7 +120,7 @@ services:
|
|||||||
prometheus:
|
prometheus:
|
||||||
image: prom/prometheus:latest
|
image: prom/prometheus:latest
|
||||||
container_name: prometheus
|
container_name: prometheus
|
||||||
deploy: # ← ДОБАВЛЕНО
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '0.5'
|
cpus: '0.5'
|
||||||
@@ -148,7 +148,7 @@ services:
|
|||||||
loki:
|
loki:
|
||||||
image: grafana/loki:2.9.2
|
image: grafana/loki:2.9.2
|
||||||
container_name: loki
|
container_name: loki
|
||||||
deploy: # ← ДОБАВЛЕНО
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '1.0'
|
cpus: '1.0'
|
||||||
@@ -173,7 +173,7 @@ services:
|
|||||||
tempo:
|
tempo:
|
||||||
image: grafana/tempo:2.4.1
|
image: grafana/tempo:2.4.1
|
||||||
container_name: tempo
|
container_name: tempo
|
||||||
deploy: # ← ДОБАВЛЕНО
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '0.5'
|
cpus: '0.5'
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ pipeline {
|
|||||||
defaultValue: 'dev',
|
defaultValue: 'dev',
|
||||||
description: 'Ветка для деплоя'
|
description: 'Ветка для деплоя'
|
||||||
)
|
)
|
||||||
|
|
||||||
string(
|
string(
|
||||||
name: 'SERVER',
|
name: 'SERVER',
|
||||||
defaultValue: '92.242.61.23',
|
defaultValue: '92.242.61.23',
|
||||||
@@ -51,156 +50,57 @@ pipeline {
|
|||||||
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
|
||||||
cd /opt/deployments/${params.BRANCH}
|
cd /opt/deployments/${params.BRANCH}
|
||||||
|
|
||||||
echo '========================================'
|
echo '1. Остановка старого приложения...'
|
||||||
echo 'Step 1: Checking current state...'
|
docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
echo '========================================'
|
docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
|
|
||||||
docker ps --filter 'name=postgres|app-backend|storage|grafana|prometheus|loki|tempo|alloy' --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
echo '2. Удаление старых образов...'
|
||||||
|
docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
|
||||||
|
|
||||||
echo '========================================'
|
echo '3. Создание сети если нужно...'
|
||||||
echo 'Step 2: Setup environment for compatibility...'
|
docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
docker network create app-network 2>/dev/null || echo 'Network app-network already exists'
|
echo '4. Запуск инфраструктуры...'
|
||||||
|
docker-compose up -d db storage
|
||||||
|
|
||||||
echo 'COMPOSE_COMPATIBILITY=true' > .env
|
echo '5. Ожидание PostgreSQL...'
|
||||||
|
sleep 10
|
||||||
|
|
||||||
echo '========================================'
|
echo '6. Сборка нового образа приложения...'
|
||||||
echo 'Step 3: Force cleanup old application...'
|
docker build --no-cache -t app-backend:latest .
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
docker-compose --compatibility down 2>/dev/null || echo 'No previous compose stack'
|
echo '7. Запуск приложения...'
|
||||||
|
docker run -d \\
|
||||||
|
--name app-backend \\
|
||||||
|
--network app-network \\
|
||||||
|
--network-alias app \\
|
||||||
|
-p 80:8080 \\
|
||||||
|
-v uploads_data:/data/uploads:rw \\
|
||||||
|
-e POSTGRES_DB=no_copy_ \\
|
||||||
|
-e POSTGRES_USER=postgres \\
|
||||||
|
-e POSTGRES_PASSWORD=postgres \\
|
||||||
|
-e POSTGRES_PORT=5432 \\
|
||||||
|
-e POSTGRES_HOST=db \\
|
||||||
|
--restart unless-stopped \\
|
||||||
|
app-backend:latest
|
||||||
|
|
||||||
docker images --filter 'reference=*app-backend*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'No images to remove'
|
echo '8. Запуск мониторинга...'
|
||||||
|
docker-compose up -d grafana prometheus loki tempo alloy
|
||||||
|
|
||||||
echo '========================================'
|
echo '9. Проверка...'
|
||||||
echo 'Step 4: Verify files and fix compose...'
|
sleep 5
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
if [ ! -f docker-compose.yaml ]; then
|
echo 'Статус контейнеров:'
|
||||||
echo 'ERROR: docker-compose.yaml not found!'
|
docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
||||||
ls -la
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 'Checking docker-compose.yaml syntax...'
|
echo '10. Проверка health...'
|
||||||
docker-compose --compatibility config 2>&1 | head -20 || echo 'Config check output'
|
if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
|
||||||
|
echo 'Приложение работает'
|
||||||
echo '========================================'
|
echo 'URL: http://${params.SERVER}:80'
|
||||||
echo 'Step 5: Start infrastructure services...'
|
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
echo 'Starting PostgreSQL with resource limits...'
|
|
||||||
docker-compose --compatibility up -d db
|
|
||||||
|
|
||||||
echo 'Starting storage service...'
|
|
||||||
docker-compose --compatibility up -d storage
|
|
||||||
|
|
||||||
echo 'Waiting for PostgreSQL to be ready...'
|
|
||||||
for i in {1..30}; do
|
|
||||||
if docker-compose --compatibility exec db pg_isready -U postgres 2>/dev/null; then
|
|
||||||
echo 'PostgreSQL is ready'
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
echo 'Waiting... attempt ' \$i
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
|
|
||||||
echo '========================================'
|
|
||||||
echo 'Step 6: Build application image...'
|
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
if [ ! -f Dockerfile ]; then
|
|
||||||
echo 'ERROR: Dockerfile not found!'
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 'Building Docker image...'
|
|
||||||
docker build --no-cache -t app-backend:latest . 2>&1 | tail -30
|
|
||||||
|
|
||||||
echo 'Image created successfully'
|
|
||||||
docker images app-backend:latest --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.Size}}\\t{{.CreatedAt}}'
|
|
||||||
|
|
||||||
echo '========================================'
|
|
||||||
echo 'Step 7: Start application with resource limits...'
|
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
docker volume create uploads_data 2>/dev/null || echo 'Volume uploads_data already exists'
|
|
||||||
|
|
||||||
echo 'Starting main application...'
|
|
||||||
docker-compose --compatibility up -d app
|
|
||||||
|
|
||||||
echo 'Waiting for application to start...'
|
|
||||||
sleep 15
|
|
||||||
|
|
||||||
echo '========================================'
|
|
||||||
echo 'Step 8: Start monitoring stack...'
|
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
docker-compose --compatibility up -d grafana prometheus loki tempo alloy
|
|
||||||
|
|
||||||
echo '========================================'
|
|
||||||
echo 'Step 9: Verify deployment...'
|
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
echo 'All containers status:'
|
|
||||||
docker-compose --compatibility ps
|
|
||||||
|
|
||||||
echo ''
|
|
||||||
echo 'Resource limits check:'
|
|
||||||
echo 'App backend limits:'
|
|
||||||
docker inspect app-backend --format='{{.HostConfig.Memory}} {{.HostConfig.CpuQuota}} {{.HostConfig.CpuPeriod}}' 2>/dev/null || echo 'Cannot inspect'
|
|
||||||
|
|
||||||
echo ''
|
|
||||||
echo 'PostgreSQL limits:'
|
|
||||||
docker inspect postgres --format='{{.HostConfig.Memory}} {{.HostConfig.CpuQuota}} {{.HostConfig.CpuPeriod}}' 2>/dev/null || echo 'Cannot inspect'
|
|
||||||
|
|
||||||
echo ''
|
|
||||||
echo 'Container resource usage:'
|
|
||||||
docker stats --no-stream --format 'table {{.Name}}\\t{{.CPUPerc}}\\t{{.MemUsage}}\\t{{.MemPerc}}' postgres app-backend storage 2>/dev/null || echo 'Stats not available'
|
|
||||||
|
|
||||||
echo '========================================'
|
|
||||||
echo 'Step 10: Health checks...'
|
|
||||||
echo '========================================'
|
|
||||||
|
|
||||||
echo 'Application health check...'
|
|
||||||
for i in {1..10}; do
|
|
||||||
if curl -s -f http://localhost:80/health 2>/dev/null; then
|
|
||||||
echo '✓ Application health check PASSED'
|
|
||||||
break
|
|
||||||
elif [ \$i -eq 10 ]; then
|
|
||||||
echo '✗ Application health check FAILED'
|
|
||||||
echo 'Last logs:'
|
|
||||||
docker-compose --compatibility logs --tail=20 app
|
|
||||||
else
|
|
||||||
echo 'Waiting for application... attempt ' \$i
|
|
||||||
sleep 5
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
echo 'Checking monitoring services...'
|
|
||||||
if curl -s -f http://localhost:3000/api/health 2>/dev/null; then
|
|
||||||
echo '✓ Grafana is healthy'
|
|
||||||
else
|
else
|
||||||
echo '⚠ Grafana may be starting'
|
echo 'Проверка health не удалась'
|
||||||
|
docker logs app-backend --tail=20
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if curl -s -f http://localhost:9090/-/healthy 2>/dev/null; then
|
|
||||||
echo '✓ Prometheus is healthy'
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo '========================================'
|
|
||||||
echo 'Deployment Summary:'
|
|
||||||
echo '========================================'
|
|
||||||
echo 'Application URL: http://${params.SERVER}:80'
|
|
||||||
echo 'Grafana: http://${params.SERVER}:3000 (admin/admin)'
|
|
||||||
echo 'Prometheus: http://${params.SERVER}:9090'
|
|
||||||
echo 'Loki: http://${params.SERVER}:3100'
|
|
||||||
echo ''
|
|
||||||
echo 'To view logs: docker-compose logs -f app'
|
|
||||||
echo 'To view all containers: docker-compose ps'
|
|
||||||
echo 'To stop: docker-compose down'
|
|
||||||
echo '========================================'
|
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
@@ -213,8 +113,6 @@ pipeline {
|
|||||||
success {
|
success {
|
||||||
echo "Deployment successful"
|
echo "Deployment successful"
|
||||||
echo "Application URL: http://${params.SERVER}:80"
|
echo "Application URL: http://${params.SERVER}:80"
|
||||||
echo "Grafana: http://${params.SERVER}:3000"
|
|
||||||
echo "Prometheus: http://${params.SERVER}:9090"
|
|
||||||
}
|
}
|
||||||
failure {
|
failure {
|
||||||
echo "Deployment failed for branch ${params.BRANCH}"
|
echo "Deployment failed for branch ${params.BRANCH}"
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -1,17 +1,35 @@
|
|||||||
package ru.soune.nocopy.configuration;
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableAutoConfiguration
|
@EnableAutoConfiguration
|
||||||
|
@AllArgsConstructor
|
||||||
public class ApplicationConfig {
|
public class ApplicationConfig {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
PasswordEncoder passwordEncoder() {
|
PasswordEncoder passwordEncoder() {
|
||||||
return new BCryptPasswordEncoder();
|
return new BCryptPasswordEncoder();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public com.vrt.NoCopyFileService noCopyFileService(
|
||||||
|
FileProtector.FileProvider fileProvider,
|
||||||
|
FileProtector.ProcessingListener processingListener) {
|
||||||
|
|
||||||
|
return new com.vrt.NoCopyFileService(
|
||||||
|
Collections.emptyList(),
|
||||||
|
fileProvider,
|
||||||
|
processingListener
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package ru.soune.nocopy.configuration.file;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import ru.soune.nocopy.service.file.FileProcessingOrchestrator;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class NoCopyInitializer {
|
||||||
|
|
||||||
|
private final FileProcessingOrchestrator orchestrator;
|
||||||
|
|
||||||
|
@EventListener(ApplicationReadyEvent.class)
|
||||||
|
public void initializeOnStartup() {
|
||||||
|
orchestrator.initializeProcessingQueue();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
package ru.soune.nocopy.controller;
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
|
import com.vrt.NoCopyFileService;
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.core.io.Resource;
|
import org.springframework.core.io.Resource;
|
||||||
@@ -20,11 +22,14 @@ import ru.soune.nocopy.dto.file.CompleteUploadResponse;
|
|||||||
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
||||||
import ru.soune.nocopy.dto.file.UploadProgress;
|
import ru.soune.nocopy.dto.file.UploadProgress;
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
import ru.soune.nocopy.entity.file.FileStatus;
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||||
import ru.soune.nocopy.entity.file.UploadStatus;
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
import ru.soune.nocopy.exception.*;
|
import ru.soune.nocopy.exception.*;
|
||||||
import ru.soune.nocopy.handler.*;
|
import ru.soune.nocopy.handler.*;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
import ru.soune.nocopy.service.file.FileEntityService;
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
import ru.soune.nocopy.service.file.FileUploadService;
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
|
|
||||||
@@ -35,6 +40,7 @@ import java.nio.file.Paths;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@@ -50,6 +56,10 @@ public class ApiController {
|
|||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
private final AuthTokenRepository authTokenRepository;
|
||||||
|
|
||||||
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
private final NoCopyFileService noCopyFileService;
|
||||||
|
|
||||||
@PostMapping("/v{version}/data")
|
@PostMapping("/v{version}/data")
|
||||||
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||||
@PathVariable("version") int version) {
|
@PathVariable("version") int version) {
|
||||||
@@ -332,6 +342,47 @@ public class ApiController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/protect/{fileId}")
|
||||||
|
public ResponseEntity<?> protect( @PathVariable(required = false) String fileId) {
|
||||||
|
Optional<FileEntity> fileEntity = fileEntityRepository.findById(fileId);
|
||||||
|
|
||||||
|
if (!fileEntity.isPresent()) {
|
||||||
|
return ResponseEntity.notFound().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
FileProtector.FileInfo fileInfo = createFileInfo(fileEntity.get());
|
||||||
|
|
||||||
|
noCopyFileService.addFile(fileInfo);
|
||||||
|
|
||||||
|
fileEntity.get().setProtectionStatus(ProtectionStatus.PROCESSING);
|
||||||
|
|
||||||
|
fileEntityRepository.save(fileEntity.get());
|
||||||
|
|
||||||
|
return ResponseEntity.ok().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
private FileProtector.FileInfo createFileInfo(FileEntity fileEntity) {
|
||||||
|
FileProtector.Type type = determineFileType(fileEntity.getMimeType());
|
||||||
|
|
||||||
|
return new FileProtector.FileInfo(type, fileEntity.getId(), String.valueOf(fileEntity.getUserId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
private FileProtector.Type determineFileType(String mimeType) {
|
||||||
|
if (mimeType == null) {
|
||||||
|
return FileProtector.Type.IMAGE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mimeType.startsWith("image")) {
|
||||||
|
return FileProtector.Type.IMAGE;
|
||||||
|
} else if (mimeType.startsWith("video")) {
|
||||||
|
return FileProtector.Type.VIDEO;
|
||||||
|
} else if (mimeType.startsWith("audio")) {
|
||||||
|
return FileProtector.Type.AUDIO;
|
||||||
|
} else {
|
||||||
|
return FileProtector.Type.IMAGE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
|
private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
|
||||||
List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
|
List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
|
||||||
.stream()
|
.stream()
|
||||||
@@ -368,18 +419,6 @@ public class ApiController {
|
|||||||
return contentType;
|
return contentType;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isPreviewSupported(String mimeType) {
|
|
||||||
if (mimeType == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return mimeType.startsWith("image") ||
|
|
||||||
mimeType.startsWith("text") ||
|
|
||||||
mimeType.equals("pdf") ||
|
|
||||||
mimeType.startsWith("video") ||
|
|
||||||
mimeType.startsWith("audio");
|
|
||||||
}
|
|
||||||
|
|
||||||
private Long getUserIdFromToken(String tokenHeader) {
|
private Long getUserIdFromToken(String tokenHeader) {
|
||||||
String token = tokenHeader.replace("Bearer ", "");
|
String token = tokenHeader.replace("Bearer ", "");
|
||||||
AuthToken authToken = authTokenRepository.findByToken(token)
|
AuthToken authToken = authTokenRepository.findByToken(token)
|
||||||
|
|||||||
@@ -60,11 +60,26 @@ public class FileEntity {
|
|||||||
@Column(name = "updated_at")
|
@Column(name = "updated_at")
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
|
|
||||||
|
@Column(name = "protected_file_path")
|
||||||
|
private String protectedFilePath;
|
||||||
|
|
||||||
|
@Column(name = "protection_status")
|
||||||
|
@Enumerated(EnumType.STRING)
|
||||||
|
private ProtectionStatus protectionStatus;
|
||||||
|
|
||||||
|
@Column(name = "protected_at")
|
||||||
|
private LocalDateTime protectedAt;
|
||||||
|
|
||||||
@PrePersist
|
@PrePersist
|
||||||
public void prePersist() {
|
public void prePersist() {
|
||||||
if (this.status == null) {
|
if (this.status == null) {
|
||||||
this.status = FileStatus.ACTIVE;
|
this.status = FileStatus.ACTIVE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.protectionStatus == null) {
|
||||||
|
this.protectionStatus = ProtectionStatus.NOT_PROTECTED;
|
||||||
|
}
|
||||||
|
|
||||||
if (this.createdAt == null) {
|
if (this.createdAt == null) {
|
||||||
this.createdAt = LocalDateTime.now();
|
this.createdAt = LocalDateTime.now();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,21 +7,10 @@ import java.util.List;
|
|||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
public enum FileType {
|
public enum FileType {
|
||||||
IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp")),
|
IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
|
||||||
VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
|
VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
|
||||||
"3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
|
"3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
|
||||||
AUDIO("audio", Arrays.asList("mp3", "wav", "flac")),
|
AUDIO("audio", Arrays.asList("mp3", "wav", "flac"));
|
||||||
DOCUMENT("document", Arrays.asList(
|
|
||||||
"pdf", "txt", "rtf",
|
|
||||||
"doc", "docx", "xls", "xlsx", "ppt", "pptx", "pps", "ppsx", "dot", "dotx", "xlt", "xltx", "pot", "potx",
|
|
||||||
"odt", "ods", "odp", "odg", "odf", "odb", "odc", "odi", "odm", "ott", "ots", "otp", "otg", "oth",
|
|
||||||
"sxw", "sxc", "sxi", "sxd", "sxg", "stc", "sti", "stw", "sxm",
|
|
||||||
"pages", "numbers", "key",
|
|
||||||
"csv", "tsv", "xml", "html", "htm", "tex", "md", "markdown",
|
|
||||||
"epub", "mobi", "azw", "azw3", "fb2",
|
|
||||||
"wps", "wpt", "et", "dps", "vsd", "vsdx",
|
|
||||||
"java", "py", "cpp", "c", "h", "js", "css", "php", "sql", "json", "yaml", "yml", "sh", "bat",
|
|
||||||
"one", "note"));
|
|
||||||
|
|
||||||
private final String displayName;
|
private final String displayName;
|
||||||
private final List<String> allowedExtensions;
|
private final List<String> allowedExtensions;
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
|
public enum ProtectionStatus {
|
||||||
|
NOT_PROTECTED,
|
||||||
|
PROCESSING,
|
||||||
|
PROTECTED,
|
||||||
|
FAILED,
|
||||||
|
FAILED_SAVE
|
||||||
|
}
|
||||||
@@ -9,7 +9,6 @@ import ru.soune.nocopy.dto.file.*;
|
|||||||
import ru.soune.nocopy.entity.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
import ru.soune.nocopy.entity.file.FileStatus;
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
import ru.soune.nocopy.entity.file.FileType;
|
|
||||||
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
|
|||||||
@@ -1,14 +1,11 @@
|
|||||||
package ru.soune.nocopy.handler.validator;
|
package ru.soune.nocopy.handler.validator;
|
||||||
|
|
||||||
import org.apache.commons.validator.routines.DomainValidator;
|
|
||||||
import org.apache.commons.validator.routines.EmailValidator;
|
import org.apache.commons.validator.routines.EmailValidator;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import org.springframework.validation.Errors;
|
import org.springframework.validation.Errors;
|
||||||
import org.springframework.validation.Validator;
|
import org.springframework.validation.Validator;
|
||||||
import ru.soune.nocopy.dto.RegRequest;
|
import ru.soune.nocopy.dto.RegRequest;
|
||||||
|
|
||||||
import java.net.InetAddress;
|
|
||||||
import java.net.UnknownHostException;
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
@@ -156,15 +153,6 @@ public class RegRequestValidator implements Validator {
|
|||||||
errors.rejectValue("password", "password.contains.spaces",
|
errors.rejectValue("password", "password.contains.spaces",
|
||||||
"Password cannot contain spaces");
|
"Password cannot contain spaces");
|
||||||
}
|
}
|
||||||
|
|
||||||
// recomment if need complexity
|
|
||||||
// checkPasswordComplexity(password, errors);
|
|
||||||
|
|
||||||
// reccoment if need check simply standart password
|
|
||||||
// checkCommonPasswords(password, errors);
|
|
||||||
|
|
||||||
// reccoment if need check simply standart password
|
|
||||||
// checkForSequences(password, errors);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkPasswordComplexity(String password, Errors errors) {
|
private void checkPasswordComplexity(String password, Errors errors) {
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import org.springframework.data.repository.query.Param;
|
|||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
import ru.soune.nocopy.entity.file.FileStatus;
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
@@ -21,11 +22,17 @@ public interface FileEntityRepository extends JpaRepository<FileEntity, String>
|
|||||||
|
|
||||||
Optional<FileEntity> findByUploadSessionId(String uploadSessionId);
|
Optional<FileEntity> findByUploadSessionId(String uploadSessionId);
|
||||||
|
|
||||||
|
List<FileEntity> findByProtectionStatus(ProtectionStatus protectionStatus);
|
||||||
|
|
||||||
boolean existsByFilePath(String filePath);
|
boolean existsByFilePath(String filePath);
|
||||||
|
|
||||||
@Query("SELECT SUM(f.fileSize) FROM FileEntity f WHERE f.userId = :userId AND f.status = 'ACTIVE'")
|
@Query("SELECT SUM(f.fileSize) FROM FileEntity f WHERE f.userId = :userId AND f.status = 'ACTIVE'")
|
||||||
Long getTotalSizeByUserId(@Param("userId") Long userId);
|
Long getTotalSizeByUserId(@Param("userId") Long userId);
|
||||||
|
|
||||||
|
@Query("SELECT f FROM FileEntity f WHERE f.protectionStatus = null AND f.status = 'ACTIVE' OR " +
|
||||||
|
"f.protectionStatus = 'NOT_PROTECTED' AND f.status = 'ACTIVE'")
|
||||||
|
List<FileEntity> findAllActiveFilesAndNotProtected();
|
||||||
|
|
||||||
@Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.originalFileName LIKE %:keyword%")
|
@Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.originalFileName LIKE %:keyword%")
|
||||||
List<FileEntity> searchByFileName(@Param("userId") Long userId, @Param("keyword") String keyword);
|
List<FileEntity> searchByFileName(@Param("userId") Long userId, @Param("keyword") String keyword);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
package ru.soune.nocopy.service.file;
|
||||||
|
|
||||||
|
import com.vrt.NoCopyFileService;
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class FileProcessingOrchestrator {
|
||||||
|
|
||||||
|
private final NoCopyFileService noCopyFileService;
|
||||||
|
|
||||||
|
private final FileEntityRepository fileRepository;
|
||||||
|
|
||||||
|
public void initializeProcessingQueue() {
|
||||||
|
List<FileEntity> filesToProtect = fileRepository.findByProtectionStatus(ProtectionStatus.NOT_PROTECTED);
|
||||||
|
|
||||||
|
for (FileEntity fileEntity : filesToProtect) {
|
||||||
|
try {
|
||||||
|
FileProtector.FileInfo fileInfo = createFileInfo(fileEntity);
|
||||||
|
|
||||||
|
noCopyFileService.addFile(fileInfo);
|
||||||
|
|
||||||
|
log.info("Add to query: {}", fileEntity.getOriginalFileName());
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Fail add to query: {}", fileEntity.getId(), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Scheduled(fixedDelay = 120000)
|
||||||
|
public void checkNewFilesForProtection() {
|
||||||
|
List<FileEntity> newFiles = fileRepository.findAllActiveFilesAndNotProtected();
|
||||||
|
|
||||||
|
for (FileEntity fileEntity : newFiles) {
|
||||||
|
FileProtector.FileInfo fileInfo = createFileInfo(fileEntity);
|
||||||
|
|
||||||
|
noCopyFileService.addFile(fileInfo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private FileProtector.FileInfo createFileInfo(FileEntity fileEntity) {
|
||||||
|
FileProtector.Type type = determineFileType(fileEntity.getMimeType());
|
||||||
|
|
||||||
|
return new FileProtector.FileInfo(type, fileEntity.getId(), String.valueOf(fileEntity.getUserId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
private FileProtector.Type determineFileType(String mimeType) {
|
||||||
|
if (mimeType == null) {
|
||||||
|
return FileProtector.Type.IMAGE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mimeType.startsWith("image")) {
|
||||||
|
return FileProtector.Type.IMAGE;
|
||||||
|
} else if (mimeType.startsWith("video")) {
|
||||||
|
return FileProtector.Type.VIDEO;
|
||||||
|
} else if (mimeType.startsWith("audio")) {
|
||||||
|
return FileProtector.Type.AUDIO;
|
||||||
|
} else {
|
||||||
|
return FileProtector.Type.IMAGE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
package ru.soune.nocopy.service.file;
|
||||||
|
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||||
|
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class NoCopyProcessingListener implements FileProtector.ProcessingListener {
|
||||||
|
|
||||||
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStartProcessing(FileProtector.FileInfo fileInfo) {
|
||||||
|
changeStatus(ProtectionStatus.PROCESSING, fileInfo.getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onProcessingFailed(FileProtector.FileInfo fileInfo) {
|
||||||
|
changeStatus(ProtectionStatus.FAILED, fileInfo.getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSavingFailed(FileProtector.FileInfo fileInfo) {
|
||||||
|
changeStatus(ProtectionStatus.FAILED_SAVE, fileInfo.getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onFinish(FileProtector.FileInfo fileInfo) {
|
||||||
|
changeStatus(ProtectionStatus.PROTECTED, fileInfo.getId());;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void changeStatus(ProtectionStatus newStatus, String fileId) {
|
||||||
|
FileEntity fileEntity = fileEntityRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> new FileEntityNotFoundException(fileId));
|
||||||
|
fileEntity.setProtectionStatus(newStatus);
|
||||||
|
|
||||||
|
fileEntityRepository.save(fileEntity);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,166 @@
|
|||||||
|
package ru.soune.nocopy.service.file;
|
||||||
|
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import com.vrt.fileprotection.OperationResult;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ProtectionFileProvider implements FileProtector.FileProvider {
|
||||||
|
|
||||||
|
|
||||||
|
private final FileEntityRepository fileRepository;
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public File getImageFile(@NotNull String id) {
|
||||||
|
return getFileById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public File getVideoFile(@NotNull String id) {
|
||||||
|
return getFileById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public File getAudioFile(@NotNull String id) {
|
||||||
|
return getFileById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
@Override
|
||||||
|
public com.vrt.fileprotection.OperationResult writeSignature(@NotNull String s, @NotNull byte[] bytes) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
@Override
|
||||||
|
public com.vrt.fileprotection.OperationResult writeAudioFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
|
||||||
|
try {
|
||||||
|
writeProtectedFile(id, data, fileExt);
|
||||||
|
return OperationResult.Companion.success();
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Failed to create protected file: {}", id, e);
|
||||||
|
return OperationResult.Companion.failure("Failed to create protected file");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
@Override
|
||||||
|
public com.vrt.fileprotection.OperationResult writeVideoFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
|
||||||
|
try {
|
||||||
|
writeProtectedFile(id, data, fileExt);
|
||||||
|
return OperationResult.Companion.success();
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Failed to create protected file: {}", id, e);
|
||||||
|
return OperationResult.Companion.failure("Failed to create protected file");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
@Override
|
||||||
|
public com.vrt.fileprotection.OperationResult writeImageFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
|
||||||
|
try {
|
||||||
|
writeProtectedFile(id, data, fileExt);
|
||||||
|
return OperationResult.Companion.success();
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Failed to create protected file: {}", id, e);
|
||||||
|
return OperationResult.Companion.failure("Failed to create protected file");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public File getSignature(@NotNull String s) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void writeProtectedFile(String id, byte[] data, String fileExt) throws IOException {
|
||||||
|
FileEntity fileEntity = fileRepository.findById(id)
|
||||||
|
.orElseThrow(() -> new RuntimeException("File not found: " + id));
|
||||||
|
|
||||||
|
String extension = determineFileExtension(fileExt, fileEntity);
|
||||||
|
Path protectedFilePath = prepareProtectedPath(fileEntity, extension);
|
||||||
|
|
||||||
|
if (Files.exists(protectedFilePath)) {
|
||||||
|
Files.delete(protectedFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
Files.write(protectedFilePath, data);
|
||||||
|
|
||||||
|
fileEntity.setProtectedFilePath(protectedFilePath.toString());
|
||||||
|
fileEntity.setProtectedAt(LocalDateTime.now());
|
||||||
|
fileEntity.setUpdatedAt(LocalDateTime.now());
|
||||||
|
fileEntity.setFileExtension(extension);
|
||||||
|
|
||||||
|
fileRepository.save(fileEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private File getFileById(String id) {
|
||||||
|
try {
|
||||||
|
FileEntity fileEntity = fileRepository.findById(id).orElseThrow(() ->
|
||||||
|
new RuntimeException("File not found: " + id));
|
||||||
|
|
||||||
|
File file = new File(fileEntity.getFilePath());
|
||||||
|
|
||||||
|
if (!file.exists()) {
|
||||||
|
throw new RuntimeException("File not found on disk: " + fileEntity.getFilePath());
|
||||||
|
}
|
||||||
|
|
||||||
|
return file;
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Error getting file: {}", id, e);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private String determineFileExtension(String fileExt, FileEntity fileEntity) {
|
||||||
|
if (fileExt != null && !fileExt.trim().isEmpty()) {
|
||||||
|
return fileExt;
|
||||||
|
} else {
|
||||||
|
return fileEntity.getFileExtension();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private Path prepareProtectedPath(FileEntity fileEntity, String extension) throws IOException {
|
||||||
|
Path originalPath = Paths.get(fileEntity.getFilePath());
|
||||||
|
|
||||||
|
String pathStr = originalPath.toString();
|
||||||
|
pathStr = pathStr.replaceFirst("/uploads/uploads/", "/uploads/protected/");
|
||||||
|
|
||||||
|
Path protectedPath = Paths.get(pathStr);
|
||||||
|
String fileName = protectedPath.getFileName().toString();
|
||||||
|
|
||||||
|
if (extension != null) {
|
||||||
|
String nameWithoutExt = fileName;
|
||||||
|
int lastDotIndex = fileName.lastIndexOf('.');
|
||||||
|
if (lastDotIndex > 0) {
|
||||||
|
nameWithoutExt = fileName.substring(0, lastDotIndex);
|
||||||
|
}
|
||||||
|
fileName = nameWithoutExt + "." + extension;
|
||||||
|
|
||||||
|
protectedPath = protectedPath.getParent().resolve(fileName);
|
||||||
|
}
|
||||||
|
|
||||||
|
Files.createDirectories(protectedPath.getParent());
|
||||||
|
|
||||||
|
return protectedPath;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -25,7 +25,7 @@ file:
|
|||||||
storage:
|
storage:
|
||||||
base-path: ${FILE_STORAGE_PATH:/data/uploads}
|
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:1048576} # 15MB
|
chunk-size: ${FILE_CHUNK_SIZE:1048576} # 1MB
|
||||||
max-file-size: ${MAX_FILE_SIZE:10737418240} # 10GB
|
max-file-size: ${MAX_FILE_SIZE:10737418240} # 10GB
|
||||||
max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3}
|
max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3}
|
||||||
chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000} # 5 минут
|
chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000} # 5 минут
|
||||||
|
|||||||
Reference in New Issue
Block a user