Selaa lähdekoodia

update loggers.

deason 4 vuotta sitten
vanhempi
commit
c0478f5633

+ 4 - 4
examcloud-core-oe-student-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/controller/ExamControlController.java

@@ -159,12 +159,12 @@ public class ExamControlController extends ControllerSupport {
             throw new StatusException("8010", "无效的会话,请离开考试");
         }
 
-        if (log.isDebugEnabled()) {
-            log.debug("0 [END_EXAM] 交卷前处理耗时:" + (System.currentTimeMillis() - startTime) + " ms");
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("0 [END_EXAM] 交卷前处理耗时:" + (System.currentTimeMillis() - startTime) + " ms");
         }
         examControlService.handInExam(examingSession.getExamRecordDataId(), HandInExamType.MANUAL, getIp(request));
-        if (log.isDebugEnabled()) {
-            log.debug("1 [END_EXAM]合计 耗时:" + (System.currentTimeMillis() - st) + " ms");
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("1 [END_EXAM]合计 耗时:" + (System.currentTimeMillis() - st) + " ms");
         }
     }
 

+ 1 - 1
examcloud-core-oe-student-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/controller/ExamFaceLivenessVerifyController.java

@@ -196,7 +196,7 @@ public class ExamFaceLivenessVerifyController extends ControllerSupport {
     @ApiOperation(value = "人脸验证完成后的回调,由faceId调用")
     @PostMapping("/faceLivenessVerifyCallback")
     public void faceLivenessVerifyCallback(@RequestParam String data) throws Exception {
-        log.info("faceId回调,data=" + data);
+        LOGGER.info("faceId回调,data=" + data);
 
         JSONObject returnJsonObject = new JSONObject(data);
         String bizNo = returnJsonObject.get("biz_no").toString();

+ 2 - 2
examcloud-core-oe-student-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/controller/ExamQuestionController.java

@@ -103,9 +103,9 @@ public class ExamQuestionController extends ControllerSupport {
 	@PostMapping("/submitQuestionAnswer")
 	public void submitQuestionAnswer(@RequestBody List<ExamStudentQuestionInfo> examQuestionInfos,
 									 HttpServletRequest request){
-		if(log.isDebugEnabled()) {
+		if(LOGGER.isDebugEnabled()) {
 			String strJosn=JsonUtil.toJson(examQuestionInfos);
-			log.debug("ExamQuestionController--submitQuestionAnswer参数信息:"+strJosn);
+			LOGGER.debug("ExamQuestionController--submitQuestionAnswer参数信息:"+strJosn);
 		}
 		User user = getAccessUser();
 		if(examQuestionInfos!=null && examQuestionInfos.size()>0){

+ 6 - 6
examcloud-core-oe-student-base/src/main/java/cn/com/qmth/examcloud/core/oe/student/base/utils/FileDisposeUtil.java

@@ -25,7 +25,7 @@ import java.util.zip.ZipOutputStream;
  */
 public class FileDisposeUtil {
 	
-	private static final Logger logger = LoggerFactory.getLogger(FileDisposeUtil.class);
+	private static final Logger LOG = LoggerFactory.getLogger(FileDisposeUtil.class);
 	
 	/**
 	 * 将网络文件保存到本地
@@ -136,7 +136,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;
@@ -144,16 +144,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));
@@ -192,7 +192,7 @@ public class FileDisposeUtil {
 				IOUtils.closeQuietly(fos);
 			}
 		}
-		logger.info("压缩"+sourceFilePath+"目录完成");
+		LOG.info("压缩"+sourceFilePath+"目录完成");
 		return flag;
 	}
 	

+ 3 - 2
examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/report/RocketMqConsumerListener.java

@@ -13,7 +13,8 @@ import org.slf4j.LoggerFactory;
 import java.util.Properties;
 
 public class RocketMqConsumerListener {
-    private final static Logger logger = LoggerFactory.getLogger(RocketMqConsumerListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RocketMqConsumerListener.class);
+
     private static ExamProcessRecordService examProcessRecordService = SpringContextHolder.getBean(ExamProcessRecordService.class);
     private static Properties properties = new Properties();
 
@@ -46,7 +47,7 @@ public class RocketMqConsumerListener {
                     onMessageExamStudent(msg);
                     return Action.CommitMessage;
                 } catch (Exception e) {
-                    logger.error("consumer failed MsgID:" + message.getMsgID(), e);
+                    LOG.error("consumer failed MsgID:" + message.getMsgID(), e);
                     return Action.ReconsumeLater;
                 }
             }

+ 2 - 2
examcloud-core-oe-student-starter/src/main/java/cn/com/qmth/examcloud/core/oe/student/starter/config/ExamProcessRecordTask.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 @Component
 @Order(999)
 public class ExamProcessRecordTask implements ApplicationRunner {
-    private final static Logger logger = LoggerFactory.getLogger(ExamProcessRecordTask.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ExamProcessRecordTask.class);
 
     private void startConsumerListener() {
 
@@ -25,7 +25,7 @@ public class ExamProcessRecordTask implements ApplicationRunner {
             if (MqType.ROCKETMQ.getCode().equals(mqType)) {
                 RocketMqConsumerListener.start();
             } else {
-                logger.error("no $report.mq-type property config!");
+                LOG.error("no $report.mq-type property config!");
             }
         }
     }

+ 3 - 3
examcloud-core-oe-student-starter/src/main/java/cn/com/qmth/examcloud/core/oe/student/starter/config/ExamingInterceptor.java

@@ -3,10 +3,10 @@ package cn.com.qmth.examcloud.core.oe.student.starter.config;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.web.enums.HttpServletRequestAttribute;
 import cn.com.qmth.examcloud.web.support.ApiInfo;
 
@@ -19,7 +19,7 @@ import cn.com.qmth.examcloud.web.support.ApiInfo;
  */
 public class ExamingInterceptor implements HandlerInterceptor {
 
-	private static final ExamCloudLog LOG = ExamCloudLogFactory.getLog(ExamingInterceptor.class);
+	private static final Logger LOG = LoggerFactory.getLogger(ExamingInterceptor.class);
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response,

+ 18 - 61
examcloud-core-oe-student-starter/src/main/resources/log4j2.xml

@@ -2,65 +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-student"/>
+        <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="CLEAN_EXAM_RECORD_TASK_APPENDER" fileName="./logs/clean/ert.log"
-                     filePattern="./logs/clean/ert-%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/clean" maxDepth="1">
-                    <IfFileName glob="ert-*.log">
-                        <IfAccumulatedFileSize exceeds="2 GB"/>
+                <Delete basePath="${LOG_DIR}" maxDepth="1">
+                    <IfFileName glob="debug-*.log">
+                        <IfAccumulatedFileSize exceeds="10 GB"/>
                     </IfFileName>
                 </Delete>
             </DefaultRolloverStrategy>
@@ -84,24 +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="CLEAN_EXAM_RECORD_TASK_LOGGER" level="${commonLevel}" additivity="false">
-            <AppenderRef ref="CLEAN_EXAM_RECORD_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>