perf: 合并 connect token

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'),
         ),
     ]

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',
+            name='account_name',
-            field=models.CharField(max_length=128, verbose_name='Login account'),
+            field=models.CharField(max_length=128, verbose_name='Account name'),
         ),
         migrations.AddField(
             model_name='connectiontoken',
-            name='username',
+            name='input_username',
-            field=models.CharField(default='', max_length=128, verbose_name='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',
+            name='value',
-            field=common.db.fields.EncryptCharField(default='', max_length=128, verbose_name='Secret'),
+            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,
         ),
     ]

apps/authentication/migrations/0015_alter_connectiontoken_login.py

@@ -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'),
-        ),
-    ]

apps/authentication/migrations/0016_auto_20221125_2240.py

@@ -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'),
-        ),
-    ]

apps/authentication/migrations/0017_auto_20221128_1839.py

@@ -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,
-        ),
-    ]

apps/authentication/migrations/0018_connectiontoken_endpoint_protocol.py

@@ -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,
-        ),
-    ]

apps/authentication/migrations/0019_remove_connectiontoken_endpoint_protocol.py

@@ -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',
-        ),
-    ]

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_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"))
+    input_secret = EncryptCharField(max_length=64, default='', blank=True, verbose_name=_("Input secret"))
-    protocol = models.CharField(
+    protocol = models.CharField(max_length=16, default=Protocol.ssh, verbose_name=_("Protocol"))
-        choices=Protocol.choices, 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(
+    date_expired = models.DateTimeField(default=date_expired_default, verbose_name=_("Date expired"))
-        default=date_expired_default, verbose_name=_("Date expired")
-    )
 
     class Meta:
         ordering = ('-date_expired',)