diff --git a/flowlong-core/src/main/java/com/aizuda/bpm/engine/core/FlowLongContext.java b/flowlong-core/src/main/java/com/aizuda/bpm/engine/core/FlowLongContext.java index 5fc95af..a957973 100644 --- a/flowlong-core/src/main/java/com/aizuda/bpm/engine/core/FlowLongContext.java +++ b/flowlong-core/src/main/java/com/aizuda/bpm/engine/core/FlowLongContext.java @@ -177,7 +177,7 @@ public class FlowLongContext { * @param configEngine 流程配置引擎 * @return {@link FlowLongEngine} */ - public FlowLongContext build(FlowLongEngine configEngine) { + public FlowLongContext build(FlowLongEngine configEngine, boolean banner) { if (log.isInfoEnabled()) { log.info("FlowLongEngine start......"); } @@ -189,6 +189,13 @@ public class FlowLongContext { log.info("FlowLongEngine be found {}", configEngine.getClass()); } configEngine.configure(this); + + if (banner) { + System.err.println("┌─┐┬ ┌─┐┬ ┬┬ ┌─┐┌┐┌┌─┐"); + System.err.println("├┤ │ │ │││││ │ │││││ ┬"); + System.err.println("└ ┴─┘└─┘└┴┘┴─┘└─┘┘└┘└─┘ 1.1.1"); + } + return this; } diff --git a/flowlong-solon-plugin/src/main/java/com/aizuda/bpm/solon/autoconfigure/FlowLongAutoConfiguration.java b/flowlong-solon-plugin/src/main/java/com/aizuda/bpm/solon/autoconfigure/FlowLongAutoConfiguration.java index 1778f17..dde9a1a 100644 --- a/flowlong-solon-plugin/src/main/java/com/aizuda/bpm/solon/autoconfigure/FlowLongAutoConfiguration.java +++ b/flowlong-solon-plugin/src/main/java/com/aizuda/bpm/solon/autoconfigure/FlowLongAutoConfiguration.java @@ -130,6 +130,7 @@ public class FlowLongAutoConfiguration { TaskAccessStrategy taskAccessStrategy, TaskActorProvider taskActorProvider, FlowLongEngine flowLongEngine, + FlowLongProperties flp, @Inject(required = false) FlowCache flowCache, @Inject(required = false) ProcessModelParser processModelParser, @Inject(required = false) FlowJsonHandler flowJsonHandler, @@ -158,7 +159,7 @@ public class FlowLongAutoConfiguration { flc.setCreateTaskHandler(createTaskHandler); flc.setTaskReminder(taskReminder); flc.setTaskTrigger(taskTrigger); - return flc.build(flowLongEngine); + return flc.build(flowLongEngine, flp.isBanner()); } @Bean diff --git a/flowlong-solon-plugin/src/main/java/com/aizuda/bpm/solon/autoconfigure/FlowLongProperties.java b/flowlong-solon-plugin/src/main/java/com/aizuda/bpm/solon/autoconfigure/FlowLongProperties.java index 3a7edd7..1d54c2b 100644 --- a/flowlong-solon-plugin/src/main/java/com/aizuda/bpm/solon/autoconfigure/FlowLongProperties.java +++ b/flowlong-solon-plugin/src/main/java/com/aizuda/bpm/solon/autoconfigure/FlowLongProperties.java @@ -5,6 +5,8 @@ package com.aizuda.bpm.solon.autoconfigure; import com.aizuda.bpm.engine.scheduling.RemindParam; +import lombok.Getter; +import lombok.Setter; import org.noear.solon.annotation.Configuration; import org.noear.solon.annotation.Inject; @@ -18,19 +20,18 @@ import org.noear.solon.annotation.Inject; * @author hubin * @since 1.0 */ +@Getter +@Setter @Inject("${flowlong}") @Configuration public class FlowLongProperties { + /** + * 是否打印 banner + */ + private boolean banner = true; /** * 提醒时间 */ private RemindParam remind; - public RemindParam getRemind() { - return remind; - } - - public void setRemind(RemindParam remind) { - this.remind = remind; - } } \ No newline at end of file diff --git a/flowlong-spring-boot-starter/src/main/java/com/aizuda/bpm/spring/autoconfigure/FlowLongAutoConfiguration.java b/flowlong-spring-boot-starter/src/main/java/com/aizuda/bpm/spring/autoconfigure/FlowLongAutoConfiguration.java index b4789f4..eca1f06 100644 --- a/flowlong-spring-boot-starter/src/main/java/com/aizuda/bpm/spring/autoconfigure/FlowLongAutoConfiguration.java +++ b/flowlong-spring-boot-starter/src/main/java/com/aizuda/bpm/spring/autoconfigure/FlowLongAutoConfiguration.java @@ -111,7 +111,7 @@ public class FlowLongAutoConfiguration { @ConditionalOnMissingBean public FlowLongContext flowLongContext(ProcessService processService, QueryService queryService, RuntimeService runtimeService, TaskService taskService, Expression expression, TaskAccessStrategy taskAccessStrategy, - TaskActorProvider taskActorProvider, FlowLongEngine flowLongEngine, + TaskActorProvider taskActorProvider, FlowLongEngine flowLongEngine, FlowLongProperties flp, @Autowired(required = false) FlowCache flowCache, @Autowired(required = false) ProcessModelParser processModelParser, @Autowired(required = false) FlowJsonHandler flowJsonHandler, @@ -139,7 +139,7 @@ public class FlowLongAutoConfiguration { flc.setCreateTaskHandler(createTaskHandler); flc.setTaskReminder(taskReminder); flc.setTaskTrigger(taskTrigger); - return flc.build(flowLongEngine); + return flc.build(flowLongEngine, flp.isBanner()); } /** diff --git a/flowlong-spring-boot-starter/src/main/java/com/aizuda/bpm/spring/autoconfigure/FlowLongProperties.java b/flowlong-spring-boot-starter/src/main/java/com/aizuda/bpm/spring/autoconfigure/FlowLongProperties.java index 550ee2b..d0b58fc 100644 --- a/flowlong-spring-boot-starter/src/main/java/com/aizuda/bpm/spring/autoconfigure/FlowLongProperties.java +++ b/flowlong-spring-boot-starter/src/main/java/com/aizuda/bpm/spring/autoconfigure/FlowLongProperties.java @@ -24,6 +24,10 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty; @Setter @ConfigurationProperties(prefix = "flowlong") public class FlowLongProperties { + /** + * 是否打印 banner + */ + private boolean banner = true; /** * 提醒时间 */ diff --git a/flowlong-spring-boot-starter/src/test/java/test/mysql/TestSupervisor.java b/flowlong-spring-boot-starter/src/test/java/test/mysql/TestSupervisor.java index 1ad3a6f..b9a7e52 100644 --- a/flowlong-spring-boot-starter/src/test/java/test/mysql/TestSupervisor.java +++ b/flowlong-spring-boot-starter/src/test/java/test/mysql/TestSupervisor.java @@ -36,6 +36,22 @@ public class TestSupervisor extends MysqlTest { this.flowLongEngine.getContext().setTaskActorProvider( new TaskActorProvider() { + @Override + public Integer getActorType(NodeModel nodeModel) { + + // 1,角色 + if (NodeSetType.role.eq(nodeModel.getSetType())) { + return 1; + } + + // 2,部门 + if (NodeSetType.department.eq(nodeModel.getSetType())) { + return 2; + } + + return 0; + } + @Override public List getTaskActors(NodeModel nodeModel, Execution execution) { if (nodeModel.getType() == 0) {