@@ -40,10 +40,7 @@ public class FileSimilarityService {
|
||||
|
||||
private final FileEntityRepository fileEntityRepository;
|
||||
|
||||
// @Value("${server.baseurl}")
|
||||
// private String baseUrl;
|
||||
|
||||
@Value("${BASE_URL}")
|
||||
@Value("${server.baseurl}")
|
||||
private String baseUrl;
|
||||
|
||||
public List<SimilarFileDTO> findDuplicateByHammingDistance(String fileId, int hammingDistance,
|
||||
@@ -242,8 +239,7 @@ public class FileSimilarityService {
|
||||
.uploadDate(similarImageProjection.getUploadDate())
|
||||
.status(similarImageProjection.getProtectionStatus())
|
||||
// .url(baseUrl + "/api/files/protected/" + similarImageProjection.getId())
|
||||
.url("https://workspace.not-copy.com" + "/api/files/protected/" + similarImageProjection.getId() + "/thumbnail")
|
||||
// .url(baseUrl + "/api/files/protected/" + similarImageProjection.getId() + "/thumbnail")
|
||||
.url(baseUrl + "/api/files/protected/" + similarImageProjection.getId() + "/thumbnail")
|
||||
.build();
|
||||
}
|
||||
|
||||
|
||||
@@ -42,10 +42,7 @@ public class EmailService {
|
||||
@Value("${app.email.verification.drop-password-subject}")
|
||||
private String dropPasswordSubject;
|
||||
|
||||
// @Value("${server.baseurl}")
|
||||
// private String baseUrl;
|
||||
|
||||
@Value("${BASE_URL}")
|
||||
@Value("${server.baseurl}")
|
||||
private String baseUrl;
|
||||
|
||||
@Value("${server.front.port}")
|
||||
@@ -73,8 +70,7 @@ public class EmailService {
|
||||
throws MessagingException, IOException {
|
||||
String htmlContent = loadAndProcessTemplate(Map.of("username", user.getFullName(),
|
||||
"current_tokens", String.valueOf(currentTokens), "missing_tokens",
|
||||
// String.valueOf(missingTokens), "link_to_token_board", baseUrl + "/pages/payment"),
|
||||
String.valueOf(missingTokens), "link_to_token_board", "https://workspace.not-copy.com" + "/pages/payment"),
|
||||
String.valueOf(missingTokens), "link_to_token_board", baseUrl + "/pages/payment"),
|
||||
"templates/token-not-found.html");
|
||||
|
||||
sendEmail("noreply@no-copy.ru", user.getEmail(), standartAdressFrom, htmlContent);
|
||||
@@ -149,8 +145,7 @@ public class EmailService {
|
||||
String htmlContent = loadAndProcessTemplate(user.getFullName(), code,
|
||||
"templates/reset-password.html");
|
||||
//TODO frontPort убрать после настройки редиректа nginx
|
||||
// String resetLink = escapeHtml(baseUrl + "/reset-password?email=" + user.getEmail());
|
||||
String resetLink = escapeHtml("https://workspace.not-copy.com" + "/reset-password?email=" + user.getEmail());
|
||||
String resetLink = escapeHtml(baseUrl + "/reset-password?email=" + user.getEmail());
|
||||
htmlContent = htmlContent.replace("{{resetLink}}", resetLink);
|
||||
|
||||
helper.setText(htmlContent, true);
|
||||
|
||||
@@ -86,10 +86,7 @@ public class SearchImageService {
|
||||
@Value("${searchapi.api-key:}")
|
||||
private String searchApiKey;
|
||||
|
||||
// @Value("${server.baseurl}")
|
||||
// private String appBaseUrl;
|
||||
|
||||
@Value("${BASE_URL}")
|
||||
@Value("${server.baseurl}")
|
||||
private String appBaseUrl;
|
||||
|
||||
@PostConstruct
|
||||
@@ -113,8 +110,7 @@ public class SearchImageService {
|
||||
);
|
||||
}
|
||||
|
||||
// String publicUrl = String.format("%s/api/files/public/%s", appBaseUrl, fileEntity.getId());
|
||||
String publicUrl = String.format("%s/api/files/public/%s", "https://workspace.not-copy.com", fileEntity.getId());
|
||||
String publicUrl = String.format("%s/api/files/public/%s", appBaseUrl, fileEntity.getId());
|
||||
|
||||
log.info("Searching reverse for image: {}", publicUrl);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user