diff --git a/infrastructure/jenkins/deploy-backend.groovy b/infrastructure/jenkins/deploy-backend.groovy index dfe82ec..f7d3677 100644 --- a/infrastructure/jenkins/deploy-backend.groovy +++ b/infrastructure/jenkins/deploy-backend.groovy @@ -78,7 +78,8 @@ pipeline { steps { script { def buildTime = sh(script: "TZ='Asia/Novosibirsk' date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim() - def baseUrl = params.SPRING_PROFILE == 'prod' ? 'https://workspace.not-copy.com' : 'https://dev-workspace.not-copy.com' + def baseUrl = params.SPRING_PROFILE == 'prod' ? 'https://workspace.not-copy.com' : + 'https://dev-workspace.not-copy.com' withCredentials([ usernamePassword( credentialsId: 'server-root-password', diff --git a/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java b/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java index 8afdf25..ce1e281 100644 --- a/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java +++ b/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java @@ -40,7 +40,10 @@ public class FileSimilarityService { private final FileEntityRepository fileEntityRepository; - @Value("${server.baseurl}") +// @Value("${server.baseurl}") +// private String baseUrl; + + @Value("${BASE_URL}") private String baseUrl; public List findDuplicateByHammingDistance(String fileId, int hammingDistance, diff --git a/src/main/java/ru/soune/nocopy/service/mail/EmailService.java b/src/main/java/ru/soune/nocopy/service/mail/EmailService.java index c34212d..1bb4054 100644 --- a/src/main/java/ru/soune/nocopy/service/mail/EmailService.java +++ b/src/main/java/ru/soune/nocopy/service/mail/EmailService.java @@ -42,7 +42,10 @@ public class EmailService { @Value("${app.email.verification.drop-password-subject}") private String dropPasswordSubject; - @Value("${server.baseurl}") + // @Value("${server.baseurl}") + // private String baseUrl; + + @Value("${BASE_URL}") private String baseUrl; @Value("${server.front.port}") diff --git a/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java b/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java index d25a633..6f4d7fc 100644 --- a/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java +++ b/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java @@ -86,7 +86,10 @@ public class SearchImageService { @Value("${searchapi.api-key:}") private String searchApiKey; - @Value("${server.baseurl}") +// @Value("${server.baseurl}") +// private String appBaseUrl; + + @Value("${BASE_URL}") private String appBaseUrl; @PostConstruct