fix: 修复操作应用/应用授权/acl等未记录日志的问题3

apps/audits/signals_handler.py

@@ -26,11 +26,21 @@ json_render = JSONRenderer()
 
 
 MODELS_NEED_RECORD = (
-    'User', 'UserGroup', 'Asset', 'Node', 'AdminUser', 'SystemUser',
+    # users
-    'Domain', 'Gateway', 'Organization', 'AssetPermission', 'CommandFilter',
+    'User', 'UserGroup',
-    'CommandFilterRule', 'License', 'Setting', 'Account', 'SyncInstanceTask',
+    # assets
-    'Platform', 'ChangeAuthPlan', 'GatherUserTask',
+    'Asset', 'Node', 'AdminUser', 'SystemUser', 'Domain', 'Gateway', 'CommandFilterRule',
-    'RemoteApp', 'RemoteAppPermission', 'DatabaseApp', 'DatabaseAppPermission',
+    'CommandFilter', 'Platform',
+    # applications
+    'Application',
+    # orgs
+    'Organization',
+    # settings
+    'Setting',
+    # perms
+    'AssetPermission', 'ApplicationPermission',
+    # xpack
+    'License', 'Account', 'SyncInstanceTask', 'ChangeAuthPlan', 'GatherUserTask',
 )
 
 

apps/orgs/utils.py

@@ -84,7 +84,10 @@ def set_org_mapper(org_mapper):
 
 def get_org_mapper():
     org_mapper = _find('org_mapper')
-    if org_mapper is None:
+    return org_mapper
+
+
+def update_org_mapper():
     org_mapper = construct_org_mapper()
     set_org_mapper(org_mapper)
     return org_mapper
@@ -93,6 +96,13 @@ def get_org_mapper():
 def get_org_by_id(org_id):
     org_id = str(org_id)
     org_mapper = get_org_mapper()
+    if not org_mapper:
+        org_mapper = update_org_mapper()
+
+    org = org_mapper.get(org_id)
+    if not org:
+        # 解决celery缓存org_mapper问题
+        org_mapper = update_org_mapper()
         org = org_mapper.get(org_id)
     return org