From abe3df6c7ada4a02fcdff5d6b3cb8e81bf31dbfe Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Sun, 4 Feb 2024 21:33:56 +0800 Subject: [PATCH] =?UTF-8?q?style=20=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/daxpay/sdk/response/DaxPayResult.java | 3 +++ .../cn/bootx/platform/daxpay/result/CommonResult.java | 4 ---- .../cn/bootx/platform/daxpay/result/DaxResult.java | 10 +++++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/daxpay-single-sdk/src/main/java/cn/bootx/platform/daxpay/sdk/response/DaxPayResult.java b/daxpay-single-sdk/src/main/java/cn/bootx/platform/daxpay/sdk/response/DaxPayResult.java index 201b69869..d65fc2fd5 100644 --- a/daxpay-single-sdk/src/main/java/cn/bootx/platform/daxpay/sdk/response/DaxPayResult.java +++ b/daxpay-single-sdk/src/main/java/cn/bootx/platform/daxpay/sdk/response/DaxPayResult.java @@ -26,4 +26,7 @@ public class DaxPayResult { /** 数据签名 */ private String sign; + + /** 追踪ID */ + private String traceId; } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/CommonResult.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/CommonResult.java index f57eef964..efdd85996 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/CommonResult.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/CommonResult.java @@ -1,9 +1,7 @@ package cn.bootx.platform.daxpay.result; -import cn.bootx.platform.common.core.code.CommonCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import org.slf4j.MDC; /** * 支付通用返回参数 @@ -14,6 +12,4 @@ import org.slf4j.MDC; @Schema(title = "支付通用返回参数") public class CommonResult { - @Schema(description = "追踪ID") - private String traceId = MDC.get(CommonCode.TRACE_ID); } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/DaxResult.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/DaxResult.java index 9156cf7b0..fcc9a9dfb 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/DaxResult.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/DaxResult.java @@ -1,7 +1,12 @@ package cn.bootx.platform.daxpay.result; +import cn.bootx.platform.common.core.code.CommonCode; import cn.bootx.platform.common.core.rest.ResResult; -import lombok.*; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import org.slf4j.MDC; /** * 支付通用响应参数 @@ -17,6 +22,9 @@ public class DaxResult extends ResResult { /** 数据签名 */ private String sign; + /** 追踪ID */ + private String traceId = MDC.get(CommonCode.TRACE_ID); + public DaxResult(int successCode, T data, String success) { super(successCode, data, success); }