修改访问日志添加

base-manager/src/main/java/com/mortals/xhx/base/framework/aspect/WebLogAspect.java

 package com.mortals.xhx.base.framework.aspect;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.net.NetUtil;
+import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.util.DateUtils;
+import com.mortals.xhx.common.pdu.access.AccessLogPdu;
+import com.mortals.xhx.module.MessageProducer;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -10,9 +15,12 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.util.ContentCachingRequestWrapper;
@@ -36,6 +44,11 @@ import java.util.Map;
 @Profile({"default", "develop", "test"})
 public class WebLogAspect {
 
+    @Value("${spring.application.name:gateway}")
+    private String appName;
+    @Autowired
+    private MessageProducer messageProducer;
+
     private static final String TRACE_ID = "traceId";
     private static final String SPAN_ID = "spanId";
     private static final String PSPAN_ID = "pspanId";
@@ -58,6 +71,7 @@ public class WebLogAspect {
         HttpServletRequest request = attributes.getRequest();
         // log.debug("请求路径 {} ,进入方法 {}", request.getRequestURI(), joinPoint.getSignature().getDeclaringTypeName() + ":" + joinPoint.getSignature().getName());
         MDC.put("req", getRequestInfo(request).toJSONString());
+        MDC.put("reqParams", getRequestInfoParams(request).toJSONString());
         MDC.put("startTime", String.valueOf(System.currentTimeMillis()));
     }
 
@@ -78,14 +92,46 @@ public class WebLogAspect {
             long takeTime = (System.currentTimeMillis() - Long.parseLong(startTime));
 
             if (result instanceof String) {
-                log.info(" \n 请求路径:{} 耗时：{}ms \n traceId：{} pspanId：{} spanId：{}  \n 请求报文：{} \n 响应报文：{}"
-                        , request.getRequestURI(), takeTime,traceId,pspanId,spanId, map.getOrDefault("req", ""), result);
+                log.debug(" \n 请求路径:{} 耗时：{}ms \n traceId：{} pspanId：{} spanId：{}  \n 请求报文：{} \n 响应报文：{}"
+                        , request.getRequestURI(), takeTime, traceId, pspanId, spanId, map.getOrDefault("req", ""), result);
             } else {
 
-                log.info(" \n 请求路径:{} 耗时：{}ms \n traceId：{} pspanId：{} spanId：{} \n 请求报文：{} \n 响应报文：{}"
-                        , request.getRequestURI(), takeTime,traceId,pspanId,spanId, map.getOrDefault("req", ""), JSON.toJSONString(result));
+                log.debug(" \n 请求路径:{} 耗时：{}ms \n traceId：{} pspanId：{} spanId：{} \n 请求报文：{} \n 响应报文：{}"
+                        , request.getRequestURI(), takeTime, traceId, pspanId, spanId, map.getOrDefault("req", ""), JSON.toJSONString(result));
+            }
+
+            if (!ObjectUtils.isEmpty(pspanId) && !ObjectUtils.isEmpty(spanId)) {
+                //paspId
+                spanId = String.valueOf(Integer.parseInt(spanId) + 1);
+                pspanId = spanId;
             }
 
+            AccessLogPdu accessLogPdu = new AccessLogPdu();
+            accessLogPdu.initAttrValue();
+            accessLogPdu.setAppName(appName);
+            accessLogPdu.setTraceID(traceId == null ? IdUtil.objectId() : traceId);
+            accessLogPdu.setPspanId(Integer.parseInt(pspanId));
+            accessLogPdu.setSpanId(Integer.parseInt(spanId));
+            accessLogPdu.setSchemaData(request.getScheme());
+            accessLogPdu.setHostName(NetUtil.getLocalHostName());
+            accessLogPdu.setUri(request.getRequestURI());
+            accessLogPdu.setTargetServer(request.getServletPath());
+            accessLogPdu.setRequestIp(request.getRemoteAddr());
+            accessLogPdu.setUa(request.getHeader("User-Agent"));
+            accessLogPdu.setRequestTime(DateUtil.parseTime(startTime));
+            accessLogPdu.setLogTime(new Date());
+            accessLogPdu.setMethod(request.getMethod());
+            accessLogPdu.setResponseTime(new Date());
+            accessLogPdu.setDuration(takeTime);
+
+            accessLogPdu.setRequestData(map.getOrDefault("reqParams", ""));
+            if (result instanceof String) {
+                accessLogPdu.setResponseData(result.toString());
+            } else {
+                accessLogPdu.setResponseData(JSON.toJSONString(result));
+            }
+            messageProducer.syncAccessSend(accessLogPdu);
+
         }
     }
 
@@ -118,4 +164,30 @@ public class WebLogAspect {
         }
         return requestInfo;
     }
+
+
+    /**
+     * 读取请求信息,如果是表单则转换为json
+     */
+    private JSONObject getRequestInfoParams(HttpServletRequest req) {
+        JSONObject requestInfo = new JSONObject();
+        try {
+
+            if (req.getQueryString() != null) {
+                requestInfo.put("queryString", URLDecoder.decode(req.getQueryString(), "UTF-8"));
+            }
+            if (req instanceof ContentCachingRequestWrapper) {
+                ContentCachingRequestWrapper wrapper = (ContentCachingRequestWrapper) req;
+                String bodyStr = new String(wrapper.getContentAsByteArray(), StandardCharsets.UTF_8);
+                if (bodyStr.startsWith("{")) {
+                    JSONObject jsonObject = JSON.parseObject(bodyStr);
+                    requestInfo.put("requestBody", jsonObject);
+                }
+            }
+        } catch (Exception e) {
+            log.error("解析请求失败", e);
+            requestInfo.put("parseError", e.getMessage());
+        }
+        return requestInfo;
+    }
 }

common-lib/pom.xml

@@ -24,6 +24,12 @@
             <artifactId>mortals-framework-springcloud</artifactId>
         </dependency>
 
+        <!-- 实现对 RabbitMQ 的自动化配置 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+
   <!--      <dependency>
             <groupId>io.sentry</groupId>
             <artifactId>sentry-spring-boot-starter</artifactId>

smart-gateway/src/main/java/com/mortals/xhx/common/key/QueueKey.java → common-lib/src/main/java/com/mortals/xhx/common/keys/QueueKey.java

-package com.mortals.xhx.common.key;
+package com.mortals.xhx.common.keys;
 
 /**
  * rabbit 队列key定义

smart-gateway/src/main/java/com/mortals/xhx/base/framework/service/MessageProducer.java → common-lib/src/main/java/com/mortals/xhx/module/MessageProducer.java

-package com.mortals.xhx.base.framework.service;
+package com.mortals.xhx.module;
 
 import com.alibaba.fastjson.JSON;
-import com.mortals.xhx.common.key.QueueKey;
+import com.mortals.xhx.common.keys.QueueKey;
 import com.mortals.xhx.common.pdu.access.AccessLogPdu;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;

smart-gateway/pom.xml

@@ -95,11 +95,7 @@
             <artifactId>spring-cloud-starter-loadbalancer</artifactId>
         </dependency>
 
-        <!-- 实现对 RabbitMQ 的自动化配置 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
+
 
 
         <!--        <dependency>

smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/AccessLogFilter.java

@@ -3,7 +3,7 @@ package com.mortals.xhx.base.framework.filter;
 import cn.hutool.core.net.NetUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.mortals.framework.util.StringUtils;
-import com.mortals.xhx.base.framework.service.MessageProducer;
+import com.mortals.xhx.module.MessageProducer;
 import com.mortals.xhx.common.pdu.access.AccessLogPdu;
 import com.mortals.xhx.common.utils.IpUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -94,7 +94,7 @@ public class AccessLogFilter implements GlobalFilter, Ordered {
         accessLogPdu.setAppName(appName);
         accessLogPdu.setTraceID(headers.getOrDefault(TRACE_ID,""));
         accessLogPdu.setPspanId(Integer.parseInt(headers.getOrDefault(PSPAN_ID,"0")));
-        accessLogPdu.setSpanId(Integer.parseInt(headers.getOrDefault(SPAN_ID,"0")));
+        accessLogPdu.setSpanId(Integer.parseInt(headers.getOrDefault(SPAN_ID,"1")));
         accessLogPdu.setSchemaData(request.getURI().getScheme());
         accessLogPdu.setHostName(NetUtil.getLocalHostName());
         accessLogPdu.setUri(requestPath);

smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/GatewayResponseFilter.java

 package com.mortals.xhx.base.framework.filter;
 
-import cn.hutool.extra.servlet.ServletUtil;
-import com.alibaba.fastjson.JSON;
 import com.mortals.framework.util.StringUtils;
-import com.mortals.xhx.base.framework.service.MessageProducer;
+import com.mortals.xhx.module.MessageProducer;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.Charsets;
 import org.reactivestreams.Publisher;
-import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
@@ -20,15 +17,11 @@ import org.springframework.core.io.buffer.DefaultDataBufferFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
-import org.springframework.stereotype.Component;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.nio.charset.Charset;
-import java.util.List;
-import java.util.Map;
 
 import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.ORIGINAL_RESPONSE_CONTENT_TYPE_ATTR;
 

smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/GlobalLogFilter.java

 package com.mortals.xhx.base.framework.filter;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.net.NetUtil;
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.extra.servlet.ServletUtil;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSON;
 import com.mortals.xhx.base.framework.config.CustomGatewayProperties;
-import com.mortals.xhx.base.framework.service.MessageProducer;
-import com.mortals.xhx.common.pdu.access.AccessLogPdu;
-import com.mortals.xhx.common.utils.IpUtils;
-import com.sun.jndi.toolkit.url.UrlUtil;
+import com.mortals.xhx.module.MessageProducer;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
@@ -24,18 +15,14 @@ import org.springframework.core.io.buffer.DataBufferUtils;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.util.UriComponentsBuilder;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import javax.sound.midi.Track;
-import java.net.InetAddress;
 import java.net.URI;
 import java.nio.CharBuffer;
 import java.nio.charset.StandardCharsets;
-import java.util.Date;
 import java.util.LinkedHashSet;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -74,8 +61,8 @@ public class GlobalLogFilter implements GlobalFilter, Ordered {
 
         ServerHttpRequest newRequest = exchange.getRequest().mutate()
                 .header(TRACE_ID, traceId)
-                .header(SPAN_ID, pspanId.toString())
-                .header(PSPAN_ID, spanId.toString())
+                .header(PSPAN_ID, pspanId.toString())
+                .header(SPAN_ID, spanId.toString())
                 .build();
         return chain.filter(exchange.mutate().request(newRequest).build());