traceId名称修改

framework-boot/src/main/java/com/mrxu/framework/boot/entity/RpcRequestInfo.java

@@ -24,7 +24,7 @@ public class RpcRequestInfo implements Serializable {
         MDC.clear();
     }
 
-    protected String trackId;
+    protected String traceId;
 
     protected String tenantId;
 
@@ -34,8 +34,8 @@ public class RpcRequestInfo implements Serializable {
 
     protected String fromServiceName;
 
-    public static String getTrackId() {
-       return get().trackId;
+    public static String getTraceId() {
+       return get().traceId;
     }
 
     public static String getTenantId() {
@@ -54,8 +54,8 @@ public class RpcRequestInfo implements Serializable {
         return get().fromServiceName;
     }
 
-    public void setTrackId(String trackId) {
-        get().trackId = trackId;
+    public void setTraceId(String trackId) {
+        get().traceId = trackId;
         MDC.put("trackId",trackId);
     }
 

framework-boot/src/main/java/com/mrxu/framework/boot/feign/FeignRequestInterceptor.java

@@ -8,9 +8,6 @@ import org.springframework.beans.factory.annotation.Value;
 
 /**
  * 功能概要：[feign拦截器主要用于透传用户信息等数据] <br>
- *
- * @author zzt
- * @date 2020/10/14
  */
 public class FeignRequestInterceptor implements RequestInterceptor {
 
@@ -34,8 +31,8 @@ public class FeignRequestInterceptor implements RequestInterceptor {
         if(StringUtils.isNotBlank(RpcRequestInfo.getUsername())){
             requestTemplate.header(HeaderConstant.USER_NAME,RpcRequestInfo.getUsername());
         }
-        if(StringUtils.isNotBlank(RpcRequestInfo.getTrackId())){
-            requestTemplate.header(HeaderConstant.TRACK_ID,RpcRequestInfo.getTrackId());
+        if(StringUtils.isNotBlank(RpcRequestInfo.getTraceId())){
+            requestTemplate.header(HeaderConstant.TRACE_ID,RpcRequestInfo.getTraceId());
         }
     }
 }

framework-boot/src/main/java/com/mrxu/framework/boot/feign/HeaderConstant.java

@@ -11,7 +11,7 @@ public interface HeaderConstant {
     /**
      * 链路追踪id
      */
-    public static final String TRACK_ID = "track_id";
+    public static final String TRACE_ID = "trace_id";
 
     /**
      * 租户id

framework-boot/src/main/java/com/mrxu/framework/boot/handle/UserInfoHandler.java

@@ -4,7 +4,6 @@ import com.mrxu.framework.boot.entity.RpcRequestInfo;
 import com.mrxu.framework.boot.feign.HeaderConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 import javax.servlet.http.HttpServletRequest;
@@ -12,9 +11,6 @@ import javax.servlet.http.HttpServletResponse;
 
 /**
  * 功能概要：[当前登录者的用户信息] <br>
- *
- * @author zzt
- * @date 2020/10/14
  */
 @Slf4j
 public class UserInfoHandler extends HandlerInterceptorAdapter {
@@ -30,9 +26,9 @@ public class UserInfoHandler extends HandlerInterceptorAdapter {
         }
         RpcRequestInfo requestInfo = RpcRequestInfo.get();
         requestInfo.setFromServiceName(request.getHeader(HeaderConstant.FROM_SERVICE_NAME));
-        String trackId = request.getHeader(HeaderConstant.TRACK_ID);
+        String trackId = request.getHeader(HeaderConstant.TRACE_ID);
         if (StringUtils.isNotBlank(trackId)) {
-            requestInfo.setTrackId(trackId);
+            requestInfo.setTraceId(trackId);
         }
         String ip = request.getHeader(HeaderConstant.IP);
         if (StringUtils.isNotBlank(ip)) {