From 9b6036ce1715181596587fc677de1ae4b82426b4 Mon Sep 17 00:00:00 2001 From: Samsong Date: Thu, 16 Sep 2021 21:55:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?FIX=EF=BC=9A=E5=8D=87=E7=BA=A7python?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=95=9C=E5=83=8F=E4=B8=BApython:3.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 解决原基础镜像python:3.7升级后导致的Bug --- docker_env/celery/Dockerfile | 4 ++-- docker_env/django/Dockerfile | 4 ++-- dvadmin-backend/requirements.txt | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docker_env/celery/Dockerfile b/docker_env/celery/Dockerfile index 7428b9c..1730568 100644 --- a/docker_env/celery/Dockerfile +++ b/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 diff --git a/docker_env/django/Dockerfile b/docker_env/django/Dockerfile index 9ca8a18..ba6f053 100644 --- a/docker_env/django/Dockerfile +++ b/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 diff --git a/dvadmin-backend/requirements.txt b/dvadmin-backend/requirements.txt index 596bc01..9b36e47 100644 --- a/dvadmin-backend/requirements.txt +++ b/dvadmin-backend/requirements.txt @@ -31,3 +31,5 @@ drf-yasg==1.20.0 daphne==3.0.2 channels==3.0.3 channels-redis==3.2.0 +opencv-python==4.5.3.56 + From c7a4324d67c1fbd18ab2bd9242356192665051a2 Mon Sep 17 00:00:00 2001 From: Samsong Date: Sat, 18 Sep 2021 14:53:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?FIX=EF=BC=9A=E4=BF=AE=E5=A4=8D.gitignore?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dvadmin-backend/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dvadmin-backend/.gitignore b/dvadmin-backend/.gitignore index 0bec1c6..a90cde3 100644 --- a/dvadmin-backend/.gitignore +++ b/dvadmin-backend/.gitignore @@ -89,7 +89,9 @@ ENV/ *.db .DS_Store __pycache__ +migrations/ !migrations/__init__.py *.pyc +conf/ !conf/env.example.py db.sqlite3 From 40f3c204a84b66d0c92e3b489e3a2f226c222871 Mon Sep 17 00:00:00 2001 From: Samsong Date: Sat, 18 Sep 2021 14:55:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?FIX=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=B8=85?= =?UTF-8?q?=E7=90=86=E7=9B=91=E6=8E=A7=E4=BF=A1=E6=81=AF=E7=9A=84=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dvadmin-backend/apps/vadmin/monitor/tasks.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dvadmin-backend/apps/vadmin/monitor/tasks.py b/dvadmin-backend/apps/vadmin/monitor/tasks.py index fb78e54..a09aa8c 100644 --- a/dvadmin-backend/apps/vadmin/monitor/tasks.py +++ b/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( - update_datetime__lt=datetime.timedelta(days=int(config_settings_obj.configValue or 30))).delete() + today = datetime.datetime.now().date() + 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}天前数据")