update loggers.

examcloud-core-oe-task-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/task/controller/ExamCaptureController.java

@@ -177,7 +177,7 @@ public class ExamCaptureController extends ControllerSupport {
                 }
             } catch (JSONException e) {
                 saveExamCaptureQueueInfo.setCameraInfos(null);
-                log.error("ExamCaptureQueueController-uploadExamCapture-004:虚拟摄像头信息格式不正确", e);
+                LOGGER.error("ExamCaptureQueueController-uploadExamCapture-004:虚拟摄像头信息格式不正确", e);
             }
         }
         validateUpyunSign(saveExamCaptureQueueInfo.getSignIdentifier(), saveExamCaptureQueueInfo.getFileUrl(), user.getUserId());

examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/pipeline/AfterHandInExamExecutor.java

@@ -4,8 +4,6 @@ import cn.com.qmth.examcloud.commons.helpers.KeyValuePair;
 import cn.com.qmth.examcloud.commons.helpers.ObjectHolder;
 import cn.com.qmth.examcloud.commons.helpers.pipeline.NodeExecuter;
 import cn.com.qmth.examcloud.commons.helpers.pipeline.TaskContext;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.core.oe.task.service.ExamRecordDataService;
 import cn.com.qmth.examcloud.support.Constants;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
@@ -13,6 +11,8 @@ import cn.com.qmth.examcloud.support.cache.bean.SysPropertyCacheBean;
 import cn.com.qmth.examcloud.support.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.support.examing.ExamRecordData;
 import cn.com.qmth.examcloud.web.helpers.SequenceLockHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -32,9 +32,7 @@ public class AfterHandInExamExecutor implements NodeExecuter<Long, ExamRecordDat
 
     private static Long DEFAULT_MAX_PROCESS_SECONDS = 30L;
 
-    @Autowired
-    private static final ExamCloudLog LOG = ExamCloudLogFactory.getLog(AfterHandInExamExecutor.class);
-
+    private static final Logger LOG = LoggerFactory.getLogger(AfterHandInExamExecutor.class);
 
     /**
      * 执行

examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/pipeline/ClearExamDataCacheExecutor.java

@@ -4,8 +4,6 @@ import cn.com.qmth.examcloud.commons.helpers.KeyValuePair;
 import cn.com.qmth.examcloud.commons.helpers.ObjectHolder;
 import cn.com.qmth.examcloud.commons.helpers.pipeline.NodeExecuter;
 import cn.com.qmth.examcloud.commons.helpers.pipeline.TaskContext;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.core.oe.task.service.ExamingSessionService;
 import cn.com.qmth.examcloud.support.Constants;
 import cn.com.qmth.examcloud.support.enums.SyncStatus;
@@ -16,6 +14,8 @@ import cn.com.qmth.examcloud.support.redis.RedisKeyHelper;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import cn.com.qmth.examcloud.web.helpers.SequenceLockHelper;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -34,7 +34,7 @@ public class ClearExamDataCacheExecutor implements NodeExecuter<Long, ExamRecord
     @Autowired
     private RedisClient redisClient;
 
-    private static final ExamCloudLog LOG = ExamCloudLogFactory.getLog(ClearExamDataCacheExecutor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ClearExamDataCacheExecutor.class);
 
     @Autowired
     private ExamingSessionService examingSessionService;

examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/pipeline/DataGainExamExecutor.java

@@ -4,8 +4,6 @@ import cn.com.qmth.examcloud.commons.helpers.KeyValuePair;
 import cn.com.qmth.examcloud.commons.helpers.ObjectHolder;
 import cn.com.qmth.examcloud.commons.helpers.pipeline.NodeExecuter;
 import cn.com.qmth.examcloud.commons.helpers.pipeline.TaskContext;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.core.oe.student.api.ExamRecordDataCloudService;
 import cn.com.qmth.examcloud.core.oe.student.api.request.GetExamRecordDataIdsReq;
 import cn.com.qmth.examcloud.core.oe.student.api.request.UpdateExamRecordDataBatchNumReq;
@@ -15,6 +13,8 @@ import cn.com.qmth.examcloud.core.oe.task.service.ExamRecordDataService;
 import cn.com.qmth.examcloud.core.oe.task.service.bean.RecordDataSyncRule;
 import cn.com.qmth.examcloud.support.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.support.examing.ExamRecordData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -34,7 +34,7 @@ import java.util.List;
 @Component
 public class DataGainExamExecutor implements NodeExecuter<Long, ExamRecordData, Long, ExamRecordData> {
 
-    private static final ExamCloudLog LOG = ExamCloudLogFactory.getLog(DataGainExamExecutor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DataGainExamExecutor.class);
 
     private final static Integer batchSize = 200;
 

examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/pipeline/HandInExamExecutor.java

@@ -5,8 +5,6 @@ import cn.com.qmth.examcloud.commons.helpers.KeyValuePair;
 import cn.com.qmth.examcloud.commons.helpers.ObjectHolder;
 import cn.com.qmth.examcloud.commons.helpers.pipeline.NodeExecuter;
 import cn.com.qmth.examcloud.commons.helpers.pipeline.TaskContext;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.util.JsonUtil;
 import cn.com.qmth.examcloud.core.oe.student.api.ExamRecordDataCloudService;
 import cn.com.qmth.examcloud.core.oe.student.api.request.HandInExamReq;
@@ -22,6 +20,8 @@ import cn.com.qmth.examcloud.support.examing.ExamingSession;
 import cn.com.qmth.examcloud.support.redis.RedisKeyHelper;
 import cn.com.qmth.examcloud.web.helpers.SequenceLockHelper;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -49,8 +49,7 @@ public class HandInExamExecutor implements NodeExecuter<Long, ExamRecordData, Lo
     @Autowired
     private ExamRecordDataCloudService examRecordDataCloudService;
 
-    @Autowired
-    private static final ExamCloudLog LOG = ExamCloudLogFactory.getLog(HandInExamExecutor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HandInExamExecutor.class);
 
     /**
      * 执行

examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/pipeline/SyncExamDataExecutor.java

@@ -4,8 +4,6 @@ import cn.com.qmth.examcloud.commons.helpers.KeyValuePair;
 import cn.com.qmth.examcloud.commons.helpers.ObjectHolder;
 import cn.com.qmth.examcloud.commons.helpers.pipeline.NodeExecuter;
 import cn.com.qmth.examcloud.commons.helpers.pipeline.TaskContext;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.util.JsonUtil;
 import cn.com.qmth.examcloud.core.oe.admin.api.ExamScoreNoticeQueueCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.SyncExamDataCloudService;
@@ -53,6 +51,8 @@ import cn.com.qmth.examcloud.support.examing.ExamRecordData;
 import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.support.helper.FaceBiopsyHelper;
 import cn.com.qmth.examcloud.web.helpers.SequenceLockHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -95,7 +95,7 @@ public class SyncExamDataExecutor implements NodeExecuter<Long, ExamRecordData,
     @Autowired
     private ExamProcessRecordRepo examProcessRecordRepo;
 
-    private static final ExamCloudLog LOG = ExamCloudLogFactory.getLog(SyncExamDataExecutor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SyncExamDataExecutor.class);
 
     /**
      * 执行

examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ProcessBaiduFaceLivenessAlarmTask.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.core.oe.task.starter.config;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.util.Util;
 import cn.com.qmth.examcloud.core.oe.task.base.ExamCaptureProcessStatisticController;
 import cn.com.qmth.examcloud.exchange.inner.api.SmsCloudService;
@@ -11,6 +9,8 @@ import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.SysPropertyCacheBean;
 import com.google.common.collect.Maps;
 import com.googlecode.aviator.AviatorEvaluator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
@@ -33,8 +33,7 @@ import java.util.Map;
 @Order(203)
 public class ProcessBaiduFaceLivenessAlarmTask implements ApplicationRunner {
 
-    private static ExamCloudLog captureLog = ExamCloudLogFactory
-            .getLog("PROCESS_EXAM_CAPTURE_TASK_LOGGER");
+    private static final Logger LOG = LoggerFactory.getLogger(ProcessBaiduFaceLivenessAlarmTask.class);
 
     @Autowired
     SmsCloudService smsCloudService;
@@ -44,7 +43,7 @@ public class ProcessBaiduFaceLivenessAlarmTask implements ApplicationRunner {
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        captureLog.warn("ProcessBaiduFaceLivenessAlarmTask enable is " + faceCompareTaskEnable);
+        LOG.warn("ProcessBaiduFaceLivenessAlarmTask enable is " + faceCompareTaskEnable);
         if (!faceCompareTaskEnable) {
             return;
         }
@@ -57,7 +56,7 @@ public class ProcessBaiduFaceLivenessAlarmTask implements ApplicationRunner {
                     try {
                         faceLivenessDectectAlarm();
                     } catch (Exception e) {
-                        captureLog.error("[FACE_LIVENESS_ALARM.] 活体检测预警出现异常", e);
+                        LOG.error("[FACE_LIVENESS_ALARM.] 活体检测预警出现异常", e);
                     }
 
                     // 每分钟轮循一次
@@ -74,8 +73,8 @@ public class ProcessBaiduFaceLivenessAlarmTask implements ApplicationRunner {
      * 活体检测，如果有必要则发短信
      */
     private void faceLivenessDectectAlarm() {
-        if (captureLog.isDebugEnabled()) {
-            captureLog.debug("[FACE_LIVENESS_ALARM] 进入活体检测" + System.currentTimeMillis()
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("[FACE_LIVENESS_ALARM] 进入活体检测" + System.currentTimeMillis()
                     + "....totalCount="
                     + ExamCaptureProcessStatisticController.getFaceLivenessDetectCount()
                     + " ,failCount="
@@ -87,7 +86,7 @@ public class ProcessBaiduFaceLivenessAlarmTask implements ApplicationRunner {
             SysPropertyCacheBean faceLivenessSmsAssemblyCodeProperty = CacheHelper
                     .getSysProperty("capture.faceLiveness.smsAssemblyCode");
             if (!faceLivenessSmsAssemblyCodeProperty.getHasValue()) {
-                captureLog.error("[FACE_LIVENESS_ALARM.] 未配置人脸比对的短信模板代码，totalCount="
+                LOG.error("[FACE_LIVENESS_ALARM.] 未配置人脸比对的短信模板代码，totalCount="
                         + ExamCaptureProcessStatisticController.getFaceCompareCount()
                         + ",errorCount="
                         + ExamCaptureProcessStatisticController.getFaceCompareFailedCount());
@@ -96,7 +95,7 @@ public class ProcessBaiduFaceLivenessAlarmTask implements ApplicationRunner {
             SysPropertyCacheBean smsPhoneProperty = CacheHelper
                     .getSysProperty("capture.sms.phones");
             if (!smsPhoneProperty.getHasValue()) {
-                captureLog.error("[FACE_LIVENESS_ALARM.] 未配置图片处理失败的通知手机号，totalCount="
+                LOG.error("[FACE_LIVENESS_ALARM.] 未配置图片处理失败的通知手机号，totalCount="
                         + ExamCaptureProcessStatisticController.getFaceCompareCount()
                         + ",errorCount="
                         + ExamCaptureProcessStatisticController.getFaceCompareFailedCount());
@@ -119,7 +118,7 @@ public class ProcessBaiduFaceLivenessAlarmTask implements ApplicationRunner {
             try {
                 smsCloudService.sendSms(sendSmsReq);
             } catch (Exception e) {
-                captureLog.error("[PROCESS_FACE_LIVENESS.] 发送短信出现异常", e);
+                LOG.error("[PROCESS_FACE_LIVENESS.] 发送短信出现异常", e);
             }
         }
         // 每1分钟重置一次总数量与失败数量

examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ProcessBaiduFacelivenessTask.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.core.oe.task.starter.config;
 
 import cn.com.qmth.examcloud.commons.helpers.concurrency.simple.ConcurrentTask;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.util.Util;
 import cn.com.qmth.examcloud.core.oe.task.dao.ExamCaptureQueueRepo;
 import cn.com.qmth.examcloud.core.oe.task.dao.entity.ExamCaptureQueueEntity;
@@ -10,6 +8,8 @@ import cn.com.qmth.examcloud.core.oe.task.service.bean.ExamCaptureQueueInfo;
 import cn.com.qmth.examcloud.core.oe.task.service.worker.BaiduFaceLivenessWorker;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import org.apache.logging.log4j.ThreadContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
@@ -26,8 +26,7 @@ import java.util.List;
 @Order(201)
 public class ProcessBaiduFacelivenessTask implements ApplicationRunner {
 
-    private static ExamCloudLog captureLog = ExamCloudLogFactory
-            .getLog("PROCESS_EXAM_CAPTURE_TASK_LOGGER");
+    private static final Logger LOG = LoggerFactory.getLogger(ProcessBaiduFacelivenessTask.class);
 
     @Autowired
     ExamCaptureQueueRepo examCaptureQueueRepo;
@@ -43,12 +42,12 @@ public class ProcessBaiduFacelivenessTask implements ApplicationRunner {
                 .findNeedFacelivenessDetectExamCaptureQueuesLimit(limit, processBatchNum);
 
         if (null == examCaptureQueueList || examCaptureQueueList.isEmpty()) {
-            captureLog
+            LOG
                     .debug("[PROCESS_BAIDUFACELIVENESS." + processBatchNum + "] 抓拍队列中没有取到数据，2秒后重试");
             return 0;
         }
 
-        captureLog.debug("[PROCESS_BAIDUFACELIVENESS." + processBatchNum + "] 抓拍队列中的数据条数为："
+        LOG.debug("[PROCESS_BAIDUFACELIVENESS." + processBatchNum + "] 抓拍队列中的数据条数为："
                 + examCaptureQueueList.size());
 
         for (ExamCaptureQueueEntity offeredQueueEntity : examCaptureQueueList) {
@@ -60,12 +59,12 @@ public class ProcessBaiduFacelivenessTask implements ApplicationRunner {
                     examCaptureQueueRepo.updateProcessBatchNum(offeredQueueEntity.getId(), processBatchNum);
                     boolean offerSuccess = concurrentTask.offerElement(copyExamCaptureQueueInfoFrom(offeredQueueEntity));
                     if (offerSuccess) {
-                        captureLog.debug("[PROCESS_BAIDUFACELIVENESS." + processBatchNum
+                        LOG.debug("[PROCESS_BAIDUFACELIVENESS." + processBatchNum
                                 + "] 向工作队列中添加数据成功：fileUrl=" + offeredQueueEntity.getFileUrl());
                         break;
                     }
 
-                    captureLog.debug("[PROCESS_BAIDUFACELIVENESS." + processBatchNum
+                    LOG.debug("[PROCESS_BAIDUFACELIVENESS." + processBatchNum
                             + "] 向工作队列中添加数据失败，30秒后重试：fileUrl=" + offeredQueueEntity.getFileUrl());
 
                     Util.sleep(PropertyHolder.getInt("$capture.queue.offer.sleepSeconds.", 30));
@@ -80,7 +79,7 @@ public class ProcessBaiduFacelivenessTask implements ApplicationRunner {
 
     @Override
     public void run(ApplicationArguments args) {
-        captureLog.warn("ProcessBaiduFacelivenessTask enable is " + faceCompareTaskEnable);
+        LOG.warn("ProcessBaiduFacelivenessTask enable is " + faceCompareTaskEnable);
         if (!faceCompareTaskEnable) {
             return;
         }
@@ -95,7 +94,7 @@ public class ProcessBaiduFacelivenessTask implements ApplicationRunner {
         // 当前获取数据的批次号(默认用时间戳)
         String processBatchNum = "B_" + System.currentTimeMillis();
 
-        captureLog.debug("[PROCESS_BAIDUFACELIVENESS." + processBatchNum + "] 启动百度处理服务...");
+        LOG.debug("[PROCESS_BAIDUFACELIVENESS." + processBatchNum + "] 启动百度处理服务...");
 
         Thread thread = new Thread(new Runnable() {
             @Override
@@ -111,7 +110,7 @@ public class ProcessBaiduFacelivenessTask implements ApplicationRunner {
                         }
                         Util.sleep(PropertyHolder.getInt("$capture.queue.read.sleepSeconds.", 2));
                     } catch (Exception e) {
-                        captureLog.error("[PROCESS_FACEPP." + processBatchNum + "] 百度活体检测出异常,3秒后重试",
+                        LOG.error("[PROCESS_FACEPP." + processBatchNum + "] 百度活体检测出异常,3秒后重试",
                                 e);
                         Util.sleep(3);
                     }

examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ProcessFaceCompareAlarmTask.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.core.oe.task.starter.config;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.util.Util;
 import cn.com.qmth.examcloud.core.oe.task.base.ExamCaptureProcessStatisticController;
 import cn.com.qmth.examcloud.exchange.inner.api.SmsCloudService;
@@ -11,6 +9,8 @@ import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.SysPropertyCacheBean;
 import com.google.common.collect.Maps;
 import com.googlecode.aviator.AviatorEvaluator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
@@ -39,12 +39,11 @@ public class ProcessFaceCompareAlarmTask implements ApplicationRunner {
     @Value("${examcloud.face.compare.task.enable}")
     private Boolean faceCompareTaskEnable;
 
-    private final ExamCloudLog captureLog = ExamCloudLogFactory
-            .getLog("PROCESS_EXAM_CAPTURE_TASK_LOGGER");
+    private static final Logger LOG = LoggerFactory.getLogger(ProcessFaceCompareAlarmTask.class);
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        captureLog.warn("ProcessFaceCompareAlarmTask enable is " + faceCompareTaskEnable);
+        LOG.warn("ProcessFaceCompareAlarmTask enable is " + faceCompareTaskEnable);
         if (!faceCompareTaskEnable) {
             return;
         }
@@ -58,7 +57,7 @@ public class ProcessFaceCompareAlarmTask implements ApplicationRunner {
                         faceCompareAlarm();
 
                     } catch (Exception e) {
-                        captureLog.error("[FACE_COMPARE_ALARM.] 人脸比对预警出现异常 ", e);
+                        LOG.error("[FACE_COMPARE_ALARM.] 人脸比对预警出现异常 ", e);
                     }
                     // 每分钟轮循一次
                     Util.sleep(60);
@@ -74,8 +73,8 @@ public class ProcessFaceCompareAlarmTask implements ApplicationRunner {
      * 人脸比对，如果有必要则发短信
      */
     private void faceCompareAlarm() {
-        if (captureLog.isDebugEnabled()) {
-            captureLog.debug("[FACE_COMPARE_ALARM] 进入人脸" + System.currentTimeMillis()
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("[FACE_COMPARE_ALARM] 进入人脸" + System.currentTimeMillis()
                     + "....totalCount="
                     + ExamCaptureProcessStatisticController.getFaceCompareCount() + " ,failCount="
                     + ExamCaptureProcessStatisticController.getFaceCompareFailedCount());
@@ -87,7 +86,7 @@ public class ProcessFaceCompareAlarmTask implements ApplicationRunner {
                     .getSysProperty("capture.faceCompare.smsAssemblyCode");
 
             if (!faceCompareSmsAssemblyCodeProperty.getHasValue()) {
-                captureLog.error("[FACE_COMPARE_ALARM.] 未配置人脸比对的短信模板代码，totalCount="
+                LOG.error("[FACE_COMPARE_ALARM.] 未配置人脸比对的短信模板代码，totalCount="
                         + ExamCaptureProcessStatisticController.getFaceCompareCount()
                         + ",errorCount="
                         + ExamCaptureProcessStatisticController.getFaceCompareFailedCount());
@@ -96,8 +95,8 @@ public class ProcessFaceCompareAlarmTask implements ApplicationRunner {
             SysPropertyCacheBean smsPhoneProperty = CacheHelper
                     .getSysProperty("capture.sms.phones");
             if (!smsPhoneProperty.getHasValue()) {
-                if (captureLog.isErrorEnabled()) {
-                    captureLog.error("[FACE_COMPARE_ALARM.] 未配置图片处理失败的通知手机号，totalCount="
+                if (LOG.isErrorEnabled()) {
+                    LOG.error("[FACE_COMPARE_ALARM.] 未配置图片处理失败的通知手机号，totalCount="
                             + ExamCaptureProcessStatisticController.getFaceCompareCount()
                             + ",errorCount="
                             + ExamCaptureProcessStatisticController.getFaceCompareFailedCount());
@@ -121,15 +120,15 @@ public class ProcessFaceCompareAlarmTask implements ApplicationRunner {
                     .valueOf(ExamCaptureProcessStatisticController.getFaceCompareFailedCount()));
             sendSmsReq.setParams(params);
             try {
-                if (captureLog.isDebugEnabled()) {
-                    captureLog.debug("[FACE_COMPARE_ALARM.] 开始调用发送短信接口，totalCount="
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug("[FACE_COMPARE_ALARM.] 开始调用发送短信接口，totalCount="
                             + ExamCaptureProcessStatisticController.getFaceCompareCount()
                             + ",errorCount="
                             + ExamCaptureProcessStatisticController.getFaceCompareFailedCount());
                 }
                 smsCloudService.sendSms(sendSmsReq);
             } catch (Exception e) {
-                captureLog.error("[FACE_COMPARE_ALARM.] 发送短信出现异常", e);
+                LOG.error("[FACE_COMPARE_ALARM.] 发送短信出现异常", e);
             }
         }
         // 每1分钟重置一次总数量与失败数量

examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/ProcessFaceCompareQueueTask.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.core.oe.task.starter.config;
 
 import cn.com.qmth.examcloud.commons.helpers.concurrency.simple.ConcurrentTask;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.util.Util;
 import cn.com.qmth.examcloud.core.oe.task.dao.ExamCaptureQueueRepo;
 import cn.com.qmth.examcloud.core.oe.task.dao.entity.ExamCaptureQueueEntity;
@@ -11,6 +9,8 @@ import cn.com.qmth.examcloud.core.oe.task.service.worker.FacePPCompareWorker;
 import cn.com.qmth.examcloud.exchange.inner.api.SmsCloudService;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import org.apache.logging.log4j.ThreadContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
@@ -27,8 +27,7 @@ import java.util.List;
 @Order(200)
 public class ProcessFaceCompareQueueTask implements ApplicationRunner {
 
-    private final ExamCloudLog captureLog = ExamCloudLogFactory
-            .getLog("PROCESS_EXAM_CAPTURE_TASK_LOGGER");
+    private static final Logger LOG = LoggerFactory.getLogger(ProcessFaceCompareQueueTask.class);
 
     @Autowired
     ExamCaptureQueueRepo examCaptureQueueRepo;
@@ -46,11 +45,11 @@ public class ProcessFaceCompareQueueTask implements ApplicationRunner {
                 .findNeedFaceCompareExamCaptureQueuesLimitByProcessBatchNum(limit, processBatchNum);
 
         if (null == examCaptureQueueList || examCaptureQueueList.isEmpty()) {
-            captureLog.debug("[PROCESS_FACEPP." + processBatchNum + "] 抓拍队列中没有取到数据，2秒后重试");
+            LOG.debug("[PROCESS_FACEPP." + processBatchNum + "] 抓拍队列中没有取到数据，2秒后重试");
             return 0;
         }
 
-        captureLog.debug("[PROCESS_FACEPP." + processBatchNum + "] 抓拍队列中的数据条数为："
+        LOG.debug("[PROCESS_FACEPP." + processBatchNum + "] 抓拍队列中的数据条数为："
                 + examCaptureQueueList.size());
 
         for (ExamCaptureQueueEntity offeredQueueEntity : examCaptureQueueList) {
@@ -63,12 +62,12 @@ public class ProcessFaceCompareQueueTask implements ApplicationRunner {
                     boolean offerSuccess = concurrentTask.offerElement(copyExamCaptureQueueInfoFrom(offeredQueueEntity));
                     // 如果向队列中添加数据成功，则更新标识
                     if (offerSuccess) {
-                        captureLog.debug("[PROCESS_FACEPP." + processBatchNum
+                        LOG.debug("[PROCESS_FACEPP." + processBatchNum
                                 + "] 向工作队列中添加数据成功：fileUrl=" + offeredQueueEntity.getFileUrl());
                         break;
                     }
 
-                    captureLog.debug("[PROCESS_FACEPP." + processBatchNum
+                    LOG.debug("[PROCESS_FACEPP." + processBatchNum
                             + "] 向工作队列中添加数据失败，30秒后重试：fileUrl=" + offeredQueueEntity.getFileUrl());
 
                     Util.sleep(PropertyHolder.getInt("$capture.queue.offer.sleepSeconds.", 30));
@@ -83,7 +82,7 @@ public class ProcessFaceCompareQueueTask implements ApplicationRunner {
 
     @Override
     public void run(ApplicationArguments args) {
-        captureLog.warn("ProcessFaceCompareQueueTask enable is " + faceCompareTaskEnable);
+        LOG.warn("ProcessFaceCompareQueueTask enable is " + faceCompareTaskEnable);
         if (!faceCompareTaskEnable) {
             return;
         }
@@ -97,7 +96,7 @@ public class ProcessFaceCompareQueueTask implements ApplicationRunner {
         // 当前获取数据的批次号(默认用时间戳)
         String processBatchNum = "A_" + System.currentTimeMillis();
 
-        captureLog.debug("[PROCESS_FACEPP." + processBatchNum + "] 启动face++人脸比对服务...");
+        LOG.debug("[PROCESS_FACEPP." + processBatchNum + "] 启动face++人脸比对服务...");
 
         Thread thread = new Thread(new Runnable() {
             @Override
@@ -113,7 +112,7 @@ public class ProcessFaceCompareQueueTask implements ApplicationRunner {
                         }
                         Util.sleep(PropertyHolder.getInt("$capture.queue.read.sleepSeconds.", 2));
                     } catch (Exception e) {
-                        captureLog.error("[PROCESS_FACEPP." + processBatchNum + "] 百度活体检测出异常,3秒后重试",
+                        LOG.error("[PROCESS_FACEPP." + processBatchNum + "] 百度活体检测出异常,3秒后重试",
                                 e);
                         Util.sleep(3);
                     }

examcloud-core-oe-task-starter/src/main/java/cn/com/qmth/examcloud/core/oe/task/starter/config/StreamTaskExecutor.java

@@ -3,11 +3,11 @@ package cn.com.qmth.examcloud.core.oe.task.starter.config;
 import cn.com.qmth.examcloud.commons.helpers.pipeline.Node;
 import cn.com.qmth.examcloud.commons.helpers.pipeline.SimpleNode;
 import cn.com.qmth.examcloud.commons.helpers.pipeline.TaskContext;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.core.oe.task.service.pipeline.*;
 import cn.com.qmth.examcloud.support.examing.ExamRecordData;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Component;
 @Order(300)
 public class StreamTaskExecutor implements ApplicationRunner {
 
-    private static final ExamCloudLog LOG = ExamCloudLogFactory.getLog(StreamTaskExecutor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StreamTaskExecutor.class);
 
     @Autowired
     private DataGainExamExecutor dataGainExamExecutor;

examcloud-core-oe-task-starter/src/main/resources/log4j2.xml

@@ -2,99 +2,32 @@
 <Configuration status="WARN" monitorInterval="30">
 
     <Properties>
-        <Property name="commonLevel" value="${sys:log.commonLevel}"/>
-        <Property name="logPattern">
+        <Property name="LOG_LEVEL" value="${sys:log.commonLevel}"/>
+        <Property name="LOG_DIR" value="./logs/examcloud-core-oe-task"/>
+        <Property name="LOG_PATTERN">
             %d{yyyy-MM-dd HH:mm:ss.SSS} | %clr{%level} | %X{TRACE_ID} %X{CALLER} | %clr{%c{1.1}:%L}{cyan} | %m%n
         </Property>
     </Properties>
 
     <Appenders>
-        <!-- 控制台 日志 -->
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
+        <Console name="CONSOLE_APPENDER" target="SYSTEM_OUT">
+            <PatternLayout pattern="${LOG_PATTERN}" charset="UTF-8"/>
         </Console>
 
-        <!-- debug 日志 -->
-        <RollingFile name="DEBUG_APPENDER"
-                     fileName="./logs/debug/debug.log"
-                     filePattern="./logs/debug/debug-%d{yyyy.MM.dd.HH}-%i.log">
-            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
-            <Policies>
-                <TimeBasedTriggeringPolicy interval="1" modulate="false"/>
-                <SizeBasedTriggeringPolicy size="100 MB"/>
-            </Policies>
-            <DefaultRolloverStrategy max="1000">
-                <Delete basePath="./logs/debug" maxDepth="1">
-                    <IfFileName glob="debug-*.log">
-                        <IfAccumulatedFileSize exceeds="2 GB"/>
-                    </IfFileName>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
+        <RollingFile name="FILE_APPENDER"
+                     fileName="${LOG_DIR}/debug.log"
+                     filePattern="${LOG_DIR}/debug-%d{yyyyMMdd}-%i.log">
+            <PatternLayout pattern="${LOG_PATTERN}" charset="UTF-8"/>
 
-        <!-- 接口日志 -->
-        <RollingFile name="INTERFACE_APPENDER" fileName="./logs/interface/interface.log"
-                     filePattern="./logs/interface/interface-%d{yyyy.MM.dd.HH}-%i.log">
-            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="false"/>
                 <SizeBasedTriggeringPolicy size="100 MB"/>
             </Policies>
-            <DefaultRolloverStrategy max="1000">
-                <Delete basePath="./logs/interface" maxDepth="1">
-                    <IfFileName glob="interface-*.log">
-                        <IfAccumulatedFileSize exceeds="10 GB"/>
-                    </IfFileName>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
 
-        <!-- 处理照片日志 -->
-        <RollingFile name="PROCESS_EXAM_CAPTURE_TASK_APPENDER" fileName="./logs/capture/capture.log"
-                     filePattern="./logs/capture/capture-%d{yyyy.MM.dd.HH}-%i.log">
-            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
-            <Policies>
-                <TimeBasedTriggeringPolicy interval="1" modulate="false"/>
-                <SizeBasedTriggeringPolicy size="100MB"/>
-            </Policies>
             <DefaultRolloverStrategy max="1000">
-                <Delete basePath="./logs/capture" maxDepth="1">
-                    <IfFileName glob="capture-*.log">
-                        <IfAccumulatedFileSize exceeds="2 GB"/>
-                    </IfFileName>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-
-        <!-- 流式自动服务综合日志 -->
-        <RollingFile name="ROOT_STREAM_TASK_APPENDER" fileName="./logs/stream/root-stream.log"
-                     filePattern="./logs/stream/root-stream-%d{yyyy.MM.dd.HH}-%i.log">
-            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
-            <Policies>
-                <TimeBasedTriggeringPolicy interval="1" modulate="false"/>
-                <SizeBasedTriggeringPolicy size="100MB"/>
-            </Policies>
-            <DefaultRolloverStrategy max="1000">
-                <Delete basePath="./logs/stream" maxDepth="1">
-                    <IfFileName glob="root-stream-*.log">
-                        <IfAccumulatedFileSize exceeds="2 GB"/>
-                    </IfFileName>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-
-        <!-- 流式自动服务详细日志 -->
-        <RollingFile name="NODE_STREAM_TASK_APPENDER" fileName="./logs/stream/node-stream.log"
-                     filePattern="./logs/stream/node-stream-%d{yyyy.MM.dd.HH}-%i.log">
-            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
-            <Policies>
-                <TimeBasedTriggeringPolicy interval="1" modulate="false"/>
-                <SizeBasedTriggeringPolicy size="100MB"/>
-            </Policies>
-            <DefaultRolloverStrategy max="1000">
-                <Delete basePath="./logs/stream" maxDepth="1">
-                    <IfFileName glob="node-stream-*.log">
-                        <IfAccumulatedFileSize exceeds="2 GB"/>
+                <Delete basePath="${LOG_DIR}" maxDepth="1">
+                    <IfFileName glob="debug-*.log">
+                        <IfAccumulatedFileSize exceeds="10 GB"/>
                     </IfFileName>
                 </Delete>
             </DefaultRolloverStrategy>
@@ -118,50 +51,14 @@
         <!--<logger name="org.springframework.data.mongodb" level="DEBUG"/>-->
         <!--<logger name="org.springframework.data.redis" level="DEBUG"/>-->
 
-        <Logger name="cn.com.qmth" level="${commonLevel}" additivity="false">
-            <AppenderRef ref="DEBUG_APPENDER"/>
-            <AppenderRef ref="Console"/>
-        </Logger>
-
-        <Logger name="INTERFACE_LOGGER" level="${commonLevel}" additivity="false">
-            <AppenderRef ref="INTERFACE_APPENDER"/>
-            <AppenderRef ref="Console"/>
-        </Logger>
-
-        <Logger name="PROCESS_EXAM_CAPTURE_TASK_LOGGER" level="${commonLevel}" additivity="false">
-            <AppenderRef ref="PROCESS_EXAM_CAPTURE_TASK_APPENDER"/>
-            <AppenderRef ref="Console"/>
-        </Logger>
-
-        <Logger name="cn.com.qmth.examcloud.web.facepp" level="${commonLevel}" additivity="false">
-            <AppenderRef ref="PROCESS_EXAM_CAPTURE_TASK_APPENDER"/>
-            <AppenderRef ref="Console"/>
-        </Logger>
-
-        <Logger name="cn.com.qmth.examcloud.web.baidu" level="${commonLevel}" additivity="false">
-            <AppenderRef ref="PROCESS_EXAM_CAPTURE_TASK_APPENDER"/>
-            <AppenderRef ref="Console"/>
-        </Logger>
-
-        <Logger name="cn.com.qmth.examcloud.commons.helpers.concurrency.simple" level="${commonLevel}"
-                additivity="false">
-            <AppenderRef ref="PROCESS_EXAM_CAPTURE_TASK_APPENDER"/>
-            <AppenderRef ref="Console"/>
-        </Logger>
-
-        <Logger name="cn.com.qmth.examcloud.commons.helpers.pipeline" level="${commonLevel}" additivity="false">
-            <AppenderRef ref="ROOT_STREAM_TASK_APPENDER"/>
-            <AppenderRef ref="Console"/>
-        </Logger>
-
-        <Logger name="cn.com.qmth.examcloud.core.oe.task.service.pipeline" level="${commonLevel}" additivity="false">
-            <AppenderRef ref="NODE_STREAM_TASK_APPENDER"/>
-            <AppenderRef ref="Console"/>
+        <Logger name="cn.com.qmth" level="${LOG_LEVEL}" additivity="false">
+            <AppenderRef ref="CONSOLE_APPENDER"/>
+            <AppenderRef ref="FILE_APPENDER"/>
         </Logger>
 
-        <Root level="${commonLevel}">
-            <AppenderRef ref="Console"/>
-            <AppenderRef ref="DEBUG_APPENDER"/>
+        <Root level="${LOG_LEVEL}">
+            <AppenderRef ref="CONSOLE_APPENDER"/>
+            <AppenderRef ref="FILE_APPENDER"/>
         </Root>
     </Loggers>