Jelajahi Sumber

修改测试服务器和本地的时候可以有访问日志

pengzhibo168 5 tahun lalu
induk
melakukan
bc8fe421a2
2 mengubah file dengan 30 tambahan dan 19 penghapusan
  1. 23 17
      Controller/UserBrandController.py
  2. 7 2
      Service/middleware.py

+ 23 - 17
Controller/UserBrandController.py

@@ -266,7 +266,10 @@ class MyserviceDynamodb(object):
         while True:
             # 刚开始,不需要传入startkey
             if last_evaluated_key is None:
-                response = table.scan()
+                try:
+                    response = table.scan()
+                except Exception:
+                    break
             else:
                 # 构建分页的起点,传入下一页面的起点,这是由主键来控制的,last_evaluated_key的值就是本表中的uid
                 try:
@@ -377,22 +380,25 @@ class MyserviceDynamodb(object):
         while True:
             # 刚开始,不需要传入startkey
             if last_evaluated_key is None:
-                response = table_handle.scan(
-                    FilterExpression=Attr('deviceSupplier').eq(username)
-                                 | Key('osType').eq(username)
-                                 | Key('deviceModel').eq(username)
-                                 | Key('userID').eq(username)
-                                 | Key('osVersion').eq(username)
-                                 | Key('country').eq(username)
-                                 | Key('appId').eq(username)
-                                 | Key('province').eq(username)
-                                 | Key('city').eq(username)
-                                 | Key('area').eq(username)
-                                 | Key('street').eq(username)
-                                 | Key('longitude').eq(username)
-                                 | Key('latitude').eq(username)
-                                 | Key('status_all').eq(username)
-                                 | Key('ip').eq(username))
+                try:
+                    response = table_handle.scan(
+                        FilterExpression=Attr('deviceSupplier').eq(username)
+                                         | Key('osType').eq(username)
+                                         | Key('deviceModel').eq(username)
+                                         | Key('userID').eq(username)
+                                         | Key('osVersion').eq(username)
+                                         | Key('country').eq(username)
+                                         | Key('appId').eq(username)
+                                         | Key('province').eq(username)
+                                         | Key('city').eq(username)
+                                         | Key('area').eq(username)
+                                         | Key('street').eq(username)
+                                         | Key('longitude').eq(username)
+                                         | Key('latitude').eq(username)
+                                         | Key('status_all').eq(username)
+                                         | Key('ip').eq(username))
+                except Exception:
+                    break
             else:
                 # 构建分页的起点,传入下一页面的起点,这是由主键来控制的,last_evaluated_key的值就是本表中的uid
                 try:

+ 7 - 2
Service/middleware.py

@@ -3,6 +3,8 @@
 from django.utils.deprecation import MiddlewareMixin
 
 from Ansjer import local_settings as api_settings
+from Ansjer.config import SERVER_TYPE
+
 from Object.ResponseObject import ResponseObject
 from Service.MiscellService import MiscellService
 import django.db
@@ -78,13 +80,16 @@ class StatisticsUrlMiddleware(MiddlewareMixin):
         self._https_statistics_to_close(request)
         ########记录访问日志
         # MiscellService.DynamoDB_add_access_log(request=request, status_code=response.status_code)
-
         if request.path !='/favicon.ico':
             print('process_response', request, response)
             try:
                 pass
                 # mysql
-                # MiscellService.add_access_log(request=request, status_code=response.status_code)
+                if SERVER_TYPE!="Ansjer.formal_settings":
+                    # print('添加日志')
+                    MiscellService.add_access_log(request=request, status_code=response.status_code)
+                # else:
+                #     print('不添加日志')
                 # mongodb版
                 # MiscellService.access_log(request=request, response=response, type=0)
             except Exception as e: