Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2024-10-18 15:45:30 +02:00
parent 1e3ec5721b 51696be2fe
commit 8d055ebf1b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-core/src/main/java/it/integry/ems/service/MailService.java
View File

@@ -97,7 +97,7 @@ public class MailService {
List<StbEmail> listEmail = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, StbEmail.class);
StbEmail stbEmail = listEmail != null && listEmail.size() > 0 ? listEmail.get(0) : null;
StbEmail stbEmail = listEmail != null && !listEmail.isEmpty() ? listEmail.get(0) : null;
if (stbEmail != null && stbEmail.getIdRiga() != null) {
EmailFileSharerSettings.ENCRYPTION encryption = EmailFileSharerSettings.ENCRYPTION.NONE;

3
ems-core/src/main/java/it/integry/ems/service/MailTemplateService.java
View File

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
import java.io.InputStream;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -21,7 +22,7 @@ public class MailTemplateService {
URL url = new URL("https://www2.studioml.it/ems-api/mail_models/integry-generic-communication-mail-template.html");
InputStream inputStream = url.openStream();
String htmlMailBody = IOUtils.toString(inputStream, "UTF-8");
String htmlMailBody = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
inputStream.close();
String bannerBgColor;