修复 修改邮箱功能 bug
This commit is contained in:
parent
ddf320ea59
commit
fa6b13da0e
13
user/User.py
13
user/User.py
|
@ -179,21 +179,20 @@ class User:
|
||||||
Returns:
|
Returns:
|
||||||
info: 回复
|
info: 回复
|
||||||
"""
|
"""
|
||||||
if v_type not in ['register', 'resetpwd']:
|
if v_type == 'register' or v_type == 'resetemail':
|
||||||
return "邮件发送失败"
|
|
||||||
|
|
||||||
if v_type == 'register':
|
|
||||||
if check_registered(self.email):
|
if check_registered(self.email):
|
||||||
return "邮箱已被注册"
|
return "邮箱已被注册"
|
||||||
code = gen_verify_code(self.email)
|
code = gen_verify_code(self.email)
|
||||||
info = sent_register_mail(self.email, code)
|
info = send_email(self.email, code, v_type)
|
||||||
return info
|
return info
|
||||||
else:
|
elif v_type == 'resetpwd':
|
||||||
if not check_registered(self.email):
|
if not check_registered(self.email):
|
||||||
return "该邮箱未注册"
|
return "该邮箱未注册"
|
||||||
code = gen_verify_code(self.email)
|
code = gen_verify_code(self.email)
|
||||||
info = send_modify_mail(self.email, code)
|
info = send_email(self.email, code, v_type)
|
||||||
return info
|
return info
|
||||||
|
else:
|
||||||
|
return "邮件发送失败"
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def feedback(content):
|
def feedback(content):
|
||||||
|
|
|
@ -190,6 +190,10 @@ def verify_email():
|
||||||
邮箱验证
|
邮箱验证
|
||||||
Parameters:
|
Parameters:
|
||||||
email 邮箱
|
email 邮箱
|
||||||
|
v_type
|
||||||
|
register 注册
|
||||||
|
resetpwd 修改密码
|
||||||
|
resetemail 修改邮箱
|
||||||
Returns:
|
Returns:
|
||||||
response: 回复
|
response: 回复
|
||||||
info: 信息
|
info: 信息
|
||||||
|
|
|
@ -15,39 +15,27 @@ from common.scripts import make_id, make_verify_code, file_path, read_json_file
|
||||||
EMAIL_API = 'http://116.63.130.34:30001'
|
EMAIL_API = 'http://116.63.130.34:30001'
|
||||||
|
|
||||||
|
|
||||||
# 邮件服务
|
def send_email(email, code, v_type):
|
||||||
def sent_register_mail(email, code):
|
|
||||||
"""
|
"""
|
||||||
发送注册邮箱验证邮件
|
发送验证码到邮箱
|
||||||
Parameters:
|
Parameters:
|
||||||
email: 邮箱
|
email: desc
|
||||||
code: 验证码
|
code: desc
|
||||||
|
v_type: desc
|
||||||
Returns:
|
Returns:
|
||||||
response: 发送结果
|
res: desc
|
||||||
"""
|
"""
|
||||||
|
types = {
|
||||||
|
"register": "注册账号",
|
||||||
|
"resetpwd": "修改密码",
|
||||||
|
"resetemail": "修改邮箱"
|
||||||
|
}
|
||||||
|
|
||||||
headers = {"Content-Type": "application/json;charset=UTF-8"}
|
headers = {"Content-Type": "application/json;charset=UTF-8"}
|
||||||
data = {"title": '【远东资信】注册邮箱验证',
|
data = {"title": "【远东资信】{}".format(types[v_type]),
|
||||||
"sender": 'fecribd@fecr.com.cn',
|
"sender": 'fecribd@fecr.com.cn',
|
||||||
"recipients": [email],
|
"recipients": [email],
|
||||||
"msg_body": "您的账户注册验证码为 【{}】,5分钟内有效".format(code)}
|
"msg_body": "您{}的验证码为 【{}】,5分钟内有效。".format(types[v_type], code)}
|
||||||
response = requests.post(url=EMAIL_API + '/send_mail', headers=headers, data=json.dumps(data))
|
|
||||||
return response.text
|
|
||||||
|
|
||||||
|
|
||||||
def send_modify_mail(email, code):
|
|
||||||
"""
|
|
||||||
# 发送修改密码邮件
|
|
||||||
Parameters:
|
|
||||||
email: 邮箱
|
|
||||||
code: 验证码
|
|
||||||
Returns:
|
|
||||||
response: 发送结果
|
|
||||||
"""
|
|
||||||
headers = {"Content-Type": "application/json;charset=UTF-8"}
|
|
||||||
data = {"title": '【远东资信】修改登陆密码',
|
|
||||||
"sender": 'fecribd@fecr.com.cn',
|
|
||||||
"recipients": [email],
|
|
||||||
"msg_body": "您的验证码为 【{}】,5分钟内有效。".format(code)}
|
|
||||||
response = requests.post(url=EMAIL_API + '/send_mail', headers=headers, data=json.dumps(data))
|
response = requests.post(url=EMAIL_API + '/send_mail', headers=headers, data=json.dumps(data))
|
||||||
return response.text
|
return response.text
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue