美洲服国内uid数据时同步iot数据

Controller/SerialNumberController.py

@@ -389,12 +389,12 @@ class SerialNumberView(View):
             region = 'us'
             # 欧洲服同步美洲服,美洲服同步国内服数据
             if CONFIG_INFO == 'eur':
-                url = 'https://www.dvema.com/'
+                domain_name = 'https://www.dvema.com/'
             else:
                 region = 'cn'
-                url = 'https://www.zositechc.cn/'
+                domain_name = 'https://www.zositechc.cn/'
 
-            url += 'serialNumber/get-status'
+            url = domain_name + 'serialNumber/get-status'
             response = requests.get(url=url, params={'serial_number': serial}, timeout=15)
 
             if response.status_code != 200:
@@ -442,7 +442,7 @@ class SerialNumberView(View):
                 # 修改企业序列号状态为2（绑定uid）
                 CompanySerialModel.objects.filter(id=company_serial_id) \
                     .update(status=2, update_time=now_time)
-                sync_iot_result = SerialNumberView.sync_iot_core_data(serial)
+                sync_iot_result = SerialNumberView.sync_iot_core_data(domain_name, serial)
 
                 operation += '同步{}服uid数据成功,同步iot数据结果:{}'.format(region, sync_iot_result)
                 sync_result = True
@@ -895,20 +895,19 @@ class SerialNumberView(View):
             return response.json(176, str(e))
 
     @staticmethod
-    def sync_iot_core_data(serial_number):
+    def sync_iot_core_data(domain_name, serial_number):
         """
-        同步iot core 数据，目前只同步美服到欧服
+        同步iot core 数据
+        @param domain_name: 域名
         @param serial_number: 序列号
         """
         try:
-            if not CONFIG_INFO == 'eur':
-                return False
             serial = serial_number[0:6]
             device_iot_qs = iotdeviceInfoModel.objects.filter(serial_number=serial)
             if device_iot_qs.exists():
                 return False
-            response = requests.get("https://www.dvema.com/serialNumber/getIoTCoreBySerialNumber",
-                                    params={'serialNumber': serial_number}, timeout=15)
+            url = domain_name + 'serialNumber/getIoTCoreBySerialNumber'
+            response = requests.get(url=url, params={'serialNumber': serial_number}, timeout=15)
             if response.status_code != 200:
                 return False
             results = json.loads(response.text)