From 313f81780f554a4962f131bbd6ab795c24d1edfe Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 05 二月 2026 14:25:02 +0800
Subject: [PATCH] #
---
/dev/null | 82 -------------
zy-acs-manager/src/main/java/com/zy/acs/manager/common/interceptor/IntegrationOpenApiInterceptor.java | 58 +++++++--
zy-acs-manager/src/main/java/com/zy/acs/manager/common/interceptor/IntegrationRecordAdvice.java | 178 +++++++++++++++++++++++++++++
3 files changed, 222 insertions(+), 96 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/config/IntegrationRecordAdvice.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/config/IntegrationRecordAdvice.java
deleted file mode 100644
index 92c6f15..0000000
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/config/IntegrationRecordAdvice.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.zy.acs.manager.common.config;
-
-import com.zy.acs.framework.common.Cools;
-import com.zy.acs.framework.common.R;
-import com.zy.acs.manager.manager.service.IntegrationRecordService;
-import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.MethodParameter;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.http.server.ServletServerHttpRequest;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-
-@Slf4j
-@ControllerAdvice
-public class IntegrationRecordAdvice implements ResponseBodyAdvice<Object> {
-
- @Autowired
- private IntegrationRecordService integrationRecordService;
-
- @Override
- public boolean supports(@NotNull MethodParameter methodParameter, @NotNull Class<? extends HttpMessageConverter<?>> aClass) {
- return true;
- }
-
- @Override
- public Object beforeBodyWrite(Object o
- , @NotNull MethodParameter methodParameter
- , @NotNull MediaType mediaType
- , @NotNull Class<? extends HttpMessageConverter<?>> aClass
- , @NotNull ServerHttpRequest serverHttpRequest
- , @NotNull ServerHttpResponse serverHttpResponse) {
- if (serverHttpRequest instanceof ServletServerHttpRequest) {
- HttpServletRequest request = ((ServletServerHttpRequest) serverHttpRequest).getServletRequest();
- Object appAuth = request.getAttribute("appAuth");
- if (appAuth != null) {
- if (o instanceof R) {
- String appkey = request.getHeader("appkey");
- Object reqCache = request.getAttribute("cache");
- if (!Cools.isEmpty(appkey)) {
- // 淇濆瓨鎺ュ彛鏃ュ織
-// apiLogService.save(
-// String.valueOf(appAuth),
-// request.getRequestURI(),
-// appkey,
-// IpTools.gainRealIp(request),
-// reqCache==null?"": JSON.toJSONString(reqCache),
-// JSON.toJSONString(o),
-// String.valueOf(((R) o).get("code")).equalsIgnoreCase("200")
-// );
- }
- }
- }
- }
- return o;
- }
-
- public static String json(HttpServletRequest request) {
- try {
- BufferedReader streamReader = new BufferedReader( new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8));
- StringBuilder sb = new StringBuilder();
- String inputStr;
- while ((inputStr = streamReader.readLine()) != null) {
- sb.append(inputStr);
- }
- return sb.toString();
- } catch (Exception e) {
- log.error(e.getMessage());
- return "";
- }
- }
-
-}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/interceptor/IntegrationOpenApiInterceptor.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/interceptor/IntegrationOpenApiInterceptor.java
index 28f980b..0c0354b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/interceptor/IntegrationOpenApiInterceptor.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/interceptor/IntegrationOpenApiInterceptor.java
@@ -2,6 +2,8 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.annotation.IntegrationAuth;
+import com.zy.acs.manager.core.domain.type.NamespaceType;
+import lombok.Value;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.stereotype.Component;
@@ -15,6 +17,7 @@
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
+import java.util.Enumeration;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -26,10 +29,7 @@
@Component
public class IntegrationOpenApiInterceptor implements HandlerInterceptor {
- private static final String ATTR_APP_AUTH = "appAuth";
- private static final String ATTR_AUTH_MEMO = "integrationAuthMemo";
- private static final String ATTR_CACHE = "cache";
- private static final String ATTR_START_AT = "openApiStartTime";
+ private static final String ATTR_CONTEXT = IntegrationOpenApiInterceptor.class.getName() + ".CONTEXT";
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
@@ -38,18 +38,31 @@
}
HandlerMethod handlerMethod = (HandlerMethod) handler;
IntegrationAuth integrationAuth = findIntegrationAuth(handlerMethod);
- if (integrationAuth == null) {
- log.debug("Skip open-api logging for {} because @IntegrationAuth is missing", handlerMethod.getMethod());
+ if (integrationAuth == null || integrationAuth.value() == IntegrationAuth.Enable.SKIP_LOG) {
return true;
}
- request.setAttribute(ATTR_APP_AUTH, integrationAuth.value());
- if (!Cools.isEmpty(integrationAuth.memo())) {
- request.setAttribute(ATTR_AUTH_MEMO, integrationAuth.memo());
- }
- request.setAttribute(ATTR_START_AT, System.currentTimeMillis());
- request.setAttribute(ATTR_CACHE, buildRequestCache(request));
+ NamespaceType namespaceType = integrationAuth.name() == null ? NamespaceType.NONE : integrationAuth.name();
+ IntegrationRequestContext context = new IntegrationRequestContext(
+ namespaceType,
+ namespaceType.name,
+ handlerMethod.getBeanType().getSimpleName() + "#" + handlerMethod.getMethod().getName(),
+ request.getMethod(),
+ request.getRequestURI(),
+ request.getQueryString(),
+ System.currentTimeMillis(),
+ buildRequestCache(request)
+ );
+ request.setAttribute(ATTR_CONTEXT, context);
return true;
+ }
+
+ public static IntegrationRequestContext getContext(HttpServletRequest request) {
+ Object attribute = request.getAttribute(ATTR_CONTEXT);
+ if (attribute instanceof IntegrationRequestContext) {
+ return (IntegrationRequestContext) attribute;
+ }
+ return null;
}
private IntegrationAuth findIntegrationAuth(HandlerMethod handlerMethod) {
@@ -65,13 +78,14 @@
cache.put("method", request.getMethod());
cache.put("uri", request.getRequestURI());
cache.put("query", request.getQueryString());
+ cache.put("contentType", request.getContentType());
cache.put("parameters", flattenParameters(request.getParameterMap()));
cache.put("headers", extractHeaders(request));
String body = readBody(request);
if (!Cools.isEmpty(body)) {
cache.put("body", body);
}
- return cache;
+ return Collections.unmodifiableMap(cache);
}
private Map<String, Object> flattenParameters(Map<String, String[]> rawParams) {
@@ -93,7 +107,11 @@
private Map<String, Object> extractHeaders(HttpServletRequest request) {
Map<String, Object> headers = new LinkedHashMap<>();
- List<String> names = Collections.list(request.getHeaderNames());
+ Enumeration<String> headerNames = request.getHeaderNames();
+ if (headerNames == null) {
+ return headers;
+ }
+ List<String> names = Collections.list(headerNames);
for (String name : names) {
headers.put(name, request.getHeader(name));
}
@@ -122,4 +140,16 @@
return StandardCharsets.UTF_8;
}
}
+
+ @Value
+ public static class IntegrationRequestContext {
+ NamespaceType namespaceType;
+ String namespace;
+ String handler;
+ String method;
+ String uri;
+ String query;
+ long startAt;
+ Map<String, Object> requestSnapshot;
+ }
}
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
new file mode 100644
index 0000000..5c8c40c
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/interceptor/IntegrationRecordAdvice.java
@@ -0,0 +1,178 @@
+package com.zy.acs.manager.common.interceptor;
+
+import com.alibaba.fastjson.JSON;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.R;
+import com.zy.acs.framework.common.SnowflakeIdWorker;
+import com.zy.acs.manager.common.interceptor.IntegrationOpenApiInterceptor.IntegrationRequestContext;
+import com.zy.acs.manager.common.utils.IpTools;
+import com.zy.acs.manager.manager.entity.IntegrationRecord;
+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.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.MethodParameter;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.http.server.ServletServerHttpRequest;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.UUID;
+
+@Slf4j
+@ControllerAdvice
+public class IntegrationRecordAdvice implements ResponseBodyAdvice<Object> {
+
+ private static final String HEADER_APP_KEY = "appkey";
+ private static final String HEADER_CALLER = "caller";
+
+ @Autowired
+ private IntegrationRecordService integrationRecordService;
+ @Resource
+ private SnowflakeIdWorker snowflakeIdWorker;
+
+ @Override
+ public boolean supports(@NotNull MethodParameter methodParameter,
+ @NotNull Class<? extends HttpMessageConverter<?>> aClass) {
+ return true;
+ }
+
+ @Override
+ public Object beforeBodyWrite(Object body,
+ @NotNull MethodParameter methodParameter,
+ @NotNull MediaType mediaType,
+ @NotNull Class<? extends HttpMessageConverter<?>> aClass,
+ @NotNull ServerHttpRequest serverHttpRequest,
+ @NotNull ServerHttpResponse serverHttpResponse) {
+ if (!(serverHttpRequest instanceof ServletServerHttpRequest)) {
+ return body;
+ }
+ HttpServletRequest request = ((ServletServerHttpRequest) serverHttpRequest).getServletRequest();
+ IntegrationRequestContext context = IntegrationOpenApiInterceptor.getContext(request);
+ if (context == null) {
+ return body;
+ }
+ try {
+ IntegrationRecord record = buildRecord(body, request, context);
+ integrationRecordService.syncRecord(record);
+ } catch (Exception e) {
+ log.error("Failed to persist integration log for {}", context.getHandler(), e);
+ }
+ return body;
+ }
+
+ private IntegrationRecord buildRecord(Object responseBody,
+ HttpServletRequest request,
+ IntegrationRequestContext context) {
+ Date now = new Date();
+ ResultView resultView = resolveResult(responseBody);
+
+ 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());
+ return record;
+ }
+
+ private ResultView resolveResult(Object body) {
+ if (!(body instanceof R)) {
+ return ResultView.unknown();
+ }
+ R response = (R) body;
+ Integer code = parseInteger(response.get("code"));
+ if (code == null) {
+ return ResultView.unknown();
+ }
+ boolean success = code == 200;
+ String error = success ? null : safeToString(response.get("msg"));
+ return new ResultView(success ? 1 : 0, error);
+ }
+
+ private Integer parseInteger(Object codeObj) {
+ if (codeObj == null) {
+ return null;
+ }
+ if (codeObj instanceof Integer) {
+ return (Integer) codeObj;
+ }
+ try {
+ return Integer.parseInt(String.valueOf(codeObj));
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ }
+
+ 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 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