fix: 操作日志显示用户加密后的密文,及日期格式调整

pull/9877/head
jiangweidong 2023-03-08 11:36:48 +08:00
parent c628ba1c4b
commit b216a9abc0
2 changed files with 5 additions and 2 deletions

View File

@ -2,13 +2,14 @@ import csv
import codecs import codecs
from itertools import chain from itertools import chain
from datetime import datetime
from django.http import HttpResponse from django.http import HttpResponse
from django.db import models from django.db import models
from settings.serializers import SettingsSerializer 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.utils import validate_ip, get_ip_city, get_logger
from common.db import fields
from .const import DEFAULT_CITY from .const import DEFAULT_CITY
@ -78,6 +79,8 @@ def model_to_dict_for_operate_log(
f.verbose_name = 'id' f.verbose_name = 'id'
elif isinstance(value, list): elif isinstance(value, list):
value = [str(v) for v in value] 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): if include_model_fields or getattr(f, 'primary_key', False):
data[str(f.verbose_name)] = value data[str(f.verbose_name)] = value

View File

@ -1,7 +1,7 @@
from werkzeug.local import Local from werkzeug.local import Local
thread_local = Local() thread_local = Local()
encrypted_field_set = set() encrypted_field_set = {'password'}
def _find(attr): def _find(attr):