|
@@ -40,6 +40,7 @@ from Object.UVerifyObject import UVerifyObject
|
|
|
from Service.CommonService import CommonService
|
|
|
from Service.ModelService import ModelService
|
|
|
from Service.TemplateService import TemplateService
|
|
|
+from Object.AWS.S3Email import S3Email
|
|
|
|
|
|
|
|
|
# 获取验证码
|
|
@@ -872,15 +873,9 @@ class v2authCodeView(TemplateView):
|
|
|
# 设置随机数缓存生命周期
|
|
|
send_data = TemplateService.email_message(type='register_code', language=response.lang)
|
|
|
start_time = time.time()
|
|
|
- ses = SesClassObject()
|
|
|
- # 发送邮件
|
|
|
- send_res = ses.alyEmailCode(
|
|
|
- send_address_list=[email],
|
|
|
- subject=send_data['title'],
|
|
|
- body=send_data['body'].replace("{username}", email).replace("{captcha}", str(identifyingCode))
|
|
|
- )
|
|
|
+ send_res = self.send_email(send_data, email, identifyingCode) # 发送验证码到用户邮箱
|
|
|
end_time = time.time()
|
|
|
- LOGGER.info('阿里云邮箱发送验证码执行时间: {:.3f} 秒,email:{}'.format((end_time - start_time), email))
|
|
|
+ LOGGER.info('{}阿里云邮箱发送验证码执行时间: {:.3f} 秒,email:{}'.format(CONFIG_INFO, (end_time - start_time), email))
|
|
|
if send_res is not True:
|
|
|
return response.json(44)
|
|
|
# 单个邮箱验证码有效期5分钟
|
|
@@ -893,6 +888,24 @@ class v2authCodeView(TemplateView):
|
|
|
LOGGER.info('aliyun_emailCode error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
return response.json(0)
|
|
|
|
|
|
+ @classmethod
|
|
|
+ def send_email(cls, send_data, user_email, identifyingCode):
|
|
|
+ ses = SesClassObject()
|
|
|
+ body = send_data['body'].replace("{username}", user_email).replace("{captcha}", str(identifyingCode))
|
|
|
+ title = send_data['title']
|
|
|
+ if CONFIG_INFO == CONFIG_EUR:
|
|
|
+ send_res = S3Email().send_email(send_data['title'], send_data['body'].replace("{username}", user_email)
|
|
|
+ .replace("{captcha}", str(identifyingCode)), user_email)
|
|
|
+ return send_res
|
|
|
+ # 发送邮件
|
|
|
+ send_res = ses.alyEmailCode(
|
|
|
+ send_address_list=[user_email],
|
|
|
+ subject=title,
|
|
|
+ body=body
|
|
|
+ )
|
|
|
+ return send_res
|
|
|
+
|
|
|
+
|
|
|
def phoneCode(self, phone, response, sign_name):
|
|
|
dataValid = DataValid()
|
|
|
if dataValid.mobile_validate(phone) is not True:
|