# Conflicts: # src/main/java/ru/soune/nocopy/configuration/HandlerConfig.java
This commit is contained in:
@@ -1,10 +1,10 @@
|
|||||||
POSTGRES_DB=no_copy_
|
POSTGRES_DB=no_copy_
|
||||||
POSTGRES_USER=postgres
|
POSTGRES_USER=ncp_db
|
||||||
POSTGRES_PASSWORD=postgres
|
POSTGRES_PASSWORD=ncpDbApp
|
||||||
POSTGRES_PORT=5432
|
POSTGRES_PORT=5432
|
||||||
POSTGRES_HOST=postgres
|
POSTGRES_HOST=postgres
|
||||||
|
|
||||||
REDIS_HOST=redis
|
REDIS_HOST=redis
|
||||||
REDIS_PORT=6379
|
REDIS_PORT=6379
|
||||||
|
|
||||||
SERVER_PORT=8080
|
SERVER_PORT=8080
|
||||||
+1
-1
@@ -16,4 +16,4 @@ RUN mkdir -p /data/uploads && chmod 755 /data/uploads
|
|||||||
|
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
CMD ["java", "-jar", "app.jar"]
|
CMD ["java", "-jar", "app.jar"]
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
Создаем сеть:
|
||||||
|
docker network create app-network
|
||||||
|
|
||||||
|
Войти в БД:
|
||||||
|
docker exec -it postgres psql -U ncp_db -d no_copy_
|
||||||
|
|
||||||
|
Выполнить команду:
|
||||||
|
\du
|
||||||
|
|
||||||
|
Должен быть один пользователь:
|
||||||
|
List of roles
|
||||||
|
Role name | Attributes
|
||||||
|
-----------+------------------------------------------------------------
|
||||||
|
ncp_db | Superuser, Create role, Create DB, Replication, Bypass RLS
|
||||||
|
|
||||||
|
суперпользователь БД:
|
||||||
|
postgres/postgres
|
||||||
|
пользователь бд для бэка
|
||||||
|
ncp_db / ncpDbApp
|
||||||
|
|
||||||
|
Подключение к БД для приложения,если volume не существует :
|
||||||
|
|
||||||
|
Создаться автоматически.
|
||||||
|
|
||||||
|
Если уже существует volume :
|
||||||
|
|
||||||
|
docker exec -it postgres psql -U postgres -d postgres
|
||||||
|
|
||||||
|
CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
|
||||||
|
|
||||||
|
GRANT ALL PRIVILEGES ON DATABASE no_copy_ TO ncp_db;
|
||||||
|
|
||||||
|
\du
|
||||||
|
|
||||||
|
\q
|
||||||
|
|
||||||
|
-------
|
||||||
|
|
||||||
|
psql -U postgres -d no_copy_
|
||||||
|
|
||||||
|
-- база
|
||||||
|
|
||||||
|
GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
|
||||||
|
|
||||||
|
-- схема
|
||||||
|
|
||||||
|
GRANT USAGE ON SCHEMA public TO ncp_db;
|
||||||
|
|
||||||
|
-- существующие таблицы
|
||||||
|
|
||||||
|
GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
|
||||||
|
|
||||||
|
-- существующие sequence (очень важно для id)
|
||||||
|
|
||||||
|
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
|
||||||
|
|
||||||
|
-- будущие таблицы
|
||||||
|
|
||||||
|
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
||||||
|
GRANT ALL ON TABLES TO ncp_db;
|
||||||
|
|
||||||
|
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
||||||
|
GRANT ALL ON SEQUENCES TO ncp_db;
|
||||||
|
|
||||||
|
|
||||||
|
Зайти в контейнер:
|
||||||
|
docker exec -it {name} bash
|
||||||
|
|
||||||
|
|||||||
@@ -31,6 +31,10 @@ dependencies {
|
|||||||
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
||||||
implementation 'commons-validator:commons-validator:1.7'
|
implementation 'commons-validator:commons-validator:1.7'
|
||||||
|
|
||||||
|
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'
|
||||||
|
implementation 'tools.jackson.core:jackson-core:3.0.3'
|
||||||
|
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
|
||||||
|
|
||||||
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
|
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
|
||||||
annotationProcessor 'org.projectlombok:lombok'
|
annotationProcessor 'org.projectlombok:lombok'
|
||||||
|
|
||||||
|
|||||||
+17
-9
@@ -18,7 +18,7 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres:17
|
image: postgres:17.7
|
||||||
restart: always
|
restart: always
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
@@ -30,14 +30,15 @@ services:
|
|||||||
memory: 1G
|
memory: 1G
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: no_copy_
|
POSTGRES_DB: no_copy_
|
||||||
POSTGRES_USER: postgres
|
POSTGRES_USER: ${POSTGRES_USER}
|
||||||
POSTGRES_PASSWORD: postgres
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
POSTGRES_SHARED_BUFFERS: 512MB
|
POSTGRES_SHARED_BUFFERS: 512MB
|
||||||
POSTGRES_EFFECTIVE_CACHE_SIZE: 1536MB
|
POSTGRES_EFFECTIVE_CACHE_SIZE: 1536MB
|
||||||
ports:
|
ports:
|
||||||
- "54320:5432"
|
- "54320:5432"
|
||||||
volumes:
|
volumes:
|
||||||
- pgdata:/var/lib/postgresql/data
|
- pgdata:/var/lib/postgresql/data
|
||||||
|
- ./init-scripts:/docker-entrypoint-initdb.d:ro
|
||||||
container_name: postgres
|
container_name: postgres
|
||||||
networks:
|
networks:
|
||||||
app-network:
|
app-network:
|
||||||
@@ -58,14 +59,17 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
FILE_STORAGE_PATH: /data/uploads
|
FILE_STORAGE_PATH: /data/uploads
|
||||||
MAX_FILE_SIZE: 10737418240
|
MAX_FILE_SIZE: 10737418240
|
||||||
# FILE_CHUNK_SIZE: 1048576
|
|
||||||
FILE_CHUNK_SIZE: 1000000
|
FILE_CHUNK_SIZE: 1000000
|
||||||
POSTGRES_DB: no_copy_
|
POSTGRES_DB: no_copy_
|
||||||
POSTGRES_USER: postgres
|
POSTGRES_USER: ${POSTGRES_USER}
|
||||||
POSTGRES_PASSWORD: postgres
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
POSTGRES_PORT: 5432
|
POSTGRES_PORT: 5432
|
||||||
POSTGRES_HOST: db
|
POSTGRES_HOST: db
|
||||||
STORAGE_SERVICE_URL: http://storage:8081
|
STORAGE_SERVICE_URL: http://storage:8081
|
||||||
|
SPRING_PROFILES_ACTIVE: docker
|
||||||
|
YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
|
||||||
|
YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
|
||||||
|
YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
ports:
|
ports:
|
||||||
@@ -78,6 +82,10 @@ services:
|
|||||||
- api
|
- api
|
||||||
volumes:
|
volumes:
|
||||||
- uploads_data:/data/uploads:rw
|
- uploads_data:/data/uploads:rw
|
||||||
|
healthcheck:
|
||||||
|
test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d no_copy_" ]
|
||||||
|
interval: 10s
|
||||||
|
retries: 5
|
||||||
|
|
||||||
grafana:
|
grafana:
|
||||||
image: grafana/grafana:10.3.1
|
image: grafana/grafana:10.3.1
|
||||||
@@ -121,7 +129,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'
|
||||||
@@ -149,7 +157,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'
|
||||||
@@ -174,7 +182,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'
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
stage('Deploy with docker-compose') {
|
stage('Deploy with docker-compose') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
@@ -38,71 +39,73 @@ pipeline {
|
|||||||
credentialsId: 'server-root-password',
|
credentialsId: 'server-root-password',
|
||||||
usernameVariable: 'SSH_USER',
|
usernameVariable: 'SSH_USER',
|
||||||
passwordVariable: 'SSH_PASS'
|
passwordVariable: 'SSH_PASS'
|
||||||
)
|
),
|
||||||
|
string(credentialsId: 'DB_USER', variable: 'DB_USER'),
|
||||||
|
string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
|
||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
echo "Deploying branch: ${params.BRANCH}"
|
echo "Deploying branch: ${params.BRANCH}"
|
||||||
|
|
||||||
echo "Copying files to server..."
|
echo "Copying files to server..."
|
||||||
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
|
sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
|
||||||
sshpass -p '$SSH_PASS' scp -r -o StrictHostKeyChecking=no ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
sshpass -p '$SSH_PASS' scp -r -o StrictHostKeyChecking=no ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
|
||||||
|
|
||||||
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 '1. Остановка старого приложения...'
|
echo '1. Остановка старого приложения...'
|
||||||
docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
|
docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
|
docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
|
||||||
|
|
||||||
echo '2. Удаление старых образов...'
|
echo '2. Удаление старых образов...'
|
||||||
docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
|
docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
|
||||||
|
|
||||||
echo '3. Создание сети если нужно...'
|
echo '3. Создание сети если нужно...'
|
||||||
docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
|
docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
|
||||||
|
|
||||||
echo '4. Запуск инфраструктуры...'
|
echo '4. Запуск инфраструктуры...'
|
||||||
docker-compose up -d db storage
|
docker-compose up -d db storage
|
||||||
|
|
||||||
echo '5. Ожидание PostgreSQL...'
|
echo '5. Ожидание PostgreSQL...'
|
||||||
sleep 10
|
sleep 10
|
||||||
|
|
||||||
echo '6. Сборка нового образа приложения...'
|
echo '6. Сборка нового образа приложения...'
|
||||||
docker build --no-cache -t app-backend:latest .
|
docker build --no-cache -t app-backend:latest .
|
||||||
|
|
||||||
echo '7. Запуск приложения...'
|
echo '7. Запуск приложения...'
|
||||||
docker run -d \\
|
docker run -d \\
|
||||||
--name app-backend \\
|
--name app-backend \\
|
||||||
--network app-network \\
|
--network app-network \\
|
||||||
--network-alias app \\
|
--network-alias app \\
|
||||||
-p 80:8080 \\
|
-p 80:8080 \\
|
||||||
-v uploads_data:/data/uploads:rw \\
|
-v uploads_data:/data/uploads:rw \\
|
||||||
-e POSTGRES_DB=no_copy_ \\
|
-e POSTGRES_DB=no_copy_ \\
|
||||||
-e POSTGRES_USER=postgres \\
|
-e POSTGRES_USER=$DB_USER \\
|
||||||
-e POSTGRES_PASSWORD=postgres \\
|
-e POSTGRES_PASSWORD=$DB_PASSWORD \\
|
||||||
-e POSTGRES_PORT=5432 \\
|
-e POSTGRES_PORT=5432 \\
|
||||||
-e POSTGRES_HOST=db \\
|
-e POSTGRES_HOST=db \\
|
||||||
--restart unless-stopped \\
|
--restart unless-stopped \\
|
||||||
app-backend:latest
|
app-backend:latest
|
||||||
|
|
||||||
echo '8. Запуск мониторинга...'
|
echo '8. Запуск мониторинга...'
|
||||||
docker-compose up -d grafana prometheus loki tempo alloy
|
docker-compose up -d grafana prometheus loki tempo alloy
|
||||||
|
|
||||||
echo '9. Проверка...'
|
echo '9. Проверка...'
|
||||||
sleep 5
|
sleep 5
|
||||||
|
|
||||||
echo 'Статус контейнеров:'
|
echo 'Статус контейнеров:'
|
||||||
docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
|
||||||
|
|
||||||
echo '10. Проверка health...'
|
echo '10. Проверка health...'
|
||||||
if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
|
if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
|
||||||
echo 'Приложение работает'
|
echo 'Приложение работает'
|
||||||
echo 'URL: http://${params.SERVER}:80'
|
echo 'URL: http://${params.SERVER}:80'
|
||||||
else
|
else
|
||||||
echo 'Проверка health не удалась'
|
echo 'Проверка health не удалась'
|
||||||
docker logs app-backend --tail=20
|
docker logs app-backend --tail=20
|
||||||
fi
|
fi
|
||||||
"
|
"
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
DO $$
|
||||||
|
BEGIN
|
||||||
|
IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = 'ncp_db') THEN
|
||||||
|
CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
|
||||||
|
END IF;
|
||||||
|
END
|
||||||
|
$$;
|
||||||
|
|
||||||
|
GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
|
||||||
|
GRANT USAGE ON SCHEMA public TO ncp_db;
|
||||||
|
|
||||||
|
GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
|
||||||
|
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
|
||||||
|
|
||||||
|
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
||||||
|
GRANT ALL ON TABLES TO ncp_db;
|
||||||
|
|
||||||
|
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
||||||
|
GRANT ALL ON SEQUENCES TO ncp_db;
|
||||||
@@ -17,6 +17,7 @@ public class HandlerConfig {
|
|||||||
FileUploadHandler upload,
|
FileUploadHandler upload,
|
||||||
FileEntityHandler file,
|
FileEntityHandler file,
|
||||||
LogoutRequestHandler logoutHandler,
|
LogoutRequestHandler logoutHandler,
|
||||||
|
ImageFoundRequestHandler imageFoundRequestHandler,
|
||||||
AuthRequestHandler authRequestHandler
|
AuthRequestHandler authRequestHandler
|
||||||
) {
|
) {
|
||||||
Map<Integer, RequestHandler> map = new HashMap<>();
|
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||||
@@ -25,6 +26,7 @@ public class HandlerConfig {
|
|||||||
map.put(20004, upload);
|
map.put(20004, upload);
|
||||||
map.put(20005, file);
|
map.put(20005, file);
|
||||||
map.put(20006, logoutHandler);
|
map.put(20006, logoutHandler);
|
||||||
|
map.put(20007, imageFoundRequestHandler);
|
||||||
map.put(20008, authRequestHandler);
|
map.put(20008, authRequestHandler);
|
||||||
|
|
||||||
return map;
|
return map;
|
||||||
|
|||||||
@@ -35,6 +35,8 @@ public class JacksonConfig {
|
|||||||
|
|
||||||
mapper.registerModule(javaTimeModule);
|
mapper.registerModule(javaTimeModule);
|
||||||
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
|
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
|
||||||
|
mapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||||
|
mapper.enable(SerializationFeature.INDENT_OUTPUT);
|
||||||
|
|
||||||
return mapper;
|
return mapper;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
public class BaseRequest {
|
public class BaseRequest {
|
||||||
@JsonProperty("version")
|
@JsonProperty("version")
|
||||||
Integer version;
|
Integer version;
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
public class BaseResponse {
|
public class BaseResponse {
|
||||||
@JsonProperty("msg_id")
|
@JsonProperty("msg_id")
|
||||||
private Integer msgId;
|
private Integer msgId;
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import jakarta.validation.constraints.Size;
|
import jakarta.validation.constraints.Size;
|
||||||
@@ -10,6 +11,7 @@ import lombok.NoArgsConstructor;
|
|||||||
@Data
|
@Data
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
public class LoginRequest {
|
public class LoginRequest {
|
||||||
|
|
||||||
@NotBlank(message = "error.not.blank") @Email(message = "error.not.email") @Size(max = 128)
|
@NotBlank(message = "error.not.blank") @Email(message = "error.not.email") @Size(max = 128)
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ public enum MessageCode {
|
|||||||
FILE_UPLOAD_ERROR(2, "File upload error"),
|
FILE_UPLOAD_ERROR(2, "File upload error"),
|
||||||
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
||||||
FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
|
FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
|
||||||
|
IMAGE_FOUND_ERROR(2, "Image found error"),
|
||||||
INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
|
INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
|
||||||
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
||||||
MSG_ID_NOT_FOUND(4, "Message id not found"),
|
MSG_ID_NOT_FOUND(4, "Message id not found"),
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
package ru.soune.nocopy.dto;
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import jakarta.validation.constraints.*;
|
import jakarta.validation.constraints.*;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
public class RegRequest {
|
public class RegRequest {
|
||||||
@NotEmpty(message = "Full name is required")
|
@NotEmpty(message = "Full name is required")
|
||||||
private String fullName;
|
private String fullName;
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import ru.soune.nocopy.entity.GenderType;
|
|||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
|
@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
|
||||||
public class UserRequest {
|
public class UserRequest {
|
||||||
@Size(min = 2)
|
@Size(min = 2)
|
||||||
private String fullName;
|
private String fullName;
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class ImageSearchRequest {
|
||||||
|
@JsonProperty("file_id")
|
||||||
|
private String fileId;
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
|
public class YandexSearchResponse {
|
||||||
|
|
||||||
|
@JsonProperty("images")
|
||||||
|
private List<ImageResult> images;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
|
public static class ImageResult {
|
||||||
|
@JsonProperty("url")
|
||||||
|
private String url;
|
||||||
|
|
||||||
|
@JsonProperty("pageUrl")
|
||||||
|
private String pageUrl;
|
||||||
|
|
||||||
|
@JsonProperty("pageTitle")
|
||||||
|
private String pageTitle;
|
||||||
|
|
||||||
|
@JsonProperty("width")
|
||||||
|
private Integer width;
|
||||||
|
|
||||||
|
@JsonProperty("height")
|
||||||
|
private Integer height;
|
||||||
|
|
||||||
|
@JsonProperty("host")
|
||||||
|
private String host;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -61,7 +61,8 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
.action(action)
|
.action(action)
|
||||||
.availableActions(Arrays.asList(
|
.availableActions(Arrays.asList(
|
||||||
"file_info", "file_by_session", "user_files",
|
"file_info", "file_by_session", "user_files",
|
||||||
"search_files", "storage_usage", "delete_file"))
|
"search_files", "storage_usage", "delete_file",
|
||||||
|
"user_files_info"))
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
return new BaseResponse(request.getMsgId(),
|
return new BaseResponse(request.getMsgId(),
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package ru.soune.nocopy.handler;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import ru.soune.nocopy.dto.BaseRequest;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
|
import ru.soune.nocopy.dto.file.ImageSearchRequest;
|
||||||
|
import ru.soune.nocopy.dto.file.YandexSearchResponse;
|
||||||
|
import ru.soune.nocopy.service.YandexSearchService;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ImageFoundRequestHandler implements RequestHandler {
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
private final YandexSearchService yandexSearchService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseResponse handle(BaseRequest request) throws Exception {
|
||||||
|
ImageSearchRequest imageSearchRequest = objectMapper.convertValue(request.getMessageBody(),
|
||||||
|
ImageSearchRequest.class);
|
||||||
|
|
||||||
|
String fileId = imageSearchRequest.getFileId();
|
||||||
|
|
||||||
|
YandexSearchResponse response = yandexSearchService.searchByFileEntity(fileId);
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), response);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,7 +13,7 @@ import java.util.*;
|
|||||||
|
|
||||||
@Component
|
@Component
|
||||||
public class RegRequestValidator implements Validator {
|
public class RegRequestValidator implements Validator {
|
||||||
private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()]{0,200}$";
|
private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()\"\"«»„‟”“”‘'’‹›❛❜❝❞〝〞〟]{1,200}$";
|
||||||
|
|
||||||
private static final String NAME_REGEX = "^[a-zA-Zа-яА-ЯёЁ\\s\\-'.]{2,100}$";
|
private static final String NAME_REGEX = "^[a-zA-Zа-яА-ЯёЁ\\s\\-'.]{2,100}$";
|
||||||
|
|
||||||
@@ -74,21 +74,6 @@ public class RegRequestValidator implements Validator {
|
|||||||
errors.rejectValue("companyName", "companyName.invalid.chars",
|
errors.rejectValue("companyName", "companyName.invalid.chars",
|
||||||
"Company name contains invalid characters");
|
"Company name contains invalid characters");
|
||||||
}
|
}
|
||||||
|
|
||||||
validateForbiddenWords(trimmedCompany, "companyName", errors,
|
|
||||||
Arrays.asList("admin", "root", "system", "test"));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void validateForbiddenWords(String text, String fieldName,
|
|
||||||
Errors errors, List<String> forbiddenWords) {
|
|
||||||
String lowerText = text.toLowerCase();
|
|
||||||
for (String word : forbiddenWords) {
|
|
||||||
if (lowerText.contains(word)) {
|
|
||||||
errors.rejectValue(fieldName, fieldName + ".forbidden.word",
|
|
||||||
"Contains forbidden word: " + word);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void validateEmail(String email, Errors errors) {
|
private void validateEmail(String email, Errors errors) {
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import java.util.Optional;
|
|||||||
public interface FileEntityRepository extends JpaRepository<FileEntity, String> {
|
public interface FileEntityRepository extends JpaRepository<FileEntity, String> {
|
||||||
|
|
||||||
List<FileEntity> findByUserId(Long userId);
|
List<FileEntity> findByUserId(Long userId);
|
||||||
|
Optional<FileEntity> findByUserIdAndChecksum(Long userId, String imageHash);
|
||||||
|
|
||||||
List<FileEntity> findByUserIdAndStatus(Long userId, FileStatus status);
|
List<FileEntity> findByUserIdAndStatus(Long userId, FileStatus status);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,162 @@
|
|||||||
|
package ru.soune.nocopy.service;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import com.fasterxml.jackson.databind.DeserializationFeature;
|
||||||
|
import jakarta.annotation.PostConstruct;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
|
import ru.soune.nocopy.dto.file.YandexSearchResponse;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||||
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
|
||||||
|
import java.io.*;
|
||||||
|
import java.net.HttpURLConnection;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.Base64;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class YandexSearchService {
|
||||||
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
@Value("${yandex.api-key}")
|
||||||
|
private String apiKey;
|
||||||
|
|
||||||
|
@Value("${yandex.folder-id}")
|
||||||
|
private String folderId;
|
||||||
|
|
||||||
|
@Value("${yandex.search-url}")
|
||||||
|
private String searchUrl;
|
||||||
|
|
||||||
|
@PostConstruct
|
||||||
|
public void init() {
|
||||||
|
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||||
|
objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public YandexSearchResponse searchByFileEntity(String fileId) throws IOException {
|
||||||
|
FileEntity fileEntity = fileEntityRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> {
|
||||||
|
throw new NotValidFieldException("File not found", new BaseResponse(20007,
|
||||||
|
MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||||
|
Map.of("fileId",fileId)));
|
||||||
|
});
|
||||||
|
byte[] fileBytes;
|
||||||
|
|
||||||
|
if (!isImageFile(fileEntity)) {
|
||||||
|
log.error("File not image: {}", fileEntity.getMimeType());
|
||||||
|
throw new NotValidFieldException("File not image", new BaseResponse(20007,
|
||||||
|
MessageCode.INVALID_FIELD.getCode(), MessageCode.INVALID_FIELD.getDescription(),
|
||||||
|
Map.of("file_type", fileEntity.getMimeType())));
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
fileBytes = readFileFromDisk(fileEntity);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new NotValidFieldException("File not found or cannot read file", new BaseResponse(20007,
|
||||||
|
MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||||
|
Map.of("fileId", fileId,
|
||||||
|
"filePath", fileEntity.getFilePath())));
|
||||||
|
}
|
||||||
|
|
||||||
|
return callYandexApi(fileBytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isImageFile(FileEntity fileEntity) {
|
||||||
|
String mimeType = fileEntity.getMimeType();
|
||||||
|
return mimeType != null && mimeType.startsWith("image");
|
||||||
|
}
|
||||||
|
|
||||||
|
private byte[] readFileFromDisk(FileEntity fileEntity) throws IOException {
|
||||||
|
Path filePath = Path.of(fileEntity.getFilePath());
|
||||||
|
|
||||||
|
if (!Files.exists(filePath)) {
|
||||||
|
throw new IOException("File not found: " + fileEntity.getFilePath());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Files.isReadable(filePath)) {
|
||||||
|
throw new IOException("Cannot read file: " + fileEntity.getFilePath());
|
||||||
|
}
|
||||||
|
|
||||||
|
return Files.readAllBytes(filePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
private YandexSearchResponse callYandexApi(byte[] imageBytes) throws IOException {
|
||||||
|
String imageBase64 = Base64.getEncoder().encodeToString(imageBytes);
|
||||||
|
String jsonRequest = String.format("{\"folderId\":\"%s\",\"data\":\"%s\",\"page\":0,\"showSimilarImages\":true}",
|
||||||
|
folderId, imageBase64);
|
||||||
|
|
||||||
|
URL url = new URL(searchUrl);
|
||||||
|
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
||||||
|
|
||||||
|
try {
|
||||||
|
connection.setRequestMethod("POST");
|
||||||
|
connection.setRequestProperty("Authorization", "Api-Key " + apiKey);
|
||||||
|
connection.setRequestProperty("Content-Type", "application/json");
|
||||||
|
connection.setRequestProperty("Accept", "application/json");
|
||||||
|
connection.setConnectTimeout(30000);
|
||||||
|
connection.setReadTimeout(30000);
|
||||||
|
connection.setDoOutput(true);
|
||||||
|
|
||||||
|
try (OutputStream os = connection.getOutputStream()) {
|
||||||
|
byte[] input = jsonRequest.getBytes("utf-8");
|
||||||
|
os.write(input, 0, input.length);
|
||||||
|
os.flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
int responseCode = connection.getResponseCode();
|
||||||
|
|
||||||
|
String responseBody;
|
||||||
|
if (responseCode == HttpURLConnection.HTTP_OK) {
|
||||||
|
try (BufferedReader br = new BufferedReader(
|
||||||
|
new InputStreamReader(connection.getInputStream(), "utf-8"))) {
|
||||||
|
responseBody = readAll(br);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
try (BufferedReader br = new BufferedReader(
|
||||||
|
new InputStreamReader(connection.getErrorStream(), "utf-8"))) {
|
||||||
|
responseBody = readAll(br);
|
||||||
|
}
|
||||||
|
throw new IOException("Error Yandex API: " + responseCode + " - " + responseBody);
|
||||||
|
}
|
||||||
|
|
||||||
|
return parseJsonResponse(responseBody);
|
||||||
|
|
||||||
|
} finally {
|
||||||
|
connection.disconnect();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private String readAll(BufferedReader reader) throws IOException {
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
String line;
|
||||||
|
while ((line = reader.readLine()) != null) {
|
||||||
|
sb.append(line);
|
||||||
|
}
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private YandexSearchResponse parseJsonResponse(String json) {
|
||||||
|
YandexSearchResponse response = null;
|
||||||
|
try {
|
||||||
|
response = objectMapper.readValue(json, YandexSearchResponse.class);
|
||||||
|
} catch (JsonProcessingException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -24,8 +24,6 @@ spring:
|
|||||||
file:
|
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:1048576} # 1MB
|
|
||||||
chunk-size: ${FILE_CHUNK_SIZE:1000000} # 1MB
|
chunk-size: ${FILE_CHUNK_SIZE:1000000} # 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}
|
||||||
@@ -52,4 +50,9 @@ logging:
|
|||||||
file:
|
file:
|
||||||
name: logs/application.log
|
name: logs/application.log
|
||||||
pattern:
|
pattern:
|
||||||
console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
|
console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
|
||||||
|
|
||||||
|
yandex:
|
||||||
|
api-key: ${YANDEX_API_KEY:AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q}
|
||||||
|
folder-id: ${YANDEX_FOLDER_ID:b1gokpdbm6qfpsou8pcd}
|
||||||
|
search-url: ${YANDEX_SEARCH_URL:https://searchapi.api.cloud.yandex.net/v2/image/search_by_image}
|
||||||
Reference in New Issue
Block a user