From 22e8a676ee42c0d78b3526bcd9a635abbe8dca03 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 28 六月 2022 11:28:21 +0800
Subject: [PATCH] 优化databus bug

---
 java110-core/src/main/java/com/java110/core/trace/Java110FeignClientInterceptor.java |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/trace/Java110FeignClientInterceptor.java b/java110-core/src/main/java/com/java110/core/trace/Java110FeignClientInterceptor.java
index bc07bfd..547d574 100644
--- a/java110-core/src/main/java/com/java110/core/trace/Java110FeignClientInterceptor.java
+++ b/java110-core/src/main/java/com/java110/core/trace/Java110FeignClientInterceptor.java
@@ -1,29 +1,33 @@
 package com.java110.core.trace;
 
-import com.java110.core.factory.Java110TraceFactory;
-import com.java110.core.log.LoggerFactory;
 import com.java110.dto.trace.TraceAnnotationsDto;
+import com.java110.dto.trace.TraceDto;
+import com.java110.utils.constant.CommonConstant;
 import okhttp3.Interceptor;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.slf4j.Logger;
-import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 
 //@Component
 public class Java110FeignClientInterceptor implements Interceptor {
-    private static Logger logger = LoggerFactory.getLogger(Java110FeignClientInterceptor.class);
+    // private static Logger logger = LoggerFactory.getLogger(Java110FeignClientInterceptor.class);
 
     @Override
     public Response intercept(Chain chain) throws IOException {
-        Request request = chain.request();
+        // Request request = chain.request();
 
-        //before , request.body()
-        logger.debug("feign 杩涘叆 Java110FeignClientAop>> intercept");
+        Request.Builder builder = chain.request().newBuilder();
+        //璋冪敤閾惧ご淇℃伅
+        TraceDto traceDto = Java110TraceFactory.getTraceDto();
+        if (traceDto != null) {
+            builder.header(CommonConstant.TRACE_ID, traceDto.getTraceId());
+            builder.header(CommonConstant.PARENT_SPAN_ID, traceDto.getId());
+        }
+        //logger.debug("feign 杩涘叆 Java110FeignClientAop>> intercept");
         Java110TraceFactory.putAnnotations(TraceAnnotationsDto.VALUE_SERVER_SEND);
         try {
-            Response response = chain.proceed(request);
+            Response response = chain.proceed(builder.build());
             //after
             return response;
         } catch (Exception e) {

--
Gitblit v1.8.0