From 0bee2b3f40638460f3fa961792d43570e4b46911 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 05 二月 2026 16:06:07 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/common/interceptor/IntegrationRecordAdvice.java | 110 ++++++++++++++++++++-----------------------------------
1 files changed, 40 insertions(+), 70 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 8003212..2603534 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,6 +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.Data;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
@@ -90,48 +91,52 @@
Exception failure) {
Date now = new Date();
RequestSnapshot payload = buildSnapshot(request);
+ String reqContent = !Cools.isEmpty(payload.getParameters())
+ ? JSON.toJSONString(payload.getParameters())
+ : payload.getJson();
- IntegrationRecord record = new IntegrationRecord();
- record.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
- record.setNamespace(context.getNamespaceType().name());
- record.setUrl(payload.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(payload));
- record.setResponse(safeToJson(responseBody));
+ IntegrationRecord record = new IntegrationRecord(
+ String.valueOf(snowflakeIdWorker.nextId()).substring(3), // 缂栧彿
+ context.getNamespaceType().desc, // 鍚嶇О绌洪棿
+ 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);
- record.setCostMs(cost(context.getStartAt()));
- record.setStatus(StatusType.ENABLE.val);
- record.setCreateTime(now);
- record.setUpdateTime(now);
- record.setMemo(context.getHandler());
return record;
}
- private void applyResult(IntegrationRecord record, Object body, Exception failure) {
+ private void applyResult(IntegrationRecord record, Object responseBody, Exception failure) {
if (failure != null) {
- record.setResult(0);
- record.setErr(failure.getMessage());
+ record.setErr("Request failed: " + failure.getMessage());
return;
}
- if (!(body instanceof R)) {
- record.setResult(null);
- record.setErr(null);
+ if (!(responseBody instanceof R)) {
+ record.setErr("Invalid response body structure. Expected: { code, msg, data }.");
return;
}
- R response = (R) body;
- Integer code = parseInteger(response.get("code"));
+ R r = (R) responseBody;
+ Integer code = parseInteger(r.get("code"));
if (code == null) {
- record.setResult(null);
- record.setErr(null);
+ record.setErr("Missing or invalid response field: code.");
return;
}
- boolean success = code == 200;
- record.setResult(success ? 1 : 0);
- record.setErr(success ? null : safeToString(response.get("msg")));
+ if (code == 200) {
+ record.setResult(1);
+ }
}
private Integer parseInteger(Object codeObj) {
@@ -148,48 +153,15 @@
}
}
- private String safeToJson(Object value) {
- if (value == null) {
- return null;
- }
- try {
- return JSON.toJSONString(value);
- } catch (Exception e) {
- log.warn("Failed to serialize value for integration log: {}", value.getClass().getName(), e);
- return String.valueOf(value);
- }
- }
-
- private String resolveCaller(HttpServletRequest request) {
- String caller = request.getHeader(HEADER_CALLER);
- if (Cools.isEmpty(caller)) {
- caller = request.getHeader(HEADER_APP_KEY);
- }
- return caller;
- }
-
- private int cost(long startAt) {
- long duration = System.currentTimeMillis() - startAt;
- if (duration < 0) {
- return 0;
- }
- return (int) duration;
- }
-
- private String safeToString(Object value) {
- return value == null ? null : String.valueOf(value);
- }
-
private RequestSnapshot buildSnapshot(HttpServletRequest request) {
Map<String, Object> params = flattenParameters(request.getParameterMap());
- String body = normalizeBody(readBody(request), request.getContentType());
return new RequestSnapshot(
request.getMethod(),
request.getRequestURI(),
request.getQueryString(),
request.getContentType(),
params.isEmpty() ? null : params,
- body
+ normalizeBody(readBody(request), request.getContentType())
);
}
@@ -203,7 +175,6 @@
Object parsed = JSON.parse(body);
return JSON.toJSONString(parsed, false);
} catch (Exception ignore) {
- // fall through to compacting whitespace
}
}
return body.replaceAll("[\\n\\r\\t]", "").trim();
@@ -261,26 +232,25 @@
}
}
+
+ @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 body;
+ private final String json;
RequestSnapshot(String method, String uri, String query, String contentType,
- Map<String, Object> parameters, String body) {
+ Map<String, Object> parameters, String json) {
this.method = method;
this.uri = uri;
this.query = query;
this.contentType = contentType;
this.parameters = parameters;
- this.body = body;
+ this.json = json;
}
- public String getUri() {
- return uri;
- }
}
}
--
Gitblit v1.9.1