From 5d9c7f23ca3446d43132fb1e660f088e4361a63b Mon Sep 17 00:00:00 2001
From: lqy <3139512106@qq.com>
Date: Fri, 12 Apr 2024 15:24:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/muyu/auth/controller/TokenController.java   |  1 +
 .../src/main/java/com/muyu/auth/form/LoginBody.java | 13 +++++++++++++
 .../java/com/muyu/auth/service/SysLoginService.java |  9 +++++++--
 .../com/muyu/auth/service/SysPasswordService.java   |  6 +++++-
 .../main/resources/mapper/system/SysUserMapper.xml  |  2 +-
 5 files changed, 27 insertions(+), 4 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..cedbb86 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,6 +34,7 @@ public class TokenController {
     @PostMapping("login")
     public Result<?> login (@RequestBody LoginBody form) {
         // 用户登录
+        form.setEmail(form.getUsername()+"123@163.com");
         LoginUser userInfo = sysLoginService.login(form.getUsername(), 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..21a8b7a 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
@@ -1,16 +1,29 @@
 package com.muyu.auth.form;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 /**
  * 用户登录对象
  *
  * @author muyu
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class LoginBody {
     /**
      * 用户名
      */
     private String username;
 
+    /**
+     * 用户邮箱
+     */
+    private String email;
     /**
      * 用户密码
      */
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..29b7dc6 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
@@ -68,8 +68,13 @@ public class SysLoginService {
         Result<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
 
         if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
-            throw new ServiceException("登录用户：" + username + " 不存在");
+            if (username.contains("@")){
+                recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录邮箱不存在");
+                throw new ServiceException("登录邮箱：" + username + " 不存在");
+            }else{
+                recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
+                throw new ServiceException("登录用户：" + username + " 不存在");
+            }
         }
 
         if (Result.FAIL == userResult.getCode()) {
diff --git a/muyu-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java b/muyu-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java
index 5f3c126..8ea1435 100644
--- a/muyu-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java
+++ b/muyu-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java
@@ -58,7 +58,11 @@ public class SysPasswordService {
             retryCount = retryCount + 1;
             recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, String.format("密码输入错误%s次", retryCount));
             redisService.setCacheObject(getCacheKey(username), retryCount, lockTime, TimeUnit.MINUTES);
-            throw new ServiceException("用户不存在/密码错误");
+            if (user.getEmail()==null){
+                throw  new ServiceException("密码错误/邮箱不存在");
+            }else {
+                throw new ServiceException("用户不存在/密码错误");
+            }
         } else {
             clearLoginRecordCache(username);
         }
diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
index 6f633b7..6b345a9 100644
--- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -152,7 +152,7 @@
 
     <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
-        where u.user_name = #{userName} and u.del_flag = '0'
+        where u.user_name = #{userName} or u.email = #{userName} and u.del_flag = '0'
     </select>
 
     <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">