From 9383508a858b083a82a90ca4593423c823a5e324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=BD=E5=A5=87=E5=AE=9D=E5=AE=9D?= <shizy2010@163.com>
Date: Fri, 28 Jun 2024 10:13:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E5=92=8C=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=99=BB=E5=BD=95=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/views/login.py | 12 ++++++++++--
 web/public/version-build              |  1 +
 web/src/i18n/pages/login/zh-cn.ts     |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 web/public/version-build

diff --git a/backend/dvadmin/system/views/login.py b/backend/dvadmin/system/views/login.py
index e04743c..f3adcb8 100644
--- a/backend/dvadmin/system/views/login.py
+++ b/backend/dvadmin/system/views/login.py
@@ -4,6 +4,7 @@ from datetime import datetime, timedelta
 from captcha.views import CaptchaStore, captcha_image
 from django.contrib import auth
 from django.contrib.auth import login
+from django.db.models import Q
 from django.shortcuts import redirect
 from django.utils.translation import gettext_lazy as _
 from drf_yasg import openapi
@@ -83,11 +84,18 @@ class LoginSerializer(TokenObtainPairSerializer):
                 else:
                     self.image_code and self.image_code.delete()
                     raise CustomValidationError("图片验证码错误")
-
-        user = Users.objects.get(username=attrs['username'])
+        try:
+            user = Users.objects.get(
+                Q(username=attrs['username']) | Q(email=attrs['username']) | Q(mobile=attrs['username']))
+        except Users.DoesNotExist:
+            raise CustomValidationError("您登录的账号不存在")
+        except Users.MultipleObjectsReturned:
+            raise CustomValidationError("您登录的账号存在多个,请联系管理员检查登录账号唯一性")
         if not user.is_active:
             raise CustomValidationError("账号已被锁定,联系管理员解锁")
         try:
+            # 必须重置用户名为username,否则使用邮箱手机号登录会提示密码错误
+            attrs['username'] = user.username
             data = super().validate(attrs)
             data["name"] = self.user.name
             data["userId"] = self.user.id
diff --git a/web/public/version-build b/web/public/version-build
new file mode 100644
index 0000000..f6571be
--- /dev/null
+++ b/web/public/version-build
@@ -0,0 +1 @@
+3.0.3.1719538291017
\ No newline at end of file
diff --git a/web/src/i18n/pages/login/zh-cn.ts b/web/src/i18n/pages/login/zh-cn.ts
index 6ab9813..07fd82e 100644
--- a/web/src/i18n/pages/login/zh-cn.ts
+++ b/web/src/i18n/pages/login/zh-cn.ts
@@ -9,7 +9,7 @@ export default {
 		two4: '友情链接',
 	},
 	account: {
-		accountPlaceholder1: '请输入登录账号',
+		accountPlaceholder1: '请输入登录账号/邮箱/手机号',
 		accountPlaceholder2: '请输入登录密码',
 		accountPlaceholder3: '请输入验证码',
 		accountBtnText: '登 录',

From 7a21f44eab58e50565d14172341fca7c6a69cb84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=BD=E5=A5=87=E5=AE=9D=E5=AE=9D?=
 <11259906+haoqibb@user.noreply.gitee.com>
Date: Fri, 28 Jun 2024 02:15:47 +0000
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20web/?=
 =?UTF-8?q?public/version-build?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/public/version-build | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 web/public/version-build

diff --git a/web/public/version-build b/web/public/version-build
deleted file mode 100644
index f6571be..0000000
--- a/web/public/version-build
+++ /dev/null
@@ -1 +0,0 @@
-3.0.3.1719538291017
\ No newline at end of file