From daf0d4fd92e14bf1419baa2166205d2cce811145 Mon Sep 17 00:00:00 2001
From: yangjian <zmister@qq.com>
Date: Wed, 17 Jun 2020 20:58:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B5=E5=AD=90=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1=E9=85=8D=E7=BD=AE=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_admin/utils.py                    |  2 +-
 app_admin/views.py                    | 11 +++++------
 template/app_admin/admin_setting.html |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app_admin/utils.py b/app_admin/utils.py
index 227179a..94d88ae 100644
--- a/app_admin/utils.py
+++ b/app_admin/utils.py
@@ -35,7 +35,7 @@ def send_email(to_email,vcode_str):
         if ssl:
             s = smtplib.SMTP_SSL(smtp_host, int(smtp_port))  # 发件箱邮件服务器及端口号
         else:
-            s = smtplib.SMTP(smtp_host, int(smtp_host))
+            s = smtplib.SMTP(smtp_host, int(smtp_port))
         subject = "MrDoc - 重置密码验证码"
         content = "你的验证码为：{}，验证码30分钟内有效！".format(vcode_str)
 
diff --git a/app_admin/views.py b/app_admin/views.py
index bd46908..c35959c 100644
--- a/app_admin/views.py
+++ b/app_admin/views.py
@@ -640,12 +640,11 @@ def admin_setting(request):
                     name='pwd',
                     defaults={"value": pwd, "types": 'email'}
                 )
-            if ssl != None:
-                # 更新SSL
-                SysSetting.objects.update_or_create(
-                    name='smtp_ssl',
-                    defaults={"value": ssl, "types": 'email'}
-                )
+            # 更新SSL
+            SysSetting.objects.update_or_create(
+                name='smtp_ssl',
+                defaults={"value": ssl, "types": 'email'}
+            )
             email_settings = SysSetting.objects.filter(types="email")
             if email_settings.count() == 6:
                 emailer = email_settings.get(name='send_emailer')
diff --git a/template/app_admin/admin_setting.html b/template/app_admin/admin_setting.html
index b71c6df..a61a1a2 100644
--- a/template/app_admin/admin_setting.html
+++ b/template/app_admin/admin_setting.html
@@ -140,7 +140,7 @@
                     <div class="layui-form-item">
                     <label class="layui-form-label">使用SSL</label>
                     <div class="layui-input-block">
-                      <input type="checkbox" name="smtp_ssl" lay-skin="switch" lay-text="开启|关闭"  {% if email_ssl %}checked{% endif %}>
+                      <input type="checkbox" name="smtp_ssl" lay-skin="switch" lay-text="开启|关闭"  {% if email_ssl.value %}checked{% endif %}>
                     </div>
                   </div>