From ce7351e7021185cdd1ec8f800557aa801927cacf Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Tue, 16 Jul 2024 18:11:47 +0800 Subject: [PATCH] refactor: ldap_user --- apps/users/migrations/0004_alter_user_email.py | 18 ++++++++++++++++++ apps/users/models/user.py | 2 +- apps/users/serializers/user_serializers.py | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 apps/users/migrations/0004_alter_user_email.py diff --git a/apps/users/migrations/0004_alter_user_email.py b/apps/users/migrations/0004_alter_user_email.py new file mode 100644 index 000000000..c77416ba1 --- /dev/null +++ b/apps/users/migrations/0004_alter_user_email.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.13 on 2024-07-16 17:03 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0003_user_source'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='email', + field=models.EmailField(blank=True, max_length=254, null=True, unique=True, verbose_name='邮箱'), + ), + ] diff --git a/apps/users/models/user.py b/apps/users/models/user.py index f4b15eda2..b16f07316 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -63,7 +63,7 @@ def get_user_dynamics_permission(user_id: str): class User(AppModelMixin): id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid1, editable=False, verbose_name="主键id") - email = models.EmailField(unique=True, verbose_name="邮箱") + email = models.EmailField(unique=True, null=True, blank=True, verbose_name="邮箱") phone = models.CharField(max_length=20, verbose_name="电话", default="") nick_name = models.CharField(max_length=150, verbose_name="昵称", default="") username = models.CharField(max_length=150, unique=True, verbose_name="用户名") diff --git a/apps/users/serializers/user_serializers.py b/apps/users/serializers/user_serializers.py index 0d595d485..46a76b840 100644 --- a/apps/users/serializers/user_serializers.py +++ b/apps/users/serializers/user_serializers.py @@ -78,7 +78,7 @@ class LoginSerializer(ApiMixin, serializers.Serializer): user = QuerySet(User).filter(Q(username=username, password=password) | Q(email=username, password=password)).first() - if user is None or user.source != "LOCAL": + if user is None: raise ExceptionCodeConstants.INCORRECT_USERNAME_AND_PASSWORD.value.to_app_api_exception() if not user.is_active: raise AppApiException(1005, "用户已被禁用,请联系管理员!")