From 107fda0f990aad0d5503b2ef7addc9fb37229761 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 28 Jul 2023 11:13:48 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=9C=BA=E8=B4=A6=E5=8F=B7=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/models/applet/applet.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/terminal/models/applet/applet.py b/apps/terminal/models/applet/applet.py index edf7b332b..5a4a08fe3 100644 --- a/apps/terminal/models/applet/applet.py +++ b/apps/terminal/models/applet/applet.py @@ -216,9 +216,11 @@ class Applet(JMSBaseModel): if private_account and private_account.username not in accounts_username_used: account = private_account else: - accounts = accounts.exclude(username__in=accounts_username_used) \ - .filter(username__startswith='jms_') - account = self.random_select_prefer_account(user, host, accounts) + accounts = accounts.exclude(username__in=accounts_username_used) + public_accounts = accounts.filter(username__startswith='jms_{}'.format(self.name)) + if not public_accounts: + public_accounts = accounts.exclude(username__in=['Administrator', 'root']) + account = self.random_select_prefer_account(user, host, public_accounts) if not account: return ttl = 60 * 60 * 24