update - 合并现有的 REQ 分支代码

This commit is contained in:
wangli 2024-05-21 10:32:22 +08:00
parent 5a35f37f7f
commit 6254dfbf75
2 changed files with 4 additions and 6 deletions

View File

@ -10,10 +10,9 @@ import cn.axzo.workflow.core.engine.job.AsyncCancelProcessInstanceHandler;
import cn.axzo.workflow.core.engine.job.AsyncCountersignUserTaskJobHandler;
import cn.axzo.workflow.core.engine.job.AsyncExtTaskInstJobHandler;
import cn.axzo.workflow.core.engine.job.AsyncRejectTaskJobHandler;
import cn.axzo.workflow.core.engine.job.AsyncTransferUserTaskJobHandler;
import cn.axzo.workflow.core.engine.job.exception.handle.CustomAsyncJobLogClearTraceExceptionHandler;
import cn.axzo.workflow.core.engine.job.exception.handle.CustomAsyncRunnableExceptionExceptionHandler;
import cn.axzo.workflow.core.engine.job.AsyncTransferUserTaskJobHandler;
import cn.axzo.workflow.core.engine.job.exception.handler.CustomAsyncRunnableExecutionExceptionHandler;
import cn.axzo.workflow.core.engine.persistence.CustomMybatisHistoricProcessInstanceDataManager;
import cn.axzo.workflow.core.service.BpmnProcessActivityService;
import cn.axzo.workflow.core.service.ExtAxHiTaskInstService;
@ -31,7 +30,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.core.StringRedisTemplate;
import java.time.Duration;
import java.util.List;
import static org.flowable.common.engine.impl.AbstractEngineConfiguration.DB_SCHEMA_UPDATE_TRUE;
@ -54,8 +52,8 @@ public class FlowableConfiguration {
CustomActivityBehaviorFactory customActivityBehaviorFactory,
StringRedisTemplate stringRedisTemplate,
ExtAxHiTaskInstService extAxHiTaskInstService,
List<JobProcessor> jobProcessors,
BpmnProcessActivityService bpmnProcessActivityService) {
BpmnProcessActivityService bpmnProcessActivityService,
List<JobProcessor> jobProcessors) {
return configuration -> {
configuration.setEnableHistoricTaskLogging(true);
configuration.setHistoryLevel(HistoryLevel.AUDIT);

View File

@ -81,7 +81,7 @@ public class EngineNoticeEventListener extends AbstractFlowableEventListener {
stopWatch.start("PUSH-PENDING-ROLLBACK Event Execution Time");
getOrderedListeners().forEach(i -> i.onPendingRollback(event));
stopWatch.stop();
log.info("PUSH-PENDING-ROLLBACK StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's");
log.info("PUSH-PENDING-ROLLBACK StopWatch : running time = {} 's", stopWatch.getTotalTimeSeconds());
break;
case CARBON_COPY:
stopWatch.start("CARBON-COPY Event Execution Time");