From 4992e4e60b73a87c3781aabd9367e11e3eaa370e Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 05 二月 2026 16:00:16 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/common/interceptor/IntegrationRecordAdvice.java |  226 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 152 insertions(+), 74 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/interceptor/IntegrationRecordAdvice.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/interceptor/IntegrationRecordAdvice.java
index 5c8c40c..cc07b4f 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/interceptor/IntegrationRecordAdvice.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/interceptor/IntegrationRecordAdvice.java
@@ -10,8 +10,7 @@
 import com.zy.acs.manager.manager.enums.IntegrationDirectionType;
 import com.zy.acs.manager.manager.enums.StatusType;
 import com.zy.acs.manager.manager.service.IntegrationRecordService;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,11 +22,17 @@
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+import org.springframework.web.util.ContentCachingRequestWrapper;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.Date;
-import java.util.UUID;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 @Slf4j
 @ControllerAdvice
@@ -62,54 +67,76 @@
         if (context == null) {
             return body;
         }
+        IntegrationRecord record = null;
         try {
-            IntegrationRecord record = buildRecord(body, request, context);
-            integrationRecordService.syncRecord(record);
+            record = buildRecord(body, request, context, null);
         } catch (Exception e) {
-            log.error("Failed to persist integration log for {}", context.getHandler(), e);
+            log.error("Failed to build integration log for {}", context.getHandler(), e);
+            record = buildRecord(null, request, context, e);
+        } finally {
+            if (record != null) {
+                try {
+                    integrationRecordService.syncRecord(record);
+                } catch (Exception persistEx) {
+                    log.error("Failed to persist integration log for {}", context.getHandler(), persistEx);
+                }
+            }
         }
         return body;
     }
 
     private IntegrationRecord buildRecord(Object responseBody,
                                           HttpServletRequest request,
-                                          IntegrationRequestContext context) {
+                                          IntegrationRequestContext context,
+                                          Exception failure) {
         Date now = new Date();
-        ResultView resultView = resolveResult(responseBody);
+        RequestSnapshot payload = buildSnapshot(request);
+        String reqContent = !Cools.isEmpty(payload.getParameters())
+                ? JSON.toJSONString(payload.getParameters())
+                : payload.getJson();
 
-        IntegrationRecord record = new IntegrationRecord();
-        record.setUuid(nextUuid());
-        record.setNamespace(context.getNamespace());
-        record.setUrl(context.getUri());
-        record.setAppkey(request.getHeader(HEADER_APP_KEY));
-        record.setCaller(resolveCaller(request));
-        record.setDirection(IntegrationDirectionType.INBOUND.value);
-        record.setTimestamp(String.valueOf(context.getStartAt()));
-        record.setClientIp(IpTools.gainRealIp(request));
-        record.setRequest(safeToJson(context.getRequestSnapshot()));
-        record.setResponse(safeToJson(responseBody));
-        record.setErr(resultView.getError());
-        record.setResult(resultView.getResult());
-        record.setCostMs(cost(context.getStartAt()));
-        record.setStatus(StatusType.ENABLE.val);
-        record.setCreateTime(now);
-        record.setUpdateTime(now);
-        record.setMemo(context.getHandler());
+        IntegrationRecord record = new IntegrationRecord(
+                String.valueOf(snowflakeIdWorker.nextId()).substring(3),    // 缂栧彿
+                context.getNamespaceType().name(),    // 鍚嶇О绌洪棿
+                payload.getUri(),    // 鎺ュ彛鍦板潃
+                request.getHeader(HEADER_APP_KEY),    // 骞冲彴瀵嗛挜
+                context.getNamespaceType().caller,    // 璋冪敤鏂规爣璇�
+                IntegrationDirectionType.INBOUND.value,    // 鏂瑰悜[闈炵┖]
+                String.valueOf(context.getStartAt()),    // 鏃堕棿鎴�
+                IpTools.gainRealIp(request),    // 瀹㈡埛绔疘P
+                reqContent,    // 璇锋眰鍐呭
+                JSON.toJSONString(responseBody),    // 鍝嶅簲鍐呭
+                null,    // 寮傚父鍐呭
+                0,    // 缁撴灉
+                (int) (System.currentTimeMillis() - context.getStartAt()),    // 鑰楁椂
+                StatusType.ENABLE.val,    // 鐘舵��
+                now,    // 娣诲姞鏃堕棿[闈炵┖]
+                now,    // 淇敼鏃堕棿[闈炵┖]
+                context.getHandler()    // 澶囨敞
+        );
+
+        applyResult(record, responseBody, failure);
         return record;
     }
 
-    private ResultView resolveResult(Object body) {
-        if (!(body instanceof R)) {
-            return ResultView.unknown();
+    private void applyResult(IntegrationRecord record, Object responseBody, Exception failure) {
+        if (failure != null) {
+            record.setErr("Request failed: " + failure.getMessage());
+            return;
         }
-        R response = (R) body;
-        Integer code = parseInteger(response.get("code"));
+        if (!(responseBody instanceof R)) {
+            record.setErr("Invalid response body structure. Expected: { code, msg, data }.");
+            return;
+        }
+        R r = (R) responseBody;
+        Integer code = parseInteger(r.get("code"));
         if (code == null) {
-            return ResultView.unknown();
+            record.setErr("Missing or invalid response field: code.");
+            return;
         }
-        boolean success = code == 200;
-        String error = success ? null : safeToString(response.get("msg"));
-        return new ResultView(success ? 1 : 0, error);
+        if (code == 200) {
+            record.setResult(1);
+        }
     }
 
     private Integer parseInteger(Object codeObj) {
@@ -126,53 +153,104 @@
         }
     }
 
-    private String safeToJson(Object value) {
-        if (value == null) {
+    private RequestSnapshot buildSnapshot(HttpServletRequest request) {
+        Map<String, Object> params = flattenParameters(request.getParameterMap());
+        return new RequestSnapshot(
+                request.getMethod(),
+                request.getRequestURI(),
+                request.getQueryString(),
+                request.getContentType(),
+                params.isEmpty() ? null : params,
+                normalizeBody(readBody(request), request.getContentType())
+        );
+    }
+
+    private String normalizeBody(String body, String contentType) {
+        if (Cools.isEmpty(body)) {
             return null;
         }
+        boolean isJson = !Cools.isEmpty(contentType) && contentType.toLowerCase().contains("json");
+        if (isJson) {
+            try {
+                Object parsed = JSON.parse(body);
+                return JSON.toJSONString(parsed, false);
+            } catch (Exception ignore) {
+            }
+        }
+        return body.replaceAll("[\\n\\r\\t]", "").trim();
+    }
+
+    private Map<String, Object> flattenParameters(Map<String, String[]> rawParams) {
+        Map<String, Object> flattened = new LinkedHashMap<>();
+        if (rawParams == null) {
+            return flattened;
+        }
+        rawParams.forEach((key, values) -> {
+            if (values == null) {
+                flattened.put(key, null);
+            } else if (values.length == 1) {
+                flattened.put(key, values[0]);
+            } else {
+                flattened.put(key, Arrays.asList(values));
+            }
+        });
+        return flattened;
+    }
+
+    private String readBody(HttpServletRequest request) {
+        HttpServletRequest target = unwrapCachingRequest(request);
+        if (target instanceof ContentCachingRequestWrapper) {
+            ContentCachingRequestWrapper wrapper = (ContentCachingRequestWrapper) target;
+            byte[] buffer = wrapper.getContentAsByteArray();
+            if (buffer.length > 0) {
+                Charset charset = charset(wrapper.getCharacterEncoding());
+                return new String(buffer, charset);
+            }
+        }
+        return null;
+    }
+
+    private HttpServletRequest unwrapCachingRequest(HttpServletRequest request) {
+        HttpServletRequest current = request;
+        while (current instanceof HttpServletRequestWrapper) {
+            if (current instanceof ContentCachingRequestWrapper) {
+                return current;
+            }
+            current = (HttpServletRequest) ((HttpServletRequestWrapper) current).getRequest();
+        }
+        return request;
+    }
+
+    private Charset charset(String encoding) {
+        if (Cools.isEmpty(encoding)) {
+            return StandardCharsets.UTF_8;
+        }
         try {
-            return JSON.toJSONString(value);
+            return Charset.forName(encoding);
         } catch (Exception e) {
-            log.warn("Failed to serialize value for integration log: {}", value.getClass().getName(), e);
-            return String.valueOf(value);
+            return StandardCharsets.UTF_8;
         }
     }
 
-    private String resolveCaller(HttpServletRequest request) {
-        String caller = request.getHeader(HEADER_CALLER);
-        if (Cools.isEmpty(caller)) {
-            caller = request.getHeader(HEADER_APP_KEY);
+
+    @Data
+    private static class RequestSnapshot {
+        private final String method;
+        private final String uri;
+        private final String query;
+        private final String contentType;
+        private final Map<String, Object> parameters;
+        private final String json;
+
+        RequestSnapshot(String method, String uri, String query, String contentType,
+                        Map<String, Object> parameters, String json) {
+            this.method = method;
+            this.uri = uri;
+            this.query = query;
+            this.contentType = contentType;
+            this.parameters = parameters;
+            this.json = json;
         }
-        return caller;
-    }
 
-    private int cost(long startAt) {
-        long duration = System.currentTimeMillis() - startAt;
-        if (duration < 0) {
-            return 0;
-        }
-        return (int) duration;
-    }
-
-    private String nextUuid() {
-        if (snowflakeIdWorker != null) {
-            return String.valueOf(snowflakeIdWorker.nextId()).substring(3);
-        }
-        return UUID.randomUUID().toString().replace("-", "");
-    }
-
-    private String safeToString(Object value) {
-        return value == null ? null : String.valueOf(value);
-    }
-
-    @Getter
-    @AllArgsConstructor
-    private static class ResultView {
-        private final Integer result;
-        private final String error;
-
-        private static ResultView unknown() {
-            return new ResultView(null, null);
-        }
     }
 }

--
Gitblit v1.9.1