PEC service is enabled only on the production server
This commit is contained in:
@@ -117,8 +117,8 @@ public class ApplicationDao {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private AssignedApplicationsRepository assignedApplicationsRepository;
|
private AssignedApplicationsRepository assignedApplicationsRepository;
|
||||||
|
|
||||||
@Value("${default_System_Receiver_Email}")
|
// @Value("${default_System_Receiver_Email}")
|
||||||
private String defaultSystemReceiverEmail;
|
// private String defaultSystemReceiverEmail;
|
||||||
|
|
||||||
@Value("${rinaldo_email}")
|
@Value("${rinaldo_email}")
|
||||||
private String rinaldoEmail;
|
private String rinaldoEmail;
|
||||||
|
|||||||
@@ -26,6 +26,9 @@ public class PecEmailService implements EmailService {
|
|||||||
@Value("${isMailSendingEnabled}")
|
@Value("${isMailSendingEnabled}")
|
||||||
private String isEmailSendingEnabled;
|
private String isEmailSendingEnabled;
|
||||||
|
|
||||||
|
@Value("${isPecServiceEnabled}")
|
||||||
|
private String isPecServiceEnabled;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private Validator validator;
|
private Validator validator;
|
||||||
|
|
||||||
@@ -55,23 +58,27 @@ public class PecEmailService implements EmailService {
|
|||||||
emailLogRequest.setSendStatus(StatusTypeEnum.SUCCESS.getValue());
|
emailLogRequest.setSendStatus(StatusTypeEnum.SUCCESS.getValue());
|
||||||
emailLogRequest.setRecipientEmails(Utils.listToCommaSeparatedString(emailRequest.getRecipient()));
|
emailLogRequest.setRecipientEmails(Utils.listToCommaSeparatedString(emailRequest.getRecipient()));
|
||||||
try {
|
try {
|
||||||
|
if (Boolean.TRUE.equals(Boolean.parseBoolean(isPecServiceEnabled))) {
|
||||||
Unirest.setTimeouts(0, 0);
|
Unirest.setTimeouts(0, 0);
|
||||||
response2 = Unirest.post(url)
|
response2 = Unirest.post(url)
|
||||||
.header("Authorization", "Bearer " + authToken)
|
.header("Authorization", "Bearer " + authToken)
|
||||||
.header("Content-Type", "application/json")
|
.header("Content-Type", "application/json")
|
||||||
.body(Utils.convertObjectToJson(emailRequest)) // Serialize the emailRequest object to JSON
|
.body(Utils.convertObjectToJson(emailRequest)) // Serialize the emailRequest object to JSON
|
||||||
.asString();
|
.asString();
|
||||||
|
}
|
||||||
}catch(Exception e) {
|
}catch(Exception e) {
|
||||||
emailLogRequest.setSendStatus(StatusTypeEnum.FAILED.getValue());
|
emailLogRequest.setSendStatus(StatusTypeEnum.FAILED.getValue());
|
||||||
emailLogRequest.setEmailServiceType(EmailServiceTypeEnum.PEC_SERVICE);
|
emailLogRequest.setEmailServiceType(EmailServiceTypeEnum.PEC_SERVICE);
|
||||||
emailLogRequest.setErrorMessage(e.getMessage());
|
emailLogRequest.setErrorMessage(e.getMessage());
|
||||||
EmailLogEntity emailLogEntity= emailLogDao.createEmailLog(emailLogRequest);
|
emailLogDao.createEmailLog(emailLogRequest);
|
||||||
throw new RuntimeException("Failed to send email via PEC: " + response2.getStatus());
|
throw new RuntimeException("Failed to send email via PEC: " + response2.getStatus());
|
||||||
}
|
}
|
||||||
|
if(response2 != null) {
|
||||||
emailLogRequest.setEmailServiceResponse(response2.getBody());
|
emailLogRequest.setEmailServiceResponse(response2.getBody());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
emailLogRequest.setEmailServiceType(EmailServiceTypeEnum.PEC_SERVICE);
|
emailLogRequest.setEmailServiceType(EmailServiceTypeEnum.PEC_SERVICE);
|
||||||
EmailLogEntity emailLogEntity= emailLogDao.createEmailLog(emailLogRequest);
|
emailLogDao.createEmailLog(emailLogRequest);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ spring.h2.console.enabled=true
|
|||||||
isVatCheckGloballyDisabled = false
|
isVatCheckGloballyDisabled = false
|
||||||
|
|
||||||
isMailSendingEnabled = true
|
isMailSendingEnabled = true
|
||||||
default_System_Receiver_Email=antonio.manca@bflows.net
|
isPecServiceEnabled = false
|
||||||
|
#default_System_Receiver_Email=antonio.manca@bflows.net
|
||||||
gepafin_email=rinaldo.bonazzo@bflows.net
|
gepafin_email=rinaldo.bonazzo@bflows.net
|
||||||
rinaldo_email=rinaldo.bonazzo@bflows.net
|
rinaldo_email=rinaldo.bonazzo@bflows.net
|
||||||
carlo_email=test@test.test
|
carlo_email=test@test.test
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ spring.jpa.show-sql=true
|
|||||||
base-url=http://localhost:8080
|
base-url=http://localhost:8080
|
||||||
|
|
||||||
isMailSendingEnabled = false
|
isMailSendingEnabled = false
|
||||||
default_System_Receiver_Email=test@test.test
|
isPecServiceEnabled = false
|
||||||
|
#default_System_Receiver_Email=test@test.test
|
||||||
gepafin_email=test@test.test
|
gepafin_email=test@test.test
|
||||||
rinaldo_email=test@test.test
|
rinaldo_email=test@test.test
|
||||||
carlo_email=test@test.test
|
carlo_email=test@test.test
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ spid.ipd.base.url=https://login.regione.umbria.it
|
|||||||
active.profile.folder=production
|
active.profile.folder=production
|
||||||
|
|
||||||
isMailSendingEnabled = true
|
isMailSendingEnabled = true
|
||||||
default_System_Receiver_Email=m.gaudino@gepafin.it,f.marinelli@gepafin.it
|
isPecServiceEnabled = true
|
||||||
|
#default_System_Receiver_Email=m.gaudino@gepafin.it,f.marinelli@gepafin.it
|
||||||
gepafin_email=bandi@pec.gepafin.it
|
gepafin_email=bandi@pec.gepafin.it
|
||||||
rinaldo_email=rinaldo.bonazzo@bflows.net
|
rinaldo_email=rinaldo.bonazzo@bflows.net
|
||||||
carlo_email=carlo.mancosu@bflows.net
|
carlo_email=carlo.mancosu@bflows.net
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ spring.datasource.password=sa
|
|||||||
spring.h2.console.enabled=true
|
spring.h2.console.enabled=true
|
||||||
base-url=http://localhost:8080
|
base-url=http://localhost:8080
|
||||||
isMailSendingEnabled = false
|
isMailSendingEnabled = false
|
||||||
default_System_Receiver_Email=test@test.test
|
isPecServiceEnabled = false
|
||||||
|
#default_System_Receiver_Email=test@test.test
|
||||||
gepafin_email=test@test.test
|
gepafin_email=test@test.test
|
||||||
rinaldo_email=test@test.test
|
rinaldo_email=test@test.test
|
||||||
carlo_email=test@test.test
|
carlo_email=test@test.test
|
||||||
|
|||||||
Reference in New Issue
Block a user