From 59715b1e024a91cbab26387ee109a3e7c76e70e9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 20 十月 2024 00:23:33 +0800
Subject: [PATCH] fix 修复 及其特殊场景下获取 StopWatch 为null问题
---
ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java | 52 ++++++++++++++++++++++++----------------------------
1 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java
index 12c8086..7cb6b78 100644
--- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java
@@ -2,11 +2,11 @@
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.StopWatch;
-import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.web.filter.RepeatedlyRequestWrapper;
@@ -19,7 +19,6 @@
/**
* web鐨勮皟鐢ㄦ椂闂寸粺璁℃嫤鎴櫒
- * dev鐜鏈夋晥
*
* @author Lion Li
* @since 3.3.0
@@ -27,37 +26,34 @@
@Slf4j
public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
- private final String prodProfile = "prod";
-
private final static ThreadLocal<StopWatch> KEY_CACHE = new ThreadLocal<>();
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
- if (!prodProfile.equals(SpringUtils.getActiveProfile())) {
- String url = request.getMethod() + " " + request.getRequestURI();
+ String url = request.getMethod() + " " + request.getRequestURI();
- // 鎵撳嵃璇锋眰鍙傛暟
- if (isJsonRequest(request)) {
- String jsonParam = "";
- if (request instanceof RepeatedlyRequestWrapper) {
- BufferedReader reader = request.getReader();
- jsonParam = IoUtil.read(reader);
- }
- log.info("[PLUS]寮�濮嬭姹� => URL[{}],鍙傛暟绫诲瀷[json],鍙傛暟:[{}]", url, jsonParam);
- } else {
- Map<String, String[]> parameterMap = request.getParameterMap();
- if (MapUtil.isNotEmpty(parameterMap)) {
- String parameters = JsonUtils.toJsonString(parameterMap);
- log.info("[PLUS]寮�濮嬭姹� => URL[{}],鍙傛暟绫诲瀷[param],鍙傛暟:[{}]", url, parameters);
- } else {
- log.info("[PLUS]寮�濮嬭姹� => URL[{}],鏃犲弬鏁�", url);
- }
+ // 鎵撳嵃璇锋眰鍙傛暟
+ if (isJsonRequest(request)) {
+ String jsonParam = "";
+ if (request instanceof RepeatedlyRequestWrapper) {
+ BufferedReader reader = request.getReader();
+ jsonParam = IoUtil.read(reader);
}
-
- StopWatch stopWatch = new StopWatch();
- KEY_CACHE.set(stopWatch);
- stopWatch.start();
+ log.info("[PLUS]寮�濮嬭姹� => URL[{}],鍙傛暟绫诲瀷[json],鍙傛暟:[{}]", url, jsonParam);
+ } else {
+ Map<String, String[]> parameterMap = request.getParameterMap();
+ if (MapUtil.isNotEmpty(parameterMap)) {
+ String parameters = JsonUtils.toJsonString(parameterMap);
+ log.info("[PLUS]寮�濮嬭姹� => URL[{}],鍙傛暟绫诲瀷[param],鍙傛暟:[{}]", url, parameters);
+ } else {
+ log.info("[PLUS]寮�濮嬭姹� => URL[{}],鏃犲弬鏁�", url);
+ }
}
+
+ StopWatch stopWatch = new StopWatch();
+ KEY_CACHE.set(stopWatch);
+ stopWatch.start();
+
return true;
}
@@ -68,8 +64,8 @@
@Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
- if (!prodProfile.equals(SpringUtils.getActiveProfile())) {
- StopWatch stopWatch = KEY_CACHE.get();
+ StopWatch stopWatch = KEY_CACHE.get();
+ if (ObjectUtil.isNotNull(stopWatch)) {
stopWatch.stop();
log.info("[PLUS]缁撴潫璇锋眰 => URL[{}],鑰楁椂:[{}]姣", request.getMethod() + " " + request.getRequestURI(), stopWatch.getTime());
KEY_CACHE.remove();
--
Gitblit v1.9.3