BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 0649c315d10ffe9a3754575fe062db27ba19ab01

Authored by YunaiV
1 parent 7f0485e8

【优化】新增 sslEnable 字段，支持 outlook 邮箱

Inline Side-by-side
Showing 5 changed files with 14 additions and 1 deletions
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java
  View file @0649c31
@@ -30,6 +30,9 @@ public class MailAccountRespVO { @@ -30,6 +30,9 @@ public class MailAccountRespVO {
30 @Schema(description = "是否开启 ssl", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") 30 @Schema(description = "是否开启 ssl", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
31 private Boolean sslEnable; 31 private Boolean sslEnable;
32 32
  33 + @Schema(description = "是否开启 starttls", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
  34 + private Boolean starttlsEnable;
  35 +
33 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) 36 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
34 private LocalDateTime createTime; 37 private LocalDateTime createTime;
35 38
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSaveReqVO.java
  View file @0649c31
@@ -38,4 +38,8 @@ public class MailAccountSaveReqVO { @@ -38,4 +38,8 @@ public class MailAccountSaveReqVO {
38 @NotNull(message = "是否开启 ssl 必填") 38 @NotNull(message = "是否开启 ssl 必填")
39 private Boolean sslEnable; 39 private Boolean sslEnable;
40 40
  41 + @Schema(description = "是否开启 starttls", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
  42 + @NotNull(message = "是否开启 starttls 必填")
  43 + private Boolean starttlsEnable;
  44 +
41 } 45 }
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
  View file @0649c31
@@ -49,5 +49,9 @@ public class MailAccountDO extends BaseDO { @@ -49,5 +49,9 @@ public class MailAccountDO extends BaseDO {
49 * 是否开启 SSL 49 * 是否开启 SSL
50 */ 50 */
51 private Boolean sslEnable; 51 private Boolean sslEnable;
  52 + /**
  53 + * 是否开启 STARTTLS
  54 + */
  55 + private Boolean starttlsEnable;
52 56
53 } 57 }
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
  View file @0649c31
@@ -120,7 +120,8 @@ public class MailSendServiceImpl implements MailSendService { @@ -120,7 +120,8 @@ public class MailSendServiceImpl implements MailSendService {
120 String from = StrUtil.isNotEmpty(nickname) ? nickname + " <" + account.getMail() + ">" : account.getMail(); 120 String from = StrUtil.isNotEmpty(nickname) ? nickname + " <" + account.getMail() + ">" : account.getMail();
121 return new MailAccount().setFrom(from).setAuth(true) 121 return new MailAccount().setFrom(from).setAuth(true)
122 .setUser(account.getUsername()).setPass(account.getPassword().toCharArray()) 122 .setUser(account.getUsername()).setPass(account.getPassword().toCharArray())
123 - .setHost(account.getHost()).setPort(account.getPort()).setSslEnable(account.getSslEnable()); 123 + .setHost(account.getHost()).setPort(account.getPort())
  124 + .setSslEnable(account.getSslEnable()).setStarttlsEnable(account.getStarttlsEnable());
124 } 125 }
125 126
126 @VisibleForTesting 127 @VisibleForTesting
yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
  View file @0649c31
@@ -520,6 +520,7 @@ CREATE TABLE IF NOT EXISTS &quot;system_mail_account&quot; ( @@ -520,6 +520,7 @@ CREATE TABLE IF NOT EXISTS &quot;system_mail_account&quot; (
520 "host" varchar NOT NULL, 520 "host" varchar NOT NULL,
521 "port" int NOT NULL, 521 "port" int NOT NULL,
522 "ssl_enable" bit NOT NULL, 522 "ssl_enable" bit NOT NULL,
  523 + "starttls_enable" bit NOT NULL,
523 "creator" varchar DEFAULT '', 524 "creator" varchar DEFAULT '',
524 "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, 525 "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
525 "updater" varchar DEFAULT '', 526 "updater" varchar DEFAULT '',