perf: 优化消息通知 (#7024)

* perf: 优化系统用户列表

* stash

* perf: 优化消息通知

* perf: 修改钉钉

* perf: 修改优化消息通知

* perf: 修改requirements

* perf: 优化datetime

Co-authored-by: ibuler <ibuler@qq.com>

apps/perms/tasks.py

@@ -7,14 +7,13 @@ from django.db.transaction import atomic
 from django.conf import settings
 from celery import shared_task
 
-from users.models import User
 from orgs.utils import tmp_to_root_org
 from common.utils import get_logger
-from common.utils.timezone import now, dt_formater, dt_parser
+from common.utils.timezone import local_now, dt_formatter, dt_parser
 from ops.celery.decorator import register_as_period_task
 from perms.notifications import (
-    AssetPermWillExpireMsg, AssetPermWillExpireForOrgAdminMsg, AssetPermWillExpireForAdminMsg,
-    AppPermWillExpireMsg, AppPermWillExpireForOrgAdminMsg, AppPermWillExpireForAdminMsg,
+    PermedWillExpireUserMsg, AssetPermsWillExpireForOrgAdminMsg,
+    PermedAppsWillExpireUserMsg, AppPermsWillExpireForOrgAdminMsg
 )
 from perms.models import AssetPermission, ApplicationPermission
 from perms.utils.asset.user_permission import UserGrantedTreeRefreshController
@@ -34,10 +33,10 @@ def check_asset_permission_expired():
 
     setting_name = 'last_asset_perm_expired_check'
 
-    end = now()
+    end = local_now()
     default_start = end - timedelta(days=36000)  # Long long ago in china
 
-    defaults = {'value': dt_formater(default_start)}
+    defaults = {'value': dt_formatter(default_start)}
     setting, created = Setting.objects.get_or_create(
         name=setting_name, defaults=defaults
     )
@@ -45,7 +44,7 @@ def check_asset_permission_expired():
         start = default_start
     else:
         start = dt_parser(setting.value)
-    setting.value = dt_formater(end)
+    setting.value = dt_formatter(end)
     setting.save()
 
     asset_perm_ids = AssetPermission.objects.filter(
@@ -61,14 +60,15 @@ def check_asset_permission_expired():
 @atomic()
 @tmp_to_root_org()
 def check_asset_permission_will_expired():
-    start = now()
+    start = local_now()
     end = start + timedelta(days=3)
 
     user_asset_mapper = defaultdict(set)
     org_perm_mapper = defaultdict(set)
 
     asset_perms = AssetPermission.objects.filter(
-        date_expired__gte=start, date_expired__lte=end
+        date_expired__gte=start,
+        date_expired__lte=end
     ).distinct()
 
     for asset_perm in asset_perms:
@@ -83,18 +83,12 @@ def check_asset_permission_will_expired():
             user_asset_mapper[u].update(assets)
 
     for user, assets in user_asset_mapper.items():
-        AssetPermWillExpireMsg(user, assets).publish_async()
-
-    admins = User.objects.filter(role=User.ROLE.ADMIN)
-
-    if org_perm_mapper:
-        for admin in admins:
-            AssetPermWillExpireForAdminMsg(admin, org_perm_mapper).publish_async()
+        PermedWillExpireUserMsg(user, assets).publish_async()
 
     for org, perms in org_perm_mapper.items():
-        org_admins = org.admins.exclude(role=User.ROLE.ADMIN)
+        org_admins = org.admins.all()
         for org_admin in org_admins:
-            AssetPermWillExpireForOrgAdminMsg(org_admin, perms, org).publish_async()
+            AssetPermsWillExpireForOrgAdminMsg(org_admin, perms, org).publish_async()
 
 
 @register_as_period_task(crontab='0 10 * * *')
@@ -102,11 +96,12 @@ def check_asset_permission_will_expired():
 @atomic()
 @tmp_to_root_org()
 def check_app_permission_will_expired():
-    start = now()
+    start = local_now()
     end = start + timedelta(days=3)
 
     app_perms = ApplicationPermission.objects.filter(
-        date_expired__gte=start, date_expired__lte=end
+        date_expired__gte=start,
+        date_expired__lte=end
     ).distinct()
 
     user_app_mapper = defaultdict(set)
@@ -121,15 +116,9 @@ def check_app_permission_will_expired():
             user_app_mapper[u].update(apps)
 
     for user, apps in user_app_mapper.items():
-        AppPermWillExpireMsg(user, apps).publish_async()
-
-    admins = User.objects.filter(role=User.ROLE.ADMIN)
-
-    if org_perm_mapper:
-        for admin in admins:
-            AppPermWillExpireForAdminMsg(admin, org_perm_mapper).publish_async()
+        PermedAppsWillExpireUserMsg(user, apps).publish_async()
 
     for org, perms in org_perm_mapper.items():
-        org_admins = org.admins.exclude(role=User.ROLE.ADMIN)
+        org_admins = org.admins.all()
         for org_admin in org_admins:
-            AppPermWillExpireForOrgAdminMsg(org_admin, perms, org).publish_async()
+            AppPermsWillExpireForOrgAdminMsg(org_admin, perms, org).publish_async()