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

Controller/DeviceConfirmRegion.py

@@ -8,6 +8,7 @@ from Model.models import CountryModel, RegionModel, P2PIpModel, DeviceDomainMode
 from Object.ResponseObject import ResponseObject
 from Service.CommonService import CommonService
 from Object.IPWeatherObject import IPQuery
+from Ansjer.config import LOGGER
 
 
 class ConfirmRegion(View):
@@ -60,8 +61,10 @@ class ConfirmRegion(View):
                 'push_api_url': push_api,
                 'push_region': push_region
             }
+            LOGGER.info('获取域名:ip:{},响应数据:{}'.format(ip, res))
             return response.json(0, res)
         except Exception as e:
+            LOGGER.info('获取域名异常:error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
 
@@ -74,16 +77,19 @@ class ConfirmRegionV2(View):
     @staticmethod
     def get(request, *args, **kwargs):
         response = ResponseObject()
+
+        # 获取ip
+        request.encoding = 'utf-8'
+        ip = CommonService.get_ip_address(request)
+
         serial_number = request.GET.get('serial_number', None)
         if not serial_number:
+            LOGGER.info('V2获取域名缺少序列号:ip:{}'.format(ip))
             return response.json(444)
         try:
             data_dict = {'serial_number': serial_number}
             device_domain_region_qs = DeviceDomainRegionModel.objects.filter(serial_number=serial_number)
 
-            # 获取ip
-            request.encoding = 'utf-8'
-            ip = CommonService.get_ip_address(request)
             data_dict['ip'] = ip
 
             # 获取国家编码
@@ -126,8 +132,10 @@ class ConfirmRegionV2(View):
                 'region_id': region_id,
                 'push_region': push_region
             }
+            LOGGER.info('V2获取域名:序列号:{},ip:{},响应数据:{}'.format(serial_number, ip, res))
             return response.json(0, res)
         except Exception as e:
+            LOGGER.info('V2获取域名异常:error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
 

Controller/SerialNumberController.py

@@ -361,7 +361,7 @@ class SerialNumberView(View):
         """
         send_email = S3Email()
         try:
-            if CONFIG_INFO == 'cn' or CONFIG_INFO == 'test':
+            if CONFIG_INFO == 'test':
                 return {}
             # 判断当前序列号是否绑定UID
             uid_serial_qs = UIDCompanySerialModel.objects.filter(company_serial_id=company_serial_id)
@@ -369,7 +369,7 @@ class SerialNumberView(View):
                 email_content = '{}序列号已占用当前数据库已绑定UID: {}'.format(CONFIG_INFO, serial)
                 send_email.faEmail(email_content, 'servers@ansjer.com')
                 return {}
-            if CONFIG_INFO == 'eur':  # 查美服
+            if CONFIG_INFO == 'eur' or CONFIG_INFO == 'cn':  # 查美服
                 response = requests.get("https://www.dvema.com/serialNumber/get-status",
                                         params={'serial_number': serial}, timeout=15)
             else:  # 查国服