support send email with SMTPSSLTransport

Signed-off-by: victorquan <[email protected]>
apolloconfig · Nov 28, 2023 · 8fe3b1c · 8fe3b1c
1 parent 6812a1a
commit 8fe3b1c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -31,6 +31,7 @@ Apollo 2.2.0
 * [Fix the issue that namespace content being cleared when identical content is pasted into the namespace](https://github.com/apolloconfig/apollo/pull/4922)
 * [feat(openapi): allow user create app via openapi](https://github.com/apolloconfig/apollo/pull/4954)
 * [Support grayscale feature for non-properties namespaces](https://github.com/apolloconfig/apollo/pull/4952)
+* [Support send email with SMTPSSLTransport](https://github.com/apolloconfig/apollo/pull/5018)
 
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/13?closed=1)
diff --git a/...portal/src/main/java/com/ctrip/framework/apollo/portal/component/config/PortalConfig.java b/...portal/src/main/java/com/ctrip/framework/apollo/portal/component/config/PortalConfig.java
@@ -223,6 +223,10 @@ public String emailConfigHost() {
     return getValue("email.config.host", "");
   }
 
+  public Boolean emailConfigUseSsl() {
+    return getBooleanProperty("email.config.useSsl", false);
+  }
+
   public String emailConfigUser() {
     return getValue("email.config.user", "");
   }

diff --git a/.../src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultEmailService.java b/.../src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultEmailService.java
@@ -20,6 +20,7 @@
 import com.ctrip.framework.apollo.portal.entity.bo.Email;
 import com.ctrip.framework.apollo.portal.spi.EmailService;
 import com.ctrip.framework.apollo.tracer.Tracer;
+import com.sun.mail.smtp.SMTPSSLTransport;
 import com.sun.mail.smtp.SMTPTransport;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -49,7 +50,10 @@ public void send(Email email) {
       return;
     }
 
+    Boolean useSsl = portalConfig.emailConfigUseSsl();
+
     SMTPTransport t = null;
+    SMTPSSLTransport tSsl = null;
     try {
       Properties prop = System.getProperties();
       Session session = Session.getInstance(prop, null);
@@ -64,21 +68,32 @@ public void send(Email email) {
       String user = portalConfig.emailConfigUser();
       String password = portalConfig.emailConfigPassword();
 
-      t = (SMTPTransport) session.getTransport("smtp");
-      t.connect(host, user, password);
-      msg.saveChanges();
-      t.sendMessage(msg, msg.getAllRecipients());
-      logger.debug("email response: {}", t.getLastServerResponse());
+      if (useSsl) {
+        t = (SMTPTransport) session.getTransport("smtp");
+        t.connect(host, user, password);
+        msg.saveChanges();
+        t.sendMessage(msg, msg.getAllRecipients());
+        logger.debug("email response: {}", t.getLastServerResponse());
+      } else {
+        tSsl = (SMTPSSLTransport) session.getTransport("smtps");
+        tSsl.connect(host, user, password);
+        msg.saveChanges();
+        tSsl.sendMessage(msg, msg.getAllRecipients());
+        logger.debug("email response: {}", tSsl.getLastServerResponse());
+      }
     } catch (Exception e) {
       logger.error("send email failed.", e);
       Tracer.logError("send email failed.", e);
     } finally {
-      if (t != null) {
-        try {
+      try {
+        if (t != null) {
           t.close();
-        } catch (Exception e) {
-          // nothing
         }
+        if (tSsl != null) {
+            tSsl.close();
+        }
+      } catch (Exception e) {
+        // nothing
       }
     }
   }