From b4d164954d7ea120bc189a79d20cc8cf73c5a45d Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Mon, 14 Oct 2019 11:59:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E8=AE=B0=E5=BD=95=E4=BB=8E=20es=20=E4=B8=AD=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=A4=B1=E8=B4=A5=EF=BC=88=E5=8E=9F=E5=9B=A0=EF=BC=9A?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E4=B8=8D?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/terminal/backends/command/es.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/terminal/backends/command/es.py b/apps/terminal/backends/command/es.py
index dde8e1e95..5aa16dfbf 100644
--- a/apps/terminal/backends/command/es.py
+++ b/apps/terminal/backends/command/es.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 
+from datetime import datetime
 from jms_storage.es import ESStorage
 from .base import CommandBase
 from .models import AbstractSessionCommand
@@ -14,6 +15,13 @@ class CommandStore(ESStorage, CommandBase):
                user=None, asset=None, system_user=None,
                input=None, session=None):
 
+        if date_from is not None:
+            if isinstance(date_from, float):
+                date_from = datetime.fromtimestamp(date_from)
+        if date_to is not None:
+            if isinstance(date_to, float):
+                date_to = datetime.fromtimestamp(date_to)
+
         data = super().filter(date_from=date_from, date_to=date_to,
                               user=user, asset=asset, system_user=system_user,
                               input=input, session=session)

From 1a1f20920d63d5e4424a65a237a61779691f867a Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Mon, 14 Oct 2019 15:15:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E6=94=B9=E7=BB=88?=
 =?UTF-8?q?=E7=AB=AF=E5=91=BD=E4=BB=A4=E7=B1=BB=E5=9E=8B=20MAPPING?=
 =?UTF-8?q?=EF=BC=88elasticsearch=20->=20es=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/terminal/backends/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/terminal/backends/__init__.py b/apps/terminal/backends/__init__.py
index 12b85b7e3..1aec6b3be 100644
--- a/apps/terminal/backends/__init__.py
+++ b/apps/terminal/backends/__init__.py
@@ -6,6 +6,7 @@ from common import utils
 
 TYPE_ENGINE_MAPPING = {
     'elasticsearch': 'terminal.backends.command.es',
+    'es': 'terminal.backends.command.es',
 }