update loggers.

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamCourseCloudServiceProvider.java

@@ -61,7 +61,7 @@ public class ExamCourseCloudServiceProvider extends ControllerSupport implements
                 courses.add(course);
             }
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
+            LOGGER.error(e.getMessage(), e);
         }
 
         return resp;

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamRecordCloudServiceProvider.java

@@ -286,8 +286,8 @@ public class ExamRecordCloudServiceProvider extends ControllerSupport implements
         List<ExamStudentEntity> limitedExamStuList =
                 examStudentRepo.getLimitExamStudentList(examId, courseCode, startId, size);
 
-        if (log.isDebugEnabled()) {
-            log.debug("1.[GET_PAGED_TO_BE_MARK_EXAM_RECORD-" + examId + "-" + courseCode + "-" + startId + "]" +
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("1.[GET_PAGED_TO_BE_MARK_EXAM_RECORD-" + examId + "-" + courseCode + "-" + startId + "]" +
                     "获取考生耗时:" + (System.currentTimeMillis() - startTime) + " ms");
         }
 
@@ -300,8 +300,8 @@ public class ExamRecordCloudServiceProvider extends ControllerSupport implements
             resp.setNextId(nextId);
             resp.setToBeMarkExamRecordBeanList(null);
 
-            if (log.isDebugEnabled()) {
-                log.debug("999.[GET_PAGED_TO_BE_MARK_EXAM_RECORD-" + examId + "-" + courseCode + "-" + startId + "]end..." +
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("999.[GET_PAGED_TO_BE_MARK_EXAM_RECORD-" + examId + "-" + courseCode + "-" + startId + "]end..." +
                         "未找到对应的考生数据，合计耗时:" + (System.currentTimeMillis() - st) + " ms");
             }
 
@@ -322,8 +322,8 @@ public class ExamRecordCloudServiceProvider extends ControllerSupport implements
             List<ExamRecordForMarkingEntity> examRecordForMarkingList =
                     examRecordForMarkingService.queryValidExamRecordList(examStu.getExamStudentId());
 
-            if (log.isDebugEnabled()) {
-                log.debug("1-2." + si + "[GET_PAGED_TO_BE_MARK_EXAM_RECORD-" + examId + "-" + courseCode + "-" + examStu.getExamStudentId() + "]" +
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("1-2." + si + "[GET_PAGED_TO_BE_MARK_EXAM_RECORD-" + examId + "-" + courseCode + "-" + examStu.getExamStudentId() + "]" +
                         "获取考生待阅卷的考试记录耗时:" + (System.currentTimeMillis() - st1) + " ms");
             }
 
@@ -352,14 +352,14 @@ public class ExamRecordCloudServiceProvider extends ControllerSupport implements
                 pagedToBeMarkList.add(pagedBean);
             }
 
-            if (log.isDebugEnabled()) {
-                log.debug("1-2." + si + "[GET_PAGED_TO_BE_MARK_EXAM_RECORD-" + examId + "-" + courseCode + "-" + examStu.getExamStudentId() + "]" +
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("1-2." + si + "[GET_PAGED_TO_BE_MARK_EXAM_RECORD-" + examId + "-" + courseCode + "-" + examStu.getExamStudentId() + "]" +
                         "构建带作答记录的待阅卷的考试记录耗时:" + (System.currentTimeMillis() - st1) + " ms");
             }
         }
 
-        if (log.isDebugEnabled()) {
-            log.debug("2.[GET_PAGED_TO_BE_MARK_EXAM_RECORD-" + examId + "-" + courseCode + "-" + startId + "]" +
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("2.[GET_PAGED_TO_BE_MARK_EXAM_RECORD-" + examId + "-" + courseCode + "-" + startId + "]" +
                     "获取" + size + "条考生的待阅卷记录共耗时:" + (System.currentTimeMillis() - startTime) + " ms");
         }
 
@@ -367,8 +367,8 @@ public class ExamRecordCloudServiceProvider extends ControllerSupport implements
         resp.setNextId(nextId);
         resp.setToBeMarkExamRecordBeanList(pagedToBeMarkList);
 
-        if (log.isDebugEnabled()) {
-            log.debug("999.[GET_PAGED_TO_BE_MARK_EXAM_RECORD-" + examId + "-" + courseCode + "-" + startId + "]end..." +
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("999.[GET_PAGED_TO_BE_MARK_EXAM_RECORD-" + examId + "-" + courseCode + "-" + startId + "]end..." +
                     "合计耗时:" + (System.currentTimeMillis() - st) + " ms");
         }
         return resp;

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamScoreDataCloudServiceProvider.java

@@ -454,18 +454,18 @@ public class ExamScoreDataCloudServiceProvider extends ControllerSupport impleme
         List<Long> examRecordDataIds = examRecordDataEntities.stream().map(ExamRecordDataEntity::getId).collect(Collectors.toList());
         List<ExamScoreEntity> examScoreEntities = examScoreRepo.findByExamRecordDataIdIn(examRecordDataIds);
         if (CollectionUtils.isEmpty(examScoreEntities)) {
-            log.info("examScoreEntities size is empty. ");
+            LOGGER.info("examScoreEntities size is empty. ");
             return queryResp;
         }
 
-        log.info("examRecordData size is " + examRecordDataEntities.size() + ", examScore size is " + examScoreEntities.size());
+        LOGGER.info("examRecordData size is " + examRecordDataEntities.size() + ", examScore size is " + examScoreEntities.size());
         Map<Long, ExamScoreEntity> examScoreMaps = examScoreEntities.stream().collect(Collectors.toMap(ExamScoreEntity::getExamRecordDataId, v -> v, (k, v) -> v));
 
         Map<Long, CourseBean> courseMaps = new HashMap<>();
         for (ExamRecordDataEntity examRecordData : examRecordDataEntities) {
             ExamScoreEntity examScore = examScoreMaps.get(examRecordData.getId());
             if (examScore == null) {
-                log.debug("examSore not exist. examRecordDataId = " + examRecordData.getId());
+                LOGGER.debug("examSore not exist. examRecordDataId = " + examRecordData.getId());
                 continue;
             }
 

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamScoreNoticeQueueCloudServiceProvider.java

@@ -50,7 +50,7 @@ public class ExamScoreNoticeQueueCloudServiceProvider extends ControllerSupport
     @PostMapping("/sendObtainScoreNotice")
     @Override
     public void sendObtainScoreNotice() {
-        log.info("开始执行sendObtainScoreNotice");
+        LOGGER.info("开始执行sendObtainScoreNotice");
         // 获取所有的通知队列
         List<ExamScoreNoticeQueueEntity> examScoreNoticeQueueList = examScoreNoticeQueueRepo.findAll();
         if (examScoreNoticeQueueList == null || examScoreNoticeQueueList.size() == 0) {
@@ -75,14 +75,14 @@ public class ExamScoreNoticeQueueCloudServiceProvider extends ControllerSupport
                             noticeEntity.setUpdateTime(new Date());
                             examScoreNoticeQueueRepo.save(noticeEntity);
                         } catch (Exception e1) {
-                            log.error("examScoreNoticeQueueRepo.save exception:" + e1.getMessage(), e1);
+                            LOGGER.error("examScoreNoticeQueueRepo.save exception:" + e1.getMessage(), e1);
                         }
                     }
-                    log.error("OeExamScoreNoticeQueueCloudServiceProvider-sendObtainScoreNotice:" + e.getMessage(), e);
+                    LOGGER.error("OeExamScoreNoticeQueueCloudServiceProvider-sendObtainScoreNotice:" + e.getMessage(), e);
                 }
             }
         }
-        log.info("结束执行sendObtainScoreNotice");
+        LOGGER.info("结束执行sendObtainScoreNotice");
     }
 
     /**

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamStudentDataCloudServiceProvider.java

@@ -90,7 +90,7 @@ public class ExamStudentDataCloudServiceProvider extends ControllerSupport imple
                 for (Long eid : errorExamRecordDataIdList) {
                     strErrorExamRecordDataIds += eid + ",";
                 }
-                log.error("[GETEXAMSTUDENTDATA],200105考试作答数据异常,错误的考试记录id:" + strErrorExamRecordDataIds);
+                LOGGER.error("[GETEXAMSTUDENTDATA],200105考试作答数据异常,错误的考试记录id:" + strErrorExamRecordDataIds);
                 throw new StatusException("200105", "考试作答数据异常,相关考试记录id为：" + strErrorExamRecordDataIds);
             }
             if (questionList.size() != effectiveScoreList.size()) {
@@ -99,7 +99,7 @@ public class ExamStudentDataCloudServiceProvider extends ControllerSupport imple
                 for (Long eid : errorExamRecordDataIdList) {
                     strErrorExamRecordDataIds += eid + ",";
                 }
-                log.error("[GETEXAMSTUDENTDATA],200106考试作答数据异常,错误的考试记录id:" + strErrorExamRecordDataIds);
+                LOGGER.error("[GETEXAMSTUDENTDATA],200106考试作答数据异常,错误的考试记录id:" + strErrorExamRecordDataIds);
                 throw new StatusException("200106", "考试作答数据异常,相关考试记录id为：" + strErrorExamRecordDataIds);
             }
         }

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/SyncExamDataCloudServiceProvider.java

@@ -2,8 +2,6 @@ package cn.com.qmth.examcloud.core.oe.admin.api.provider;
 
 import cn.com.qmth.examcloud.api.commons.enums.ExamType;
 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.core.oe.admin.api.SyncExamDataCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.*;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.SyncExamDataReq;
@@ -25,6 +23,8 @@ import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.transaction.annotation.Transactional;
@@ -49,7 +49,7 @@ public class SyncExamDataCloudServiceProvider extends ControllerSupport implemen
 
     private static final long serialVersionUID = -25466948667789119L;
 
-    private static final ExamCloudLog LOG = ExamCloudLogFactory.getLog(SyncExamDataCloudServiceProvider.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SyncExamDataCloudServiceProvider.class);
 
     @Autowired
     private ExamRecordForMarkingService examRecordForMarkingService;

examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/FileDisposeUtil.java

@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class FileDisposeUtil {
 	
-	private static final Logger logger = LoggerFactory.getLogger(FileDisposeUtil.class);
+	private static final Logger LOG = LoggerFactory.getLogger(FileDisposeUtil.class);
 	
 	/**
 	 * 将网络文件保存到本地
@@ -147,7 +147,7 @@ public class FileDisposeUtil {
 	 * @return
 	 */
 	public static boolean fileToZip(String sourceFilePath, String zipFilePath,String fileName) {
-		logger.info("压缩"+sourceFilePath+"目录开始");
+		LOG.info("压缩"+sourceFilePath+"目录开始");
 		boolean flag = false;
 		File sourceFile = new File(sourceFilePath);
 		FileInputStream fis = null;
@@ -155,16 +155,16 @@ public class FileDisposeUtil {
 		FileOutputStream fos = null;
 		ZipOutputStream zos = null;
 		if (sourceFile.exists() == false) {
-			logger.error("待压缩的文件目录：" + sourceFilePath + "不存在.");
+			LOG.error("待压缩的文件目录：" + sourceFilePath + "不存在.");
 		} else {
 			try {
 				File zipFile = new File(zipFilePath+File.separator+fileName+".zip");
 				if (zipFile.exists()) {
-					logger.error(zipFilePath + "目录下存在名字为:"+fileName+".zip"+"打包文件.");
+					LOG.error(zipFilePath + "目录下存在名字为:"+fileName+".zip"+"打包文件.");
 				} else {
 					File[] sourceFiles = sourceFile.listFiles();
 					if (null == sourceFiles || sourceFiles.length < 1) {
-						logger.error("待压缩的文件目录：" + sourceFilePath+ "里面不存在文件，无需压缩.");
+						LOG.error("待压缩的文件目录：" + sourceFilePath+ "里面不存在文件，无需压缩.");
 					} else {
 						fos = new FileOutputStream(zipFile);
 						zos = new ZipOutputStream(new BufferedOutputStream(fos));
@@ -203,7 +203,7 @@ public class FileDisposeUtil {
 				IOUtils.closeQuietly(fos);
 			}
 		}
-		logger.info("压缩"+sourceFilePath+"目录完成");
+		LOG.info("压缩"+sourceFilePath+"目录完成");
 		return flag;
 	}
 	

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/exporttask/ExportTask.java

@@ -1,7 +1,5 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.exporttask;
 
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.util.JsonMapper;
 import cn.com.qmth.examcloud.commons.util.Util;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExportTaskEntity;
@@ -13,9 +11,12 @@ import cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore.ExamScoreQuery
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentQuery;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
 import cn.com.qmth.examcloud.web.support.SpringContextHolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ExportTask extends Thread {
-	private static final ExamCloudLog log = ExamCloudLogFactory.getLog(ExportTask.class);
+
+	private static final Logger LOG = LoggerFactory.getLogger(ExportTask.class);
 
 	private static int cacheLockTimeout = 60 * 2;
 
@@ -49,7 +50,7 @@ public class ExportTask extends Thread {
 				}
 				exportTaskService.endExportTask(et.getId());
 			} catch (Exception e) {
-				log.error("ExportTask error ", e);
+				LOG.error("ExportTask error ", e);
 			} finally {
 				redisClient.delete(cacheLock);
 			}

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/AsyncExportServiceImpl.java

@@ -15,13 +15,13 @@ import java.util.UUID;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 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.JsonMapper;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExportTaskStatus;
@@ -54,7 +54,7 @@ import cn.com.qmth.examcloud.web.filestorage.YunPathInfo;
 @Service
 public class AsyncExportServiceImpl implements AsyncExportService {
 
-	private static final ExamCloudLog log = ExamCloudLogFactory.getLog(AsyncExportServiceImpl.class);
+	private static final Logger LOG = LoggerFactory.getLogger(AsyncExportServiceImpl.class);
 
 	private static final String TASK_EXPORT_DIR = "task_export";
 
@@ -104,7 +104,7 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 			examRecords = ExamStudentEntityConvert.ofExcel(examStudentInfoList);
 
 		} catch (Exception e) {
-			log.error(e.getMessage());
+			LOG.error(e.getMessage());
 			if (e instanceof StatusException) {
 				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR,
 						((StatusException) e).getDesc());
@@ -124,7 +124,7 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 			tempFile.getParentFile().mkdirs();
 			tempFile.createNewFile();
 		} catch (IOException e) {
-			log.error(e.getMessage());
+			LOG.error(e.getMessage());
 			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "生成导出文件异常");
 			return;
 		}
@@ -138,10 +138,10 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 			env.setRelativePath(filePath);
 			YunPathInfo oss = FileStorageUtil.saveFile(TASK_EXPORT_DIR, env, tempFile, null);
 
-			log.info("asyncExportExamScheduling finished... " + oss.getRelativePath());
+			LOG.info("asyncExportExamScheduling finished... " + oss.getRelativePath());
 			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.SUCCESS, null, oss.getRelativePath());
 		} catch (Exception e) {
-			log.error("asyncExportExamScheduling error... " + e);
+			LOG.error("asyncExportExamScheduling error... " + e);
 			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "上传至文件服务器异常");
 		} finally {
 			FileUtils.deleteQuietly(tempFile);
@@ -181,7 +181,7 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 			}
 
 		} catch (Exception e) {
-			log.error(e.getMessage());
+			LOG.error(e.getMessage());
 			if (e instanceof StatusException) {
 				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR,
 						((StatusException) e).getDesc());
@@ -200,7 +200,7 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 			tempFile.getParentFile().mkdirs();
 			tempFile.createNewFile();
 		} catch (IOException e) {
-			log.error(e.getMessage());
+			LOG.error(e.getMessage());
 			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "生成导出文件异常");
 			return;
 		}
@@ -214,10 +214,10 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 			env.setRelativePath(filePath);
 			YunPathInfo oss = FileStorageUtil.saveFile(TASK_EXPORT_DIR, env, tempFile, null);
 
-			log.info("asyncExportExamRecordDetails finished... " + oss.getRelativePath());
+			LOG.info("asyncExportExamRecordDetails finished... " + oss.getRelativePath());
 			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.SUCCESS, null, oss.getRelativePath());
 		} catch (Exception e) {
-			log.info("asyncExportExamRecordDetails error... " + e.getMessage());
+			LOG.info("asyncExportExamRecordDetails error... " + e.getMessage());
 			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "上传至文件服务器异常");
 		} finally {
 			FileUtils.deleteQuietly(tempFile);
@@ -254,7 +254,7 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 				return;
 			}
 		} catch (Exception e) {
-			log.error(e.getMessage());
+			LOG.error(e.getMessage());
 			if (e instanceof StatusException) {
 				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR,
 						((StatusException) e).getDesc());
@@ -273,7 +273,7 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 			tempFile.getParentFile().mkdirs();
 			tempFile.createNewFile();
 		} catch (IOException e) {
-			log.error(e.getMessage());
+			LOG.error(e.getMessage());
 			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "生成导出文件异常");
 			return;
 		}
@@ -286,10 +286,10 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 			env.setRelativePath(filePath);
 			YunPathInfo oss = FileStorageUtil.saveFile(TASK_EXPORT_DIR, env, tempFile, null);
 
-			log.info("asyncExportExamScoreStatistics finished... " + oss.getRelativePath());
+			LOG.info("asyncExportExamScoreStatistics finished... " + oss.getRelativePath());
 			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.SUCCESS, null, oss.getRelativePath());
 		} catch (Exception e) {
-			log.info("asyncExportExamScoreStatistics error... " + e.getMessage());
+			LOG.info("asyncExportExamScoreStatistics error... " + e.getMessage());
 			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "上传至文件服务器异常");
 		} finally {
 			FileUtils.deleteQuietly(tempFile);

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamCaptureServiceImpl.java

@@ -8,8 +8,6 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
 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.core.basic.api.bean.CourseBean;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamCaptureRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
@@ -35,6 +33,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -64,8 +64,8 @@ public class ExamCaptureServiceImpl implements ExamCaptureService {
     private IllegallyTypeService illegallyTypeService;
     @Autowired
     private ExamScoreRepo examScoreRepo;
-    private static final ExamCloudLog LOG = ExamCloudLogFactory
-            .getLog(ExamCaptureServiceImpl.class);
+
+    private static final Logger LOG = LoggerFactory.getLogger(ExamCaptureServiceImpl.class);
 
     @Override
     public ExamCaptureAuditInfo getExamCaptureAuditDetail(Long examRecordDataId) {

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordServiceImpl.java

@@ -29,6 +29,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -44,8 +46,6 @@ import com.google.common.collect.Lists;
 
 import cn.com.qmth.examcloud.api.commons.enums.ExamType;
 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.core.basic.api.StudentCloudService;
 import cn.com.qmth.examcloud.core.basic.api.bean.StudentBean;
 import cn.com.qmth.examcloud.core.basic.api.request.GetStudentListByIdsReq;
@@ -93,8 +93,9 @@ import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
  */
 @Service
 public class ExamRecordServiceImpl implements ExamRecordService {
-    private static final ExamCloudLog LOG = ExamCloudLogFactory
-            .getLog(ExamRecordServiceImpl.class);
+
+    private static final Logger LOG = LoggerFactory.getLogger(ExamRecordServiceImpl.class);
+
     @Autowired
     private ExamScoreRepo examScoreRepo;
     @Autowired

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamStudentFinalScoreServiceImpl.java

@@ -1,7 +1,5 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-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.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreRepo;
@@ -15,6 +13,8 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.enums.MarkingType;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentFinalScoreService;
 import cn.com.qmth.examcloud.support.enums.ExamProperties;
 import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -39,7 +39,7 @@ public class ExamStudentFinalScoreServiceImpl implements ExamStudentFinalScoreSe
     @Autowired
     private ExamStudentFinalScoreRepo examStudentFinalScoreRepo;
 
-    private static final ExamCloudLog LOG = ExamCloudLogFactory.getLog(ExamStudentFinalScoreServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ExamStudentFinalScoreServiceImpl.class);
 
     @Override
     public ExamStudentFinalScoreEntity calcAndSaveFinalScore(Long examStudentId) {

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

@@ -2,47 +2,31 @@
 <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-admin"/>
+        <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">
+                <Delete basePath="${LOG_DIR}" maxDepth="1">
+                    <IfFileName glob="debug-*.log">
                         <IfAccumulatedFileSize exceeds="10 GB"/>
                     </IfFileName>
                 </Delete>
@@ -67,19 +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 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>