邮箱登录

muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java

@@ -68,6 +68,10 @@ public class SysLoginService {
         Result<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
 
         if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
+            if (username.contains("@")){
+                recordLogService.recordLogininfor(username,Constants.LOGIN_FAIL,"邮箱错误");
+                throw new ServiceException("邮箱"+username+"错误,请检查");
+            }
             recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
             throw new ServiceException("登录用户：" + username + " 不存在");
         }

muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java

@@ -26,6 +26,11 @@ public class LoginUser implements Serializable {
      * 用户名
      */
     private String username;
+    /**
+     * pr
+     *
+     */
+    private String email;
 
     /**
      * 登录时间
@@ -128,4 +133,8 @@ public class LoginUser implements Serializable {
     public void setSysUser (SysUser sysUser) {
         this.sysUser = sysUser;
     }
+
+    public CharSequence getEmail() {
+        return this.email=email;
+    }
 }

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java

@@ -36,7 +36,7 @@ public class SysUserOnlineController extends BaseController {
 
     @RequiresPermissions("monitor:online:list")
     @GetMapping("/list")
-    public Result<TableDataInfo<SysUserOnline>> list (String ipaddr, String userName) {
+    public Result<TableDataInfo<SysUserOnline>> list (String email,String ipaddr, String userName) {
         Collection<String> keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
         List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
         for (String key : keys) {
@@ -47,6 +47,8 @@ public class SysUserOnlineController extends BaseController {
                 userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
             } else if (StringUtils.isNotEmpty(userName)) {
                 userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+            } else if (StringUtils.isNotEmpty(email)) {
+                userOnlineList.add(userOnlineService.selectOnlineByEmail(email, user));
             } else {
                 userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
             }

muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java

@@ -47,6 +47,15 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return 用户对象信息
      */
     public SysUser selectUserByUserName (String userName);
+    /**
+     * 通过邮箱查询用户
+     *
+     * @param email 用户名
+     *
+     * @return 用户对象信息
+     */
+    public SysUser selectUserByEmail(String email);
+
 
     /**
      * 通过用户ID查询用户
@@ -139,4 +148,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return 结果
      */
     public SysUser checkEmailUnique (String email);
+
 }

muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java

@@ -29,6 +29,15 @@ public interface SysUserOnlineService {
      * @return 在线用户信息
      */
     public SysUserOnline selectOnlineByUserName (String userName, LoginUser user);
+    /**
+     * 通过邮箱查询信息
+     *
+     * @param email  邮箱
+     * @param user     用户信息
+     *
+     * @return 在线用户信息
+     */
+    public SysUserOnline selectOnlineByEmail(String email, LoginUser user);
 
     /**
      * 通过登录地址/用户名称查询信息

muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java

@@ -45,6 +45,21 @@ public class SysUserOnlineServiceImpl implements SysUserOnlineService {
         }
         return null;
     }
+    /**
+     * 通过邮箱称查询信息
+     *
+     * @param email 用户名称
+     * @param user     用户信息
+     *
+     * @return 在线用户信息
+     */
+    @Override
+    public SysUserOnline selectOnlineByEmail(String email, LoginUser user) {
+        if (StringUtils.equals(email, user.getEmail())) {
+            return loginUserToUserOnline(user);
+        }
+        return null;
+    }
 
     /**
      * 通过登录地址/用户名称查询信息

muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java

@@ -102,6 +102,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return userMapper.selectUserByUserName(userName);
     }
 
+
     /**
      * 通过用户ID查询用户
      *

muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -152,7 +152,11 @@
 
     <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="selectUserByEmail" resultType="com.muyu.common.system.domain.SysUser">
+        <include refid="selectUserVo"/>
+        where u.email = #{email} and u.del_flag = '0'
     </select>
 
     <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
@@ -184,6 +188,7 @@
         limit 1
     </select>
 
+
     <insert id="insertUser" parameterType="com.muyu.common.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
         insert into sys_user(
         <if test="userId != null and userId != 0">user_id,</if>