From 4e134e61ede1f8574189af45c810ca365c7c7f9a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 五月 2022 18:33:14 +0800
Subject: [PATCH] 优化代码

---
 java110-core/src/main/java/com/java110/core/trace/Java110TraceLogAop.java |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/trace/Java110TraceLogAop.java b/java110-core/src/main/java/com/java110/core/trace/Java110TraceLogAop.java
index b57d796..5f53d2c 100644
--- a/java110-core/src/main/java/com/java110/core/trace/Java110TraceLogAop.java
+++ b/java110-core/src/main/java/com/java110/core/trace/Java110TraceLogAop.java
@@ -32,29 +32,33 @@
         TraceParamDto traceParamDto = new TraceParamDto();
         JSONObject paramIn = new JSONObject();
         JSONObject paramOut = new JSONObject();
-
-        Object[] args = pjp.getArgs();
-        for (int paramIndex = 0; paramIndex < args.length; paramIndex++) {
-            if (args[paramIndex] instanceof HttpServletRequest) {
+        try {
+            Object[] args = pjp.getArgs();
+            for (int paramIndex = 0; paramIndex < args.length; paramIndex++) {
+                if (args[paramIndex] instanceof HttpServletRequest) {
 //                HttpServletRequest request = (HttpServletRequest) args[paramIndex];
 //                paramIn.put("param" + paramIndex, request.getParameterMap());
-                continue;
+                    continue;
+                }
+                if (args[paramIndex] instanceof HttpServletResponse) {
+                    continue;
+                }
+                paramIn.put("param" + paramIndex, args[paramIndex]);
             }
-            if (args[paramIndex] instanceof HttpServletResponse) {
-                continue;
+            traceParamDto.setReqParam(paramIn.toJSONString());
+            out = pjp.proceed();
+        }catch (Exception e){
+            throw e;
+        }finally {
+            if (out != null) {
+                paramOut.put("param", out);
+            } else {
+                paramOut.put("param", new JSONObject());
             }
-            paramIn.put("param" + paramIndex, args[paramIndex]);
+            traceParamDto.setResParam(paramOut.toJSONString());
+            Java110TraceFactory.putParams(traceParamDto);
+            logger.debug("--Java110TraceLog---:{}", JSONObject.toJSONString(traceParamDto));
         }
-        traceParamDto.setReqParam(paramIn.toJSONString());
-        out = pjp.proceed();
-        if (paramOut != null) {
-            paramOut.put("param", out);
-        } else {
-            paramOut.put("param", new JSONObject());
-        }
-        traceParamDto.setResParam(paramOut.toJSONString());
-        Java110TraceFactory.putParams(traceParamDto);
-        logger.debug("--Java110TraceLog---:{}", paramOut.toJSONString());
         return out;
     }
 }

--
Gitblit v1.8.0