|
@@ -1445,6 +1445,7 @@ class wxAuthSignView(TemplateView):
|
|
|
if user_extend_qs.exists():
|
|
|
# 如果用户绑定过则直接登录
|
|
|
userID = user_extend_qs[0].userID
|
|
|
+ print(userID)
|
|
|
user_qs = Device_User.objects.filter(userID=userID)
|
|
|
return self.do_login(user_qs, response)
|
|
|
else:
|
|
@@ -1608,6 +1609,7 @@ class wxPerfectView(TemplateView):
|
|
|
else:
|
|
|
return response.json(414)
|
|
|
|
|
|
+
|
|
|
# 获取验证码
|
|
|
class OauthAuthCodeView(TemplateView):
|
|
|
|
|
@@ -1650,7 +1652,7 @@ class OauthAuthCodeView(TemplateView):
|
|
|
country_code = request_dict.get('country_code', None)
|
|
|
sign_name = request_dict.get('sign_name', None)
|
|
|
token = request_dict.get('token', None)
|
|
|
- print (token)
|
|
|
+ print(token)
|
|
|
if email is not None:
|
|
|
email = email.strip()
|
|
|
# 阿里云的发送邮箱的调用方法
|
|
@@ -1823,6 +1825,7 @@ class OauthAuthCodeView(TemplateView):
|
|
|
else:
|
|
|
return response.json(10, res["Message"])
|
|
|
|
|
|
+
|
|
|
class OauthPerfectView(TemplateView):
|
|
|
@method_decorator(csrf_exempt)
|
|
|
def dispatch(self, *args, **kwargs):
|
|
@@ -1858,7 +1861,7 @@ class OauthPerfectView(TemplateView):
|
|
|
password = request_dict.get('password', None)
|
|
|
authcode = request_dict.get('authcode', None)
|
|
|
token = request_dict.get('token', None)
|
|
|
- print (token)
|
|
|
+ print(token)
|
|
|
token = request_dict.get('token')
|
|
|
tko = TokenObject(token)
|
|
|
if password is None or authcode is None:
|
|
@@ -1867,14 +1870,14 @@ class OauthPerfectView(TemplateView):
|
|
|
password = password.strip()
|
|
|
if phone is not None:
|
|
|
phone = phone.strip()
|
|
|
- return self.do_phone(tko,phone, authcode, password, response)
|
|
|
+ return self.do_phone(tko, phone, authcode, password, response)
|
|
|
elif email is not None:
|
|
|
email = email.strip()
|
|
|
- return self.do_email(tko,email, authcode, password, response)
|
|
|
+ return self.do_email(tko, email, authcode, password, response)
|
|
|
else:
|
|
|
return response.json(444, 'phone')
|
|
|
|
|
|
- def do_email(self,tko, email, authcode, password, response):
|
|
|
+ def do_email(self, tko, email, authcode, password, response):
|
|
|
data_valid = DataValid()
|
|
|
if data_valid.email_validate(email) is not True:
|
|
|
return response.json(105)
|
|
@@ -1895,12 +1898,12 @@ class OauthPerfectView(TemplateView):
|
|
|
return response.json(121)
|
|
|
# if not reds.set_data(key=email + '_forgetPwdResetCode', val=resetCode, expire=300):
|
|
|
# return response.json(10, '生成缓存错误')
|
|
|
- user_qs.update(userEmail=email,password=make_password(password))
|
|
|
+ user_qs.update(userEmail=email, password=make_password(password))
|
|
|
if not reds.del_data(email + '_OauthPerfect'):
|
|
|
return response.json(10, '删除缓存失败')
|
|
|
return response.json(0)
|
|
|
|
|
|
- def do_phone(self,tko, phone, authcode, password, response):
|
|
|
+ def do_phone(self, tko, phone, authcode, password, response):
|
|
|
data_valid = DataValid()
|
|
|
if data_valid.mobile_validate(phone) is not True:
|
|
|
return response.json(100)
|
|
@@ -1915,18 +1918,19 @@ class OauthPerfectView(TemplateView):
|
|
|
return response.json(102)
|
|
|
reds = RedisObject()
|
|
|
resetCode = reds.get_data(key=str(phone) + '_OauthPerfect')
|
|
|
- print (resetCode)
|
|
|
+ print(resetCode)
|
|
|
if resetCode is False:
|
|
|
return response.json(90)
|
|
|
if authcode != resetCode:
|
|
|
return response.json(121)
|
|
|
# if not reds.set_data(key=phone + '_forgetPwdResetCode', val=resetCode, expire=300):
|
|
|
# return response.json(10, '生成缓存错误')
|
|
|
- user_qs.update(phone=phone,password=make_password(password))
|
|
|
+ user_qs.update(phone=phone, password=make_password(password))
|
|
|
if not reds.del_data(str(phone) + '_OauthPerfect'):
|
|
|
return response.json(10, '删除缓存失败')
|
|
|
return response.json(0)
|
|
|
|
|
|
+
|
|
|
class Un_bundingWXView(TemplateView):
|
|
|
@method_decorator(csrf_exempt)
|
|
|
def dispatch(self, *args, **kwargs):
|
|
@@ -1958,20 +1962,20 @@ class Un_bundingWXView(TemplateView):
|
|
|
|
|
|
def ValidationError(self, request_dict, response):
|
|
|
token = request_dict.get('token', None)
|
|
|
- print (token)
|
|
|
+ print(token)
|
|
|
token = request_dict.get('token')
|
|
|
tko = TokenObject(token)
|
|
|
if tko.code == 0:
|
|
|
- user_qs = Device_User.objects.filter(userID=tko.userID).values('phone','userEmail')
|
|
|
+ user_qs = Device_User.objects.filter(userID=tko.userID).values('phone', 'userEmail')
|
|
|
UserExtend = UserExtendModel.objects.filter(userID=tko.userID)
|
|
|
- if(user_qs[0]['phone']!='' or user_qs[0]['userEmail']!=''):
|
|
|
- print (user_qs[0]['phone']!='')
|
|
|
- print (user_qs[0]['userEmail']!='')
|
|
|
+ if (user_qs[0]['phone'] != '' or user_qs[0]['userEmail'] != ''):
|
|
|
+ print(user_qs[0]['phone'] != '')
|
|
|
+ print(user_qs[0]['userEmail'] != '')
|
|
|
if UserExtend.exists():
|
|
|
- UserExtend.update(authOpenID='',authType=0)
|
|
|
+ UserExtend.update(authOpenID='', authType=0)
|
|
|
else:
|
|
|
- print ('都是空')
|
|
|
+ print('都是空')
|
|
|
else:
|
|
|
return response.json(tko.code)
|
|
|
|
|
|
- return response.json(0)
|
|
|
+ return response.json(0)
|