diff --git a/powerjob-server/src/main/resources/logback-product.xml b/powerjob-server/src/main/resources/logback-product.xml index 9f63badf..2be6e263 100644 --- a/powerjob-server/src/main/resources/logback-product.xml +++ b/powerjob-server/src/main/resources/logback-product.xml @@ -2,18 +2,17 @@ + + + + + - - - ${CONSOLE_LOG_PATTERN} - utf8 - - diff --git a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/RepositoryTest.java b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/RepositoryTest.java index 51cd52b3..341fe412 100644 --- a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/RepositoryTest.java +++ b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/RepositoryTest.java @@ -1,6 +1,8 @@ package com.github.kfcfans.powerjob.server.test; +import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.github.kfcfans.powerjob.server.common.constans.SwitchableStatus; import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; @@ -104,12 +106,12 @@ public class RepositoryTest { @Test public void testDeleteInstanceInfo() { - instanceInfoRepository.deleteAllByGmtModifiedBefore(new Date()); + instanceInfoRepository.deleteAllByGmtModifiedBeforeAndStatusIn(new Date(), InstanceStatus.finishedStatus); } @Test public void testDeleteWorkflowInstanceInfo() { - workflowInstanceInfoRepository.deleteAllByGmtModifiedBefore(new Date()); + workflowInstanceInfoRepository.deleteAllByGmtModifiedBeforeAndStatusIn(new Date(), WorkflowInstanceStatus.finishedStatus); } }