github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #11113 from jumpserver/pr@dev@perf_account_select 

perf: 修改发布机账号选择
pull/11114/head
老广 2023-07-28 11:17:02 +08:00 committed by GitHub
parent 58124af1ce 93350faa08
commit dbfb9db5c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/terminal/models/applet/applet.py
View File

@ -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_')
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