From 39ae41d531c78934063db4592cb201958bfe4591 Mon Sep 17 00:00:00 2001
From: tjq <tengjiqi@gmail.com>
Date: Fri, 27 Nov 2020 22:41:25 +0800
Subject: [PATCH] fix: product env can't output log to console #114

---
 .../src/main/resources/logback-product.xml            | 11 +++++------
 .../kfcfans/powerjob/server/test/RepositoryTest.java  |  6 ++++--
 2 files changed, 9 insertions(+), 8 deletions(-)

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 @@
 <!-- 生产环境日志 -->
 <configuration>
 
+    <!--默认配置-->
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <!--配置控制台(Console)-->
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+
     <!--
         日志路径，注意权限问题，否则无法打印日志。
         大坑记录：`~/logs`不会在用户目录下创建文件夹，而是在项目目录下创建名为~的文件夹
      -->
     <property name="LOG_PATH" value="${user.home}/powerjob-server/logs"/>
 
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-            <charset>utf8</charset>
-        </encoder>
-    </appender>
 
     <!-- 系统所有异常日志（ERROR）双写 start -->
     <appender name="ERROR_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
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);
     }
 
 }