From 2bf9c7df07dcbc4bb73968b5ce54eb562e5ce437 Mon Sep 17 00:00:00 2001 From: lilong Date: Fri, 28 Jun 2024 14:56:33 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A(REQ-2300)=20=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E8=A7=A3=E6=9E=90=EF=BC=8C?= =?UTF-8?q?=E7=94=B1=E7=94=A8=E6=88=B7=E6=98=BE=E7=A4=BA=E7=9A=84=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E8=A7=A3=E6=9E=90=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aop/DataPermissionFeignInterceptor.java | 3 +- ...or.java => DataPermissionInterceptor.java} | 25 +- .../aop/DataPermissionMybatisInterceptor.java | 560 +++++++++--------- .../config/DataPermissionConfig.java | 28 +- .../context/DataPermissionContextFactory.java | 2 +- .../context/DataPermissionContextHolder.java | 5 + 6 files changed, 319 insertions(+), 304 deletions(-) rename axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/{DataPermissionPrepareInterceptor.java => DataPermissionInterceptor.java} (88%) diff --git a/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/DataPermissionFeignInterceptor.java b/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/DataPermissionFeignInterceptor.java index 87f7eb0..641a20f 100644 --- a/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/DataPermissionFeignInterceptor.java +++ b/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/DataPermissionFeignInterceptor.java @@ -9,8 +9,9 @@ import static cn.axzo.framework.datapermission.context.DataPermissionContextHold /** * 上下文中有DataPermissionContext，则把数据放在header中 + * 根据用户调研结果，选择BFF解析规则结果放在上下文，由用户显示的把上下文的数据传递到底层服务，方便排查问题和使用 */ -@Component +//@Component public class DataPermissionFeignInterceptor implements RequestInterceptor { @Override diff --git a/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/DataPermissionPrepareInterceptor.java b/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/DataPermissionInterceptor.java similarity index 88% rename from axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/DataPermissionPrepareInterceptor.java rename to axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/DataPermissionInterceptor.java index daa0bfa..179cb05 100644 --- a/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/DataPermissionPrepareInterceptor.java +++ b/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/DataPermissionInterceptor.java @@ -11,8 +11,11 @@ import cn.axzo.karma.client.feign.tyr.request.GetMergeMatchDataReq; import cn.axzo.karma.client.feign.tyr.request.MatchDataObjectReq; import cn.axzo.karma.client.feign.tyr.response.MatchDataObjectResp; import cn.axzo.karma.client.feign.tyr.response.MergeMatchDataResp; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Pointcut; @@ -37,7 +40,7 @@ import static cn.axzo.framework.datapermission.context.DataPermissionContextHold @Aspect @Order(100) @Component -public class DataPermissionPrepareInterceptor { +public class DataPermissionInterceptor { @Lazy @Autowired @@ -75,17 +78,21 @@ public class DataPermissionPrepareInterceptor { /** * 切入含有@DataPermissiont && @RestController 注解的类 */ - @Before(value = "@within(dataPermission) && @within(restController)") - public void classHandler(DataPermission dataPermission, RestController restController) { + @Around(value = "@within(dataPermission) && @within(restController)") + @SneakyThrows + public Object classHandler(ProceedingJoinPoint pjp, DataPermission dataPermission, RestController restController) { handle(dataPermission); + return pjp.proceed(pjp.getArgs()); } /** * 切入含有@DataPermissiont && @RequestMapping/@PostMapping/@GetMapping/@PutMapping/@DeleteMapping/@PatchMapping 之一注解的方法 */ - @Before(value = "@annotation(dataPermission) && mappingAnnotations()") - public void methodHandler(DataPermission dataPermission) { + @Around(value = "@annotation(dataPermission) && mappingAnnotations()") + @SneakyThrows + public Object methodHandler(ProceedingJoinPoint pjp, DataPermission dataPermission) { handle(dataPermission); + return pjp.proceed(pjp.getArgs()); } public void handle(DataPermission dataPermission) { @@ -105,12 +112,12 @@ public class DataPermissionPrepareInterceptor { // header中有值，表示数据权限规则已经被解析，只需要获取数据去使用 if (StringUtils.isBlank(dataPermissionHeader)) { resolveRule(dataPermission); - return; +// return; } - DataPermissionContextHolder.DataPermissionContext dataPermissionContext = getCachedDataPermission(dataPermissionHeader); - dataPermissionContext.setDataPermission(dataPermission); - DataPermissionContextHolder.setContext(dataPermissionContext); +// DataPermissionContextHolder.DataPermissionContext dataPermissionContext = getCachedDataPermission(dataPermissionHeader); +// dataPermissionContext.setDataPermission(dataPermission); +// DataPermissionContextHolder.setContext(dataPermissionContext); } /** diff --git a/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/DataPermissionMybatisInterceptor.java b/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/DataPermissionMybatisInterceptor.java index dcb7aa6..0726b71 100644 --- a/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/DataPermissionMybatisInterceptor.java +++ b/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/aop/DataPermissionMybatisInterceptor.java @@ -51,286 +51,288 @@ import java.util.Optional; * @author tanjie@axzo.cn * @date 2024/5/31 11:41 */ -@RequiredArgsConstructor -public class DataPermissionMybatisInterceptor extends JsqlParserSupport implements InnerInterceptor { +//@RequiredArgsConstructor +public class DataPermissionMybatisInterceptor +// extends JsqlParserSupport implements InnerInterceptor +{ - private final DataPermissionContextFactory dataPermissionContextFactory; +// private final DataPermissionContextFactory dataPermissionContextFactory; - @Override - public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException { - if (!filter()) { - return; - } - PluginUtils.MPBoundSql mpBs = PluginUtils.mpBoundSql(boundSql); - mpBs.sql(parserSingle(mpBs.sql(), null)); - } - - @Override - public void beforePrepare(StatementHandler sh, Connection connection, Integer transactionTimeout) { - PluginUtils.MPStatementHandler mpSh = PluginUtils.mpStatementHandler(sh); - MappedStatement ms = mpSh.mappedStatement(); - SqlCommandType sct = ms.getSqlCommandType(); - // 不管insert - if (sct == SqlCommandType.UPDATE || sct == SqlCommandType.DELETE) { - if (!filter()) return; - if (SqlParserHelper.getSqlParserInfo(ms)) return; - PluginUtils.MPBoundSql mpBs = mpSh.mPBoundSql(); - mpBs.sql(parserMulti(mpBs.sql(), null)); - } - } - - @Override - protected void processSelect(Select select, int index, String sql, Object obj) { - processSelectBody(select.getSelectBody()); - List withItemsList = select.getWithItemsList(); - if (!CollectionUtils.isEmpty(withItemsList)) { - withItemsList.forEach(this::processSelectBody); - } - } - - protected void processSelectBody(SelectBody selectBody) { - if (selectBody == null) { - return; - } - if (selectBody instanceof PlainSelect) { - processPlainSelect((PlainSelect) selectBody); - } else if (selectBody instanceof WithItem) { - WithItem withItem = (WithItem) selectBody; - processSelectBody(withItem.getSelectBody()); - } else { - SetOperationList operationList = (SetOperationList) selectBody; - if (operationList.getSelects() != null && operationList.getSelects().size() > 0) { - operationList.getSelects().forEach(this::processSelectBody); - } - } - } - - - /** - * update 语句处理 - */ - @Override - protected void processUpdate(Update update, int index, String sql, Object obj) { - final Table table = update.getTable(); - if (!filter()) { - // 过滤退出执行 - return; - } - update.setWhere(this.andExpression(table, update.getWhere())); - } - - /** - * delete 语句处理 - */ - @Override - protected void processDelete(Delete delete, int index, String sql, Object obj) { - if (!filter()) { - // 过滤退出执行 - return; - } - delete.setWhere(this.andExpression(delete.getTable(), delete.getWhere())); - } - - /** - * delete update 语句 where 处理 - */ - protected Expression andExpression(Table table, Expression where) { - - - DataPermissionContextHolder.DataPermissionContext dataPermissionContext = DataPermissionContextHolder.get(); - DataPermission dataPermission = dataPermissionContext.getDataPermission(); - // 接口未配置注解，就不需要自动增加sql - if (dataPermission == null) { - return where; - } - - List byDataPermission = dataPermissionContextFactory.getRuleByDataPermission(); - Optional first = byDataPermission.stream().filter(rule -> rule.getTableName().contains(table.getName())).findFirst(); - if (!first.isPresent()) { - return where; - } - DataPermissionRuleService dataPermissionRuleService = first.get(); - Expression ruleExpression = dataPermissionRuleService.getExpression(table.getName(), table.getAlias()); - - if (null != where) { - if (where instanceof OrExpression) { - return new AndExpression(ruleExpression, new Parenthesis(where)); - } else { - return new AndExpression(ruleExpression, where); - } - } - return ruleExpression; - } - - - - - - /** - * 处理 PlainSelect - */ - protected void processPlainSelect(PlainSelect plainSelect) { - FromItem fromItem = plainSelect.getFromItem(); - Expression where = plainSelect.getWhere(); - processWhereSubSelect(where); - if (fromItem instanceof Table) { - Table fromTable = (Table) fromItem; - if (filter()) { - //#1186 github - plainSelect.setWhere(builderExpression(where, fromTable)); - } - } else { - processFromItem(fromItem); - } - List joins = plainSelect.getJoins(); - if (joins != null && joins.size() > 0) { - joins.forEach(j -> { - processJoin(j); - processFromItem(j.getRightItem()); - }); - } - } - - /** - * 处理where条件内的子查询 - *

- * 支持如下: - * 1. in - * 2. = - * 3. > - * 4. < - * 5. >= - * 6. <= - * 7. <> - * 8. EXISTS - * 9. NOT EXISTS - *

- * 前提条件: - * 1. 子查询必须放在小括号中 - * 2. 子查询一般放在比较操作符的右边 - * - * @param where where 条件 - */ - protected void processWhereSubSelect(Expression where) { - if (where == null) { - return; - } - if (where instanceof FromItem) { - processFromItem((FromItem) where); - return; - } - if (where.toString().indexOf("SELECT") > 0) { - // 有子查询 - if (where instanceof BinaryExpression) { - // 比较符号 , and , or , 等等 - BinaryExpression expression = (BinaryExpression) where; - processWhereSubSelect(expression.getLeftExpression()); - processWhereSubSelect(expression.getRightExpression()); - } else if (where instanceof InExpression) { - // in - InExpression expression = (InExpression) where; - ItemsList itemsList = expression.getRightItemsList(); - if (itemsList instanceof SubSelect) { - processSelectBody(((SubSelect) itemsList).getSelectBody()); - } - } else if (where instanceof ExistsExpression) { - // exists - ExistsExpression expression = (ExistsExpression) where; - processWhereSubSelect(expression.getRightExpression()); - } else if (where instanceof NotExpression) { - // not exists - NotExpression expression = (NotExpression) where; - processWhereSubSelect(expression.getExpression()); - } else if (where instanceof Parenthesis) { - Parenthesis expression = (Parenthesis) where; - processWhereSubSelect(expression.getExpression()); - } - } - } - - /** - * 处理子查询等 - */ - protected void processFromItem(FromItem fromItem) { - if (fromItem instanceof SubJoin) { - SubJoin subJoin = (SubJoin) fromItem; - if (subJoin.getJoinList() != null) { - subJoin.getJoinList().forEach(this::processJoin); - } - if (subJoin.getLeft() != null) { - processFromItem(subJoin.getLeft()); - } - } else if (fromItem instanceof SubSelect) { - SubSelect subSelect = (SubSelect) fromItem; - if (subSelect.getSelectBody() != null) { - processSelectBody(subSelect.getSelectBody()); - } - } else if (fromItem instanceof ValuesList) { - logger.debug("Perform a subquery, if you do not give us feedback"); - } else if (fromItem instanceof LateralSubSelect) { - LateralSubSelect lateralSubSelect = (LateralSubSelect) fromItem; - if (lateralSubSelect.getSubSelect() != null) { - SubSelect subSelect = lateralSubSelect.getSubSelect(); - if (subSelect.getSelectBody() != null) { - processSelectBody(subSelect.getSelectBody()); - } - } - } - } - - /** - * 处理联接语句 - */ - protected void processJoin(Join join) { - if (join.getRightItem() instanceof Table) { - Table fromTable = (Table) join.getRightItem(); - if (!filter()) { - // 过滤退出执行 - return; - } - join.setOnExpression(builderExpression(join.getOnExpression(), fromTable)); - } - } - - /** - * 处理条件 - */ - protected Expression builderExpression(Expression currentExpression, Table table) { - - DataPermissionContextHolder.DataPermissionContext dataPermissionContext = DataPermissionContextHolder.get(); - DataPermission dataPermission = dataPermissionContext.getDataPermission(); - - // 接口未配置注解，就不需要自动增加sql - if (dataPermission == null) { - return currentExpression; - } - - List byDataPermission = dataPermissionContextFactory.getRuleByDataPermission(); - Optional first = byDataPermission.stream().filter(rule -> rule.getTableName().contains(table.getName())).findFirst(); - if (!first.isPresent()) { - return currentExpression; - } - DataPermissionRuleService dataPermissionRuleService = first.get(); - Expression ruleExpression = dataPermissionRuleService.getExpression(table.getName(), table.getAlias()); - if (currentExpression == null) { - return ruleExpression; - } - if (currentExpression instanceof OrExpression) { - return new AndExpression(new Parenthesis(currentExpression), ruleExpression); - } else { - return new AndExpression(currentExpression, ruleExpression); - } - } - - private boolean filter() { - DataPermissionContextHolder.DataPermissionContext dataPermissionContext = DataPermissionContextHolder.get(); - if (null == dataPermissionContext - || dataPermissionContext.getDataPermission() == null - || !dataPermissionContext.getDataPermission().enable()) { - return false; - } - - return true; - } +// @Override +// public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException { +// if (!filter()) { +// return; +// } +// PluginUtils.MPBoundSql mpBs = PluginUtils.mpBoundSql(boundSql); +// mpBs.sql(parserSingle(mpBs.sql(), null)); +// } +// +// @Override +// public void beforePrepare(StatementHandler sh, Connection connection, Integer transactionTimeout) { +// PluginUtils.MPStatementHandler mpSh = PluginUtils.mpStatementHandler(sh); +// MappedStatement ms = mpSh.mappedStatement(); +// SqlCommandType sct = ms.getSqlCommandType(); +// // 不管insert +// if (sct == SqlCommandType.UPDATE || sct == SqlCommandType.DELETE) { +// if (!filter()) return; +// if (SqlParserHelper.getSqlParserInfo(ms)) return; +// PluginUtils.MPBoundSql mpBs = mpSh.mPBoundSql(); +// mpBs.sql(parserMulti(mpBs.sql(), null)); +// } +// } +// +// @Override +// protected void processSelect(Select select, int index, String sql, Object obj) { +// processSelectBody(select.getSelectBody()); +// List withItemsList = select.getWithItemsList(); +// if (!CollectionUtils.isEmpty(withItemsList)) { +// withItemsList.forEach(this::processSelectBody); +// } +// } +// +// protected void processSelectBody(SelectBody selectBody) { +// if (selectBody == null) { +// return; +// } +// if (selectBody instanceof PlainSelect) { +// processPlainSelect((PlainSelect) selectBody); +// } else if (selectBody instanceof WithItem) { +// WithItem withItem = (WithItem) selectBody; +// processSelectBody(withItem.getSelectBody()); +// } else { +// SetOperationList operationList = (SetOperationList) selectBody; +// if (operationList.getSelects() != null && operationList.getSelects().size() > 0) { +// operationList.getSelects().forEach(this::processSelectBody); +// } +// } +// } +// +// +// /** +// * update 语句处理 +// */ +// @Override +// protected void processUpdate(Update update, int index, String sql, Object obj) { +// final Table table = update.getTable(); +// if (!filter()) { +// // 过滤退出执行 +// return; +// } +// update.setWhere(this.andExpression(table, update.getWhere())); +// } +// +// /** +// * delete 语句处理 +// */ +// @Override +// protected void processDelete(Delete delete, int index, String sql, Object obj) { +// if (!filter()) { +// // 过滤退出执行 +// return; +// } +// delete.setWhere(this.andExpression(delete.getTable(), delete.getWhere())); +// } +// +// /** +// * delete update 语句 where 处理 +// */ +// protected Expression andExpression(Table table, Expression where) { +// +// +// DataPermissionContextHolder.DataPermissionContext dataPermissionContext = DataPermissionContextHolder.get(); +// DataPermission dataPermission = dataPermissionContext.getDataPermission(); +// // 接口未配置注解，就不需要自动增加sql +// if (dataPermission == null) { +// return where; +// } +// +// List byDataPermission = dataPermissionContextFactory.getRuleByDataPermission(); +// Optional first = byDataPermission.stream().filter(rule -> rule.getTableName().contains(table.getName())).findFirst(); +// if (!first.isPresent()) { +// return where; +// } +// DataPermissionRuleService dataPermissionRuleService = first.get(); +// Expression ruleExpression = dataPermissionRuleService.getExpression(table.getName(), table.getAlias()); +// +// if (null != where) { +// if (where instanceof OrExpression) { +// return new AndExpression(ruleExpression, new Parenthesis(where)); +// } else { +// return new AndExpression(ruleExpression, where); +// } +// } +// return ruleExpression; +// } +// +// +// +// +// +// /** +// * 处理 PlainSelect +// */ +// protected void processPlainSelect(PlainSelect plainSelect) { +// FromItem fromItem = plainSelect.getFromItem(); +// Expression where = plainSelect.getWhere(); +// processWhereSubSelect(where); +// if (fromItem instanceof Table) { +// Table fromTable = (Table) fromItem; +// if (filter()) { +// //#1186 github +// plainSelect.setWhere(builderExpression(where, fromTable)); +// } +// } else { +// processFromItem(fromItem); +// } +// List joins = plainSelect.getJoins(); +// if (joins != null && joins.size() > 0) { +// joins.forEach(j -> { +// processJoin(j); +// processFromItem(j.getRightItem()); +// }); +// } +// } +// +// /** +// * 处理where条件内的子查询 +// *

+// * 支持如下: +// * 1. in +// * 2. = +// * 3. > +// * 4. < +// * 5. >= +// * 6. <= +// * 7. <> +// * 8. EXISTS +// * 9. NOT EXISTS +// *

+// * 前提条件: +// * 1. 子查询必须放在小括号中 +// * 2. 子查询一般放在比较操作符的右边 +// * +// * @param where where 条件 +// */ +// protected void processWhereSubSelect(Expression where) { +// if (where == null) { +// return; +// } +// if (where instanceof FromItem) { +// processFromItem((FromItem) where); +// return; +// } +// if (where.toString().indexOf("SELECT") > 0) { +// // 有子查询 +// if (where instanceof BinaryExpression) { +// // 比较符号 , and , or , 等等 +// BinaryExpression expression = (BinaryExpression) where; +// processWhereSubSelect(expression.getLeftExpression()); +// processWhereSubSelect(expression.getRightExpression()); +// } else if (where instanceof InExpression) { +// // in +// InExpression expression = (InExpression) where; +// ItemsList itemsList = expression.getRightItemsList(); +// if (itemsList instanceof SubSelect) { +// processSelectBody(((SubSelect) itemsList).getSelectBody()); +// } +// } else if (where instanceof ExistsExpression) { +// // exists +// ExistsExpression expression = (ExistsExpression) where; +// processWhereSubSelect(expression.getRightExpression()); +// } else if (where instanceof NotExpression) { +// // not exists +// NotExpression expression = (NotExpression) where; +// processWhereSubSelect(expression.getExpression()); +// } else if (where instanceof Parenthesis) { +// Parenthesis expression = (Parenthesis) where; +// processWhereSubSelect(expression.getExpression()); +// } +// } +// } +// +// /** +// * 处理子查询等 +// */ +// protected void processFromItem(FromItem fromItem) { +// if (fromItem instanceof SubJoin) { +// SubJoin subJoin = (SubJoin) fromItem; +// if (subJoin.getJoinList() != null) { +// subJoin.getJoinList().forEach(this::processJoin); +// } +// if (subJoin.getLeft() != null) { +// processFromItem(subJoin.getLeft()); +// } +// } else if (fromItem instanceof SubSelect) { +// SubSelect subSelect = (SubSelect) fromItem; +// if (subSelect.getSelectBody() != null) { +// processSelectBody(subSelect.getSelectBody()); +// } +// } else if (fromItem instanceof ValuesList) { +// logger.debug("Perform a subquery, if you do not give us feedback"); +// } else if (fromItem instanceof LateralSubSelect) { +// LateralSubSelect lateralSubSelect = (LateralSubSelect) fromItem; +// if (lateralSubSelect.getSubSelect() != null) { +// SubSelect subSelect = lateralSubSelect.getSubSelect(); +// if (subSelect.getSelectBody() != null) { +// processSelectBody(subSelect.getSelectBody()); +// } +// } +// } +// } +// +// /** +// * 处理联接语句 +// */ +// protected void processJoin(Join join) { +// if (join.getRightItem() instanceof Table) { +// Table fromTable = (Table) join.getRightItem(); +// if (!filter()) { +// // 过滤退出执行 +// return; +// } +// join.setOnExpression(builderExpression(join.getOnExpression(), fromTable)); +// } +// } +// +// /** +// * 处理条件 +// */ +// protected Expression builderExpression(Expression currentExpression, Table table) { +// +// DataPermissionContextHolder.DataPermissionContext dataPermissionContext = DataPermissionContextHolder.get(); +// DataPermission dataPermission = dataPermissionContext.getDataPermission(); +// +// // 接口未配置注解，就不需要自动增加sql +// if (dataPermission == null) { +// return currentExpression; +// } +// +// List byDataPermission = dataPermissionContextFactory.getRuleByDataPermission(); +// Optional first = byDataPermission.stream().filter(rule -> rule.getTableName().contains(table.getName())).findFirst(); +// if (!first.isPresent()) { +// return currentExpression; +// } +// DataPermissionRuleService dataPermissionRuleService = first.get(); +// Expression ruleExpression = dataPermissionRuleService.getExpression(table.getName(), table.getAlias()); +// if (currentExpression == null) { +// return ruleExpression; +// } +// if (currentExpression instanceof OrExpression) { +// return new AndExpression(new Parenthesis(currentExpression), ruleExpression); +// } else { +// return new AndExpression(currentExpression, ruleExpression); +// } +// } +// +// private boolean filter() { +// DataPermissionContextHolder.DataPermissionContext dataPermissionContext = DataPermissionContextHolder.get(); +// if (null == dataPermissionContext +// || dataPermissionContext.getDataPermission() == null +// || !dataPermissionContext.getDataPermission().enable()) { +// return false; +// } +// +// return true; +// } } diff --git a/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/config/DataPermissionConfig.java b/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/config/DataPermissionConfig.java index 015a57c..fa0d0e6 100644 --- a/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/config/DataPermissionConfig.java +++ b/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/config/DataPermissionConfig.java @@ -13,20 +13,20 @@ import java.util.List; * @author tanjie@axzo.cn * @date 2024/5/31 16:34 */ -@ConditionalOnBean(MybatisPlusInterceptor.class) +//@ConditionalOnBean(MybatisPlusInterceptor.class) public class DataPermissionConfig { - @Bean - @ConditionalOnBean(MybatisPlusInterceptor.class) - public DataPermissionMybatisInterceptor mybatisDataPermissionInterceptor(MybatisPlusInterceptor mybatisPlusInterceptor, DataPermissionContextFactory dataPermissionContextFactory) { - DataPermissionMybatisInterceptor dataPermissionMybatisInterceptor = new DataPermissionMybatisInterceptor(dataPermissionContextFactory); - mybatisPlusInterceptor.addInnerInterceptor(dataPermissionMybatisInterceptor); - return dataPermissionMybatisInterceptor; - } - - - @Bean - public DataPermissionContextFactory dataPermissionRuleFactory(List rules) { - return new DataPermissionContextFactory(rules); - } +// @Bean +// @ConditionalOnBean(MybatisPlusInterceptor.class) +// public DataPermissionMybatisInterceptor mybatisDataPermissionInterceptor(MybatisPlusInterceptor mybatisPlusInterceptor, DataPermissionContextFactory dataPermissionContextFactory) { +// DataPermissionMybatisInterceptor dataPermissionMybatisInterceptor = new DataPermissionMybatisInterceptor(dataPermissionContextFactory); +// mybatisPlusInterceptor.addInnerInterceptor(dataPermissionMybatisInterceptor); +// return dataPermissionMybatisInterceptor; +// } +// +// +// @Bean +// public DataPermissionContextFactory dataPermissionRuleFactory(List rules) { +// return new DataPermissionContextFactory(rules); +// } } diff --git a/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/context/DataPermissionContextFactory.java b/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/context/DataPermissionContextFactory.java index 3822ef3..42226a5 100644 --- a/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/context/DataPermissionContextFactory.java +++ b/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/context/DataPermissionContextFactory.java @@ -9,7 +9,7 @@ import java.util.List; * @author tanjie@axzo.cn * @date 2024/5/31 17:58 */ -@AllArgsConstructor +//@AllArgsConstructor public class DataPermissionContextFactory { List rules; diff --git a/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/context/DataPermissionContextHolder.java b/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/context/DataPermissionContextHolder.java index 20441a9..5a4af6a 100644 --- a/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/context/DataPermissionContextHolder.java +++ b/axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/context/DataPermissionContextHolder.java @@ -61,6 +61,11 @@ public class DataPermissionContextHolder { * 解析后的部门id */ private Set nodeIds; + + /** + * 数据权限解析后的单位id + */ + private Set ouIds; } public static void remove() {