From 2a53a20808792fdce86b74d79e18358cbc3c2be6 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 24 Jul 2020 10:25:19 +0800 Subject: [PATCH] =?UTF-8?q?perf(assets):=20=E4=BF=AE=E6=94=B9=20=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=94=A8=E6=88=B7=20=E7=AE=A1=E7=90=86=E7=94=A8?= =?UTF-8?q?=E6=88=B7=20=E7=AD=89=E7=9A=84=E7=94=A8=E6=88=B7=E5=90=8D?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E5=88=B0128?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0053_auto_20200723_1232.py | 34 +++++++++++++++++++ apps/assets/models/base.py | 2 +- .../migrations/0002_auto_20200723_1232.py | 18 ++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 apps/assets/migrations/0053_auto_20200723_1232.py create mode 100644 apps/tickets/migrations/0002_auto_20200723_1232.py diff --git a/apps/assets/migrations/0053_auto_20200723_1232.py b/apps/assets/migrations/0053_auto_20200723_1232.py new file mode 100644 index 000000000..7d1ba220d --- /dev/null +++ b/apps/assets/migrations/0053_auto_20200723_1232.py @@ -0,0 +1,34 @@ +# Generated by Django 2.2.10 on 2020-07-23 04:32 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('assets', '0052_auto_20200715_1535'), + ] + + operations = [ + migrations.AlterField( + model_name='adminuser', + name='username', + field=models.CharField(blank=True, db_index=True, max_length=128, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_@\\-\\.]*$', 'Special char not allowed')], verbose_name='Username'), + ), + migrations.AlterField( + model_name='authbook', + name='username', + field=models.CharField(blank=True, db_index=True, max_length=128, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_@\\-\\.]*$', 'Special char not allowed')], verbose_name='Username'), + ), + migrations.AlterField( + model_name='gateway', + name='username', + field=models.CharField(blank=True, db_index=True, max_length=128, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_@\\-\\.]*$', 'Special char not allowed')], verbose_name='Username'), + ), + migrations.AlterField( + model_name='systemuser', + name='username', + field=models.CharField(blank=True, db_index=True, max_length=128, validators=[django.core.validators.RegexValidator('^[0-9a-zA-Z_@\\-\\.]*$', 'Special char not allowed')], verbose_name='Username'), + ), + ] diff --git a/apps/assets/models/base.py b/apps/assets/models/base.py index 3c9a481a5..282c9b928 100644 --- a/apps/assets/models/base.py +++ b/apps/assets/models/base.py @@ -230,7 +230,7 @@ class AuthMixin: class BaseUser(OrgModelMixin, AuthMixin, ConnectivityMixin): id = models.UUIDField(default=uuid.uuid4, primary_key=True) name = models.CharField(max_length=128, verbose_name=_('Name')) - username = models.CharField(max_length=32, blank=True, verbose_name=_('Username'), validators=[alphanumeric], db_index=True) + username = models.CharField(max_length=128, blank=True, verbose_name=_('Username'), validators=[alphanumeric], db_index=True) password = fields.EncryptCharField(max_length=256, blank=True, null=True, verbose_name=_('Password')) private_key = fields.EncryptTextField(blank=True, null=True, verbose_name=_('SSH private key')) public_key = fields.EncryptTextField(blank=True, null=True, verbose_name=_('SSH public key')) diff --git a/apps/tickets/migrations/0002_auto_20200723_1232.py b/apps/tickets/migrations/0002_auto_20200723_1232.py new file mode 100644 index 000000000..26d980a4a --- /dev/null +++ b/apps/tickets/migrations/0002_auto_20200723_1232.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.10 on 2020-07-23 04:32 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('tickets', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='ticket', + name='type', + field=models.CharField(choices=[('general', 'General'), ('login_confirm', 'Login confirm'), ('request_asset', 'Request asset permission')], default='general', max_length=16, verbose_name='Type'), + ), + ]