diff --git a/src/main/java/we/filter/FizzGatewayFilter.java b/src/main/java/we/filter/FizzGatewayFilter.java index 929af65..74a6012 100644 --- a/src/main/java/we/filter/FizzGatewayFilter.java +++ b/src/main/java/we/filter/FizzGatewayFilter.java @@ -19,13 +19,11 @@ package we.filter; import java.nio.charset.StandardCharsets; import java.util.HashMap; -import java.util.List; import java.util.Map; import javax.annotation.Resource; import com.alibaba.nacos.api.config.annotation.NacosValue; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -88,7 +86,7 @@ public class FizzGatewayFilter implements WebFilter { long start = System.currentTimeMillis(); ServerHttpRequest request = exchange.getRequest(); ServerHttpResponse serverHttpResponse = exchange.getResponse(); - + String path = WebUtils.getPathPrefix(exchange) + serviceId + WebUtils.getReqPath(exchange); String method = request.getMethodValue(); AggregateResource aggregateResource = configLoader.matchAggregateResource(method, path); @@ -106,12 +104,9 @@ public class FizzGatewayFilter implements WebFilter { } // traceId - String tmpTraceId = CommonConstants.TRACE_ID_PREFIX + exchange.getRequest().getId(); - if (StringUtils.isNotBlank(request.getHeaders().getFirst(CommonConstants.HEADER_TRACE_ID))) { - tmpTraceId = request.getHeaders().getFirst(CommonConstants.HEADER_TRACE_ID); - } - final String traceId = tmpTraceId; + String traceId = exchange.getRequest().getId(); LogService.setBizId(traceId); + serverHttpResponse.getHeaders().add(CommonConstants.HEADER_TRACE_ID, traceId); // 客户端提交上来的信息 Map clientInput = new HashMap<>(); @@ -147,10 +142,6 @@ public class FizzGatewayFilter implements WebFilter { // defalut content-type serverHttpResponse.getHeaders().add("Content-Type", "application/json; charset=UTF-8"); } - List headerTraceIds = serverHttpResponse.getHeaders().get(CommonConstants.HEADER_TRACE_ID); - if (headerTraceIds == null || !headerTraceIds.contains(traceId)) { - serverHttpResponse.getHeaders().add(CommonConstants.HEADER_TRACE_ID, traceId); - } long end = System.currentTimeMillis(); pipeline.getStepContext().addElapsedTime("总耗时", end - start);