From d25d580ba46f72a1bce025934b1baaea62311320 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 5 Dec 2022 11:06:50 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=90=88=E5=B9=B6=20connect=20token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0013_connectiontoken_protocol.py | 3 +- .../migrations/0014_auto_20221122_2152.py | 35 +++++++++---- .../0015_alter_connectiontoken_login.py | 18 ------- .../migrations/0016_auto_20221125_2240.py | 50 ------------------- .../migrations/0017_auto_20221128_1839.py | 18 ------- .../0018_connectiontoken_endpoint_protocol.py | 19 ------- ...emove_connectiontoken_endpoint_protocol.py | 17 ------- .../authentication/models/connection_token.py | 12 ++--- 8 files changed, 31 insertions(+), 141 deletions(-) delete mode 100644 apps/authentication/migrations/0015_alter_connectiontoken_login.py delete mode 100644 apps/authentication/migrations/0016_auto_20221125_2240.py delete mode 100644 apps/authentication/migrations/0017_auto_20221128_1839.py delete mode 100644 apps/authentication/migrations/0018_connectiontoken_endpoint_protocol.py delete mode 100644 apps/authentication/migrations/0019_remove_connectiontoken_endpoint_protocol.py diff --git a/apps/authentication/migrations/0013_connectiontoken_protocol.py b/apps/authentication/migrations/0013_connectiontoken_protocol.py index f6e310e24..3ba4785b0 100644 --- a/apps/authentication/migrations/0013_connectiontoken_protocol.py +++ b/apps/authentication/migrations/0013_connectiontoken_protocol.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('authentication', '0012_auto_20220816_1629'), ] @@ -13,6 +12,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='connectiontoken', name='protocol', - field=models.CharField(choices=[('ssh', 'SSH'), ('rdp', 'RDP'), ('telnet', 'Telnet'), ('vnc', 'VNC'), ('mysql', 'MySQL'), ('mariadb', 'MariaDB'), ('oracle', 'Oracle'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('redis', 'Redis'), ('mongodb', 'MongoDB'), ('k8s', 'K8S'), ('http', 'HTTP'), ('None', ' Settings')], default='ssh', max_length=16, verbose_name='Protocol'), + field=models.CharField(default='ssh', max_length=16, verbose_name='Protocol'), ), ] diff --git a/apps/authentication/migrations/0014_auto_20221122_2152.py b/apps/authentication/migrations/0014_auto_20221122_2152.py index b198295a5..483b6d5f0 100644 --- a/apps/authentication/migrations/0014_auto_20221122_2152.py +++ b/apps/authentication/migrations/0014_auto_20221122_2152.py @@ -1,11 +1,11 @@ # Generated by Django 3.2.14 on 2022-11-22 13:52 -import common.db.fields from django.db import migrations, models +import common.db.fields + class Migration(migrations.Migration): - dependencies = [ ('authentication', '0013_connectiontoken_protocol'), ] @@ -14,21 +14,38 @@ class Migration(migrations.Migration): migrations.RenameField( model_name='connectiontoken', old_name='account_username', - new_name='login' + new_name='account_name' ), migrations.AlterField( model_name='connectiontoken', - name='login', - field=models.CharField(max_length=128, verbose_name='Login account'), + name='account_name', + field=models.CharField(max_length=128, verbose_name='Account name'), ), migrations.AddField( model_name='connectiontoken', - name='username', - field=models.CharField(default='', max_length=128, verbose_name='Username'), + name='input_username', + field=models.CharField(blank=True, default='', max_length=128, verbose_name='Input username'), + ), + migrations.AddField( + model_name='connectiontoken', + name='input_secret', + field=common.db.fields.EncryptCharField(blank=True, default='', max_length=128, + verbose_name='Input secret'), + ), + migrations.RenameField( + model_name='connectiontoken', + old_name='secret', + new_name='value', ), migrations.AlterField( model_name='connectiontoken', - name='secret', - field=common.db.fields.EncryptCharField(default='', max_length=128, verbose_name='Secret'), + name='value', + field=models.CharField(default='', max_length=64, verbose_name='Value'), + ), + migrations.AddField( + model_name='connectiontoken', + name='connect_method', + field=models.CharField(default='web_ui', max_length=32, verbose_name='Connect method'), + preserve_default=False, ), ] diff --git a/apps/authentication/migrations/0015_alter_connectiontoken_login.py b/apps/authentication/migrations/0015_alter_connectiontoken_login.py deleted file mode 100644 index f2c6abecb..000000000 --- a/apps/authentication/migrations/0015_alter_connectiontoken_login.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.14 on 2022-11-23 02:26 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('authentication', '0014_auto_20221122_2152'), - ] - - operations = [ - migrations.AlterField( - model_name='connectiontoken', - name='login', - field=models.CharField(max_length=128, verbose_name='Login account'), - ), - ] diff --git a/apps/authentication/migrations/0016_auto_20221125_2240.py b/apps/authentication/migrations/0016_auto_20221125_2240.py deleted file mode 100644 index 041a29fc6..000000000 --- a/apps/authentication/migrations/0016_auto_20221125_2240.py +++ /dev/null @@ -1,50 +0,0 @@ -# Generated by Django 3.2.14 on 2022-11-25 14:40 - -from django.db import migrations, models - -import common.db.fields - - -class Migration(migrations.Migration): - dependencies = [ - ('authentication', '0015_alter_connectiontoken_login'), - ] - - operations = [ - migrations.RenameField( - model_name='connectiontoken', - old_name='login', - new_name='account_name' - ), - migrations.RenameField( - model_name='connectiontoken', - old_name='secret', - new_name='value', - ), - migrations.RenameField( - model_name='connectiontoken', - old_name='username', - new_name='input_username', - ), - migrations.AlterField( - model_name='connectiontoken', - name='account_name', - field=models.CharField(max_length=128, verbose_name='Account name'), - ), - migrations.AlterField( - model_name='connectiontoken', - name='value', - field=models.CharField(default='', max_length=64, verbose_name='Value'), - ), - migrations.AddField( - model_name='connectiontoken', - name='input_secret', - field=common.db.fields.EncryptCharField(blank=True, default='', max_length=128, - verbose_name='Input Secret'), - ), - migrations.AlterField( - model_name='connectiontoken', - name='input_username', - field=models.CharField(blank=True, default='', max_length=128, verbose_name='Input Username'), - ), - ] diff --git a/apps/authentication/migrations/0017_auto_20221128_1839.py b/apps/authentication/migrations/0017_auto_20221128_1839.py deleted file mode 100644 index bcdb71020..000000000 --- a/apps/authentication/migrations/0017_auto_20221128_1839.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.14 on 2022-11-28 10:39 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ('authentication', '0016_auto_20221125_2240'), - ] - - operations = [ - migrations.AddField( - model_name='connectiontoken', - name='connect_method', - field=models.CharField(default='web_ui', max_length=32, verbose_name='Connect method'), - preserve_default=False, - ), - ] diff --git a/apps/authentication/migrations/0018_connectiontoken_endpoint_protocol.py b/apps/authentication/migrations/0018_connectiontoken_endpoint_protocol.py deleted file mode 100644 index f267a62fd..000000000 --- a/apps/authentication/migrations/0018_connectiontoken_endpoint_protocol.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.2.14 on 2022-11-29 04:49 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('authentication', '0017_auto_20221128_1839'), - ] - - operations = [ - migrations.AddField( - model_name='connectiontoken', - name='endpoint_protocol', - field=models.CharField(choices=[('ssh', 'SSH'), ('rdp', 'RDP'), ('telnet', 'Telnet'), ('vnc', 'VNC'), ('mysql', 'MySQL'), ('mariadb', 'MariaDB'), ('oracle', 'Oracle'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('redis', 'Redis'), ('mongodb', 'MongoDB'), ('k8s', 'K8S'), ('http', 'HTTP'), ('None', ' Settings')], default='', max_length=16, verbose_name='Endpoint protocol'), - preserve_default=False, - ), - ] diff --git a/apps/authentication/migrations/0019_remove_connectiontoken_endpoint_protocol.py b/apps/authentication/migrations/0019_remove_connectiontoken_endpoint_protocol.py deleted file mode 100644 index ef7f401bd..000000000 --- a/apps/authentication/migrations/0019_remove_connectiontoken_endpoint_protocol.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.2.14 on 2022-11-29 13:27 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('authentication', '0018_connectiontoken_endpoint_protocol'), - ] - - operations = [ - migrations.RemoveField( - model_name='connectiontoken', - name='endpoint_protocol', - ), - ] diff --git a/apps/authentication/models/connection_token.py b/apps/authentication/models/connection_token.py index ef4fad0ac..93b137923 100644 --- a/apps/authentication/models/connection_token.py +++ b/apps/authentication/models/connection_token.py @@ -29,17 +29,13 @@ class ConnectionToken(OrgModelMixin, JMSBaseModel): related_name='connection_tokens', verbose_name=_('Asset'), ) account_name = models.CharField(max_length=128, verbose_name=_("Account name")) # 登录账号Name - input_username = models.CharField(max_length=128, default='', blank=True, verbose_name=_("Input Username")) - input_secret = EncryptCharField(max_length=64, default='', blank=True, verbose_name=_("Input Secret")) - protocol = models.CharField( - choices=Protocol.choices, max_length=16, default=Protocol.ssh, verbose_name=_("Protocol") - ) + input_username = models.CharField(max_length=128, default='', blank=True, verbose_name=_("Input username")) + input_secret = EncryptCharField(max_length=64, default='', blank=True, verbose_name=_("Input secret")) + protocol = models.CharField(max_length=16, default=Protocol.ssh, verbose_name=_("Protocol")) connect_method = models.CharField(max_length=32, verbose_name=_("Connect method")) user_display = models.CharField(max_length=128, default='', verbose_name=_("User display")) asset_display = models.CharField(max_length=128, default='', verbose_name=_("Asset display")) - date_expired = models.DateTimeField( - default=date_expired_default, verbose_name=_("Date expired") - ) + date_expired = models.DateTimeField(default=date_expired_default, verbose_name=_("Date expired")) class Meta: ordering = ('-date_expired',)