Commit 9fe1ce8e1a249dfcb4affcec57678be3086e5977
1 parent
c34c218b
chore:flowable from 7.0.1 to 7.2.0
Showing
4 changed files
with
8 additions
and
8 deletions
yudao-dependencies/pom.xml
| @@ -46,7 +46,7 @@ | @@ -46,7 +46,7 @@ | ||
| 46 | <jedis-mock.version>1.1.11</jedis-mock.version> | 46 | <jedis-mock.version>1.1.11</jedis-mock.version> |
| 47 | <mockito-inline.version>5.2.0</mockito-inline.version> | 47 | <mockito-inline.version>5.2.0</mockito-inline.version> |
| 48 | <!-- Bpm 工作流相关 --> | 48 | <!-- Bpm 工作流相关 --> |
| 49 | - <flowable.version>7.0.1</flowable.version> | 49 | + <flowable.version>7.2.0</flowable.version> |
| 50 | <!-- 工具类相关 --> | 50 | <!-- 工具类相关 --> |
| 51 | <anji-plus-captcha.version>1.4.0</anji-plus-captcha.version> | 51 | <anji-plus-captcha.version>1.4.0</anji-plus-captcha.version> |
| 52 | <jsoup.version>1.21.2</jsoup.version> | 52 | <jsoup.version>1.21.2</jsoup.version> |
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmnModelUtils.java
| @@ -18,11 +18,11 @@ import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConsta | @@ -18,11 +18,11 @@ import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConsta | ||
| 18 | import com.google.common.collect.Maps; | 18 | import com.google.common.collect.Maps; |
| 19 | import lombok.extern.slf4j.Slf4j; | 19 | import lombok.extern.slf4j.Slf4j; |
| 20 | import org.flowable.bpmn.converter.BpmnXMLConverter; | 20 | import org.flowable.bpmn.converter.BpmnXMLConverter; |
| 21 | -import org.flowable.bpmn.model.Process; | ||
| 22 | import org.flowable.bpmn.model.*; | 21 | import org.flowable.bpmn.model.*; |
| 22 | +import org.flowable.bpmn.model.Process; | ||
| 23 | import org.flowable.common.engine.api.FlowableException; | 23 | import org.flowable.common.engine.api.FlowableException; |
| 24 | +import org.flowable.common.engine.api.delegate.Expression; | ||
| 24 | import org.flowable.common.engine.impl.util.io.BytesStreamSource; | 25 | import org.flowable.common.engine.impl.util.io.BytesStreamSource; |
| 25 | -import org.flowable.engine.impl.el.FixedValue; | ||
| 26 | 26 | ||
| 27 | import java.util.*; | 27 | import java.util.*; |
| 28 | 28 | ||
| @@ -406,7 +406,7 @@ public class BpmnModelUtils { | @@ -406,7 +406,7 @@ public class BpmnModelUtils { | ||
| 406 | flowableListener.getFieldExtensions().add(fieldExtension); | 406 | flowableListener.getFieldExtensions().add(fieldExtension); |
| 407 | } | 407 | } |
| 408 | 408 | ||
| 409 | - public static BpmSimpleModelNodeVO.ListenerHandler parseListenerConfig(FixedValue fixedValue) { | 409 | + public static BpmSimpleModelNodeVO.ListenerHandler parseListenerConfig(Expression fixedValue) { |
| 410 | String expressionText = fixedValue.getExpressionText(); | 410 | String expressionText = fixedValue.getExpressionText(); |
| 411 | Assert.notNull(expressionText, "监听器扩展字段({})不能为空", expressionText); | 411 | Assert.notNull(expressionText, "监听器扩展字段({})不能为空", expressionText); |
| 412 | return JsonUtils.parseObject(expressionText, BpmSimpleModelNodeVO.ListenerHandler.class); | 412 | return JsonUtils.parseObject(expressionText, BpmSimpleModelNodeVO.ListenerHandler.class); |
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/listener/BpmCallActivityListener.java
| @@ -14,9 +14,9 @@ import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; | @@ -14,9 +14,9 @@ import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; | ||
| 14 | import jakarta.annotation.Resource; | 14 | import jakarta.annotation.Resource; |
| 15 | import lombok.Setter; | 15 | import lombok.Setter; |
| 16 | import lombok.extern.slf4j.Slf4j; | 16 | import lombok.extern.slf4j.Slf4j; |
| 17 | +import org.flowable.common.engine.api.delegate.Expression; | ||
| 17 | import org.flowable.engine.delegate.DelegateExecution; | 18 | import org.flowable.engine.delegate.DelegateExecution; |
| 18 | import org.flowable.engine.delegate.ExecutionListener; | 19 | import org.flowable.engine.delegate.ExecutionListener; |
| 19 | -import org.flowable.engine.impl.el.FixedValue; | ||
| 20 | import org.flowable.engine.runtime.ProcessInstance; | 20 | import org.flowable.engine.runtime.ProcessInstance; |
| 21 | import org.springframework.stereotype.Component; | 21 | import org.springframework.stereotype.Component; |
| 22 | 22 | ||
| @@ -34,7 +34,7 @@ public class BpmCallActivityListener implements ExecutionListener { | @@ -34,7 +34,7 @@ public class BpmCallActivityListener implements ExecutionListener { | ||
| 34 | public static final String DELEGATE_EXPRESSION = "${bpmCallActivityListener}"; | 34 | public static final String DELEGATE_EXPRESSION = "${bpmCallActivityListener}"; |
| 35 | 35 | ||
| 36 | @Setter | 36 | @Setter |
| 37 | - private FixedValue listenerConfig; | 37 | + private Expression listenerConfig; |
| 38 | 38 | ||
| 39 | @Resource | 39 | @Resource |
| 40 | private BpmProcessDefinitionService processDefinitionService; | 40 | private BpmProcessDefinitionService processDefinitionService; |
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/listener/BpmUserTaskListener.java
| @@ -7,8 +7,8 @@ import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; | @@ -7,8 +7,8 @@ import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; | ||
| 7 | import jakarta.annotation.Resource; | 7 | import jakarta.annotation.Resource; |
| 8 | import lombok.Setter; | 8 | import lombok.Setter; |
| 9 | import lombok.extern.slf4j.Slf4j; | 9 | import lombok.extern.slf4j.Slf4j; |
| 10 | +import org.flowable.common.engine.api.delegate.Expression; | ||
| 10 | import org.flowable.engine.delegate.TaskListener; | 11 | import org.flowable.engine.delegate.TaskListener; |
| 11 | -import org.flowable.engine.impl.el.FixedValue; | ||
| 12 | import org.flowable.engine.runtime.ProcessInstance; | 12 | import org.flowable.engine.runtime.ProcessInstance; |
| 13 | import org.flowable.task.service.delegate.DelegateTask; | 13 | import org.flowable.task.service.delegate.DelegateTask; |
| 14 | import org.springframework.context.annotation.Scope; | 14 | import org.springframework.context.annotation.Scope; |
| @@ -33,7 +33,7 @@ public class BpmUserTaskListener implements TaskListener { | @@ -33,7 +33,7 @@ public class BpmUserTaskListener implements TaskListener { | ||
| 33 | private BpmProcessInstanceService processInstanceService; | 33 | private BpmProcessInstanceService processInstanceService; |
| 34 | 34 | ||
| 35 | @Setter | 35 | @Setter |
| 36 | - private FixedValue listenerConfig; | 36 | + private Expression listenerConfig; |
| 37 | 37 | ||
| 38 | @Override | 38 | @Override |
| 39 | public void notify(DelegateTask delegateTask) { | 39 | public void notify(DelegateTask delegateTask) { |