Selaa lähdekoodia

修复保存设备地区信息token认证存在问题

locky 2 vuotta sitten
vanhempi
commit
7f7e1d04ca
1 muutettua tiedostoa jossa 13 lisäystä ja 5 poistoa
  1. 13 5
      Controller/SerialNumberController.py

+ 13 - 5
Controller/SerialNumberController.py

@@ -376,15 +376,16 @@ class SerialNumberView(View):
             return response(444)
             return response(444)
 
 
         try:
         try:
-            token_obj = TokenObject(token)
-            if token_obj.code != 0:
-                return response.json(token_obj.code)
-            response.lang = token_obj.lang
-
             serial_number = serial_number[:9]
             serial_number = serial_number[:9]
 
 
             # 不是美洲服,请求美洲域名保存数据
             # 不是美洲服,请求美洲域名保存数据
             if CONFIG_INFO != CONFIG_US:
             if CONFIG_INFO != CONFIG_US:
+                # token认证
+                token_obj = TokenObject(token)
+                if token_obj.code != 0:
+                    return response.json(token_obj.code)
+                response.lang = token_obj.lang
+
                 url = SERVER_DOMAIN_US + 'serialNumber/saveRegion'
                 url = SERVER_DOMAIN_US + 'serialNumber/saveRegion'
                 data = request_dict.dict()
                 data = request_dict.dict()
                 data['ip'] = CommonService.get_ip_address(request)
                 data['ip'] = CommonService.get_ip_address(request)
@@ -396,6 +397,7 @@ class SerialNumberView(View):
                     assert res['result_code'] == 0
                     assert res['result_code'] == 0
                 except (TimeoutError, AssertionError):
                 except (TimeoutError, AssertionError):
                     return response.json(5)
                     return response.json(5)
+            # 美洲服,处理请求和保存数据
             else:
             else:
                 data = {}
                 data = {}
 
 
@@ -406,6 +408,12 @@ class SerialNumberView(View):
                     data['region_id'] = region_id
                     data['region_id'] = region_id
                     data['ip'] = request_dict.get('ip', '')
                     data['ip'] = request_dict.get('ip', '')
                 else:
                 else:
+                    # token认证
+                    token_obj = TokenObject(token)
+                    if token_obj.code != 0:
+                        return response.json(token_obj.code)
+                    response.lang = token_obj.lang
+
                     region_id = CommonService.confirm_region_id()
                     region_id = CommonService.confirm_region_id()
                     data['region_id'] = region_id
                     data['region_id'] = region_id
                     data['ip'] = CommonService.get_ip_address(request)
                     data['ip'] = CommonService.get_ip_address(request)