github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #9554 from jumpserver/pr@dev@perf_activities_log 

perf: 优化Activity日志[操作日志、登录日志]显示
pull/9574/head
老广 2023-02-15 20:44:40 +08:00 committed by GitHub
parent 679cd6a4e1 7235910a86
commit b464261ed3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/audits/api.py
View File

@ -53,8 +53,9 @@ class UserLoginCommonMixin:
search_fields = ['id', 'username', 'ip', 'city'] search_fields = ['id', 'username', 'ip', 'city']
class UserLoginLogViewSet(UserLoginCommonMixin, ListModelMixin, JMSGenericViewSet): class UserLoginLogViewSet(
UserLoginCommonMixin, RetrieveModelMixin, ListModelMixin, JMSGenericViewSet
):
@staticmethod @staticmethod
def get_org_members(): def get_org_members():
users = current_org.get_members().values_list('username', flat=True) users = current_org.get_members().values_list('username', flat=True)

18
apps/audits/serializers.py
View File

@ -110,6 +110,7 @@ class ActivityUnionLogSerializer(serializers.Serializer):
timestamp = serializers.SerializerMethodField() timestamp = serializers.SerializerMethodField()
detail_url = serializers.SerializerMethodField() detail_url = serializers.SerializerMethodField()
content = serializers.SerializerMethodField() content = serializers.SerializerMethodField()
r_type = serializers.CharField(read_only=True)
@staticmethod @staticmethod
def get_timestamp(obj): def get_timestamp(obj):
@ -132,18 +133,19 @@ class ActivityUnionLogSerializer(serializers.Serializer):
return detail_url return detail_url
if obj_type == ActivityChoices.operate_log: if obj_type == ActivityChoices.operate_log:
detail_url = reverse( detail_url = '%s?%s' % (
view_name='audits:operate-log-detail', reverse(
kwargs={'pk': obj['id']}, 'audits:operate-log-detail',
api_to_ui=True, is_audit=True kwargs={'pk': obj['id']},
) ), 'type=action_detail')
elif obj_type == ActivityChoices.task: elif obj_type == ActivityChoices.task:
detail_url = reverse( detail_url = reverse(
'ops:celery-task-log', kwargs={'pk': detail_id} 'ops:celery-task-log', kwargs={'pk': detail_id}
) )
elif obj_type == ActivityChoices.login_log: elif obj_type == ActivityChoices.login_log:
detail_url = '%s?id=%s' % ( detail_url = reverse(
reverse('api-audits:login-log-list', api_to_ui=True, is_audit=True), 'audits:login-log-detail',
detail_id kwargs={'pk': detail_id},
api_to_ui=True, is_audit=True
) )
return detail_url return detail_url