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

perf: 修改资产协议 xpack

pull/12013/head^2
ibuler 2023-11-02 19:34:55 +08:00 committed by 老广
parent eee119eba1
commit 927fe1f128
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/assets/const/protocol.py
View File

@ -27,7 +27,7 @@ class Protocol(ChoicesMixin, models.TextChoices):
redis = 'redis', 'Redis' redis = 'redis', 'Redis'
mongodb = 'mongodb', 'MongoDB' mongodb = 'mongodb', 'MongoDB'
k8s = 'k8s', 'K8S' k8s = 'k8s', 'K8s'
http = 'http', 'HTTP(s)' http = 'http', 'HTTP(s)'
chatgpt = 'chatgpt', 'ChatGPT' chatgpt = 'chatgpt', 'ChatGPT'
@ -295,15 +295,21 @@ class Protocol(ChoicesMixin, models.TextChoices):
} }
@classmethod @classmethod
@cached_method(ttl=600)
def protocols(cls): def protocols(cls):
return cls.settings().keys() protocols = []
xpack_enabled = settings.XPACK_ENABLED
for protocol, config in cls.settings().items():
if not xpack_enabled and config.get('xpack', False):
continue
protocols.append(protocol)
return protocols
@classmethod @classmethod
@cached_method(ttl=600) @cached_method(ttl=600)
def xpack_protocols(cls): def xpack_protocols(cls):
return [ return [
protocol protocol for protocol, config in cls.settings().items()
for protocol, config in cls.settings().items()
if config.get('xpack', False) if config.get('xpack', False)
] ]

2
apps/assets/migrations/0071_systemuser_type.py
View File

@ -83,7 +83,7 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='systemuser', model_name='systemuser',
name='protocol', name='protocol',
field=models.CharField(choices=[('ssh', 'SSH'), ('rdp', 'RDP'), ('telnet', 'Telnet'), ('vnc', 'VNC'), ('mysql', 'MySQL'), ('oracle', 'Oracle'), ('mariadb', 'MariaDB'), ('postgresql', 'PostgreSQL'), ('k8s', 'K8S')], default='ssh', max_length=16, verbose_name='Protocol'), field=models.CharField(choices=[('ssh', 'SSH'), ('rdp', 'RDP'), ('telnet', 'Telnet'), ('vnc', 'VNC'), ('mysql', 'MySQL'), ('oracle', 'Oracle'), ('mariadb', 'MariaDB'), ('postgresql', 'PostgreSQL'), ('k8s', 'K8s')], default='ssh', max_length=16, verbose_name='Protocol'),
), ),
migrations.RunPython(migrate_admin_user_to_system_user), migrations.RunPython(migrate_admin_user_to_system_user),
migrations.RenameField( migrations.RenameField(

2
apps/assets/migrations/0081_auto_20211105_1605.py
View File

@ -13,6 +13,6 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='systemuser', model_name='systemuser',
name='protocol', name='protocol',
field=models.CharField(choices=[('ssh', 'SSH'), ('rdp', 'RDP'), ('telnet', 'Telnet'), ('vnc', 'VNC'), ('mysql', 'MySQL'), ('oracle', 'Oracle'), ('mariadb', 'MariaDB'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('k8s', 'K8S')], default='ssh', max_length=16, verbose_name='Protocol'), field=models.CharField(choices=[('ssh', 'SSH'), ('rdp', 'RDP'), ('telnet', 'Telnet'), ('vnc', 'VNC'), ('mysql', 'MySQL'), ('oracle', 'Oracle'), ('mariadb', 'MariaDB'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('k8s', 'K8s')], default='ssh', max_length=16, verbose_name='Protocol'),
), ),
] ]

2
apps/assets/migrations/0084_auto_20220112_1959.py
View File

@ -40,7 +40,7 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='systemuser', model_name='systemuser',
name='protocol', name='protocol',
field=models.CharField(choices=[('ssh', 'SSH'), ('rdp', 'RDP'), ('telnet', 'Telnet'), ('vnc', 'VNC'), ('mysql', 'MySQL'), ('redis', 'Redis'), ('oracle', 'Oracle'), ('mariadb', 'MariaDB'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('k8s', 'K8S')], default='ssh', max_length=16, verbose_name='Protocol'), field=models.CharField(choices=[('ssh', 'SSH'), ('rdp', 'RDP'), ('telnet', 'Telnet'), ('vnc', 'VNC'), ('mysql', 'MySQL'), ('redis', 'Redis'), ('oracle', 'Oracle'), ('mariadb', 'MariaDB'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('k8s', 'K8s')], default='ssh', max_length=16, verbose_name='Protocol'),
), ),
migrations.CreateModel( migrations.CreateModel(
name='AccountBackupPlanExecution', name='AccountBackupPlanExecution',

2
apps/assets/migrations/0087_auto_20220223_1539.py
View File

@ -13,6 +13,6 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='systemuser', model_name='systemuser',
name='protocol', name='protocol',
field=models.CharField(choices=[('ssh', 'SSH'), ('rdp', 'RDP'), ('telnet', 'Telnet'), ('vnc', 'VNC'), ('mysql', 'MySQL'), ('oracle', 'Oracle'), ('mariadb', 'MariaDB'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('redis', 'Redis'), ('mongodb', 'MongoDB'), ('k8s', 'K8S')], default='ssh', max_length=16, verbose_name='Protocol'), field=models.CharField(choices=[('ssh', 'SSH'), ('rdp', 'RDP'), ('telnet', 'Telnet'), ('vnc', 'VNC'), ('mysql', 'MySQL'), ('oracle', 'Oracle'), ('mariadb', 'MariaDB'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('redis', 'Redis'), ('mongodb', 'MongoDB'), ('k8s', 'K8s')], default='ssh', max_length=16, verbose_name='Protocol'),
), ),
] ]