From 6257b8ace7af4bc96197f4e6ecda818898e1ad36 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 22 Apr 2022 22:06:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/media/VideoUtils.java     |  4 ++--
 .../modules/sys/interceptor/LogInterceptor.java  | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/media/VideoUtils.java b/common/src/main/java/com/jeesite/common/media/VideoUtils.java
index 12f48e08..638bd3f1 100644
--- a/common/src/main/java/com/jeesite/common/media/VideoUtils.java
+++ b/common/src/main/java/com/jeesite/common/media/VideoUtils.java
@@ -116,7 +116,7 @@ public class VideoUtils {
 				log.error("视频剪切图片失败", e);
 			}
 		}
-		log.debug("视频剪切图片" + (statusTemp ? "成功" : "失败") + "，用时：" + TimeUtils.formatDateAgo(System.currentTimeMillis() - startTime));
+		log.debug("视频剪切图片" + (statusTemp ? "成功" : "失败") + "，用时：" + TimeUtils.formatTime(System.currentTimeMillis() - startTime));
 		return statusTemp;
 	}
 
@@ -142,7 +142,7 @@ public class VideoUtils {
 		}
 		log.debug("删除临时文件");
 		FileUtils.deleteFile(tempFile);
-		log.debug("视频转换" + (statusTemp ? "成功" : "失败") + "，用时：" + TimeUtils.formatDateAgo(System.currentTimeMillis() - startTime));
+		log.debug("视频转换" + (statusTemp ? "成功" : "失败") + "，用时：" + TimeUtils.formatTime(System.currentTimeMillis() - startTime));
 		return statusTemp;
 	}
 
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java b/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java
index 75100673..b88b284a 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java
@@ -44,8 +44,7 @@ public class LogInterceptor extends BaseService implements HandlerInterceptor {
 		long beginTime = System.currentTimeMillis();// 1、开始时间  
 		startTimeThreadLocal.set(beginTime);		// 线程绑定变量（该数据只有当前请求的线程可见）  
 		if (logger.isDebugEnabled()){
-	        logger.debug("开始计时: {}  URI: {}  IP: {}", new SimpleDateFormat("hh:mm:ss.SSS")
-	        	.format(beginTime), request.getRequestURI(), IpUtils.getRemoteAddr(request));
+	        logger.debug("请求开始, URI: {}, IP: {}", request.getRequestURI(), IpUtils.getRemoteAddr(request));
 		}
 		return true;
 	}
@@ -53,8 +52,8 @@ public class LogInterceptor extends BaseService implements HandlerInterceptor {
 	@Override
 	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, 
 			ModelAndView modelAndView) throws Exception {
-		if (modelAndView != null){
-			logger.info("ViewName: " + modelAndView.getViewName() + " <<<<<<<<< " + request.getRequestURI() + " >>>>>>>>> " + handler);
+		if (modelAndView != null && logger.isDebugEnabled()){
+			logger.debug("ViewName: " + modelAndView.getViewName() + " <<< " + request.getRequestURI() + " >>> " + handler);
 		}
 	}
 
@@ -79,11 +78,12 @@ public class LogInterceptor extends BaseService implements HandlerInterceptor {
 		LogUtils.saveLog(UserUtils.getUser(), request, handler, ex, null, null, executeTime);
 		
 		// 打印JVM信息。
-		if (logger.isDebugEnabled()){
+		if (logger.isInfoEnabled()){
 			Runtime runtime = Runtime.getRuntime();
-	        logger.debug("计时结束: {}  用时: {}  URI: {}  总内存: {}  已用内存: {}",
-	        		DateUtils.formatDate(endTime, "hh:mm:ss.SSS"), TimeUtils.formatDateAgo(executeTime), request.getRequestURI(), 
-					ByteUtils.formatByteSize(runtime.totalMemory()), ByteUtils.formatByteSize(runtime.totalMemory()-runtime.freeMemory())); 
+			long totalMemory = runtime.totalMemory();
+	        logger.info("请求完成, URI: {}, 用时: {}, 总内存: {}, 剩余: {}", request.getRequestURI(),
+					TimeUtils.formatTime(executeTime), ByteUtils.formatByteSize(totalMemory),
+					ByteUtils.formatByteSize(totalMemory-(totalMemory-runtime.freeMemory())));
 		}
 		MDC.remove(TRACE_ID);
 	}