tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 刷新角色权限代码位置调整

Browse Source
This commit is contained in:
haoxr
2024-01-29 18:14:40 +08:00
parent 825f1fdfb3
commit 93720b526a
13 changed files with 147 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/youlai/system/service/SysRoleMenuService.java
View File

@@ -2,11 +2,9 @@ package com.youlai.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.system.model.bo.RolePermsBO;
import com.youlai.system.model.entity.SysRoleMenu;
import java.util.List;
import java.util.Set;
/**
* 角色菜单业务接口
@@ -26,9 +24,23 @@ public interface SysRoleMenuService extends IService<SysRoleMenu> {
/**
* 获取角色和权限的列表
*
* @return 角色权限的列表
* 刷新权限缓存(所有角色)
*/
List<RolePermsBO> getRolePermsList(String roleCode);
void refreshRolePermsCache();
/**
* 刷新权限缓存(指定角色)
*
* @param roleCode 角色编码
*/
void refreshRolePermsCache(String roleCode);
/**
* 刷新权限缓存(修改角色编码时调用)
*
* @param oldRoleCode 旧角色编码
* @param newRoleCode 新角色编码
*/
void refreshRolePermsCache(String oldRoleCode, String newRoleCode);
}

2
src/main/java/com/youlai/system/service/SysUserRoleService.java
View File

@@ -23,5 +23,5 @@ public interface SysUserRoleService extends IService<SysUserRole> {
* @param roleId 角色ID
* @return true：已分配 false：未分配
*/
boolean isRoleAssignedToUser(Long roleId);
boolean hasAssignedUsers(Long roleId);
}

8
src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java
View File

@@ -7,7 +7,7 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.jwt.JWTPayload;
import com.youlai.system.common.constant.CacheConstants;
import com.youlai.system.common.constant.SecurityConstants;
import com.youlai.system.common.enums.CaptchaTypeEnum;
import com.youlai.system.model.dto.CaptchaResult;
import com.youlai.system.model.dto.LoginResult;
@@ -81,9 +81,9 @@ public class AuthServiceImpl implements AuthService {
Long expiration = Convert.toLong(claims.get(JWTPayload.EXPIRES_AT));
if (expiration != null) {
long ttl = expiration - System.currentTimeMillis() / 1000;
redisTemplate.opsForValue().set(CacheConstants.BLACKLIST_TOKEN_PREFIX + jti, null, ttl, TimeUnit.SECONDS);
redisTemplate.opsForValue().set(SecurityConstants.BLACKLIST_TOKEN_PREFIX + jti, null, ttl, TimeUnit.SECONDS);
} else {
redisTemplate.opsForValue().set(CacheConstants.BLACKLIST_TOKEN_PREFIX + jti, null);
redisTemplate.opsForValue().set(SecurityConstants.BLACKLIST_TOKEN_PREFIX + jti, null);
}
}
SecurityContextHolder.clearContext();
@@ -124,7 +124,7 @@ public class AuthServiceImpl implements AuthService {
// 验证码文本缓存至Redis，用于登录校验
String captchaKey = IdUtil.fastSimpleUUID();
redisTemplate.opsForValue().set(CacheConstants.CAPTCHA_CODE_PREFIX + captchaKey, captchaCode,
redisTemplate.opsForValue().set(SecurityConstants.CAPTCHA_CODE_PREFIX + captchaKey, captchaCode,
captchaProperties.getExpireSeconds(), TimeUnit.SECONDS);
return CaptchaResult.builder()

10
src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java
View File

@@ -18,8 +18,8 @@ import com.youlai.system.model.form.MenuForm;
import com.youlai.system.model.query.MenuQuery;
import com.youlai.system.model.vo.MenuVO;
import com.youlai.system.model.vo.RouteVO;
import com.youlai.system.security.service.PermissionService;
import com.youlai.system.service.SysMenuService;
import com.youlai.system.service.SysRoleMenuService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.cache.annotation.CacheEvict;
@@ -43,7 +43,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
private final MenuConverter menuConverter;
private final PermissionService permissionService;
private final SysRoleMenuService roleMenuService;
/**
@@ -224,7 +224,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
if (result) {
// 编辑刷新角色权限缓存
if (menuForm.getId() != null) {
permissionService.refreshRolePermsCache();
roleMenuService.refreshRolePermsCache();
}
}
return result;
@@ -251,7 +251,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
*
* @param menuId 菜单ID
* @param visible 是否显示(1->显示；2->隐藏)
* @return
* @return 是否修改成功
*/
@Override
@CacheEvict(cacheNames = "menu", key = "'routes'")
@@ -302,7 +302,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
// 刷新角色权限缓存
if (result) {
permissionService.refreshRolePermsCache();
roleMenuService.refreshRolePermsCache();
}
return result;

88
src/main/java/com/youlai/system/service/impl/SysRoleMenuServiceImpl.java
View File

@@ -1,13 +1,19 @@
package com.youlai.system.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.youlai.system.common.constant.SecurityConstants;
import com.youlai.system.mapper.SysRoleMenuMapper;
import com.youlai.system.model.bo.RolePermsBO;
import com.youlai.system.model.entity.SysRoleMenu;
import com.youlai.system.service.SysRoleMenuService;
import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Set;
/**
@@ -17,8 +23,79 @@ import java.util.List;
* @since 2.5.0
*/
@Service
@RequiredArgsConstructor
public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRoleMenu> implements SysRoleMenuService {
private final RedisTemplate<String, Object> redisTemplate;
/**
* 初始化权限缓存
*/
@PostConstruct
public void initRolePermsCache() {
refreshRolePermsCache();
}
/**
* 刷新权限缓存
*/
@Override
public void refreshRolePermsCache() {
// 清理权限缓存
redisTemplate.opsForHash().delete(SecurityConstants.ROLE_PERMS_PREFIX, "*");
List<RolePermsBO> list = this.baseMapper.getRolePermsList(null);
if (CollectionUtil.isNotEmpty(list)) {
list.forEach(item -> {
String roleCode = item.getRoleCode();
Set<String> perms = item.getPerms();
redisTemplate.opsForHash().put(SecurityConstants.ROLE_PERMS_PREFIX, roleCode, perms);
});
}
}
/**
* 刷新权限缓存
*/
@Override
public void refreshRolePermsCache(String roleCode) {
// 清理权限缓存
redisTemplate.opsForHash().delete(SecurityConstants.ROLE_PERMS_PREFIX, roleCode);
List<RolePermsBO> list = this.baseMapper.getRolePermsList(roleCode);
if (CollectionUtil.isNotEmpty(list)) {
RolePermsBO rolePerms = list.get(0);
if (rolePerms == null) {
return;
}
Set<String> perms = rolePerms.getPerms();
redisTemplate.opsForHash().put(SecurityConstants.ROLE_PERMS_PREFIX, roleCode, perms);
}
}
/**
* 刷新权限缓存 (角色编码变更时调用)
*/
@Override
public void refreshRolePermsCache(String oldRoleCode, String newRoleCode) {
// 清理旧角色权限缓存
redisTemplate.opsForHash().delete(SecurityConstants.ROLE_PERMS_PREFIX, oldRoleCode);
// 添加新角色权限缓存
List<RolePermsBO> list =this.baseMapper.getRolePermsList(newRoleCode);
if (CollectionUtil.isNotEmpty(list)) {
RolePermsBO rolePerms = list.get(0);
if (rolePerms == null) {
return;
}
Set<String> perms = rolePerms.getPerms();
redisTemplate.opsForHash().put(SecurityConstants.ROLE_PERMS_PREFIX, newRoleCode, perms);
}
}
/**
* 获取角色拥有的菜单ID集合
*
@@ -31,15 +108,4 @@ public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRo
return menuIds;
}
/**
* 获取权限角色列表
*
* @return 权限角色列表
*/
@Override
public List<RolePermsBO> getRolePermsList(String roleCode) {
List<RolePermsBO> rolePerms= this.baseMapper.getRolePermsList(roleCode);
return rolePerms;
}
}

2
src/main/java/com/youlai/system/service/impl/SysUserRoleServiceImpl.java
View File

@@ -75,7 +75,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
* @return true：已分配 false：未分配
*/
@Override
public boolean isRoleAssignedToUser(Long roleId) {
public boolean hasAssignedUsers(Long roleId) {
int count = this.baseMapper.countUsersForRole(roleId);
return count > 0;
}