From 8f1ec01b585d5d622a06c68ccda5b394222d8f59 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Fri, 8 Nov 2024 18:26:46 +0800 Subject: [PATCH] update --- web/admin/setting/notify_email.py | 4 ++-- web/core/mw.py | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/web/admin/setting/notify_email.py b/web/admin/setting/notify_email.py index a71bceb10..ce38e1cb4 100644 --- a/web/admin/setting/notify_email.py +++ b/web/admin/setting/notify_email.py @@ -61,9 +61,9 @@ def set_notify_email_test(): data = json.loads(tag_data) test_pass = mw.emailNotifyTest(data) - if test_pass: + if test_pass == True: return mw.returnData(True, '验证成功') - return mw.returnData(False, '验证失败') + return mw.returnData(False, '验证失败:'+test_pass) # 切换邮件开关 @blueprint.route('/set_notify_email_enable', endpoint='set_notify_email_enable', methods=['POST']) diff --git a/web/core/mw.py b/web/core/mw.py index deab5a480..3dc278889 100644 --- a/web/core/mw.py +++ b/web/core/mw.py @@ -1198,16 +1198,19 @@ def emailNotifyMessage(data): import utils.email as email try: if data['smtp_ssl'] == 'ssl': - email.sendSSL(data['smtp_host'], data['smtp_port'], + r = email.sendSSL(data['smtp_host'], data['smtp_port'], data['username'], data['password'], data['to_mail_addr'], data['subject'], data['content']) else: - email.send(data['smtp_host'], data['smtp_port'], + r = email.send(data['smtp_host'], data['smtp_port'], data['username'], data['password'], data['to_mail_addr'], data['subject'], data['content']) + + print(r) return True except Exception as e: print(getTracebackInfo()) + return str(e) return False