From e466b6e38e8bc6e58a8c489cdee26bbe7bdd1af3 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 14 Feb 2023 22:56:36 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BA=A7=E7=94=9F?= =?UTF-8?q?=E7=9A=84=20activity=20=E6=B2=A1=E6=9C=89=20org?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/audits/signal_handlers.py | 0 apps/audits/signal_handlers/activity_log.py | 12 ++++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 apps/audits/signal_handlers.py diff --git a/apps/audits/signal_handlers.py b/apps/audits/signal_handlers.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/audits/signal_handlers/activity_log.py b/apps/audits/signal_handlers/activity_log.py index fe0553ce8..154a0b441 100644 --- a/apps/audits/signal_handlers/activity_log.py +++ b/apps/audits/signal_handlers/activity_log.py @@ -12,6 +12,7 @@ from common.utils import get_object_or_none, i18n_fmt from jumpserver.utils import current_request from ops.celery import app from orgs.utils import tmp_to_root_org +from orgs.models import Organization from terminal.models import Session from users.models import User from ..const import ActivityChoices @@ -112,7 +113,7 @@ class ActivityLogHandler(object): gettext_noop('User %s use account %s login asset %s'), obj.user, obj.account, obj.asset ) - return [obj.asset_id, obj.user_id, obj.account_id], detail, ActivityChoices.session_log + return [obj.asset_id, obj.user_id, obj.account_id], detail, ActivityChoices.session_log, obj.org_id @staticmethod def login_log_for_activity(obj): @@ -122,7 +123,7 @@ class ActivityLogHandler(object): resource_list = [] if user_id: resource_list = [user_id['id']] - return resource_list, detail, ActivityChoices.login_log + return resource_list, detail, ActivityChoices.login_log, Organization.SYSTEM_ID activity_handler = ActivityLogHandler() @@ -178,9 +179,12 @@ def on_session_or_login_log_created(sender, instance=None, created=False, **kwar if not created or model_name not in handler_mapping: return - resource_ids, detail, act_type = handler_mapping[model_name](instance) + resource_ids, detail, act_type, org_id = handler_mapping[model_name](instance) activities = [ - ActivityLog(resource_id=i, type=act_type, detail=detail, detail_id=instance.id) + ActivityLog( + resource_id=i, type=act_type, detail=detail, + detail_id=instance.id, org_id=org_id + ) for i in resource_ids ] ActivityLog.objects.bulk_create(activities)