Quellcode durchsuchen

v3LoginView类新添加返回字段(status和region)

guanhailong vor 2 Jahren
Ursprung
Commit
ea80a74346
1 geänderte Dateien mit 29 neuen und 2 gelöschten Zeilen
  1. 29 2
      Controller/UserController.py

+ 29 - 2
Controller/UserController.py

@@ -2012,7 +2012,31 @@ class v3LoginView(TemplateView):
 
         users = user_qs.values('role__rid', 'role__roleName', 'userID', 'NickName', 'username', 'userEmail',
                                'phone', 'password', 'userIconPath', 'fingerprint_enable', 'fingerprint_key',
-                               'subscribe_email')[0]
+                               'subscribe_email', 'region_country')[0]
+        number = int(number)
+        if users[0]['region_country'] != 0 and number != users[0]['region_country']:
+            region_country = users[0]['region_country']
+            country = CountryModel.objects.filter(id=region_country).values('country_name')
+            res = {
+                'refresh_expire': '',
+                'subscribe_email': '',
+                'authType': '',
+                'access_expire': '',
+                'userEmail': '',
+                'NickName': '',
+                'userIconUrl': '',
+                'phone': '',
+                'permList': '',
+                'refresh_token': '',
+                'username': '',
+                'roleName': '',
+                'access_token': '',
+                'rid': '',
+                'userID': '',
+                'status': 1,
+                'region': country
+            }
+            return response.json(177, res)
         if not check_password(password, users['password']):
             return response.json(111)
 
@@ -2045,10 +2069,11 @@ class v3LoginView(TemplateView):
                                            push_type=push_type, token_val=token_val, m_code=m_code, lang=lang, tz=tz)
 
         now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
-        if not number or number == '0':
+        if not number or number == 0:
             user_qs.update(last_login=now_time, language=response.lang)
         else:
             user_qs.update(last_login=now_time, language=response.lang, region_country=number)
+        region = CountryModel.objects.filter(id=number).values('country_name')
 
         res['rid'] = users['role__rid']
         res['roleName'] = users['role__roleName']
@@ -2067,6 +2092,8 @@ class v3LoginView(TemplateView):
         res['phone'] = users['phone'] if users['phone'] is not None else ''
         res['authType'] = auth_type
         res['subscribe_email'] = users['subscribe_email'] if users['subscribe_email'] is not None else ''
+        res['status'] = 0
+        res['region'] = region
         return response.json(0, res)