From c8d7d42f66d865851e1fc29873fe62e3d0e9dfb1 Mon Sep 17 00:00:00 2001 From: "fghbng@qq.com" Date: Mon, 17 May 2021 15:30:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E7=9B=98=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jumpserver/api.py | 2 -- apps/orgs/signals_handler/cache.py | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/jumpserver/api.py b/apps/jumpserver/api.py index 4bbba64e3..9e9ceeda6 100644 --- a/apps/jumpserver/api.py +++ b/apps/jumpserver/api.py @@ -221,8 +221,6 @@ class IndexApi(DatesLoginMetricMixin, APIView): query_params = self.request.query_params caches = OrgResourceStatisticsCache(current_org) - if current_org.is_root(): - caches.refresh() _all = query_params.get('all') diff --git a/apps/orgs/signals_handler/cache.py b/apps/orgs/signals_handler/cache.py index 5862d5edf..626975991 100644 --- a/apps/orgs/signals_handler/cache.py +++ b/apps/orgs/signals_handler/cache.py @@ -18,6 +18,7 @@ def refresh_user_amount_on_user_create_or_delete(user_id): for org in orgs: org_cache = OrgResourceStatisticsCache(org) org_cache.expire('users_amount') + OrgResourceStatisticsCache(Organization.root()).expire('users_amount') @receiver(post_save, sender=User) @@ -44,6 +45,7 @@ def on_org_user_changed_refresh_cache(sender, action, instance, reverse, pk_set, for org in orgs: org_cache = OrgResourceStatisticsCache(org) org_cache.expire('users_amount') + OrgResourceStatisticsCache(Organization.root()).expire('users_amount') class OrgResourceStatisticsRefreshUtil: @@ -67,6 +69,7 @@ class OrgResourceStatisticsRefreshUtil: if cache_field_name: org_cache = OrgResourceStatisticsCache(instance.org) org_cache.expire(*cache_field_name) + OrgResourceStatisticsCache(Organization.root()).expire(*cache_field_name) @receiver(pre_save)