backdev/no-copy
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

dev test baseurl for test
Test Workflow / test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
backdev
2026-04-22 01:06:19 +07:00
parent 83ed7c5b01
commit 6dec7838ce
3 changed files with 70 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
+7 -1
View File
@@ -22,9 +22,11 @@ import ru.soune.nocopy.repository.UserRepository;
import ru.soune.nocopy.service.file.cloud.CloudStorageService; import ru.soune.nocopy.service.file.cloud.CloudStorageService;
import java.io.IOException; import java.io.IOException;
import java.nio.channels.FileChannel;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -241,8 +243,12 @@ public class FileEntityService {
if (Files.exists(protectedFilePath)) { if (Files.exists(protectedFilePath)) {
Files.delete(protectedFilePath); Files.delete(protectedFilePath);
} }
// SEND ON DISK
try (FileChannel channel = FileChannel.open(protectedFilePath, StandardOpenOption.WRITE)) {
channel.force(true);
}
Files.write(protectedFilePath, data); // Files.write(protectedFilePath, data);
if (imageResizeService.isImage(extension)) { if (imageResizeService.isImage(extension)) {
imageResizeService.generateSizes(fileEntity, data); imageResizeService.generateSizes(fileEntity, data);
src/main/java/ru/soune/nocopy/service/file/cloud/CloudStorageService.java
-1
View File
@@ -51,7 +51,6 @@ public class CloudStorageService {
public void saveFilesToStorage(String mimeType, String extension, String sendToCloudFilePath) { public void saveFilesToStorage(String mimeType, String extension, String sendToCloudFilePath) {
AwsCredentials credentials = AwsBasicCredentials.create(key, secretKey); AwsCredentials credentials = AwsBasicCredentials.create(key, secretKey);
S3Client s3Client = S3Client.builder() S3Client s3Client = S3Client.builder()
.httpClient(ApacheHttpClient.create()) .httpClient(ApacheHttpClient.create())
.region(Region.of(region)) .region(Region.of(region))
src/main/java/ru/soune/nocopy/service/file/impl/ProtectionFileProviderImpl.java
+63 -43
View File
@@ -115,51 +115,43 @@ public class ProtectionFileProviderImpl implements FileProtector.FileProvider {
@NotNull @NotNull
@Override @Override
public com.vrt.fileprotection.OperationResult writeAudioFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) { public com.vrt.fileprotection.OperationResult writeAudioFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
log.info("__________________________________________");
try { try {
FileEntity fileEntity = fileEntityService.writeProtectedFile(id, data, fileExt); FileEntity fileEntity = fileEntityService.writeProtectedFile(id, data, fileExt);
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED"); Path filePath = Paths.get(fileEntity.getProtectedFilePath());
log.info("FILEENTITY PROTECTED"); if (!Files.exists(filePath)) {
log.info("FILEENTITY PROTECTED"); log.error("File not found after write: {}", filePath);
log.info("FILEENTITY PROTECTED"); return OperationResult.Companion.failure("File not found");
log.info("FILEENTITY PROTECTED"); }
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED"); log.info("File ready for upload: {} (size: {} bytes)", filePath, Files.size(filePath));
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED");
log.info("FILEENTITY PROTECTED : " + fileEntity.getMimeType());
log.info("FILEENTITY PROTECTED : " + fileEntity.getMimeType());
log.info("FILEENTITY PROTECTED : " + fileEntity.getFileExtension());
log.info("FILEENTITY PROTECTED : " + fileEntity.getFileExtension());
log.info("FILEENTITY PROTECTED : " + fileEntity.getProtectedFilePath());
log.info("FILEENTITY PROTECTED : " + fileEntity.getProtectedFilePath());
log.info("FILEENTITY PROTECTED : " + fileEntity.getProtectedFilePath());
log.info("FILEENTITY PROTECTED : " + fileEntity.getProtectedFilePath());
log.info("FILEENTITY PROTECTED : " + fileEntity.getProtectedFilePath());
cloudStorageService.saveFilesToStorage(fileEntity.getMimeType(), fileEntity.getFileExtension(), cloudStorageService.saveFilesToStorage(fileEntity.getMimeType(), fileEntity.getFileExtension(),
fileEntity.getProtectedFilePath()); fileEntity.getProtectedFilePath());
@@ -174,6 +166,26 @@ public class ProtectionFileProviderImpl implements FileProtector.FileProvider {
@NotNull @NotNull
@Override @Override
public com.vrt.fileprotection.OperationResult writeVideoFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) { public com.vrt.fileprotection.OperationResult writeVideoFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
log.info("++++++++++++++++++++++++++++++++++++");
try { try {
FileEntity fileEntity = fileEntityService.writeProtectedFile(id, data, fileExt); FileEntity fileEntity = fileEntityService.writeProtectedFile(id, data, fileExt);
@@ -190,6 +202,14 @@ public class ProtectionFileProviderImpl implements FileProtector.FileProvider {
@NotNull @NotNull
@Override @Override
public com.vrt.fileprotection.OperationResult writeImageFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) { public com.vrt.fileprotection.OperationResult writeImageFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
log.info("+_+_+_+_+_+_+_+_+_+_+_+_+");
log.info("+_+_+_+_+_+_+_+_+_+_+_+_+");
log.info("+_+_+_+_+_+_+_+_+_+_+_+_+");
log.info("+_+_+_+_+_+_+_+_+_+_+_+_+");
log.info("+_+_+_+_+_+_+_+_+_+_+_+_+");
log.info("+_+_+_+_+_+_+_+_+_+_+_+_+");
log.info("+_+_+_+_+_+_+_+_+_+_+_+_+");
log.info("+_+_+_+_+_+_+_+_+_+_+_+_+");
try { try {
FileEntity fileEntity = fileEntityService.writeProtectedFile(id, data, fileExt); FileEntity fileEntity = fileEntityService.writeProtectedFile(id, data, fileExt);