Merge remote-tracking branch 'remotes/origin/locky' into test

Ansjer/cn_config/test_settings.py

@@ -242,10 +242,10 @@ LOGGING = {
             'formatter': 'standard',
             'encoding': 'utf-8',
         },
-        'device_info': {
+        'error_code': {
             'level': 'INFO',
             'class': 'logging.handlers.TimedRotatingFileHandler',
-            'filename': BASE_DIR + '/static/log/device_info/info.log',
+            'filename': BASE_DIR + '/static/log/error_code/error_code.log',
             'backupCount': 30,
             'when': 'D',
             'formatter': 'standard',
@@ -274,7 +274,7 @@ LOGGING = {
             'propagate': False
         },
         'device_info': {
-            'handlers': ['device_info'],
+            'handlers': ['error_code'],
             'level': 'INFO',
             'propagate': False
         },

MiddleWare/requestRecord.py

@@ -6,17 +6,19 @@
 @IDE ：PyCharm
 """
 import json
+import logging
 import time
 from django.utils.deprecation import MiddlewareMixin
-from Ansjer.config import LOGGER
 from Model.models import RequestRecordModel
 
 
 class RequestRecordMiddleware(MiddlewareMixin):
-    def process_request(self, request):
+    @staticmethod
+    def process_request(request):
         request.start_time = time.time()
 
-    def process_response(self, request, response):
+    @staticmethod
+    def process_response(request, response):
         try:
             execute_time = time.time() - request.start_time
             method = request.method
@@ -35,7 +37,8 @@ class RequestRecordMiddleware(MiddlewareMixin):
                 # 记录响应码不为0的接口日志
                 if ('result_code' in content and content['result_code'] != 0) or \
                         ('code' in content and content['code'] != 0):
-                    LOGGER.info('请求路径:{}, 请求方式:{}, 输入数据:{}, 输出数据:{}, 响应状态:{}'.
+                    logger = logging.getLogger('error_code')
+                    logger.info('请求接口:{}, 请求方式:{}, 请求参数:{}, 响应数据:{}, 状态码:{}'.
                                 format(url, method, parameter, content, response.status_code))
 
                 if response.status_code == 500:  # 处理没有捕获异常的情况

Model/models.py

@@ -1272,7 +1272,7 @@ class UID_Bucket(models.Model):
     uid = models.CharField(max_length=20, verbose_name='设备UID', db_index=True)
     channel = models.SmallIntegerField(default=0, verbose_name='通道')
     bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, verbose_name='存储空间')
-    status = models.SmallIntegerField(default=0, verbose_name='状态[0:关闭,1:开启]')  # 修改2023/5/15(原状态[0:开启,1:关闭])
+    status = models.SmallIntegerField(default=0, verbose_name='状态[0:关闭,1:开启]')
     endTime = models.BigIntegerField(verbose_name='套餐结束时间', db_index=True, default=0)
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updateTime = models.BigIntegerField(verbose_name='更新时间', default=0)