【更新】① 权限资源调整为缓存方式;② 环境监测器,用于后续区分单体与Cloud

pull/286/head
这么难演 2025-09-22 23:35:18 +08:00 committed by 就是那个锅
parent 7f96675dc2
commit 2e8970482f
5 changed files with 276 additions and 31 deletions

View File

@ -25,6 +25,11 @@ public class CacheConstant {
*/
public static final String PERMISSION_RESOURCE_CACHE_KEY = "permission-resource";
/**
* Method
*/
public static final String PERMISSION_RESOURCE_METHOD_CACHE_KEY = "permission-resource-method";
/**
* B
*/

View File

@ -0,0 +1,73 @@
/*
* Copyright [2022] [https://www.xiaonuo.vip]
*
* SnowyAPACHE LICENSE 2.0使
*
* 1.LICENSE
* 2.Snowy
* 3.使使
* 4. https://www.xiaonuo.vip
* 5.xiaonuobase@qq.com
* 6.Snowy https://www.xiaonuo.vip
*/
package vip.xiaonuo.common.detector;
import cn.hutool.core.util.ObjectUtil;
import jakarta.annotation.Nullable;
import jakarta.annotation.Resource;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import vip.xiaonuo.common.prop.CommonProperties;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
/**
*
*
* @author jiangcs
* @since 2025/9/13 23:20
*/
@Configuration
public class EnvironmentDetector implements ApplicationListener<ApplicationReadyEvent> {
// 是否是SnowyCloud
private static boolean snowyCloud = false;
@Resource
private Environment environment;
@Resource
private CommonProperties commonProperties;
@Override
public void onApplicationEvent(@Nullable ApplicationReadyEvent event) {
// 检查是否存在 Nacos 相关配置
boolean hasNacosConfig = environment.containsProperty("spring.cloud.nacos.config.server-addr");
boolean hasNacosDiscovery = environment.containsProperty("spring.cloud.nacos.discovery.server-addr");
snowyCloud = hasNacosConfig || hasNacosDiscovery;
}
/**
*
* <p>Cloud</p>
*
* @param path
* @return
*/
public String convertBackendPath(String path) {
if (snowyCloud) {
List<Map<String, String>> list = commonProperties.getBackendPaths();
Set<Map<String, String>> urlSet = list.stream().filter(m -> path.startsWith(m.get("name")))
.collect(Collectors.toSet());
if (ObjectUtil.isNotEmpty(urlSet)) {
return urlSet.iterator().next().get("value") + path;
}
}
return path;
}
}

View File

@ -17,6 +17,9 @@ import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
/**
*
*
@ -29,9 +32,19 @@ import org.springframework.stereotype.Component;
@ConfigurationProperties(prefix = "snowy.config.common")
public class CommonProperties {
/** 前端地址 */
/**
*
*/
private String frontUrl;
/** 后端地址 */
/**
*
*/
private String backendUrl;
/**
*
*/
private List<Map<String, String>> backendPaths;
}

View File

@ -12,16 +12,15 @@
*/
package vip.xiaonuo.sys.modular.role.service.impl;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollStreamUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.lang.tree.TreeNode;
import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -29,12 +28,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import vip.xiaonuo.common.cache.CommonCacheOperator;
import vip.xiaonuo.common.consts.CacheConstant;
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
import vip.xiaonuo.common.exception.CommonException;
import vip.xiaonuo.common.listener.CommonDataChangeEventCenter;
@ -63,10 +61,7 @@ import vip.xiaonuo.sys.modular.user.entity.SysUser;
import vip.xiaonuo.sys.modular.user.enums.SysUserStatusEnum;
import vip.xiaonuo.sys.modular.user.service.SysUserService;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -96,6 +91,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
@Resource
private MobileMenuApi mobileMenuApi;
@Resource
private CommonCacheOperator commonCacheOperator;
@Override
public Page<SysRole> page(SysRolePageParam sysRolePageParam) {
QueryWrapper<SysRole> queryWrapper = new QueryWrapper<SysRole>().checkSqlInjection();
@ -455,26 +453,12 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
@Override
public List<String> permissionTreeSelector() {
List<String> permissionResult = CollectionUtil.newArrayList();
SpringUtil.getApplicationContext().getBeansOfType(RequestMappingHandlerMapping.class).values()
.forEach(requestMappingHandlerMapping -> requestMappingHandlerMapping.getHandlerMethods()
.forEach((key, value) -> {
SaCheckPermission saCheckPermission = value.getMethod().getAnnotation(SaCheckPermission.class);
if(ObjectUtil.isNotEmpty(saCheckPermission)) {
PathPatternsRequestCondition pathPatternsCondition = key.getPathPatternsCondition();
if (pathPatternsCondition != null) {
String apiName = "未定义接口名称";
Operation apiOperation = value.getMethod().getAnnotation(Operation.class);
if(ObjectUtil.isNotEmpty(apiOperation)) {
String annotationValue = apiOperation.summary();
if(ObjectUtil.isNotEmpty(annotationValue)) {
apiName = annotationValue;
}
}
String nm = StrUtil.BRACKET_START + apiName + StrUtil.BRACKET_END;
pathPatternsCondition.getPatterns().forEach(pt -> permissionResult.add(pt + nm));
}
}
}));
Object permissionResourceObject = commonCacheOperator.get(CacheConstant.PERMISSION_RESOURCE_CACHE_KEY);
if(Objects.nonNull(permissionResourceObject)){
permissionResult = Convert.toList(String.class,permissionResourceObject);
}
return CollectionUtil.sortByPinyin(permissionResult.stream().filter(api ->
!api.startsWith("/" + StrUtil.BRACKET_START)
&& !api.startsWith("/error")

View File

@ -0,0 +1,170 @@
/*
* Copyright [2022] [https://www.xiaonuo.vip]
*
* SnowyAPACHE LICENSE 2.0使
*
* 1.LICENSE
* 2.Snowy
* 3.使使
* 4. https://www.xiaonuo.vip
* 5.xiaonuobase@qq.com
* 6.Snowy https://www.xiaonuo.vip
*/
package vip.xiaonuo.core.listener;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import cn.hutool.log.Log;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.annotation.Resource;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition;
import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import vip.xiaonuo.common.cache.CommonCacheOperator;
import vip.xiaonuo.common.consts.CacheConstant;
import java.util.List;
import java.util.Map;
import java.util.Objects;
/**
* @RequestMapping
* <p>
*
*
* @author dongxiayu
* @date 2023/1/29 23:24
**/
@Component
@Order(1)
public class ResourceCollectListener implements CommandLineRunner {
private static final Log log = Log.get();
@Resource
private CommonCacheOperator commonCacheOperator;
@Override
public void run(String... args) {
//1.获取所有后端接口
List<String> permissionResult = CollectionUtil.newArrayList();
Map<String, String> permissionMethodMap = MapUtil.newHashMap();
SpringUtil.getApplicationContext().getBeansOfType(RequestMappingHandlerMapping.class).values()
.forEach(requestMappingHandlerMapping -> requestMappingHandlerMapping.getHandlerMethods()
.forEach((key, value) -> {
SaCheckPermission saCheckPermission = value.getMethod().getAnnotation(SaCheckPermission.class);
if (ObjectUtil.isNotEmpty(saCheckPermission)) {
String path = null;
// Spring Boot 3.x
PathPatternsRequestCondition pathPatternsCondition = key.getPathPatternsCondition();
if (pathPatternsCondition != null) {
path = pathPatternsCondition.getPatterns().iterator().next().getPatternString();
}
// Spring Boot 2.x
PatternsRequestCondition patternsCondition = key.getPatternsCondition();
if (patternsCondition != null) {
path = patternsCondition.getPatterns().iterator().next();
}
if (path != null) {
String apiName = "未定义接口名称";
Operation apiOperation = value.getMethod().getAnnotation(Operation.class);
if (ObjectUtil.isNotEmpty(apiOperation)) {
String annotationValue = apiOperation.summary();
if (ObjectUtil.isNotEmpty(annotationValue)) {
apiName = annotationValue;
}
}
String permissionKey = path + StrUtil.BRACKET_START + apiName + StrUtil.BRACKET_END;
permissionResult.add(permissionKey);
// build permission method map data
buildPermissionMethodMapData(value, permissionMethodMap, permissionKey);
}
}
}));
//2.汇总添加到缓存
Object permissionResourceObject = commonCacheOperator.get(CacheConstant.PERMISSION_RESOURCE_CACHE_KEY);
List<String> permissionResource;
if (Objects.isNull(permissionResourceObject)) {
permissionResource = CollUtil.newArrayList();
} else {
permissionResource = Convert.toList(String.class, permissionResourceObject);
}
if (CollUtil.isNotEmpty(permissionResult)) {
for (String permission : permissionResult) {
if (!permissionResource.contains(permission)) {
permissionResource.add(permission);
}
}
// 刷新缓存
commonCacheOperator.put(CacheConstant.PERMISSION_RESOURCE_CACHE_KEY, permissionResource);
}
// 3.汇总添加Permission Method Map数据到缓存
refreshPermissionMethodMapDataToCache(permissionMethodMap);
log.info(">>> 缓存资源URL集合完成!资源数量:{}", permissionResult.size());
}
/**
* refreshPermissionMethodMapDataToCache
*
* @param permissionMethodMap map of key {@link String},value {@link String}
*/
private void refreshPermissionMethodMapDataToCache(Map<String, String> permissionMethodMap) {
Object permissionMethodMapObject = commonCacheOperator.get(CacheConstant.PERMISSION_RESOURCE_METHOD_CACHE_KEY);
Map<String, String> permissionMethodMapFromCache = null;
if (Objects.isNull(permissionMethodMapObject)) {
permissionMethodMapFromCache = MapUtil.newHashMap();
} else {
permissionMethodMapFromCache = Convert.toMap(String.class, String.class, permissionMethodMapObject);
}
if (CollUtil.isNotEmpty(permissionMethodMap)) {
for (Map.Entry<String, String> permissionMethodEntry : permissionMethodMap.entrySet()) {
String permissionKey = permissionMethodEntry.getKey();
String permissionMethod = permissionMethodEntry.getValue();
permissionMethodMapFromCache.put(permissionKey, permissionMethod);
}
// 刷新缓存
commonCacheOperator.put(CacheConstant.PERMISSION_RESOURCE_METHOD_CACHE_KEY, permissionMethodMapFromCache);
}
}
/**
* buildPermissionMethodMapData
*
* @param value {@link HandlerMethod}
* @param permissionMethodMap map of key {@link String},value {@link String}
* @param permissionKey {@link String}
*/
private static void buildPermissionMethodMapData(HandlerMethod value, Map<String, String> permissionMethodMap, String permissionKey) {
GetMapping getMappingAnno = value.getMethod().getAnnotation(GetMapping.class);
PostMapping postMappingAnno = value.getMethod().getAnnotation(PostMapping.class);
String permissionMethod = null;
if (Objects.nonNull(getMappingAnno)) {
permissionMethod = HttpMethod.GET.name();
}
if (Objects.nonNull(postMappingAnno)) {
permissionMethod = HttpMethod.POST.name();
}
permissionMethodMap.put(permissionKey, permissionMethod);
}
}