7x31/databasir
1
0
Fork 0
mirror of https://github.com/vran-dev/databasir.git synced 2025-10-29 11:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

add useTLS property to mail setting (#277)

Browse Source 
* feat: add useSSL property to mail setting

* feat: update frontend resource

* feat: update submodule
This commit is contained in:
vran
2023-08-29 11:03:42 +08:00
committed by GitHub
parent 2592056cd7
commit 2925a57917
25 changed files with 122 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/databasir/core/domain/system/data/SystemEmailResponse.java
View File

@@ -17,5 +17,7 @@ public class SystemEmailResponse {
private Boolean useSSL;
private Boolean useTls;
private LocalDateTime createAt;
}

3
core/src/main/java/com/databasir/core/domain/system/data/SystemEmailUpdateRequest.java
View File

@@ -26,4 +26,7 @@ public class SystemEmailUpdateRequest {
@NotNull
private Boolean useSSL;
@NotNull
private Boolean useTls;
}

22
core/src/main/java/com/databasir/core/domain/system/service/SystemService.java
View File

@@ -24,16 +24,17 @@ public class SystemService {
public Optional<SystemEmailResponse> getEmailSetting() {
return sysMailDao.selectOptionTopOne()
.map(mail -> {
SystemEmailResponse response = new SystemEmailResponse();
response.setSmtpHost(mail.getSmtpHost());
response.setSmtpPort(mail.getSmtpPort());
response.setUsername(mail.getUsername());
response.setCreateAt(mail.getCreateAt());
response.setMailFrom(mail.getMailFrom());
response.setUseSSL(mail.getUseSsl());
return response;
});
.map(mail -> {
SystemEmailResponse response = new SystemEmailResponse();
response.setSmtpHost(mail.getSmtpHost());
response.setSmtpPort(mail.getSmtpPort());
response.setUsername(mail.getUsername());
response.setCreateAt(mail.getCreateAt());
response.setMailFrom(mail.getMailFrom());
response.setUseSSL(mail.getUseSsl());
response.setUseTls(mail.getUseTls());
return response;
});
}
public void deleteSystemEmail() {
@@ -50,6 +51,7 @@ public class SystemService {
sysMail.setUsername(request.getUsername());
sysMail.setMailFrom(request.getMailFrom());
sysMail.setUseSsl(request.getUseSSL());
sysMail.setUseTls(request.getUseTls());
Optional<Integer> idOpt = sysMailDao.selectOptionTopOne().map(SysMail::getId);
idOpt.ifPresent(sysMail::setId);

9
core/src/main/java/com/databasir/core/infrastructure/mail/MailSender.java
View File

@@ -13,6 +13,7 @@ import javax.mail.internet.MimeMessage;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.Collections;
import java.util.Properties;
@Component
public class MailSender {
@@ -54,11 +55,19 @@ public class MailSender {
}
sender.setUsername(properties.getUsername());
sender.setPassword(properties.getPassword());
Properties props = sender.getJavaMailProperties();
props.put("mail.smtp.auth", "true");
if (properties.getUseSsl()) {
sender.setProtocol("smtps");
props.put("mail.smtp.ssl.enable", "true");
} else {
sender.setProtocol("smtp");
}
if (properties.getUseTls()) {
props.put("mail.smtp.starttls.enable", "true");
}
sender.setDefaultEncoding(StandardCharsets.UTF_8.name());
return sender;
}