From a1d4541fede179964942fbd119f7da11cc05ed75 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 16 九月 2021 09:06:10 +0800
Subject: [PATCH] 日志注解新增是否保存响应参数

---
 src/main/java/com/ruoyi/framework/aspectj/LogAspect.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
index f30b88c..cc66490 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@@ -92,9 +92,6 @@
             // 璇锋眰鐨勫湴鍧�
             String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
             operLog.setOperIp(ip);
-            // 杩斿洖鍙傛暟
-            operLog.setJsonResult(JSON.toJSONString(jsonResult));
-
             operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
             if (loginUser != null)
             {
@@ -113,7 +110,7 @@
             // 璁剧疆璇锋眰鏂瑰紡
             operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
             // 澶勭悊璁剧疆娉ㄨВ涓婄殑鍙傛暟
-            getControllerMethodDescription(joinPoint, controllerLog, operLog);
+            getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
             // 淇濆瓨鏁版嵁搴�
             AsyncManager.me().execute(AsyncFactory.recordOper(operLog));
         }
@@ -133,7 +130,7 @@
      * @param operLog 鎿嶄綔鏃ュ織
      * @throws Exception
      */
-    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog) throws Exception
+    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception
     {
         // 璁剧疆action鍔ㄤ綔
         operLog.setBusinessType(log.businessType().ordinal());
@@ -147,6 +144,11 @@
             // 鑾峰彇鍙傛暟鐨勪俊鎭紝浼犲叆鍒版暟鎹簱涓��
             setRequestValue(joinPoint, operLog);
         }
+        // 鏄惁闇�瑕佷繚瀛榬esponse锛屽弬鏁板拰鍊�
+        if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult))
+        {
+            operLog.setJsonResult(StringUtils.substring(JSON.toJSONString(jsonResult), 0, 2000));
+        }
     }
 
     /**

--
Gitblit v1.9.3