diff --git a/README.md b/README.md index 1e518c5..ad40cf0 100644 --- a/README.md +++ b/README.md @@ -323,6 +323,7 @@ server_name dev-workspace.not-copy.com; ssl_certificate_key /etc/letsencrypt/live/dev-workspace.not-copy.com/privkey.pem; location /api/ { + proxy_pass http://localhost:3001; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java b/src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java index e54e23b..becdb7b 100644 --- a/src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java +++ b/src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java @@ -58,12 +58,6 @@ public interface FileEntityRepository extends JpaRepository List findFileByUserIdAndStatus(Long userId, FileStatus status); - @Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.mimeType = :mimeType") - List findByUserIdAndMimeType(Long userId, String mimeType); - - @Query("SELECT f FROM FileEntity f WHERE f.mimeType = :mimeType") - List findByMimeType(String mimeType); - @Query("SELECT f FROM FileEntity f WHERE f.mimeType = :mimeType AND f.userId IN :userIds") List findByMimeTypeAndUserIds(String mimeType, List userIds); @@ -75,7 +69,4 @@ public interface FileEntityRepository extends JpaRepository Page findByStatusIn(List statuses, Pageable pageable); List findByUserIdAndStatusIn(Long userId, List statuses); - - @Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.status IN :statuses") - List findByStatuses(Long userId, @Param("statuses") List statuses); } diff --git a/src/main/java/ru/soune/nocopy/service/ImageHashService.java b/src/main/java/ru/soune/nocopy/service/ImageHashService.java index 9a97a55..515513d 100644 --- a/src/main/java/ru/soune/nocopy/service/ImageHashService.java +++ b/src/main/java/ru/soune/nocopy/service/ImageHashService.java @@ -26,7 +26,9 @@ public class ImageHashService { private final CloudStorageService cloudStorageService; public Map calculateHash(Path imagePath) throws IOException { - File file = cloudStorageService.readFileFromStorageByPath(imagePath.toString()); +// File file = cloudStorageService.readFileFromStorageByPath(imagePath.toString()); + File file = imagePath.toFile(); + PHash pHash = PerceptualHashHelper.INSTANCE.generateDCTPerceptualHash(file);