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/v1/__init__.py

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

apps/terminal/api/v2/__init__.py

@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from .terminal import *

apps/terminal/api/v2/terminal.py

@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from rest_framework import viewsets, generics
-from rest_framework import status
-from rest_framework.response import Response
-
-from common.permissions import IsSuperUser, WithBootstrapToken
-
-
-from ...models import Terminal
-from ...serializers import v2 as serializers
-
-__all__ = ['TerminalViewSet', 'TerminalRegistrationApi']
-
-
-class TerminalViewSet(viewsets.ModelViewSet):
-    queryset = Terminal.objects.filter(is_deleted=False)
-    serializer_class = serializers.TerminalSerializer
-    permission_classes = [IsSuperUser]
-
-
-class TerminalRegistrationApi(generics.CreateAPIView):
-    serializer_class = serializers.TerminalRegistrationSerializer
-    permission_classes = [WithBootstrapToken]
-    http_method_names = ['post']
-
-    def create(self, request, *args, **kwargs):
-        data = {k: v for k, v in request.data.items()}
-        serializer = serializers.TerminalSerializer(
-            data=data, context={'request': request}
-        )
-        serializer.is_valid(raise_exception=True)
-        terminal = serializer.save()
-        sa_serializer = serializer.sa_serializer_class(instance=terminal.user)
-        data['service_account'] = sa_serializer.data
-        return Response(data, status=status.HTTP_201_CREATED)
-