修改数据库配置

Ansjer/cn_config/formal_settings.py

@@ -77,13 +77,13 @@ WSGI_APPLICATION = 'Ansjer.cn_config.formal_wsgi.application'
 
 # 业务数据库
 DATABASE_DATA = 'ansjer_server_cn'
-SERVER_HOST = 'server-cn.cvp7gfpnmziz.rds.cn-northwest-1.amazonaws.com.cn'
-DATABASES_USER = 'aws_rds'
-DATABASES_PASS = 'H84NQ8NARr9e39tn6aW5'
+SERVER_HOST = '192.168.0.51'
+DATABASES_USER = 'root'
+DATABASES_PASS = 'Ansjer123'
 
 # 推送数据库
 DATABASE_DATA2 = 'ansjer_push_cn'
-SERVER_HOST2 = '123.60.93.45'
+SERVER_HOST2 = '192.168.0.50'
 DATABASES_USER2 = 'root'
 DATABASES_PASS2 = 'Ansjer123'
 

Controller/DeviceConfirmRegion.py

@@ -92,11 +92,9 @@ class ConfirmRegionV2(View):
         if not serial_number:
             return response.json(444)
         try:
-            data_dict = {'serial_number': serial_number}
+            data_dict = {'ip': ip}
             device_domain_region_qs = DeviceDomainRegionModel.objects.filter(serial_number=serial_number)
 
-            data_dict['ip'] = ip
-
             # 获取国家编码
             ip_addr_qs = IPAddr.objects.filter(ip=ip, is_geoip2=False).values('country_code', 'region')
             if ip_addr_qs.exists():
@@ -134,6 +132,7 @@ class ConfirmRegionV2(View):
             if device_domain_region_qs.exists():
                 device_domain_region_qs.update(**data_dict)
             else:
+                data_dict['serial_number'] = serial_number
                 device_domain_region_qs.create(**data_dict)
 
             LOGGER.info('获取域名V2接口信息:{},{}'.format(serial_number, data_dict))

Controller/SerialNumberController.py

@@ -545,6 +545,10 @@ class SerialNumberView(View):
             return response.json(13)
 
         now_time = int(time.time())
+        # 记录操作日志
+        ip = CommonService.get_ip_address(request)
+        content = json.loads(json.dumps(request_dict))
+
         serial = serial_number[0:6]
         company_serial_qs = CompanySerialModel.objects.filter(serial_number=serial).values('status')
         if not company_serial_qs.exists():
@@ -572,11 +576,20 @@ class SerialNumberView(View):
             uid = uid_serial.uid.uid
             # 写入序列号解绑uid表
             SerialUnbindUID.objects.create(serial=serial, uid=uid, created_time=now_time, updated_time=now_time)
+            end_time = int(time.time())
+            # 记录操作日志
+            log = {
+                'ip': ip,
+                'user_id': 1,
+                'status': 200,
+                'time': now_time,
+                'content': json.dumps(content),
+                'url': 'serialNumber/detachUID',
+                'operation': '序列号{}加入解绑队列uid:{}:{}秒'.format(serial, uid, end_time-now_time),
+            }
+            LogModel.objects.create(**log)
             return response.json(0)
         except Exception as e:
-            # 记录操作日志
-            ip = CommonService.get_ip_address(request)
-            content = json.loads(json.dumps(request_dict))
             log = {
                 'ip': ip,
                 'user_id': 1,
@@ -584,7 +597,7 @@ class SerialNumberView(View):
                 'time': now_time,
                 'content': json.dumps(content) + '异常:{}'.format(repr(e)),
                 'url': 'serialNumber/detachUID',
-                'operation': '序列号{}解绑uid{}异常'.format(serial, uid),
+                'operation': '序列号{}解绑uid异常'.format(serial),
             }
             LogModel.objects.create(**log)
             return response.json(176, str(e))

Model/models.py

@@ -3415,7 +3415,7 @@ class DeviceDomainModel(models.Model):
 
 class DeviceDomainRegionModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='主键')
-    serial_number = models.CharField(default='', max_length=9, verbose_name='序列号')
+    serial_number = models.CharField(default='', max_length=9, db_index=True, verbose_name='序列号')
     ip = models.CharField(default='', max_length=32, verbose_name='ip')
     country_code = models.CharField(default='', max_length=8, verbose_name='国家编码')
     region_id = models.SmallIntegerField(default=0, verbose_name='对应tb_region表id')

Service/CloudLogs.py

@@ -79,7 +79,7 @@ def add_batch_log(data_list):
                                                   url=data['url'],
                                                   operation=data['operation'],
                                                   time=data['time'],
-                                                  content=data['content']))
+                                                  content=''))
             CloudLogModel.objects.bulk_create(querysetlist)
         else:
             return