From 05fcfa75d9bcd29f44c5a28d1a665a496347dce1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 13 Aug 2021 14:43:16 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java b/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java
index b34a8e5..c481134 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java
@@ -1,5 +1,10 @@
package com.matrix.system.app.authority;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.matrix.component.redis.RedisClient;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
@@ -17,6 +22,7 @@
import java.util.*;
import java.util.Map.Entry;
+import java.util.stream.Collectors;
/**
* DefaultAuthorityManager 实现了权限控制接口
@@ -31,7 +37,12 @@
private static final int DEFAULT_2 = 2;
@Autowired
+ RedisClient redisClient;
+
+ @Autowired
SysFunctionService sysFunctionService;
+
+ public static final String USER_POWER_REDISKEY_APP = "USER_POWER_APP";
public static final String USERFUNCTION = "userFunction";
/** 用户所有路径权限的记录 **/
@@ -91,8 +102,32 @@
List<String> userUrlMapping = new ArrayList<>();
- // 获取用户所有权限
- getUserFunction(user,userFunction, userUrlMapping);
+ String redisKey = USER_POWER_REDISKEY_APP + SecureUtil.md5(user.getSuId()+"");
+ String cachedValue = redisClient.getCachedValue(redisKey);
+ if (StringUtils.isNotBlank(cachedValue)) {
+ //从缓存中获取用户权限
+ JSONObject powerMap = JSONUtil.parseObj(cachedValue);
+ String userFunctionMapStr = powerMap.get(USERFUNCTION).toString();
+ JSONObject userFunctionMap = JSONUtil.parseObj(userFunctionMapStr);
+ Set<String> userFunctionMapKeys = userFunctionMap.keySet();
+ userFunctionMapKeys.forEach(key -> {
+ userFunction.put(key, userFunctionMap.get(key, SysFunction.class));
+ });
+
+ String userUrlMappingListStr = powerMap.get(USER_URL_MAPPING).toString();
+ JSONArray userUrlMappingArray = JSONUtil.parseArray(userUrlMappingListStr);
+ for (int i = 0; i < userUrlMappingArray.size(); i++) {
+ userUrlMapping.add(userUrlMappingArray.get(i, String.class));
+ }
+ } else {
+ // 获取用户所有权限
+ getUserFunction(user,userFunction, userUrlMapping);
+
+ Map<String ,Object> powerMap=new HashMap<>();
+ powerMap.put(USERFUNCTION, userFunction);
+ powerMap.put(USER_URL_MAPPING, userUrlMapping);
+ redisClient.saveValue(redisKey,JSONUtil.parseObj(powerMap,true));
+ }
// TODO 这里的用户权限应该放到redis缓存中，在拦截器中做权限拦截
@@ -129,11 +164,17 @@
// 普通员工账号只拥有自己所拥有的权限
List<SysFunction> userFunctionList = sysFunctionService.findFunctionByRoleIds(sysUser.getRoleIds());
for (SysFunction sysFunction : userFunctionList) {
+
+ sysFunction.setSysFnBtnRel(
+ sysFunction.getSysFnBtnRel().stream().filter(item->StringUtils.isContentSet(item.getBtnValue(),sysFunction.getRpfBns())).collect(Collectors.toList())
+ );
+
// TODO注册访问路径
registerUrlMapping(userUrlMapping, sysFunction,false);
if (userFunctionMap.containsKey(sysFunction.getFnCode())) {
// 如果功能已经被添加到集合中则追加权限按钮
SysFunction oneFunctionInMap = userFunctionMap.get(sysFunction.getFnCode());
+
// 为了方便判断所以用字符串记录一下
if (StringUtils.isBlank(oneFunctionInMap.getRpfBns())) {
oneFunctionInMap.setRpfBns(sysFunction.getRpfBns());
--
Gitblit v1.9.1