|
@@ -1085,8 +1085,10 @@ class v2LoginView(TemplateView):
|
|
def valid_login(self, user_qs, password, response):
|
|
def valid_login(self, user_qs, password, response):
|
|
if not user_qs.exists():
|
|
if not user_qs.exists():
|
|
return response.json(104)
|
|
return response.json(104)
|
|
- users = user_qs.values('role__rid', 'role__roleName', 'userID', 'role', 'NickName', 'username', 'userEmail',
|
|
|
|
- 'phone', 'password', 'userIconPath', 'user_isValid', 'is_active')[0]
|
|
|
|
|
|
+ # users = user_qs.values('role__rid', 'role__roleName', 'userID', 'role', 'NickName', 'username', 'userEmail',
|
|
|
|
+ # 'phone', 'password', 'userIconPath', 'user_isValid', 'is_active')[0]
|
|
|
|
+ users = user_qs.values('role__rid', 'role__roleName', 'userID', 'NickName', 'username', 'userEmail',
|
|
|
|
+ 'phone', 'password', 'userIconPath')[0]
|
|
if not check_password(password, users['password']):
|
|
if not check_password(password, users['password']):
|
|
return response.json(111)
|
|
return response.json(111)
|
|
userID = users['userID']
|
|
userID = users['userID']
|
|
@@ -1139,8 +1141,8 @@ class InitInfoView(View):
|
|
|
|
|
|
# 初始化设备token
|
|
# 初始化设备token
|
|
def init_uid(self, request_dict, userID, response):
|
|
def init_uid(self, request_dict, userID, response):
|
|
- token_val = request_dict.get('token_val', None)
|
|
|
|
- m_code = request_dict.get('m_code', None)
|
|
|
|
|
|
+ # token_val = request_dict.get('token_val', None)
|
|
|
|
+ # m_code = request_dict.get('m_code', None)
|
|
sm_count = SysMsgModel.objects.filter(userID_id=userID, status=0).count()
|
|
sm_count = SysMsgModel.objects.filter(userID_id=userID, status=0).count()
|
|
res = {
|
|
res = {
|
|
'usmsg': sm_count
|
|
'usmsg': sm_count
|