From 8f36d8d1c4b007c90927b610d8f198259f1a4358 Mon Sep 17 00:00:00 2001 From: zly666 <1272268474@qq.com> Date: Fri, 12 Apr 2024 14:15:34 +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/service/SysLoginService.java | 4 ++++ .../com/muyu/common/system/domain/LoginUser.java | 9 +++++++++ .../controller/SysUserOnlineController.java | 4 +++- .../com/muyu/system/mapper/SysUserMapper.java | 10 ++++++++++ .../muyu/system/service/SysUserOnlineService.java | 9 +++++++++ .../service/impl/SysUserOnlineServiceImpl.java | 15 +++++++++++++++ .../system/service/impl/SysUserServiceImpl.java | 1 + .../resources/mapper/system/SysUserMapper.xml | 7 ++++++- 8 files changed, 57 insertions(+), 2 deletions(-) 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..aed3ece 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,6 +68,10 @@ public class SysLoginService { Result 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 + " 不存在"); } 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..16268e1 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 @@ -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; + } } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java index 26f7883..19c6f56 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java +++ b/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> list (String ipaddr, String userName) { + public Result> list (String email,String ipaddr, String userName) { Collection keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*"); List userOnlineList = new ArrayList(); 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)); } 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..41539c0 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 @@ -47,6 +47,15 @@ public interface SysUserMapper extends BaseMapper { * @return 用户对象信息 */ public SysUser selectUserByUserName (String userName); + /** + * 通过邮箱查询用户 + * + * @param email 用户名 + * + * @return 用户对象信息 + */ + public SysUser selectUserByEmail(String email); + /** * 通过用户ID查询用户 @@ -139,4 +148,5 @@ public interface SysUserMapper extends BaseMapper { * @return 结果 */ public SysUser checkEmailUnique (String email); + } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java index 531735b..b54946d 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java +++ b/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); /** * 通过登录地址/用户名称查询信息 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..cff4869 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 @@ -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; + } /** * 通过登录地址/用户名称查询信息 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..4e0ab46 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 @@ -102,6 +102,7 @@ public class SysUserServiceImpl extends ServiceImpl impl return userMapper.selectUserByUserName(userName); } + /** * 通过用户ID查询用户 * 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..1b7af59 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,11 @@ + + insert into sys_user( user_id,