Bugfix (#2506)

* [Update] 增加清理celery日志

* [Update] 修复两周前会话命令数量系那是问题

* [Update] 修复两周前会话命令数量系那是问题

* [Update] 修改结构

* [Update] 添加datatable失败的日志

* [Update] 转换配置文件格式

* [Update] 添加traceback

apps/terminal/api/__init__.py

@@ -1,2 +1,5 @@
 # -*- coding: utf-8 -*-
 #
+from .terminal import *
+from .session import *
+from .task import *

apps/terminal/api/session.py

@@ -9,17 +9,17 @@ from django.http import HttpResponseNotFound
 from django.conf import settings
 from rest_framework.pagination import LimitOffsetPagination
 from rest_framework import viewsets
-from rest_framework.views import Response
+from rest_framework.response import Response
 from rest_framework_bulk import BulkModelViewSet
 import jms_storage
 
 
 from common.utils import is_uuid
 from common.permissions import IsOrgAdminOrAppUser
-from ...hands import SystemUser
-from ...models import Terminal, Session
-from ...serializers import v1 as serializers
-from ...backends import get_command_storage, get_multi_command_storage, \
+from ..hands import SystemUser
+from ..models import Terminal, Session
+from .. import serializers
+from ..backends import get_command_storage, get_multi_command_storage, \
     SessionCommandSerializer
 
 __all__ = ['SessionViewSet', 'SessionReplayViewSet', 'CommandViewSet']

apps/terminal/api/task.py

@@ -6,8 +6,8 @@ from rest_framework_bulk import BulkModelViewSet
 
 from common.utils import get_object_or_none
 from common.permissions import IsOrgAdminOrAppUser
-from ...models import Session, Task
-from ...serializers import v1 as serializers
+from ..models import Session, Task
+from .. import serializers
 
 
 __all__ = ['TaskViewSet', 'KillSessionAPI']

apps/terminal/api/terminal.py

@@ -14,8 +14,8 @@ from rest_framework.permissions import AllowAny
 
 from common.utils import get_object_or_none
 from common.permissions import IsAppUser, IsOrgAdminOrAppUser, IsSuperUser
-from ...models import Terminal, Status, Session
-from ...serializers import v1 as serializers
+from ..models import Terminal, Status, Session
+from .. import serializers
 
 __all__ = [
     'TerminalViewSet', 'TerminalTokenApi', 'StatusViewSet', 'TerminalConfig',

apps/terminal/api_v2/terminal.py

@@ -7,8 +7,8 @@ from rest_framework.response import Response
 from common.permissions import IsSuperUser, WithBootstrapToken
 
 
-from ...models import Terminal
-from ...serializers import v2 as serializers
+from ..models import Terminal
+from .. import serializers_v2 as serializers
 
 __all__ = ['TerminalViewSet', 'TerminalRegistrationApi']
 

apps/terminal/backends/command/db.py

@@ -66,10 +66,14 @@ class CommandStore(CommandBase):
         date_from_default = timezone.now() - datetime.timedelta(days=7)
         date_to_default = timezone.now()
 
-        date_from = date_from if date_from else date_from_default
-        date_to = date_to if date_to else date_to_default
-        filter_kwargs['timestamp__gte'] = int(date_from.timestamp())
-        filter_kwargs['timestamp__lte'] = int(date_to.timestamp())
+        if not date_from and not session:
+            date_from = date_from_default
+        if not date_to and not session:
+            date_to = date_to_default
+        if date_from is not None:
+            filter_kwargs['timestamp__gte'] = int(date_from.timestamp())
+        if date_to is not None:
+            filter_kwargs['timestamp__lte'] = int(date_to.timestamp())
 
         if user:
             filter_kwargs["user"] = user

apps/terminal/serializers/__init__.py

@@ -1,2 +1,3 @@
 # -*- coding: utf-8 -*-
 #
+from .v1 import *

apps/terminal/serializers_v2/__init__.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
 #
+
 from .terminal import *
-from .session import *
-from .task import *

apps/terminal/serializers_v2/terminal.py

@@ -3,7 +3,7 @@
 from rest_framework import serializers
 
 from common.utils import get_request_ip
-from users.serializers.v2 import ServiceAccountSerializer
+from users.serializers_v2 import ServiceAccountSerializer
 from ..models import Terminal
 
 

apps/terminal/urls/api_urls.py

@@ -5,7 +5,7 @@
 from django.urls import path, include
 from rest_framework_bulk.routes import BulkRouter
 
-from ..api import v1 as api
+from .. import api
 
 app_name = 'terminal'
 

apps/terminal/urls/api_urls_v2.py

@@ -5,7 +5,7 @@
 from django.urls import path
 from rest_framework_bulk.routes import BulkRouter
 
-from ..api import v2 as api
+from .. import api_v2 as api
 
 app_name = 'terminal'