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..c35460b 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.getUsernameOrEmail(), form.getPassword());
         // 获取登录token
         return Result.success(tokenService.createToken(userInfo));
     }
@@ -66,7 +66,7 @@ public class TokenController {
     @PostMapping("register")
     public Result<?> register (@RequestBody RegisterBody registerBody) {
         // 用户注册
-        sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
+        sysLoginService.register(registerBody.getUsernameOrEmail(), registerBody.getPassword());
         return Result.success();
     }
 }
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..e4cfb0e 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,36 +40,36 @@ public class SysLoginService {
     /**
      * 登录
      */
-    public LoginUser login (String username, String password) {
+    public LoginUser login (String usernameOrEmail, String password) {
         // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(username, password)) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
+        if (StringUtils.isAnyBlank(usernameOrEmail, password)) {
+            recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_FAIL, "用户/密码必须填写");
             throw new ServiceException("用户/密码必须填写");
         }
         // 密码如果不在指定范围内 错误
         if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
                 || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
+            recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_FAIL, "用户密码不在指定范围");
             throw new ServiceException("用户密码不在指定范围");
         }
         // 用户名不在指定范围内 错误
-        if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
+        if (usernameOrEmail.length() < UserConstants.USERNAME_MIN_LENGTH
+                || usernameOrEmail.length() > UserConstants.USERNAME_MAX_LENGTH) {
+            recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_FAIL, "用户名不在指定范围");
             throw new ServiceException("用户名不在指定范围");
         }
         // IP黑名单校验
         String blackStr = Convert.toStr(redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST));
         if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr())) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "很遗憾，访问IP已被列入系统黑名单");
+            recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_FAIL, "很遗憾，访问IP已被列入系统黑名单");
             throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
         }
         // 查询用户信息
-        Result<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
+        Result<LoginUser> userResult = remoteUserService.getUserInfo(usernameOrEmail, SecurityConstants.INNER);
 
         if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
-            throw new ServiceException("登录用户：" + username + " 不存在");
+            recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_FAIL, "登录用户不存在");
+            throw new ServiceException("登录用户：" + usernameOrEmail + " 不存在");
         }
 
         if (Result.FAIL == userResult.getCode()) {
@@ -79,15 +79,15 @@ public class SysLoginService {
         LoginUser userInfo = userResult.getData();
         SysUser user = userResult.getData().getSysUser();
         if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
-            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
+            recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
+            throw new ServiceException("对不起，您的账号：" + usernameOrEmail + " 已被删除");
         }
         if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
-            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+            recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
+            throw new ServiceException("对不起，您的账号：" + usernameOrEmail + " 已停用");
         }
         passwordService.validate(user, password);
-        recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
+        recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_SUCCESS, "登录成功");
         return userInfo;
     }
 
@@ -98,13 +98,13 @@ public class SysLoginService {
     /**
      * 注册
      */
-    public void register (String username, String password) {
+    public void register (String usernameOrEmail, String password) {
         // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(username, password)) {
+        if (StringUtils.isAnyBlank(usernameOrEmail, password)) {
             throw new ServiceException("用户/密码必须填写");
         }
-        if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
+        if (usernameOrEmail.length() < UserConstants.USERNAME_MIN_LENGTH
+                || usernameOrEmail.length() > UserConstants.USERNAME_MAX_LENGTH) {
             throw new ServiceException("账户长度必须在2到20个字符之间");
         }
         if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
@@ -114,14 +114,14 @@ public class SysLoginService {
 
         // 注册用户信息
         SysUser sysUser = new SysUser();
-        sysUser.setUserName(username);
-        sysUser.setNickName(username);
+        sysUser.setUserName(usernameOrEmail);
+        sysUser.setNickName(usernameOrEmail);
         sysUser.setPassword(SecurityUtils.encryptPassword(password));
         Result<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
 
         if (Result.FAIL == registerResult.getCode()) {
             throw new ServiceException(registerResult.getMsg());
         }
-        recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功");
+        recordLogService.recordLogininfor(usernameOrEmail, Constants.REGISTER, "注册成功");
     }
 }
diff --git a/muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java b/muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java
index 2d4de80..8af419b 100644
--- a/muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java
+++ b/muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java
@@ -22,15 +22,15 @@ public class SysRecordLogService {
     /**
      * 记录登录信息
      *
-     * @param username 用户名
+     * @param usernameOrEmail 用户名
      * @param status   状态
      * @param message  消息内容
      *
      * @return
      */
-    public void recordLogininfor (String username, String status, String message) {
+    public void recordLogininfor (String usernameOrEmail, String status, String message) {
         SysLogininfor logininfor = new SysLogininfor();
-        logininfor.setUserName(username);
+        logininfor.setUserName(usernameOrEmail);
         logininfor.setIpaddr(IpUtils.getIpAddr());
         logininfor.setMsg(message);
         // 日志状态
diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java b/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java
index b19697e..5196384 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java
+++ b/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java
@@ -46,7 +46,7 @@ public class TokenService {
         String userName = loginUser.getSysUser().getUserName();
         loginUser.setToken(token);
         loginUser.setUserid(userId);
-        loginUser.setUsername(userName);
+        loginUser.setUsernameOrEmail(userName);
         loginUser.setIpaddr(IpUtils.getIpAddr());
         refreshToken(loginUser);
 
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java
index ce39e96..c835352 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java
+++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java
@@ -25,7 +25,7 @@ public class LoginUser implements Serializable {
     /**
      * 用户名
      */
-    private String username;
+    private String usernameOrEmail;
 
     /**
      * 登录时间
@@ -73,12 +73,12 @@ public class LoginUser implements Serializable {
         this.userid = userid;
     }
 
-    public String getUsername () {
-        return username;
+    public String getUsernameOrEmail() {
+        return usernameOrEmail;
     }
 
-    public void setUsername (String username) {
-        this.username = username;
+    public void setUsernameOrEmail(String usernameOrEmail) {
+        this.usernameOrEmail = usernameOrEmail;
     }
 
     public Long getLoginTime () {
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java
index 6be7436..610273d 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java
+++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java
@@ -49,7 +49,7 @@ public class SysUser extends BaseEntity {
      * 用户账号
      */
     @Excel(name = "登录名称")
-    private String userName;
+    private String usernameOrEmail;
 
     /**
      * 用户昵称
@@ -179,11 +179,11 @@ public class SysUser extends BaseEntity {
     @NotBlank(message = "用户账号不能为空")
     @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
     public String getUserName () {
-        return userName;
+        return usernameOrEmail;
     }
 
-    public void setUserName (String userName) {
-        this.userName = userName;
+    public void setUserName (String usernameOrEmail) {
+        this.usernameOrEmail = usernameOrEmail;
     }
 
     @Email(message = "邮箱格式不正确")
@@ -306,7 +306,7 @@ public class SysUser extends BaseEntity {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("userId", getUserId())
                 .append("deptId", getDeptId())
-                .append("userName", getUserName())
+                .append("usernameOrEmail", getUserName())
                 .append("nickName", getNickName())
                 .append("email", getEmail())
                 .append("phonenumber", getPhonenumber())
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java
index cb968e0..d3dae34 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java
+++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java
@@ -19,13 +19,13 @@ public interface RemoteUserService {
     /**
      * 通过用户名查询用户信息
      *
-     * @param username 用户名
+     * @param usernameOrEmail 用户名
      * @param source   请求来源
      *
      * @return 结果
      */
-    @GetMapping("/user/info/{username}")
-    public Result<LoginUser> getUserInfo (@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    @GetMapping("/user/info/{usernameOrEmail}")
+    public Result<LoginUser> getUserInfo (@PathVariable("usernameOrEmail") String usernameOrEmail, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 注册用户信息
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java
index b7f4d60..29e45dc 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java
+++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java
@@ -23,7 +23,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
         log.error("用户服务调用失败:{}", throwable.getMessage());
         return new RemoteUserService() {
             @Override
-            public Result<LoginUser> getUserInfo (String username, String source) {
+            public Result<LoginUser> getUserInfo (String usernameOrEmail, String source) {
                 return Result.error("获取用户失败:" + throwable.getMessage());
             }
 
diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java
index ae49255..b47aac3 100644
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java
@@ -43,12 +43,12 @@ public class SysProfileController extends BaseController {
      */
     @GetMapping
     public Result profile () {
-        String username = SecurityUtils.getUsername();
-        SysUser user = userService.selectUserByUserName(username);
+        String usernameOrEmail = SecurityUtils.getUsername();
+        SysUser user = userService.selectUserByUserName(usernameOrEmail);
         return Result.success(
                 ProfileResp.builder()
-                        .roleGroup( userService.selectUserRoleGroup(username) )
-                        .postGroup( userService.selectUserPostGroup(username) )
+                        .roleGroup( userService.selectUserRoleGroup(usernameOrEmail) )
+                        .postGroup( userService.selectUserPostGroup(usernameOrEmail) )
                         .sysUser(user)
                         .build()
         );
@@ -86,8 +86,8 @@ public class SysProfileController extends BaseController {
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
     public Result updatePwd (String oldPassword, String newPassword) {
-        String username = SecurityUtils.getUsername();
-        SysUser user = userService.selectUserByUserName(username);
+        String usernameOrEmail = SecurityUtils.getUsername();
+        SysUser user = userService.selectUserByUserName(usernameOrEmail);
         String password = user.getPassword();
         if (!SecurityUtils.matchesPassword(oldPassword, password)) {
             return error("修改密码失败，旧密码错误");
@@ -95,7 +95,7 @@ public class SysProfileController extends BaseController {
         if (SecurityUtils.matchesPassword(newPassword, password)) {
             return error("新密码不能与旧密码相同");
         }
-        if (userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0) {
+        if (userService.resetUserPwd(usernameOrEmail, SecurityUtils.encryptPassword(newPassword)) > 0) {
             // 更新缓存用户密码
             LoginUser loginUser = SecurityUtils.getLoginUser();
             loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newPassword));
@@ -122,7 +122,7 @@ public class SysProfileController extends BaseController {
                 return error("文件服务异常，请联系管理员");
             }
             String url = fileResult.getData().getUrl();
-            if (userService.updateUserAvatar(loginUser.getUsername(), url)) {
+            if (userService.updateUserAvatar(loginUser.getUsernameOrEmail(), url)) {
                 // 更新缓存用户头像
                 loginUser.getSysUser().setAvatar(url);
                 tokenService.setLoginUser(loginUser);
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..29a64eb 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
@@ -97,9 +97,9 @@ public class SysUserController extends BaseController {
      * 获取当前用户信息
      */
     @InnerAuth
-    @GetMapping("/info/{username}")
-    public Result<LoginUser> info (@PathVariable("username") String username) {
-        SysUser sysUser = userService.selectUserByUserName(username);
+    @GetMapping("/info/{usernameOrEmail}")
+    public Result<LoginUser> info (@PathVariable("usernameOrEmail") String usernameOrEmail) {
+        SysUser sysUser = userService.selectUserByUserName(usernameOrEmail);
         if (StringUtils.isNull(sysUser)) {
             return Result.error("用户名或密码错误");
         }
@@ -120,12 +120,12 @@ public class SysUserController extends BaseController {
     @InnerAuth
     @PostMapping("/register")
     public Result<Boolean> register (@RequestBody SysUser sysUser) {
-        String username = sysUser.getUserName();
+        String usernameOrEmail = sysUser.getUserName();
         if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
             return Result.error("当前系统没有开启注册功能！");
         }
         if (!userService.checkUserNameUnique(sysUser)) {
-            return Result.error("保存用户'" + username + "'失败，注册账号已存在");
+            return Result.error("保存用户'" + usernameOrEmail + "'失败，注册账号已存在");
         }
         return Result.success(userService.registerUser(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..6e8cf1d 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
@@ -42,11 +42,11 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     /**
      * 通过用户名查询用户
      *
-     * @param userName 用户名
+     * @param usernameOrEmail 用户名
      *
      * @return 用户对象信息
      */
-    public SysUser selectUserByUserName (String userName);
+    public SysUser selectUserByUsernameOrEmail(String usernameOrEmail);
 
     /**
      * 通过用户ID查询用户
@@ -78,22 +78,22 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     /**
      * 修改用户头像
      *
-     * @param userName 用户名
+     * @param usernameOrEmail 用户名
      * @param avatar   头像地址
      *
      * @return 结果
      */
-    public int updateUserAvatar (@Param("userName") String userName, @Param("avatar") String avatar);
+    public int updateUserAvatar (@Param("usernameOrEmail") String usernameOrEmail, @Param("avatar") String avatar);
 
     /**
      * 重置用户密码
      *
-     * @param userName 用户名
+     * @param usernameOrEmail 用户名
      * @param password 密码
      *
      * @return 结果
      */
-    public int resetUserPwd (@Param("userName") String userName, @Param("password") String password);
+    public int resetUserPwd (@Param("usernameOrEmail") String usernameOrEmail, @Param("password") String password);
 
     /**
      * 通过用户ID删除用户
@@ -116,11 +116,11 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     /**
      * 校验用户名称是否唯一
      *
-     * @param userName 用户名称
+     * @param usernameOrEmail 用户名称
      *
      * @return 结果
      */
-    public SysUser checkUserNameUnique (String userName);
+    public SysUser checkUserNameUnique (String usernameOrEmail);
 
     /**
      * 校验手机号码是否唯一
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..de74eeb 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
@@ -41,11 +41,11 @@ public interface SysUserService extends IService<SysUser> {
     /**
      * 通过用户名查询用户
      *
-     * @param userName 用户名
+     * @param usernameOrEmail 用户名
      *
      * @return 用户对象信息
      */
-    public SysUser selectUserByUserName (String userName);
+    public SysUser selectUserByUserName (String usernameOrEmail);
 
     /**
      * 通过用户ID查询用户
@@ -59,20 +59,20 @@ public interface SysUserService extends IService<SysUser> {
     /**
      * 根据用户ID查询用户所属角色组
      *
-     * @param userName 用户名
+     * @param usernameOrEmail 用户名
      *
      * @return 结果
      */
-    public String selectUserRoleGroup (String userName);
+    public String selectUserRoleGroup (String usernameOrEmail);
 
     /**
      * 根据用户ID查询用户所属岗位组
      *
-     * @param userName 用户名
+     * @param usernameOrEmail 用户名
      *
      * @return 结果
      */
-    public String selectUserPostGroup (String userName);
+    public String selectUserPostGroup (String usernameOrEmail);
 
     /**
      * 校验用户名称是否唯一
@@ -171,12 +171,12 @@ public interface SysUserService extends IService<SysUser> {
     /**
      * 修改用户头像
      *
-     * @param userName 用户名
+     * @param usernameOrEmail 用户名
      * @param avatar   头像地址
      *
      * @return 结果
      */
-    public boolean updateUserAvatar (String userName, String avatar);
+    public boolean updateUserAvatar (String usernameOrEmail, String avatar);
 
     /**
      * 重置用户密码
@@ -190,12 +190,12 @@ public interface SysUserService extends IService<SysUser> {
     /**
      * 重置用户密码
      *
-     * @param userName 用户名
+     * @param usernameOrEmail 用户名
      * @param password 密码
      *
      * @return 结果
      */
-    public int resetUserPwd (String userName, String password);
+    public int resetUserPwd (String usernameOrEmail, String password);
 
     /**
      * 通过用户ID删除用户
diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java
index 8ede754..b642a16 100644
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java
@@ -1,6 +1,5 @@
 package com.muyu.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.system.domain.LoginUser;
 import com.muyu.system.domain.SysUserOnline;
@@ -40,7 +39,7 @@ public class SysUserOnlineServiceImpl implements SysUserOnlineService {
      */
     @Override
     public SysUserOnline selectOnlineByUserName (String userName, LoginUser user) {
-        if (StringUtils.equals(userName, user.getUsername())) {
+        if (StringUtils.equals(userName, user.getUsernameOrEmail())) {
             return loginUserToUserOnline(user);
         }
         return null;
@@ -57,7 +56,7 @@ public class SysUserOnlineServiceImpl implements SysUserOnlineService {
      */
     @Override
     public SysUserOnline selectOnlineByInfo (String ipaddr, String userName, LoginUser user) {
-        if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) {
+        if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsernameOrEmail())) {
             return loginUserToUserOnline(user);
         }
         return null;
@@ -77,7 +76,7 @@ public class SysUserOnlineServiceImpl implements SysUserOnlineService {
         }
         SysUserOnline sysUserOnline = new SysUserOnline();
         sysUserOnline.setTokenId(user.getToken());
-        sysUserOnline.setUserName(user.getUsername());
+        sysUserOnline.setUserName(user.getUsernameOrEmail());
         sysUserOnline.setIpaddr(user.getIpaddr());
         sysUserOnline.setLoginTime(user.getLoginTime());
         return sysUserOnline;
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..36e20a0 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
@@ -93,13 +93,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     /**
      * 通过用户名查询用户
      *
-     * @param userName 用户名
+     * @param usernameOrEmail 用户名
      *
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserByUserName (String userName) {
-        return userMapper.selectUserByUserName(userName);
+    public SysUser selectUserByUserName (String usernameOrEmail) {
+        return userMapper.selectUserByUsernameOrEmail(usernameOrEmail);
     }
 
     /**
@@ -117,13 +117,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     /**
      * 查询用户所属角色组
      *
-     * @param userName 用户名
+     * @param usernameOrEmail 用户名
      *
      * @return 结果
      */
     @Override
-    public String selectUserRoleGroup (String userName) {
-        List<SysRole> list = roleMapper.selectRolesByUserName(userName);
+    public String selectUserRoleGroup (String usernameOrEmail) {
+        List<SysRole> list = roleMapper.selectRolesByUserName(usernameOrEmail);
         if (CollectionUtils.isEmpty(list)) {
             return StringUtils.EMPTY;
         }
@@ -133,13 +133,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     /**
      * 查询用户所属岗位组
      *
-     * @param userName 用户名
+     * @param usernameOrEmail 用户名
      *
      * @return 结果
      */
     @Override
-    public String selectUserPostGroup (String userName) {
-        List<SysPost> list = postMapper.selectPostsByUserName(userName);
+    public String selectUserPostGroup (String usernameOrEmail) {
+        List<SysPost> list = postMapper.selectPostsByUserName(usernameOrEmail);
         if (CollectionUtils.isEmpty(list)) {
             return StringUtils.EMPTY;
         }
@@ -319,14 +319,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     /**
      * 修改用户头像
      *
-     * @param userName 用户名
+     * @param usernameOrEmail 用户名
      * @param avatar   头像地址
      *
      * @return 结果
      */
     @Override
-    public boolean updateUserAvatar (String userName, String avatar) {
-        return userMapper.updateUserAvatar(userName, avatar) > 0;
+    public boolean updateUserAvatar (String usernameOrEmail, String avatar) {
+        return userMapper.updateUserAvatar(usernameOrEmail, avatar) > 0;
     }
 
     /**
@@ -344,14 +344,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     /**
      * 重置用户密码
      *
-     * @param userName 用户名
+     * @param usernameOrEmail 用户名
      * @param password 密码
      *
      * @return 结果
      */
     @Override
-    public int resetUserPwd (String userName, String password) {
-        return userMapper.resetUserPwd(userName, password);
+    public int resetUserPwd (String usernameOrEmail, String password) {
+        return userMapper.resetUserPwd(usernameOrEmail, password);
     }
 
     /**
@@ -463,7 +463,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         for (SysUser user : userList) {
             try {
                 // 验证是否存在这个用户
-                SysUser u = userMapper.selectUserByUserName(user.getUserName());
+                SysUser u = userMapper.selectUserByUsernameOrEmail(user.getUserName());
                 if (StringUtils.isNull(u)) {
                     BeanValidators.validateWithException(validator, user);
                     user.setPassword(SecurityUtils.encryptPassword(password));
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..c0e75ba 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
@@ -7,7 +7,7 @@
     <resultMap type="com.muyu.common.system.domain.SysUser" id="SysUserResult">
         <id property="userId" column="user_id"/>
         <result property="deptId" column="dept_id"/>
-        <result property="userName" column="user_name"/>
+        <result property="usernameOrEmail" column="user_name"/>
         <result property="nickName" column="nick_name"/>
         <result property="email" column="email"/>
         <result property="phonenumber" column="phonenumber"/>
@@ -91,8 +91,8 @@
         <if test="userId != null and userId != 0">
             AND u.user_id = #{userId}
         </if>
-        <if test="userName != null and userName != ''">
-            AND u.user_name like concat('%', #{userName}, '%')
+        <if test="usernameOrEmail != null and usernameOrEmail != ''">
+            AND u.user_name like concat('%', #{usernameOrEmail}, '%')
         </if>
         <if test="status != null and status != ''">
             AND u.status = #{status}
@@ -121,8 +121,8 @@
         left join sys_user_role ur on u.user_id = ur.user_id
         left join sys_role r on r.role_id = ur.role_id
         where u.del_flag = '0' and r.role_id = #{roleId}
-        <if test="userName != null and userName != ''">
-            AND u.user_name like concat('%', #{userName}, '%')
+        <if test="usernameOrEmail != null and usernameOrEmail != ''">
+            AND u.user_name like concat('%', #{usernameOrEmail}, '%')
         </if>
         <if test="phonenumber != null and phonenumber != ''">
             AND u.phonenumber like concat('%', #{phonenumber}, '%')
@@ -140,8 +140,8 @@
         where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
         and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and
         ur.role_id = #{roleId})
-        <if test="userName != null and userName != ''">
-            AND u.user_name like concat('%', #{userName}, '%')
+        <if test="usernameOrEmail != null and usernameOrEmail != ''">
+            AND u.user_name like concat('%', #{usernameOrEmail}, '%')
         </if>
         <if test="phonenumber != null and phonenumber != ''">
             AND u.phonenumber like concat('%', #{phonenumber}, '%')
@@ -150,9 +150,9 @@
         ${params.dataScope}
     </select>
 
-    <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
+    <select id="selectUserByUsernameOrEmail" parameterType="String" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
-        where u.user_name = #{userName} and u.del_flag = '0'
+        where u.user_name = #{usernameOrEmail} or u.email = #{usernameOrEmail} and u.del_flag = '0'
     </select>
 
     <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
@@ -163,7 +163,7 @@
     <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
         select user_id, user_name
         from sys_user
-        where user_name = #{userName}
+        where user_name = #{usernameOrEmail}
           and del_flag = '0'
         limit 1
     </select>
@@ -188,7 +188,7 @@
         insert into sys_user(
         <if test="userId != null and userId != 0">user_id,</if>
         <if test="deptId != null and deptId != 0">dept_id,</if>
-        <if test="userName != null and userName != ''">user_name,</if>
+        <if test="usernameOrEmail != null and usernameOrEmail != ''">user_name,</if>
         <if test="nickName != null and nickName != ''">nick_name,</if>
         <if test="email != null and email != ''">email,</if>
         <if test="avatar != null and avatar != ''">avatar,</if>
@@ -202,7 +202,7 @@
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
         <if test="deptId != null and deptId != ''">#{deptId},</if>
-        <if test="userName != null and userName != ''">#{userName},</if>
+        <if test="usernameOrEmail != null and usernameOrEmail != ''">#{usernameOrEmail},</if>
         <if test="nickName != null and nickName != ''">#{nickName},</if>
         <if test="email != null and email != ''">#{email},</if>
         <if test="avatar != null and avatar != ''">#{avatar},</if>
@@ -220,7 +220,7 @@
         update sys_user
         <set>
             <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
-            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="usernameOrEmail != null and usernameOrEmail != ''">user_name = #{usernameOrEmail},</if>
             <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
             <if test="email != null ">email = #{email},</if>
             <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
@@ -246,13 +246,13 @@
     <update id="updateUserAvatar" parameterType="com.muyu.common.system.domain.SysUser">
         update sys_user
         set avatar = #{avatar}
-        where user_name = #{userName}
+        where user_name = #{usernameOrEmail}
     </update>
 
     <update id="resetUserPwd" parameterType="com.muyu.common.system.domain.SysUser">
         update sys_user
         set password = #{password}
-        where user_name = #{userName}
+        where user_name = #{usernameOrEmail}
     </update>
 
     <delete id="deleteUserById" parameterType="Long">