Merge branch 'test' of http://192.168.136.99:3000/servers/ASJServer

Controller/IotCoreController.py

@@ -113,10 +113,12 @@ class IotCoreView(View):
         # 判断设备是否已注册证书
         if not iotdeviceInfo_qs.exists():
             thingGroup = device_version + '_' + language
-            if SERVER_TYPE == 'Ansjer.us_config.formal_settings':  # 国外正式配置使用固定ip进行测试
-                ip = '67.220.90.13'
-            else:
-                ip = CommonService.get_ip_address(request)
+            # 设备模拟国外环境测试
+            # if SERVER_TYPE == 'Ansjer.us_config.formal_settings':  # 国外正式配置使用固定ip进行测试
+            #     ip = '67.220.90.13'
+            # else:
+            #     ip = CommonService.get_ip_address(request)
+            ip = CommonService.get_ip_address(request)
             region_id = Device_Region().get_device_region(ip)
 
             iotClient = IOTClient(region_id)

Controller/SerialNumberController.py

@@ -152,10 +152,13 @@ class SerialNumberView(View):
             p2p_type = serial_number[9:10]
         try:
             if not country_id:
-                if SERVER_TYPE == 'Ansjer.us_config.formal_settings':   # 国外正式配置使用固定ip进行测试
-                    ip = '67.220.90.13'
-                else:
-                    ip = CommonService.get_ip_address(request)
+                # 设备模拟国外环境测试
+                # if SERVER_TYPE == 'Ansjer.us_config.formal_settings':   # 国外正式配置使用固定ip进行测试
+                #     ip = '67.220.90.13'
+                # else:
+                #     ip = CommonService.get_ip_address(request)
+
+                ip = CommonService.get_ip_address(request)
                 country_id = Device_Region().get_device_region(ip)
 
             # 判断序列号是否已和企业关联