From a33cf03e7ae41c84dcc09c44cf52417539a1236c Mon Sep 17 00:00:00 2001 From: vapao Date: Mon, 18 May 2020 14:44:31 +0800 Subject: [PATCH] =?UTF-8?q?U=20=E6=94=AF=E6=8C=81=E9=9D=9ESSL=E7=9A=84?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spug_api/apps/setting/views.py | 13 ++++++++----- spug_api/libs/mail.py | 7 +++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/spug_api/apps/setting/views.py b/spug_api/apps/setting/views.py index d13532f..d88db82 100644 --- a/spug_api/apps/setting/views.py +++ b/spug_api/apps/setting/views.py @@ -47,14 +47,17 @@ def ldap_test(request): def email_test(request): form, error = JsonParser( - Argument('server'), - Argument('port', type=int), - Argument('username'), - Argument('password'), + Argument('server', help='请输入邮件服务地址'), + Argument('port', type=int, help='请输入邮件服务端口号'), + Argument('username', help='请输入邮箱账号'), + Argument('password', help='请输入密码/授权码'), ).parse(request.body) if error is None: try: - server = smtplib.SMTP_SSL(form.server, form.port) + if form.port == 465: + server = smtplib.SMTP_SSL(form.server, form.port) + else: + server = smtplib.SMTP(form.server, form.port) server.login(form.username, form.password) return json_response() except Exception as e: diff --git a/spug_api/libs/mail.py b/spug_api/libs/mail.py index 3a71ac2..54acec0 100644 --- a/spug_api/libs/mail.py +++ b/spug_api/libs/mail.py @@ -6,13 +6,16 @@ import smtplib class Mail: def __init__(self, server, port, username, password, nickname=None): self.host = server - self.port = port + self.port = int(port) self.user = username self.password = password self.nickname = nickname def _get_server(self): - server = smtplib.SMTP_SSL(self.host, self.port) + if self.port == 465: + server = smtplib.SMTP_SSL(self.host, self.port) + else: + server = smtplib.SMTP(self.host, self.port) server.login(self.user, self.password) return server