更新邮件发送工具

Author: wu-clan

backend/app/core/conf.py

@@ -55,6 +55,7 @@ class Settings(BaseSettings):
     EMAIL_PORT: int = 465
     EMAIL_USER: str = '[email protected]'
     EMAIL_PASSWORD: str = 'cvszjyenrlvfkeaef'  # 授权密码，非邮箱密码
+    EMAIL_SSL: bool = True
 
     # 邮箱登录验证码过期时间
     EMAIL_LOGIN_CODE_MAX_AGE: int = 60 * 2  # 时效 60 * 2 = 2 分钟

backend/app/utils/send_email.py

@@ -17,29 +17,31 @@
 def send_email_verification_code(send_to, code, text=SEND_RESET_PASSWORD_TEXT):
     """
     发送电子邮件验证码
+
     :param send_to: 收件人
     :param code: 验证码
     :param text: 邮件文本内容
     :return:
     """
-    _text = text.replace(str(_only_one), code)
+    _text = text.replace(_only_one, code)
     message = MIMEMultipart()
-    subject = settings.EMAIL_DESCRIPTION
     content = MIMEText(_text, _charset="utf-8")
     message['from'] = settings.EMAIL_USER
-    message['subject'] = subject
+    message['subject'] = settings.EMAIL_DESCRIPTION
     message.attach(content)
 
     # 登录smtp服务器并发送邮件
-    smtp = smtplib.SMTP()
     try:
+        if settings.EMAIL_SSL:
+            smtp = smtplib.SMTP_SSL(host=settings.EMAIL_HOST, port=settings.EMAIL_PORT)
+        else:
+            smtp = smtplib.SMTP(host=settings.EMAIL_HOST, port=settings.EMAIL_PORT)
         smtp.connect(settings.EMAIL_SERVER)
         smtp.login(settings.EMAIL_USER, settings.EMAIL_PASSWORD)
         smtp.sendmail(message['from'], send_to, message.as_string())
+        smtp.quit()
     except Exception as e:
         log.error('邮件发送失败 {}', e)
-    finally:
-        smtp.quit()
 
 
 if __name__ == '__main__':