From 66539b8674db40d3d08b2e8dd85feab10904f4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E6=9C=9D?=
 <13694051+wangxizhao123@user.noreply.gitee.com>
Date: Sat, 13 Apr 2024 14:49:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/muyu/auth/controller/TokenController.java |  2 +-
 .../main/java/com/muyu/auth/form/LoginBody.java   | 15 +++++++++++++++
 .../com/muyu/auth/service/SysLoginService.java    |  8 ++++----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java b/muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java
index 960a13f..e17cc55 100644
--- a/muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java
+++ b/muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java
@@ -34,7 +34,7 @@ public class TokenController {
     @PostMapping("login")
     public Result<?> login (@RequestBody LoginBody form) {
         // 用户登录
-        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
+        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getEmail(), form.getPassword());
         // 获取登录token
         return Result.success(tokenService.createToken(userInfo));
     }
diff --git a/muyu-auth/src/main/java/com/muyu/auth/form/LoginBody.java b/muyu-auth/src/main/java/com/muyu/auth/form/LoginBody.java
index 999ad44..952ff50 100644
--- a/muyu-auth/src/main/java/com/muyu/auth/form/LoginBody.java
+++ b/muyu-auth/src/main/java/com/muyu/auth/form/LoginBody.java
@@ -11,6 +11,11 @@ public class LoginBody {
      */
     private String username;
 
+    /**
+     * 邮箱
+     */
+    private String email;
+
     /**
      * 用户密码
      */
@@ -24,6 +29,14 @@ public class LoginBody {
         this.username = username;
     }
 
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
     public String getPassword () {
         return password;
     }
@@ -31,4 +44,6 @@ public class LoginBody {
     public void setPassword (String password) {
         this.password = password;
     }
+
+
 }
diff --git a/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java b/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java
index ff0af1a..b72b203 100644
--- a/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java
+++ b/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java
@@ -40,11 +40,11 @@ public class SysLoginService {
     /**
      * 登录
      */
-    public LoginUser login (String username, String password) {
+    public LoginUser login (String username, String email, String password) {
         // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(username, password)) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
-            throw new ServiceException("用户/密码必须填写");
+        if (StringUtils.isAnyBlank(username, email, password)) {
+            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/邮箱/密码必须填写");
+            throw new ServiceException("用户/邮箱/密码必须填写");
         }
         // 密码如果不在指定范围内 错误
         if (password.length() < UserConstants.PASSWORD_MIN_LENGTH