github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-03 01:56:39 +00:00
Code Issues Projects Releases Wiki Activity

[Update] 优化登录日志时间范围

Browse Source
This commit is contained in:
BaiJiangJie 2019-10-22 17:40:55 +08:00
parent 3c7fa1b60b
commit 950358f5ba
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/audits/models.py
View File

@ -88,13 +88,11 @@ class UserLoginLog(models.Model):
datetime = models.DateTimeField(default=timezone.now, verbose_name=_('Date login')) datetime = models.DateTimeField(default=timezone.now, verbose_name=_('Date login'))
@classmethod @classmethod
def get_login_logs(cls, date_from=None, date_to=None, user=None, keyword=None, date_format=None): def get_login_logs(cls, date_from=None, date_to=None, user=None, keyword=None):
login_logs = cls.objects.all() login_logs = cls.objects.all()
if date_from and date_to: if date_from and date_to:
date_from = timezone.datetime.strptime(date_from, date_format) date_from = "{} {}".format(date_from, '00:00:00')
date_to = timezone.datetime.strptime( date_to = "{} {}".format(date_to, '23:59:59')
date_to + ' 23:59:59', date_format + ' %H:%M:%S'
)
login_logs = login_logs.filter( login_logs = login_logs.filter(
datetime__gte=date_from, datetime__lte=date_to datetime__gte=date_from, datetime__lte=date_to
) )

2
apps/audits/views.py
View File

@ -282,7 +282,7 @@ class LoginLogExportView(PermissionsMixin, View):
login_logs = UserLoginLog.get_login_logs( login_logs = UserLoginLog.get_login_logs(
date_from=date_from, date_to=date_to, user=user, date_from=date_from, date_to=date_to, user=user,
keyword=keyword, date_format=self.date_format keyword=keyword,
) )
except ValueError: except ValueError:
return HttpResponse('Json object not valid', status=400) return HttpResponse('Json object not valid', status=400)