1. 修复租户创建报错
2. 修复数据权限不生效 3. 修复操作日志记录报错
This commit is contained in:
parent
25c5291338
commit
d21dcba1ee
@ -1,5 +1,7 @@
|
|||||||
package cn.iocoder.yudao.framework.datapermission.config;
|
package cn.iocoder.yudao.framework.datapermission.config;
|
||||||
|
|
||||||
|
import cn.hutool.core.collection.CollUtil;
|
||||||
|
import cn.hutool.extra.spring.SpringUtil;
|
||||||
import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRule;
|
import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRule;
|
||||||
import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
|
import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
|
||||||
import cn.iocoder.yudao.framework.security.core.LoginUser;
|
import cn.iocoder.yudao.framework.security.core.LoginUser;
|
||||||
@ -10,6 +12,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
|||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 基于部门的数据权限 AutoConfiguration
|
* 基于部门的数据权限 AutoConfiguration
|
||||||
@ -18,12 +21,21 @@ import java.util.List;
|
|||||||
*/
|
*/
|
||||||
@AutoConfiguration
|
@AutoConfiguration
|
||||||
@ConditionalOnClass(LoginUser.class)
|
@ConditionalOnClass(LoginUser.class)
|
||||||
@ConditionalOnBean(value = {PermissionApi.class, DeptDataPermissionRuleCustomizer.class})
|
@ConditionalOnBean(value = DeptDataPermissionRuleCustomizer.class)
|
||||||
public class YudaoDeptDataPermissionAutoConfiguration {
|
public class YudaoDeptDataPermissionAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public DeptDataPermissionRule deptDataPermissionRule(PermissionApi permissionApi,
|
public DeptDataPermissionRule deptDataPermissionRule(PermissionApi permissionApi,
|
||||||
List<DeptDataPermissionRuleCustomizer> customizers) {
|
List<DeptDataPermissionRuleCustomizer> customizers) {
|
||||||
|
// Cloud 专属逻辑:优先使用本地的 PermissionApi 实现类,而不是 Feign 调用
|
||||||
|
// 原因:在创建租户时,租户还没创建好,导致 Feign 调用获取数据权限时,报“租户不存在”的错误
|
||||||
|
try {
|
||||||
|
PermissionApi permissionApiImpl = SpringUtil.getBean("permissionApiImpl", PermissionApi.class);
|
||||||
|
if (permissionApiImpl != null) {
|
||||||
|
permissionApi = permissionApiImpl;
|
||||||
|
}
|
||||||
|
} catch (Exception ignored) {}
|
||||||
|
|
||||||
// 创建 DeptDataPermissionRule 对象
|
// 创建 DeptDataPermissionRule 对象
|
||||||
DeptDataPermissionRule rule = new DeptDataPermissionRule(permissionApi);
|
DeptDataPermissionRule rule = new DeptDataPermissionRule(permissionApi);
|
||||||
// 补全表配置
|
// 补全表配置
|
||||||
|
@ -196,7 +196,7 @@ public class OperateLogAspect {
|
|||||||
operateLogObj.setName(operateLog.name());
|
operateLogObj.setName(operateLog.name());
|
||||||
}
|
}
|
||||||
if (StrUtil.isEmpty(operateLogObj.getName()) && operation != null) {
|
if (StrUtil.isEmpty(operateLogObj.getName()) && operation != null) {
|
||||||
operateLogObj.setName(operation.description());
|
operateLogObj.setName(operation.summary());
|
||||||
}
|
}
|
||||||
// type 属性
|
// type 属性
|
||||||
if (operateLog != null && ArrayUtil.isNotEmpty(operateLog.type())) {
|
if (operateLog != null && ArrayUtil.isNotEmpty(operateLog.type())) {
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package cn.iocoder.yudao.framework.operatelog.core.service;
|
package cn.iocoder.yudao.framework.operatelog.core.service;
|
||||||
|
|
||||||
import cn.hutool.core.bean.BeanUtil;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
|
||||||
import cn.iocoder.yudao.module.system.api.logger.OperateLogApi;
|
import cn.iocoder.yudao.module.system.api.logger.OperateLogApi;
|
||||||
import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO;
|
import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
@ -66,7 +66,7 @@ public class TenantSecurityWebFilter extends ApiRequestFilter {
|
|||||||
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
|
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
|
||||||
throws ServletException, IOException {
|
throws ServletException, IOException {
|
||||||
Long tenantId = TenantContextHolder.getTenantId();
|
Long tenantId = TenantContextHolder.getTenantId();
|
||||||
boolean isRpcRequest = !WebFrameworkUtils.isRpcRequest(request);
|
boolean isRpcRequest = WebFrameworkUtils.isRpcRequest(request);
|
||||||
// 1. 登陆的用户,校验是否有权限访问该租户,避免越权问题。
|
// 1. 登陆的用户,校验是否有权限访问该租户,避免越权问题。
|
||||||
LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
||||||
if (user != null) {
|
if (user != null) {
|
||||||
|
Loading…
Reference in New Issue
Block a user