From 861ac637ccb33e780ab0f7748604d19a1052b743 Mon Sep 17 00:00:00 2001
From: gyc <2649472510@qq.com>
Date: Fri, 12 Apr 2024 15:11:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E7=AE=B1=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java  | 20 ++++++++++++++++---
 .../com/muyu/system/mapper/SysUserMapper.java |  2 ++
 .../muyu/system/service/SysUserService.java   |  2 ++
 .../service/impl/SysUserServiceImpl.java      |  6 ++++++
 .../resources/mapper/system/SysUserMapper.xml |  4 ++++
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java
index 9811a0e..b3edd32 100644
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java
@@ -99,10 +99,24 @@ public class SysUserController extends BaseController {
     @InnerAuth
     @GetMapping("/info/{username}")
     public Result<LoginUser> info (@PathVariable("username") String username) {
-        SysUser sysUser = userService.selectUserByUserName(username);
-        if (StringUtils.isNull(sysUser)) {
-            return Result.error("用户名或密码错误");
+        String regular = "^" +
+                "(([^<>()\\[\\]\\\\.,;:\\s@\"]+(\\.[^<>()\\[\\]\\\\.,;:\\s@\"]+)*)|(\".+\"))@" +
+                "((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\])|" +
+                "(([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}))" +
+                "$";
+        SysUser sysUser=null;
+        if (username.matches(regular)) {
+            sysUser = userService.selectUserByEmail(username);
+            if (StringUtils.isNull(sysUser)) {
+                return Result.error("邮箱或密码错误");
+            }
+        }else {
+             sysUser = userService.selectUserByUserName(username);
+            if (StringUtils.isNull(sysUser)) {
+                return Result.error("用户名或密码错误");
+            }
         }
+
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(sysUser);
         // 权限集合
diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java
index e037b34..5120cb3 100644
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java
@@ -139,4 +139,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return 结果
      */
     public SysUser checkEmailUnique (String email);
+
+    SysUser selectUserByEmail(String username);
 }
diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java
index f4c6167..53db860 100644
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java
@@ -225,4 +225,6 @@ public interface SysUserService extends IService<SysUser> {
      * @return 结果
      */
     public String importUser (List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    SysUser selectUserByEmail(String username);
 }
diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
index ab88e1c..05ccd64 100644
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
@@ -500,4 +500,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return successMsg.toString();
     }
 
+    @Override
+    public SysUser selectUserByEmail(String username) {
+
+        return userMapper.selectUserByEmail(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..3b65c6a 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
@@ -183,6 +183,10 @@
           and del_flag = '0'
         limit 1
     </select>
+    <select id="selectUserByEmail" resultType="com.muyu.common.system.domain.SysUser">
+        <include refid="selectUserVo"/>
+        where u.email = #{username} and u.del_flag = '0'
+    </select>
 
     <insert id="insertUser" parameterType="com.muyu.common.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
         insert into sys_user(