From a4ece2b2713526fe4c22472211ae12a5b0684439 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 2 Jun 2020 15:41:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20audits=E4=B8=AD=E6=B7=BB=E5=8A=A0id?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/audits/api.py         |  8 ++++----
 apps/audits/serializers.py | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/audits/api.py b/apps/audits/api.py
index 7deee860d..2c10024c2 100644
--- a/apps/audits/api.py
+++ b/apps/audits/api.py
@@ -37,8 +37,8 @@ class UserLoginLogViewSet(ListModelMixin,
     date_range_filter_fields = [
         ('datetime', ('date_from', 'date_to'))
     ]
-    filterset_fields = ['username']
-    search_fields = ['ip', 'city', 'username']
+    filter_fields = ['username', 'ip', 'city', 'type', 'status', 'mfa']
+    search_fields =['username', 'ip', 'city']
 
     @staticmethod
     def get_org_members():
@@ -61,8 +61,8 @@ class OperateLogViewSet(ListModelMixin, OrgGenericViewSet):
     date_range_filter_fields = [
         ('datetime', ('date_from', 'date_to'))
     ]
-    filterset_fields = ['user', 'action', 'resource_type']
-    search_fields = ['filename']
+    filter_fields = ['user', 'action', 'resource_type', 'resource']
+    search_fields = ['resource']
     ordering_fields = ['-datetime']
 
 
diff --git a/apps/audits/serializers.py b/apps/audits/serializers.py
index a23efe534..dbb072d0b 100644
--- a/apps/audits/serializers.py
+++ b/apps/audits/serializers.py
@@ -13,7 +13,7 @@ class FTPLogSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.FTPLog
         fields = (
-            'user', 'remote_addr', 'asset', 'system_user',
+            'id', 'user', 'remote_addr', 'asset', 'system_user',
             'operate', 'filename', 'is_success', 'date_start'
         )
 
@@ -26,7 +26,7 @@ class UserLoginLogSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.UserLoginLog
         fields = (
-            'username', 'type', 'type_display', 'ip', 'city', 'user_agent',
+            'id', 'username', 'type', 'type_display', 'ip', 'city', 'user_agent',
             'mfa', 'reason', 'status', 'status_display', 'datetime', 'mfa_display'
         )
 
@@ -35,7 +35,7 @@ class OperateLogSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.OperateLog
         fields = (
-            'user', 'action', 'resource_type', 'resource',
+            'id', 'user', 'action', 'resource_type', 'resource',
             'remote_addr', 'datetime'
         )
 
@@ -44,7 +44,7 @@ class PasswordChangeLogSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.PasswordChangeLog
         fields = (
-            'user', 'change_by', 'remote_addr', 'datetime'
+           'id', 'user', 'change_by', 'remote_addr', 'datetime'
         )
 
 
@@ -58,7 +58,7 @@ class CommandExecutionSerializer(serializers.ModelSerializer):
     class Meta:
         model = CommandExecution
         fields = (
-            'hosts', 'run_as', 'command', 'user', 'is_finished',
+            'id', 'hosts', 'run_as', 'command', 'user', 'is_finished',
             'date_start', 'result', 'is_success'
         )
         extra_kwargs = {
-- 
GitLab