From 460a68fcfa17272b56f567b5263efbdd4035a6bd Mon Sep 17 00:00:00 2001 From: fanghao <2249194670@qq.com> Date: Sat, 13 Apr 2024 10:21:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/auth/service/SysLoginService.java | 22 +++++++++++++++---- .../muyu/auth/service/SysPasswordService.java | 7 +++++- .../com/muyu/system/mapper/SysMenuMapper.java | 2 ++ .../service/impl/SysConfigServiceImpl.java | 4 ++-- .../service/impl/SysDictTypeServiceImpl.java | 10 +++++++++ .../service/impl/SysMenuServiceImpl.java | 19 ++++++++++++++-- .../service/impl/SysRoleServiceImpl.java | 10 ++++----- .../resources/mapper/system/SysMenuMapper.xml | 1 + 8 files changed, 61 insertions(+), 14 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 c7f48ce..89cc56c 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,9 +68,15 @@ public class SysLoginService { Result 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()) { throw new ServiceException(userResult.getMsg()); } @@ -84,8 +90,15 @@ public class SysLoginService { recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员"); throw new ServiceException("对不起，您的账号：" + username + " 已停用"); } + if (username.contains("@")){ + user.setEmail(null); + } passwordService.validate(user, password); - recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功"); + if (username.contains("@")){ + recordLogService.recordLogininfor(username,Constants.LOGIN_SUCCESS,"邮箱登录成功"); + }else { + recordLogService.recordLogininfor(username,Constants.LOGIN_SUCCESS,"用户登录成功"); + } return userInfo; } @@ -99,7 +112,8 @@ public class SysLoginService { public void register (String username, String password) { // 用户名或密码为空 错误 if (StringUtils.isAnyBlank(username, password)) { - throw new ServiceException("用户/密码必须填写"); +// throw new ServiceException("用户/密码必须填写"); + throw new ServiceException("用户/邮箱/密码必须填写"); } if (username.length() < UserConstants.USERNAME_MIN_LENGTH || username.length() > UserConstants.USERNAME_MAX_LENGTH) { 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..8eed98e 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,12 @@ 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/java/com/muyu/system/mapper/SysMenuMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java index 8ceaaa0..1a298a7 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java @@ -135,4 +135,6 @@ public interface SysMenuMapper extends BaseMapper { * @return 结果 */ public SysMenu checkMenuNameUnique (@Param("menuName") String menuName, @Param("parentId") Long parentId); + + List selectSysMenuList(List longs); } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java index bc07cc8..773d862 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java @@ -46,8 +46,8 @@ public class SysConfigServiceImpl extends ServiceImpl dictDatas = DictUtils.getDictCache(dictType); +// if (StringUtils.isNotEmpty(dictDatas)){ +// return dictDatas; +// } +// dictDatas = dictDataMapper.selectDictDataByType(dictType); +// if (StringUtils.isNotEmpty(dictDatas)) { +// DictUtils.setDictCache(dictType,dictDatas); +// return dictDatas; +// } +// return null; } /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index e4e2ec8..39ad3e6 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -27,7 +27,7 @@ import java.util.stream.Collectors; * @author muyu */ @Service -public class SysMenuServiceImpl extends ServiceImpl implements SysMenuService { +public class SysMenuServiceImpl extends ServiceImpl implements SysMenuService { public static final String PREMISSION_STRING = "perms[\"{0}\"]"; @Autowired @@ -51,6 +51,22 @@ public class SysMenuServiceImpl extends ServiceImpl impl return selectMenuList(new SysMenu(), userId); } + public List selectSysMenuList(List menuList){ + List longs = menuList.stream() + .map(menu -> menu.getParentId()) + .filter(parentId -> parentId != 0) + .distinct() + .toList(); + if (longs.size()==0){ + return null; + } + List sysMenus = menuMapper.selectSysMenuList(longs); + List sysMenus1 = selectSysMenuList(sysMenus); + if (sysMenus1 != null){ + sysMenus.addAll(sysMenus1); + } + return sysMenus; + } /** * 查询系统菜单列表 * @@ -93,7 +109,6 @@ public class SysMenuServiceImpl extends ServiceImpl impl /** * 根据角色ID查询权限 * - * @param roleId 角色ID * * @return 权限列表 */ diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java index fa832da..b691d7e 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java @@ -183,12 +183,12 @@ public class SysRoleServiceImpl extends ServiceImpl impl */ @Override public void checkRoleDataScope (Long roleId) { - if (!SysUser.isAdmin(SecurityUtils.getUserId())) { + if (!SysUser.isAdmin(SecurityUtils.getUserId())){ SysRole role = new SysRole(); role.setRoleId(roleId); List roles = SpringUtils.getAopProxy(this).selectRoleList(role); - if (StringUtils.isEmpty(roles)) { - throw new ServiceException("没有权限访问角色数据！"); + if (StringUtils.isEmpty(roles)){ + throw new ServiceException("没有权限访问角色数据"); } } } @@ -386,8 +386,8 @@ public class SysRoleServiceImpl extends ServiceImpl impl */ @Override public int insertAuthUsers (Long roleId, Long[] userIds) { - // 新增用户与角色管理 - List list = new ArrayList(); + + ArrayList list = new ArrayList<>(); for (Long userId : userIds) { SysUserRole ur = new SysUserRole(); ur.setUserId(userId); diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml index 1dac5c4..8344a6b 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -185,6 +185,7 @@ where menu_name=#{menuName} and parent_id = #{parentId} limit 1 + update sys_menu