Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(audit/login): fix #876 login audit log login_time not local time #878

Merged
merged 3 commits into from
Jan 10, 2023
Merged

fix(audit/login): fix #876 login audit log login_time not local time #878

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbe9e9b
fix(audit/login): fix #876 login audit log login_time not local time
wklken Jan 10, 2023
edcc049
Merge remote-tracking branch 'upstream/pre_2.5.2' into fix_2.5.2_logi…
wklken Jan 10, 2023
225ee7f
fix(audit/login): fix slz wrong
wklken Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/api/bkuser_core/api/web/audit/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import datetime
from typing import Optional

from django.utils import timezone
from django.utils.translation import ugettext_lazy as _
from rest_framework import serializers

Expand Down Expand Up @@ -91,7 +92,9 @@ class LoginLogOutputSLZ(serializers.Serializer):
reason = serializers.SerializerMethodField(help_text=_("失败原因"), required=False)

def get_datetime(self, obj):
return obj.create_time
# 转换成本地时间
local_time = timezone.localtime(obj.create_time)
return local_time.strftime("%Y-%m-%d %H:%M:%S")

def get_reason(self, obj) -> Optional[str]:
"""get reason display name"""
Expand Down