@@ -228,12 +228,6 @@ public class FileSimilarityService {
|
|||||||
} else {
|
} else {
|
||||||
level = "DIFFERENT";
|
level = "DIFFERENT";
|
||||||
}
|
}
|
||||||
log.info("baseUrl: {}", baseUrl);
|
|
||||||
log.info("baseUrl: {}", baseUrl);
|
|
||||||
log.info("baseUrl: {}", baseUrl);
|
|
||||||
log.info("baseUrl: {}", baseUrl);
|
|
||||||
log.info("baseUrl: {}", baseUrl);
|
|
||||||
log.info("baseUrl: {}", baseUrl);
|
|
||||||
|
|
||||||
return SimilarFileDTO.builder()
|
return SimilarFileDTO.builder()
|
||||||
.fileId(similarImageProjection.getId())
|
.fileId(similarImageProjection.getId())
|
||||||
@@ -248,7 +242,8 @@ public class FileSimilarityService {
|
|||||||
.uploadDate(similarImageProjection.getUploadDate())
|
.uploadDate(similarImageProjection.getUploadDate())
|
||||||
.status(similarImageProjection.getProtectionStatus())
|
.status(similarImageProjection.getProtectionStatus())
|
||||||
// .url(baseUrl + "/api/files/protected/" + similarImageProjection.getId())
|
// .url(baseUrl + "/api/files/protected/" + similarImageProjection.getId())
|
||||||
.url(baseUrl + "/api/files/protected/" + similarImageProjection.getId() + "/thumbnail")
|
.url("https://workspace.not-copy.com" + "/api/files/protected/" + similarImageProjection.getId() + "/thumbnail")
|
||||||
|
// .url(baseUrl + "/api/files/protected/" + similarImageProjection.getId() + "/thumbnail")
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -73,7 +73,8 @@ public class EmailService {
|
|||||||
throws MessagingException, IOException {
|
throws MessagingException, IOException {
|
||||||
String htmlContent = loadAndProcessTemplate(Map.of("username", user.getFullName(),
|
String htmlContent = loadAndProcessTemplate(Map.of("username", user.getFullName(),
|
||||||
"current_tokens", String.valueOf(currentTokens), "missing_tokens",
|
"current_tokens", String.valueOf(currentTokens), "missing_tokens",
|
||||||
String.valueOf(missingTokens), "link_to_token_board", baseUrl + "/pages/payment"),
|
// String.valueOf(missingTokens), "link_to_token_board", baseUrl + "/pages/payment"),
|
||||||
|
String.valueOf(missingTokens), "link_to_token_board", "https://workspace.not-copy.com" + "/pages/payment"),
|
||||||
"templates/token-not-found.html");
|
"templates/token-not-found.html");
|
||||||
|
|
||||||
sendEmail("noreply@no-copy.ru", user.getEmail(), standartAdressFrom, htmlContent);
|
sendEmail("noreply@no-copy.ru", user.getEmail(), standartAdressFrom, htmlContent);
|
||||||
@@ -148,7 +149,8 @@ public class EmailService {
|
|||||||
String htmlContent = loadAndProcessTemplate(user.getFullName(), code,
|
String htmlContent = loadAndProcessTemplate(user.getFullName(), code,
|
||||||
"templates/reset-password.html");
|
"templates/reset-password.html");
|
||||||
//TODO frontPort убрать после настройки редиректа nginx
|
//TODO frontPort убрать после настройки редиректа nginx
|
||||||
String resetLink = escapeHtml(baseUrl + "/reset-password?email=" + user.getEmail());
|
// String resetLink = escapeHtml(baseUrl + "/reset-password?email=" + user.getEmail());
|
||||||
|
String resetLink = escapeHtml("https://workspace.not-copy.com" + "/reset-password?email=" + user.getEmail());
|
||||||
htmlContent = htmlContent.replace("{{resetLink}}", resetLink);
|
htmlContent = htmlContent.replace("{{resetLink}}", resetLink);
|
||||||
|
|
||||||
helper.setText(htmlContent, true);
|
helper.setText(htmlContent, true);
|
||||||
|
|||||||
@@ -113,7 +113,8 @@ public class SearchImageService {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
String publicUrl = String.format("%s/api/files/public/%s", appBaseUrl, fileEntity.getId());
|
// 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());
|
||||||
|
|
||||||
log.info("Searching reverse for image: {}", publicUrl);
|
log.info("Searching reverse for image: {}", publicUrl);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user