Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
83eb8f77
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
83eb8f77
编写于
4月 14, 2020
作者:
B
Bai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Update] 修改测试邮件后,配置获取不稳定的Bug(显示给settings赋值导致)
上级
0910236f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
21 addition
and
6 deletion
+21
-6
apps/settings/api.py
apps/settings/api.py
+21
-6
未找到文件。
apps/settings/api.py
浏览文件 @
83eb8f77
...
...
@@ -7,7 +7,7 @@ from smtplib import SMTPSenderRefused
from
rest_framework
import
generics
from
rest_framework.views
import
Response
,
APIView
from
django.conf
import
settings
from
django.core.mail
import
send_mail
from
django.core.mail
import
send_mail
,
get_connection
from
django.utils.translation
import
ugettext_lazy
as
_
from
.utils
import
(
...
...
@@ -35,18 +35,33 @@ class MailTestingAPI(APIView):
def
post
(
self
,
request
):
serializer
=
self
.
serializer_class
(
data
=
request
.
data
)
if
serializer
.
is_valid
():
email_host
=
serializer
.
validated_data
[
'EMAIL_HOST'
]
email_port
=
serializer
.
validated_data
[
'EMAIL_PORT'
]
email_host_user
=
serializer
.
validated_data
[
"EMAIL_HOST_USER"
]
email_host_password
=
serializer
.
validated_data
[
'EMAIL_HOST_PASSWORD'
]
email_from
=
serializer
.
validated_data
[
"EMAIL_FROM"
]
email_recipient
=
serializer
.
validated_data
[
"EMAIL_RECIPIENT"
]
email_host_user
=
serializer
.
validated_data
[
"EMAIL_HOST_USER"
]
for
k
,
v
in
serializer
.
validated_data
.
items
():
if
k
.
startswith
(
'EMAIL'
):
setattr
(
settings
,
k
,
v
)
email_use_ssl
=
serializer
.
validated_data
[
'EMAIL_USE_SSL'
]
email_use_tls
=
serializer
.
validated_data
[
'EMAIL_USE_TLS'
]
# 设置 settings 的值,会导致动态配置在当前进程失效
# for k, v in serializer.validated_data.items():
# if k.startswith('EMAIL'):
# setattr(settings, k, v)
try
:
subject
=
"Test"
message
=
"Test smtp setting"
email_from
=
email_from
or
email_host_user
email_recipient
=
email_recipient
or
email_from
send_mail
(
subject
,
message
,
email_from
,
[
email_recipient
])
connection
=
get_connection
(
host
=
email_host
,
port
=
email_port
,
uesrname
=
email_host_user
,
password
=
email_host_password
,
use_tls
=
email_use_tls
,
use_ssl
=
email_use_ssl
,
)
send_mail
(
subject
,
message
,
email_from
,
[
email_recipient
],
connection
=
connection
)
except
SMTPSenderRefused
as
e
:
resp
=
e
.
smtp_error
if
isinstance
(
resp
,
bytes
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录