From ed92f10208115486934613513b52954291ed2c1e Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 17 Nov 2023 15:37:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E9=9D=9E=E6=B4=BB=E8=B7=83=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/users/tasks.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/users/tasks.py b/apps/users/tasks.py index ecc59c3bc..4c7887c0f 100644 --- a/apps/users/tasks.py +++ b/apps/users/tasks.py @@ -88,8 +88,8 @@ def check_unused_users(): uncommon_users_ttl = settings.SECURITY_UNCOMMON_USERS_TTL seconds_to_subtract = uncommon_users_ttl * 24 * 60 * 60 t = timezone.now() - timedelta(seconds=seconds_to_subtract) - last_login_q = Q(last_login__lte=t) | Q(last_login__isnull=True) - api_key_q = Q(date_api_key_last_used__lte=t) | Q(date_api_key_last_used__isnull=True) + last_login_q = Q(last_login__lte=t) | (Q(last_login__isnull=True) & Q(date_joined__lte=t)) + api_key_q = Q(date_api_key_last_used__lte=t) | (Q(date_api_key_last_used__isnull=True) & Q(date_joined__lte=t)) users = User.objects \ .filter(date_joined__lt=t) \ @@ -99,6 +99,7 @@ def check_unused_users(): if not users: return + print("Some users are not used for a long time, and they will be disabled.") resource_ids = [] for user in users: