优化保存区域信息接口

Controller/SerialNumberController.py

@@ -10,7 +10,7 @@ from django.views import View
 
 from Ansjer.config import CRCKey, CONFIG_INFO, CONFIG_US, CONFIG_EUR, \
     CONFIG_CN, USED_SERIAL_REDIS_LIST, UNUSED_SERIAL_REDIS_LIST, SERVER_DOMAIN_US, REGION_ID_LIST, SERVER_DOMAIN_TEST, \
-    SERVER_DOMAIN_LIST, SERVER_DOMAIN_CN, SERVER_DOMAIN_EUR, RESET_REGION_ID_SERIAL_REDIS_LIST, LOGGER
+    SERVER_DOMAIN_LIST, SERVER_DOMAIN_CN, SERVER_DOMAIN_EUR, RESET_REGION_ID_SERIAL_REDIS_LIST, LOGGER, CONFIG_TEST
 from Controller.UnicomCombo.UnicomComboController import UnicomComboView
 from Model.models import SerialNumberModel, CompanySerialModel, UIDCompanySerialModel, UIDModel, Device_Info, \
     iotdeviceInfoModel, LogModel, UidSetModel, UID_Bucket, \
@@ -737,6 +737,9 @@ class SerialNumberView(View):
         try:
             serial_number = serial_number[:6]
 
+            # 测试和国内服不保存区域信息
+            if CONFIG_INFO == CONFIG_CN or CONFIG_INFO == CONFIG_TEST:
+                return response.json(0)
             # 不是美洲服,请求美洲域名保存数据
             if CONFIG_INFO != CONFIG_US:
                 # token认证
@@ -750,12 +753,12 @@ class SerialNumberView(View):
                 data['ip'] = CommonService.get_ip_address(request)
                 data['region_id'] = CommonService.confirm_region_id()
                 try:
-                    r = requests.post(url=url, data=data, timeout=15)
+                    r = requests.post(url=url, data=data, timeout=10)
                     assert r.status_code == 200
                     res = r.json()
                     assert res['result_code'] == 0
-                except (TimeoutError, AssertionError):
-                    return response.json(5)
+                except Exception as e:
+                    pass
             # 美洲服,处理请求和保存数据
             else:
                 data = {}