|
@@ -397,7 +397,7 @@ class ForgetPwdView(TemplateView):
|
|
reset_pwd = redisObj.get_data(key=userID + '_email_reset_pwd')
|
|
reset_pwd = redisObj.get_data(key=userID + '_email_reset_pwd')
|
|
if reset_pwd is False:
|
|
if reset_pwd is False:
|
|
tko = TokenObject()
|
|
tko = TokenObject()
|
|
- rest = tko.generate(data={'userID': userID,'username':userName})
|
|
|
|
|
|
+ rest = tko.generate(data={'userID': userID,'user':userName})
|
|
token = rest['access_token']
|
|
token = rest['access_token']
|
|
reset_pwd = CommonService.RandomStr(6)
|
|
reset_pwd = CommonService.RandomStr(6)
|
|
send_data = TemplateService.email_message(type='forget', language='en')
|
|
send_data = TemplateService.email_message(type='forget', language='en')
|
|
@@ -687,7 +687,7 @@ class v2registerView(TemplateView):
|
|
print('userID' + userID)
|
|
print('userID' + userID)
|
|
tko = TokenObject()
|
|
tko = TokenObject()
|
|
user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
|
|
user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
|
|
- res = tko.generate(data={'userID': userID, 'lang': response.lang, 'username': user_list[0]["username"]})
|
|
|
|
|
|
+ res = tko.generate(data={'userID': userID, 'lang': response.lang, 'user': user_list[0]["username"]})
|
|
# 增加角色
|
|
# 增加角色
|
|
user_qs[0].role.add(Role.objects.get(rid=1))
|
|
user_qs[0].role.add(Role.objects.get(rid=1))
|
|
role_dict = ModelService.own_role(userID=userID)
|
|
role_dict = ModelService.own_role(userID=userID)
|
|
@@ -926,7 +926,7 @@ class v2resetPwdByCodeView(TemplateView):
|
|
print('userID' + userID)
|
|
print('userID' + userID)
|
|
tko = TokenObject()
|
|
tko = TokenObject()
|
|
user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
|
|
user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
|
|
- res = tko.generate(data={'userID': userID, 'lang': response.lang, 'username': user_list[0]["username"]})
|
|
|
|
|
|
+ res = tko.generate(data={'userID': userID, 'lang': response.lang, 'user': user_list[0]["username"]})
|
|
# 增加角色
|
|
# 增加角色
|
|
user_qs[0].role.add(Role.objects.get(rid=1))
|
|
user_qs[0].role.add(Role.objects.get(rid=1))
|
|
role_dict = ModelService.own_role(userID=userID)
|
|
role_dict = ModelService.own_role(userID=userID)
|
|
@@ -1026,7 +1026,7 @@ class v2LoginView(TemplateView):
|
|
userID = role_qs[0]['userID']
|
|
userID = role_qs[0]['userID']
|
|
tko = TokenObject()
|
|
tko = TokenObject()
|
|
user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
|
|
user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
|
|
- res = tko.generate(data={'userID': userID, 'lang': response.lang, 'username': user_list[0]["username"]})
|
|
|
|
|
|
+ res = tko.generate(data={'userID': userID, 'lang': response.lang, 'user': user_list[0]["username"]})
|
|
if tko.code == 0:
|
|
if tko.code == 0:
|
|
now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
|
|
now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
|
|
user_qs.update(last_login=now_time, online=True, language=response.lang)
|
|
user_qs.update(last_login=now_time, online=True, language=response.lang)
|