From 2054f5802bd6a072e524f85de58fd38fcdb70e12 Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Tue, 7 Jan 2025 14:20:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4Accessor=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowable/core/manager/FlowableManager.java | 2 +- .../flowable/core/model/FlowableAccessor.java | 6 ++---- .../flowable/test/accessor/RoleCheckAccessor.java | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/flowable-core/src/main/java/com/lanyuanxiaoyao/flowable/core/manager/FlowableManager.java b/flowable-core/src/main/java/com/lanyuanxiaoyao/flowable/core/manager/FlowableManager.java index 63b7999..c3d96c1 100644 --- a/flowable-core/src/main/java/com/lanyuanxiaoyao/flowable/core/manager/FlowableManager.java +++ b/flowable-core/src/main/java/com/lanyuanxiaoyao/flowable/core/manager/FlowableManager.java @@ -155,7 +155,7 @@ public abstract class FlowableManager { throw new IllegalArgumentException("权限检查器为空"); } FlowableAccessor accessor = createBean(accessorClass); - if (!accessor.access(configuration, instance, node, action)) { + if (!accessor.access(instance, node, action)) { throw new IllegalArgumentException("权限校验不通过"); } diff --git a/flowable-core/src/main/java/com/lanyuanxiaoyao/flowable/core/model/FlowableAccessor.java b/flowable-core/src/main/java/com/lanyuanxiaoyao/flowable/core/model/FlowableAccessor.java index c465c2e..df056a6 100644 --- a/flowable-core/src/main/java/com/lanyuanxiaoyao/flowable/core/model/FlowableAccessor.java +++ b/flowable-core/src/main/java/com/lanyuanxiaoyao/flowable/core/model/FlowableAccessor.java @@ -1,7 +1,5 @@ package com.lanyuanxiaoyao.flowable.core.model; -import com.lanyuanxiaoyao.flowable.core.manager.FlowableConfiguration; - /** * 权限校验 * @@ -9,11 +7,11 @@ import com.lanyuanxiaoyao.flowable.core.manager.FlowableConfiguration; * @version 20241231 */ public interface FlowableAccessor { - boolean access(FlowableConfiguration configuration, FlowableInstance instance, FlowableNode node, FlowableAction action); + boolean access(FlowableInstance instance, FlowableNode node, FlowableAction action); class DefaultFlowableAccessor implements FlowableAccessor { @Override - public boolean access(FlowableConfiguration configuration, FlowableInstance instance, FlowableNode node, FlowableAction action) { + public boolean access(FlowableInstance instance, FlowableNode node, FlowableAction action) { return true; } } diff --git a/flowable-example/src/main/java/com/lanyuanxiaoyao/flowable/test/accessor/RoleCheckAccessor.java b/flowable-example/src/main/java/com/lanyuanxiaoyao/flowable/test/accessor/RoleCheckAccessor.java index 101cf2d..2b3d3d5 100644 --- a/flowable-example/src/main/java/com/lanyuanxiaoyao/flowable/test/accessor/RoleCheckAccessor.java +++ b/flowable-example/src/main/java/com/lanyuanxiaoyao/flowable/test/accessor/RoleCheckAccessor.java @@ -1,6 +1,5 @@ package com.lanyuanxiaoyao.flowable.test.accessor; -import com.lanyuanxiaoyao.flowable.core.manager.FlowableConfiguration; import com.lanyuanxiaoyao.flowable.core.model.FlowableAccessor; import com.lanyuanxiaoyao.flowable.core.model.FlowableAction; import com.lanyuanxiaoyao.flowable.core.model.FlowableInstance; @@ -15,7 +14,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class RoleCheckAccessor implements FlowableAccessor { @Override - public boolean access(FlowableConfiguration configuration, FlowableInstance instance, FlowableNode node, FlowableAction action) { + public boolean access(FlowableInstance instance, FlowableNode node, FlowableAction action) { FlowableMetadata metadata = instance.getMetadata(); return metadata.containsKey("role"); }