|
@@ -1484,7 +1484,6 @@ class v2forgetPwdCodeView(TemplateView):
|
|
|
if not user_qs.exists():
|
|
|
return response.json(102)
|
|
|
users = user_qs.values().first()
|
|
|
- res = {}
|
|
|
reds = RedisObject()
|
|
|
reds_key = str(phone) + '_forgetPwdResetCode'
|
|
|
resetCode = reds.get_data(key=reds_key)
|
|
@@ -1502,38 +1501,31 @@ class v2forgetPwdCodeView(TemplateView):
|
|
|
lang_id = LanguageModel.objects.filter(lang=lang).values('id')
|
|
|
region_qs = CountryLanguageModel.objects.filter(country_id=region_country, language_id=lang_id[0]['id']).values(
|
|
|
'country_name')
|
|
|
- res['region'] = region_qs[0]['country_name'] if region_qs.exists() else ''
|
|
|
+
|
|
|
aliSms = AliSmsObject()
|
|
|
if not number or number == '0':
|
|
|
- res['status'] = 0
|
|
|
user_qs.update(last_login=now_time, language=lang)
|
|
|
msg_res = aliSms.send_code_sms(phone=phone, code=resetCode, sign_name=sign_ms,
|
|
|
temp_msg='SMS_151675019')
|
|
|
if msg_res["Code"] == "OK":
|
|
|
if not reds.set_data(key=reds_key, val=resetCode, expire=300):
|
|
|
- res['Message'] = '生成缓存错误'
|
|
|
- return response.json(10, res)
|
|
|
+ return response.json(10, '生成缓存错误')
|
|
|
else:
|
|
|
- res['Message'] = msg_res['Message']
|
|
|
- return response.json(10, res)
|
|
|
+ return response.json(10, msg_res['Message'])
|
|
|
else:
|
|
|
number = int(number)
|
|
|
if number != region_country and region_country != 0:
|
|
|
- res['status'] = 1
|
|
|
user_qs.update(last_login=now_time, language=lang)
|
|
|
else:
|
|
|
- res['status'] = 0
|
|
|
user_qs.update(last_login=now_time, language=lang, region_country=number)
|
|
|
msg_res = aliSms.send_code_sms(phone=phone, code=resetCode, sign_name=sign_ms,
|
|
|
temp_msg='SMS_151675019')
|
|
|
if msg_res["Code"] == "OK":
|
|
|
if not reds.set_data(key=reds_key, val=resetCode, expire=300):
|
|
|
- res['Message'] = '生成缓存错误'
|
|
|
- return response.json(10, res)
|
|
|
+ return response.json(10, '生成缓存错误')
|
|
|
else:
|
|
|
- res['Message'] = msg_res['Message']
|
|
|
- return response.json(10, res)
|
|
|
- return response.json(0, res)
|
|
|
+ return response.json(10, msg_res['Message'])
|
|
|
+ return response.json(0)
|
|
|
|
|
|
def do_v2_send_phone_code(self, country_code, phone, response, sign_name, number, lang):
|
|
|
data_valid = DataValid()
|
|
@@ -1543,7 +1535,6 @@ class v2forgetPwdCodeView(TemplateView):
|
|
|
if not user_qs.exists():
|
|
|
return response.json(102)
|
|
|
users = user_qs.values().first()
|
|
|
- res = {}
|
|
|
reds = RedisObject()
|
|
|
reds_key = str(phone) + '_forgetPwdResetCode'
|
|
|
resetCode = reds.get_data(key=reds_key)
|
|
@@ -1571,38 +1562,30 @@ class v2forgetPwdCodeView(TemplateView):
|
|
|
lang_id = LanguageModel.objects.filter(lang=lang).values('id')
|
|
|
region_qs = CountryLanguageModel.objects.filter(country_id=region_country, language_id=lang_id[0]['id']).values(
|
|
|
'country_name')
|
|
|
- res['region'] = region_qs[0]['country_name'] if region_qs.exists() else ''
|
|
|
if not number or number == '0':
|
|
|
- res['status'] = 0
|
|
|
user_qs.update(last_login=now_time, language=lang)
|
|
|
msg_res = aliSms.send_code_sms(phone=rec_phone, code=resetCode, sign_name=sign_ms,
|
|
|
temp_msg=temp_msg)
|
|
|
if msg_res["Code"] == "OK":
|
|
|
if not reds.set_data(key=reds_key, val=resetCode, expire=300):
|
|
|
- res['Message'] = '生成缓存错误'
|
|
|
- return response.json(10, res)
|
|
|
+ return response.json(10, '生成缓存错误')
|
|
|
else:
|
|
|
- res['Message'] = msg_res['Message']
|
|
|
- return response.json(10, res)
|
|
|
+ return response.json(10, msg_res['Message'])
|
|
|
else:
|
|
|
number = int(number)
|
|
|
if number != region_country and region_country != 0:
|
|
|
- res['status'] = 1
|
|
|
user_qs.update(last_login=now_time, language=lang)
|
|
|
else:
|
|
|
- res['status'] = 0
|
|
|
user_qs.update(last_login=now_time, language=lang, region_country=number)
|
|
|
msg_res = aliSms.send_code_sms(phone=rec_phone, code=resetCode, sign_name=sign_ms,
|
|
|
temp_msg=temp_msg)
|
|
|
if msg_res["Code"] == "OK":
|
|
|
if not reds.set_data(key=reds_key, val=resetCode, expire=300):
|
|
|
- res['Message'] = '生成缓存错误'
|
|
|
- return response.json(10, res)
|
|
|
+ return response.json(10, '生成缓存错误')
|
|
|
else:
|
|
|
- res['Message'] = msg_res['Message']
|
|
|
- return response.json(10, res)
|
|
|
+ return response.json(10, msg_res['Message'])
|
|
|
|
|
|
- return response.json(0, res)
|
|
|
+ return response.json(0)
|
|
|
|
|
|
def do_send_email_code(self, email, response, number, lang):
|
|
|
data_valid = DataValid()
|