From 7f601fcfb3e5cdc9ffc66b72383d83ef6f79e1d6 Mon Sep 17 00:00:00 2001 From: vladp Date: Fri, 6 Mar 2026 23:52:06 +0700 Subject: [PATCH] dev async global search --- infrastructure/jenkins/deploy-backend.groovy | 7 +++++++ .../nocopy/dto/search/GlobalSearchStatusResponse.java | 2 +- src/main/resources/application-dev.yaml | 2 +- src/main/resources/application-prod.yaml | 2 +- src/main/resources/application.yaml | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/infrastructure/jenkins/deploy-backend.groovy b/infrastructure/jenkins/deploy-backend.groovy index 30fc29f..07105f2 100644 --- a/infrastructure/jenkins/deploy-backend.groovy +++ b/infrastructure/jenkins/deploy-backend.groovy @@ -27,6 +27,11 @@ pipeline { defaultValue: 'app-network-dev', description: 'Имя сети (будет создана если не существует)' ) + choice( + name: 'SPRING_PROFILE', + choices: ['dev', 'prod'], + description: 'Профиль Spring для запуска' + ) } stages { @@ -73,6 +78,7 @@ pipeline { steps { script { def buildTime = sh(script: "TZ='Asia/Novosibirsk' date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim() + def springProfile = params.SPRING_PROFILE withCredentials([ usernamePassword( credentialsId: 'server-root-password', @@ -155,6 +161,7 @@ pipeline { -e POSTGRES_PORT=5432 \\ -e POSTGRES_HOST=no_copy_${params.PORT} \\ -e FILE_STORAGE_PATH=/data/uploads \\ + -e SPRING_PROFILES_ACTIVE=${springProfile} \\ app-backend-${params.PORT}:latest echo '8. Проверка...' diff --git a/src/main/java/ru/soune/nocopy/dto/search/GlobalSearchStatusResponse.java b/src/main/java/ru/soune/nocopy/dto/search/GlobalSearchStatusResponse.java index 0634aa1..3983c19 100644 --- a/src/main/java/ru/soune/nocopy/dto/search/GlobalSearchStatusResponse.java +++ b/src/main/java/ru/soune/nocopy/dto/search/GlobalSearchStatusResponse.java @@ -14,5 +14,5 @@ public class GlobalSearchStatusResponse { private Integer progress; - private List results; +// private List results; } diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index bd1102b..597f72a 100644 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -1,2 +1,2 @@ server: - baseurl: "http://localhost" \ No newline at end of file + baseurl: "dev-workspace.not-copy.com" \ No newline at end of file diff --git a/src/main/resources/application-prod.yaml b/src/main/resources/application-prod.yaml index 2a35858..d048416 100644 --- a/src/main/resources/application-prod.yaml +++ b/src/main/resources/application-prod.yaml @@ -1,2 +1,2 @@ server: - baseurl: "http://92.242.61.23" \ No newline at end of file + baseurl: "workspace.not-copy.com" \ No newline at end of file diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 9b1d602..65731c1 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -75,7 +75,7 @@ security: server: port: ${SERVER_PORT:8080} - baseurl: "http://92.242.61.23" +# baseurl: "http://92.242.61.23" front: port: ":2998" tomcat: