From b216a9abc0734c58b20eb760e75158bd48de4ee7 Mon Sep 17 00:00:00 2001 From: jiangweidong Date: Wed, 8 Mar 2023 11:36:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7=E5=8A=A0=E5=AF=86=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E5=AF=86=E6=96=87=EF=BC=8C=E5=8F=8A=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/audits/utils.py | 5 ++++- apps/common/local.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/audits/utils.py b/apps/audits/utils.py index e62a40577..8d399824c 100644 --- a/apps/audits/utils.py +++ b/apps/audits/utils.py @@ -2,13 +2,14 @@ import csv import codecs from itertools import chain +from datetime import datetime from django.http import HttpResponse from django.db import models from settings.serializers import SettingsSerializer +from common.utils.timezone import as_current_tz from common.utils import validate_ip, get_ip_city, get_logger -from common.db import fields from .const import DEFAULT_CITY @@ -78,6 +79,8 @@ def model_to_dict_for_operate_log( f.verbose_name = 'id' elif isinstance(value, list): value = [str(v) for v in value] + elif isinstance(value, datetime): + value = as_current_tz(value).strftime('%Y-%m-%d %H:%M:%S') if include_model_fields or getattr(f, 'primary_key', False): data[str(f.verbose_name)] = value diff --git a/apps/common/local.py b/apps/common/local.py index 947ae3d6b..19b00537e 100644 --- a/apps/common/local.py +++ b/apps/common/local.py @@ -1,7 +1,7 @@ from werkzeug.local import Local thread_local = Local() -encrypted_field_set = set() +encrypted_field_set = {'password'} def _find(attr):