浏览代码

设备获取域名push_region

locky 1 年之前
父节点
当前提交
c79ccca424
共有 1 个文件被更改,包括 6 次插入3 次删除
  1. 6 3
      Controller/SerialNumberController.py

+ 6 - 3
Controller/SerialNumberController.py

@@ -745,18 +745,22 @@ class SerialNumberView(View):
 
 
         try:
         try:
             serial_number = serial_number[:6]
             serial_number = serial_number[:6]
-
             device_domain_region_qs = DeviceDomainRegionModel.objects.filter(serial_number=serial_number).values(
             device_domain_region_qs = DeviceDomainRegionModel.objects.filter(serial_number=serial_number).values(
                 'region_id')
                 'region_id')
             if not device_domain_region_qs.exists():
             if not device_domain_region_qs.exists():
                 return response.json(173)
                 return response.json(173)
+
             region_id = device_domain_region_qs[0]['region_id']
             region_id = device_domain_region_qs[0]['region_id']
             region_qs = RegionModel.objects.filter(id=region_id).values('api', 'push_api')
             region_qs = RegionModel.objects.filter(id=region_id).values('api', 'push_api')
             if not region_qs.exists():
             if not region_qs.exists():
                 return response.json(173)
                 return response.json(173)
+
+            # 国内和测试的推送存储地区为国内
+            push_region = 2 if region_id in [1, 5] else 1
             res = {
             res = {
                 'api': region_qs[0]['api'],
                 'api': region_qs[0]['api'],
-                'push_api': region_qs[0]['push_api']
+                'push_api': region_qs[0]['push_api'],
+                'push_region': push_region
             }
             }
             return response.json(0, res)
             return response.json(0, res)
         except Exception as e:
         except Exception as e:
@@ -927,4 +931,3 @@ class SerialNumberView(View):
         except Exception as e:
         except Exception as e:
             LOGGER.info('{}判断是否4G设备异常,errLine:{}, errMsg:{}'.format(serial_number, e.__traceback__.tb_lineno, repr(e)))
             LOGGER.info('{}判断是否4G设备异常,errLine:{}, errMsg:{}'.format(serial_number, e.__traceback__.tb_lineno, repr(e)))
             return False
             return False
-