oapi req rsp

gin/entity/entity.go

-package entity
-
-type CopyHttpReq struct {
-	Method  string              `json:"method"`
-	URL     string              `json:"url"`
-	Headers map[string][]string `json:"headers"`
-	Body    string              `json:"body"`
-}
-
-type CopyHttpRsp struct {
-	Headers map[string][]string `json:"headers"`
-	Body    string              `json:"body"`
-}

gin/middleware/logging.go

@@ -2,8 +2,7 @@ package middleware
 
 import (
 	"bytes"
-	"fmt"
-	"gitlab.wanzhuangkj.com/tush/xpkg/gin/entity"
+	"gitlab.wanzhuangkj.com/tush/xpkg/httpcli/entity"
 	"io"
 	"net/http"
 	"time"
@@ -191,7 +190,7 @@ func Logging(opts ...Option) gin.HandlerFunc {
 			)
 		}
 
-		SetCopyReq(c, buf)
+		entity.SetCopyReq(c, buf)
 
 		c.Set(ctxUtils.KeyAppName, o.appName)
 
@@ -241,74 +240,6 @@ func Logging(opts ...Option) gin.HandlerFunc {
 	}
 }
 
-func SetCopyReq(c *gin.Context, buf *bytes.Buffer) {
-	copyHttpReq := &entity.CopyHttpReq{}
-	copyHttpReq.Method = c.Request.Method
-	copyHttpReq.URL = c.Request.URL.String()
-	copyHttpReq.Headers = c.Request.Header
-	copyHttpReq.Body = buf.String()
-	c.Set(ctxUtils.KeyReqBody, copyHttpReq)
-}
-
-func GetCopyReq(c *gin.Context) *entity.CopyHttpReq {
-	if val, isExist := c.Get(ctxUtils.KeyReqBody); isExist {
-		if req, ok := val.(*entity.CopyHttpReq); ok {
-			return req
-		}
-	}
-	return nil
-}
-
-func SetCopyRsp(c *gin.Context, buf *bytes.Buffer) {
-	copyHttpRsp := &entity.CopyHttpRsp{}
-	copyHttpRsp.Headers = c.Writer.Header()
-	copyHttpRsp.Body = buf.String()
-	c.Set(ctxUtils.KeyRspBody, copyHttpRsp)
-}
-
-func GetCopyRsp(c *gin.Context) *entity.CopyHttpRsp {
-	if val, isExist := c.Get(ctxUtils.KeyRspBody); isExist {
-		if rsp, ok := val.(*entity.CopyHttpRsp); ok {
-			return rsp
-		}
-	}
-	return nil
-}
-
-func SetCopyApiReq(c *gin.Context, buf *bytes.Buffer) {
-	copyHttpReq := &entity.CopyHttpReq{}
-	copyHttpReq.Method = c.Request.Method
-	copyHttpReq.URL = c.Request.URL.String()
-	copyHttpReq.Headers = c.Request.Header
-	copyHttpReq.Body = buf.String()
-	c.Set(fmt.Sprintf(ctxUtils.KeyOApiReqBody, ctxUtils.GetGinCtxTraceID(c)), copyHttpReq)
-}
-
-func GetCopyApiReq(c *gin.Context) *entity.CopyHttpReq {
-	if val, isExist := c.Get(fmt.Sprintf(ctxUtils.KeyOApiReqBody, ctxUtils.GetGinCtxTraceID(c))); isExist {
-		if req, ok := val.(*entity.CopyHttpReq); ok {
-			return req
-		}
-	}
-	return nil
-}
-
-func SetCopyApiRsp(c *gin.Context, buf *bytes.Buffer) {
-	copyHttpRsp := &entity.CopyHttpRsp{}
-	copyHttpRsp.Headers = c.Writer.Header()
-	copyHttpRsp.Body = buf.String()
-	c.Set(fmt.Sprintf(ctxUtils.KeyOApiRspBody, ctxUtils.GetGinCtxTraceID(c)), copyHttpRsp)
-}
-
-func GetCopyApiRsp(c *gin.Context) *entity.CopyHttpRsp {
-	if val, isExist := c.Get(fmt.Sprintf(ctxUtils.KeyOApiRspBody, ctxUtils.GetGinCtxTraceID(c))); isExist {
-		if rsp, ok := val.(*entity.CopyHttpRsp); ok {
-			return rsp
-		}
-	}
-	return nil
-}
-
 // SimpleLog print response info
 func SimpleLog(opts ...Option) gin.HandlerFunc {
 	o := defaultOptions()

gin/response/response.go

@@ -4,7 +4,7 @@ package response
 import (
 	"bytes"
 	"encoding/json"
-	"gitlab.wanzhuangkj.com/tush/xpkg/gin/middleware"
+	"gitlab.wanzhuangkj.com/tush/xpkg/httpcli/entity"
 	"net/http"
 	"strconv"
 	"time"
@@ -63,7 +63,7 @@ func writeJSON(c *gin.Context, code int, res interface{}) {
 	if res != nil {
 		resBytes, _ := json.Marshal(res)
 		buf := bytes.NewBuffer(resBytes)
-		middleware.SetCopyRsp(c, buf)
+		entity.SetCopyRsp(c, buf)
 		_, _ = c.Writer.Write(resBytes)
 	}
 	//err := json.NewEncoder(c.Writer).Encode(res)

httpcli/entity/entity.go

+package entity
+
+import (
+	"bytes"
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
+)
+
+type CopyHttpReq struct {
+	Method  string              `json:"method"`
+	URL     string              `json:"url"`
+	Headers map[string][]string `json:"headers"`
+	Body    string              `json:"body"`
+}
+
+type CopyHttpRsp struct {
+	Headers map[string][]string `json:"headers"`
+	Body    string              `json:"body"`
+}
+
+func SetCopyReq(c *gin.Context, buf *bytes.Buffer) {
+	copyHttpReq := &CopyHttpReq{}
+	copyHttpReq.Method = c.Request.Method
+	copyHttpReq.URL = c.Request.URL.String()
+	copyHttpReq.Headers = c.Request.Header
+	copyHttpReq.Body = buf.String()
+	c.Set(ctxUtils.KeyReqBody, copyHttpReq)
+}
+
+func GetCopyReq(c *gin.Context) *CopyHttpReq {
+	if val, isExist := c.Get(ctxUtils.KeyReqBody); isExist {
+		if req, ok := val.(*CopyHttpReq); ok {
+			return req
+		}
+	}
+	return nil
+}
+
+func SetCopyRsp(c *gin.Context, buf *bytes.Buffer) {
+	copyHttpRsp := &CopyHttpRsp{}
+	copyHttpRsp.Headers = c.Writer.Header()
+	copyHttpRsp.Body = buf.String()
+	c.Set(ctxUtils.KeyRspBody, copyHttpRsp)
+}
+
+func GetCopyRsp(c *gin.Context) *CopyHttpRsp {
+	if val, isExist := c.Get(ctxUtils.KeyRspBody); isExist {
+		if rsp, ok := val.(*CopyHttpRsp); ok {
+			return rsp
+		}
+	}
+	return nil
+}
+
+func SetCopyApiReq(c *gin.Context, buf *bytes.Buffer) {
+	copyHttpReq := &CopyHttpReq{}
+	copyHttpReq.Method = c.Request.Method
+	copyHttpReq.URL = c.Request.URL.String()
+	copyHttpReq.Headers = c.Request.Header
+	copyHttpReq.Body = buf.String()
+	c.Set(fmt.Sprintf(ctxUtils.KeyOApiReqBody, ctxUtils.GetGinCtxTraceID(c)), copyHttpReq)
+}
+
+func GetCopyApiReq(c *gin.Context) *CopyHttpReq {
+	if val, isExist := c.Get(fmt.Sprintf(ctxUtils.KeyOApiReqBody, ctxUtils.GetGinCtxTraceID(c))); isExist {
+		if req, ok := val.(*CopyHttpReq); ok {
+			return req
+		}
+	}
+	return nil
+}
+
+func SetCopyApiRsp(c *gin.Context, buf *bytes.Buffer) {
+	copyHttpRsp := &CopyHttpRsp{}
+	copyHttpRsp.Headers = c.Writer.Header()
+	copyHttpRsp.Body = buf.String()
+	c.Set(fmt.Sprintf(ctxUtils.KeyOApiRspBody, ctxUtils.GetGinCtxTraceID(c)), copyHttpRsp)
+}
+
+func GetCopyApiRsp(c *gin.Context) *CopyHttpRsp {
+	if val, isExist := c.Get(fmt.Sprintf(ctxUtils.KeyOApiRspBody, ctxUtils.GetGinCtxTraceID(c))); isExist {
+		if rsp, ok := val.(*CopyHttpRsp); ok {
+			return rsp
+		}
+	}
+	return nil
+}

httpcli/httpcli.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"gitlab.wanzhuangkj.com/tush/xpkg/httpcli/entity"
 	"io"
 	"net/http"
 	"net/url"
@@ -255,7 +256,6 @@ func (req *Request) push(ctx context.Context) (*Response, error) {
 		buf = bytes.NewBufferString(req.body)
 	}
 
-	//logger.Info("httpCli req", logger.String("body", buf.String()), ctxUtils.CtxTraceIDField(ctx))
 	return req.send(ctx, buf, buf)
 }
 
@@ -296,8 +296,9 @@ func (req *Request) send(ctx context.Context, body io.Reader, buf *bytes.Buffer)
 		return nil, req.err
 	}
 	if buf != nil {
-		requestID := ctxUtils.CtxRequestID(ctx)
-		ctxUtils.SetVal(ctx, fmt.Sprintf(ctxUtils.KeyOApiReqBody, requestID), buf.Bytes())
+		if c, _ := ctxUtils.GetGinCtx(ctx); c != nil {
+			entity.SetCopyApiReq(c, buf)
+		}
 	}
 	if req.customRequest != nil {
 		req.customRequest(req.request, buf)
@@ -338,8 +339,10 @@ func (req *Request) send(ctx context.Context, body io.Reader, buf *bytes.Buffer)
 					return xerror.New(err.Error())
 				}
 				bodyBuf := bytes.NewBuffer(body)
+				if c, _ := ctxUtils.GetGinCtx(ctx); c != nil {
+					entity.SetCopyApiRsp(c, buf)
+				}
 				logger.Info("httpCli rsp", logger.Any("header", resp.Header), logger.Any("body", bodyBuf.String()), ctxUtils.CtxTraceIDField(ctx))
-				ctxUtils.SetVal(ctx, fmt.Sprintf(ctxUtils.KeyOApiRspBody, ctxUtils.CtxRequestID(ctx)), bodyBuf.Bytes())
 				if body != nil {
 					resp.Body = io.NopCloser(bodyBuf)
 				}
@@ -377,7 +380,9 @@ func (req *Request) send(ctx context.Context, body io.Reader, buf *bytes.Buffer)
 			}
 			bodyBuf := bytes.NewBuffer(body)
 			logger.Info("httpCli rsp", logger.Any("header", resp.Header), logger.Any("body", bodyBuf.String()), ctxUtils.CtxTraceIDField(ctx))
-			ctxUtils.SetVal(ctx, fmt.Sprintf("oApiRsp-%s", ctxUtils.CtxRequestID(ctx)), bodyBuf.Bytes())
+			if c, _ := ctxUtils.GetGinCtx(ctx); c != nil {
+				entity.SetCopyApiRsp(c, buf)
+			}
 			if body != nil {
 				resp.Body = io.NopCloser(bodyBuf)
 			}