From 84de5a5d42d8540f9e5867b2feba1c334cf4f6ba Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 09 十月 2022 09:26:18 +0800
Subject: [PATCH] update redisson 3.17.6 => 3.17.7 修复设置NameMapper导致队列功能异常问题
---
ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java | 61 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
index 6cec140..63e777d 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
@@ -1,18 +1,20 @@
package com.ruoyi.framework.handler;
import cn.hutool.core.annotation.AnnotationUtil;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ConcurrentHashSet;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ClassUtil;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.annotation.DataColumn;
import com.ruoyi.common.annotation.DataPermission;
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.service.UserService;
+import com.ruoyi.common.core.domain.dto.RoleDTO;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.DataScopeType;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.helper.DataPermissionHelper;
+import com.ruoyi.common.helper.LoginHelper;
+import com.ruoyi.common.utils.StreamUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import lombok.extern.slf4j.Slf4j;
@@ -30,11 +32,9 @@
import org.springframework.expression.spel.support.StandardEvaluationContext;
import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -73,12 +73,16 @@
inavlidCacheSet.add(mappedStatementId);
return where;
}
- SysUser currentUser = SpringUtils.getBean(UserService.class).selectUserById(SecurityUtils.getUserId());
+ LoginUser currentUser = DataPermissionHelper.getVariable("user");
+ if (ObjectUtil.isNull(currentUser)) {
+ currentUser = LoginHelper.getLoginUser();
+ DataPermissionHelper.setVariable("user", currentUser);
+ }
// 濡傛灉鏄秴绾х鐞嗗憳锛屽垯涓嶈繃婊ゆ暟鎹�
- if (StringUtils.isNull(currentUser) || currentUser.isAdmin()) {
+ if (LoginHelper.isAdmin()) {
return where;
}
- String dataFilterSql = buildDataFilter(currentUser, dataColumns, isSelect);
+ String dataFilterSql = buildDataFilter(dataColumns, isSelect);
if (StringUtils.isBlank(dataFilterSql)) {
return where;
}
@@ -99,14 +103,15 @@
/**
* 鏋勯�犳暟鎹繃婊ql
*/
- private String buildDataFilter(SysUser user, DataColumn[] dataColumns, boolean isSelect) {
- StringBuilder sqlString = new StringBuilder();
+ private String buildDataFilter(DataColumn[] dataColumns, boolean isSelect) {
// 鏇存柊鎴栧垹闄ら渶婊¤冻鎵�鏈夋潯浠�
String joinStr = isSelect ? " OR " : " AND ";
+ LoginUser user = DataPermissionHelper.getVariable("user");
StandardEvaluationContext context = new StandardEvaluationContext();
context.setBeanResolver(beanResolver);
- context.setVariable("user", user);
- for (SysRole role : user.getRoles()) {
+ DataPermissionHelper.getContext().forEach(context::setVariable);
+ Set<String> conditions = new HashSet<>();
+ for (RoleDTO role : user.getRoles()) {
user.setRoleId(role.getRoleId());
// 鑾峰彇瑙掕壊鏉冮檺娉涘瀷
DataScopeType type = DataScopeType.findCode(role.getDataScope());
@@ -119,26 +124,34 @@
}
boolean isSuccess = false;
for (DataColumn dataColumn : dataColumns) {
+ if (dataColumn.key().length != dataColumn.value().length) {
+ throw new ServiceException("瑙掕壊鏁版嵁鑼冨洿寮傚父 => key涓巚alue闀垮害涓嶅尮閰�");
+ }
// 涓嶅寘鍚� key 鍙橀噺 鍒欎笉澶勭悊
- if (!StringUtils.contains(type.getSqlTemplate(), "#" + dataColumn.key())) {
+ if (!StringUtils.containsAny(type.getSqlTemplate(),
+ Arrays.stream(dataColumn.key()).map(key -> "#" + key).toArray(String[]::new)
+ )) {
continue;
}
// 璁剧疆娉ㄨВ鍙橀噺 key 涓鸿〃杈惧紡鍙橀噺 value 涓哄彉閲忓��
- context.setVariable(dataColumn.key(), dataColumn.value());
+ for (int i = 0; i < dataColumn.key().length; i++) {
+ context.setVariable(dataColumn.key()[i], dataColumn.value()[i]);
+ }
// 瑙ｆ瀽sql妯℃澘骞跺～鍏�
String sql = parser.parseExpression(type.getSqlTemplate(), parserContext).getValue(context, String.class);
- sqlString.append(joinStr).append(sql);
+ conditions.add(joinStr + sql);
isSuccess = true;
}
// 鏈鐞嗘垚鍔熷垯濉厖鍏滃簳鏂规
- if (!isSuccess) {
- sqlString.append(joinStr).append(type.getElseSql());
+ if (!isSuccess && StringUtils.isNotBlank(type.getElseSql())) {
+ conditions.add(joinStr + type.getElseSql());
}
}
- if (StringUtils.isNotBlank(sqlString.toString())) {
- return sqlString.substring(joinStr.length());
+ if (CollUtil.isNotEmpty(conditions)) {
+ String sql = StreamUtils.join(conditions, Function.identity(), "");
+ return sql.substring(joinStr.length());
}
return "";
}
@@ -154,13 +167,13 @@
DataPermission dataPermission;
// 鑾峰彇鏂规硶娉ㄨВ
for (Method method : methods) {
- dataPermission = dataPermissionCacheMap.get(method.getName());
+ dataPermission = dataPermissionCacheMap.get(mappedStatementId);
if (ObjectUtil.isNotNull(dataPermission)) {
return dataPermission.value();
}
if (AnnotationUtil.hasAnnotation(method, DataPermission.class)) {
dataPermission = AnnotationUtil.getAnnotation(method, DataPermission.class);
- dataPermissionCacheMap.put(method.getName(), dataPermission);
+ dataPermissionCacheMap.put(mappedStatementId, dataPermission);
return dataPermission.value();
}
}
--
Gitblit v1.9.3