Pre Merge pull request !46 from wangkun/dvadmin-dev-kunwen

docker_env/celery/Dockerfile

@@ -1,11 +1,11 @@
-FROM python:3.7
+FROM python:3.8
 # ENV PYTHONUNBUFFERED 1
 RUN sed -i s/deb.debian.org/mirrors.163.com/g /etc/apt/sources.list
 RUN cat /etc/apt/sources.list
 RUN apt-get clean
 RUN apt-get update
 RUN apt-get install -y build-essential
-RUN apt-get install -y python3.7-dev libpq-dev libopencv-dev python-opencv
+RUN apt-get install -y python3.8-dev libpq-dev libopencv-dev
 RUN apt-get install -y redis-tools
 RUN mkdir /dvadmin-backend
 WORKDIR /dvadmin-backend

docker_env/django/Dockerfile

@@ -1,11 +1,11 @@
-FROM python:3.7
+FROM python:3.8
 # ENV PYTHONUNBUFFERED 1
 RUN sed -i s/deb.debian.org/mirrors.163.com/g /etc/apt/sources.list
 RUN cat /etc/apt/sources.list
 RUN apt-get clean
 RUN apt-get update
 RUN apt-get install -y build-essential
-RUN apt-get install -y python3.7-dev libpq-dev libopencv-dev python-opencv
+RUN apt-get install -y python3.8-dev libpq-dev libopencv-dev
 RUN apt-get install -y redis-tools
 RUN mkdir /dvadmin-backend
 WORKDIR /dvadmin-backend

dvadmin-backend/.gitignore

@@ -89,7 +89,9 @@ ENV/
 *.db
 .DS_Store
 __pycache__
+migrations/
 !migrations/__init__.py
 *.pyc
+conf/
 !conf/env.example.py
 db.sqlite3

dvadmin-backend/apps/vadmin/monitor/tasks.py

@@ -84,6 +84,7 @@ def clean_surplus_monitor_info():
     :return:
     """
     config_settings_obj = ConfigSettings.objects.filter(configKey='sys.monitor.info.save_days').first()
-    Monitor.objects.filter(
+    today = datetime.datetime.now().date()
-        update_datetime__lt=datetime.timedelta(days=int(config_settings_obj.configValue or 30))).delete()
+    clean_day_before = today - datetime.timedelta(days=int(config_settings_obj.configValue or 30))
+    Monitor.objects.filter(update_datetime__lt=clean_day_before).delete()
     logger.info(f"成功清空{config_settings_obj.configValue}天前数据")

dvadmin-backend/apps/vadmin/op_drf/filters.py

@@ -6,7 +6,7 @@ import logging
 import operator
 from functools import reduce
 
-from django.utils import six
+# from django.utils import six
 from mongoengine.queryset import visitor
 from rest_framework.filters import BaseFilterBackend, SearchFilter, OrderingFilter
 
@@ -34,7 +34,7 @@ class MongoSearchFilter(SearchFilter):
         if not search_fields or not search_terms:
             return queryset
         orm_lookups = [
-            self.construct_search(six.text_type(search_field))
+            self.construct_search(str(search_field))
             for search_field in search_fields
         ]
         if not orm_lookups:
@@ -67,7 +67,7 @@ class MongoOrderingFilter(OrderingFilter):
             ]
         else:
             valid_fields = [
-                (item, item) if isinstance(item, six.string_types) else item
+                (item, item) if isinstance(item, str) else item
                 for item in valid_fields
             ]
 

dvadmin-backend/apps/vadmin/utils/authentication.py

@@ -7,7 +7,7 @@ import jwt
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.cache import cache
-from django.utils.six import text_type
+# from django.utils.six import text_type
 from django.utils.translation import ugettext as _
 from rest_framework import exceptions
 from rest_framework_jwt.utils import jwt_decode_handler
@@ -61,7 +61,7 @@ class OpAuthJwtAuthentication(object):
         :return:
         """
         auth = request.META.get('HTTP_AUTHORIZATION', b'')
-        if isinstance(auth, text_type):
+        if isinstance(auth, str):
             auth = auth.encode(settings.JWT_AUTH.get('HTTP_HEADER_ENCODING', 'iso-8859-1'))
         if not auth:
             return ''

dvadmin-backend/apps/vadmin/utils/request_util.py

@@ -40,16 +40,14 @@ def get_request_ip(request):
     :param request:
     :return:
     """
-    ip = getattr(request, 'request_ip', None)
-    if ip:
-        return ip
-    ip = request.META.get('REMOTE_ADDR', '')
-    if not ip:
     x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR', '')
     if x_forwarded_for:
-            ip = x_forwarded_for.split(',')[-1].strip()
+        return x_forwarded_for.split(',')[-1].strip()
-        else:
+    remote_addr = request.META.get('REMOTE_ADDR', '')
-            ip = 'unknown'
+    if remote_addr:
+        return remote_addr
+    ip = getattr(request, 'request_ip', 'unknown')
+    
     return ip