|
|
@@ -694,11 +694,12 @@ class v2registerView(TemplateView):
|
|
|
return self.do_login(phone_qs, response)
|
|
|
|
|
|
def do_login(self, user_qs, response):
|
|
|
+ now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
|
|
|
+ user_qs.update(last_login=now_time, online=True)
|
|
|
userID = user_qs[0].userID
|
|
|
print('userID' + userID)
|
|
|
tko = TokenObject()
|
|
|
res = tko.generate(data={'userID': userID, 'lang': response.lang})
|
|
|
- device_user_query_set = Device_User.objects.get(userID=userID)
|
|
|
# 增加角色
|
|
|
user_qs[0].role.add(Role.objects.get(rid=1))
|
|
|
role_dict = ModelService.own_role(userID=userID)
|
|
|
@@ -930,6 +931,35 @@ class v2resetPwdByCodeView(TemplateView):
|
|
|
return response.json(10, '删除缓存失败')
|
|
|
return response.json(0)
|
|
|
|
|
|
+ def do_login(self, user_qs, response):
|
|
|
+ now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
|
|
|
+ user_qs.update(last_login=now_time, online=True)
|
|
|
+ userID = user_qs[0].userID
|
|
|
+ print('userID' + userID)
|
|
|
+ tko = TokenObject()
|
|
|
+ res = tko.generate(data={'userID': userID, 'lang': response.lang})
|
|
|
+ # 增加角色
|
|
|
+ user_qs[0].role.add(Role.objects.get(rid=1))
|
|
|
+ role_dict = ModelService.own_role(userID=userID)
|
|
|
+ res['rid'] = role_dict['rid']
|
|
|
+ res['roleName'] = role_dict['roleName']
|
|
|
+ res['permList'] = ModelService.own_permission(userID)
|
|
|
+ res['userID'] = userID
|
|
|
+ # 昵称，邮箱，电话，刷新，头像
|
|
|
+ user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
|
|
|
+ userIconPath = str(user_list[0]["userIconPath"])
|
|
|
+ if userIconPath and userIconPath.find('static/') != -1:
|
|
|
+ userIconPath = userIconPath.replace('static/', '').replace('\\', '/')
|
|
|
+ res['userIconUrl'] = SERVER_DOMAIN + '/account/getAvatar/' + userIconPath
|
|
|
+ else:
|
|
|
+ res['userIconUrl'] = ''
|
|
|
+ res['NickName'] = user_list[0]["NickName"] if user_list[0]["NickName"] is not None else ''
|
|
|
+ res['username'] = user_list[0]["username"] if user_list[0]["username"] is not None else ''
|
|
|
+ res['userEmail'] = user_list[0]["userEmail"] if user_list[0]["userEmail"] is not None else ''
|
|
|
+ res['phone'] = user_list[0]["phone"] if user_list[0]["phone"] is not None else ''
|
|
|
+ print(res)
|
|
|
+ return response.json(0, res)
|
|
|
+
|
|
|
|
|
|
# 登录
|
|
|
class v2LoginView(TemplateView):
|
chenjunkai