ctxUtils

cache/memory.go

@@ -11,7 +11,7 @@ import (
 	"github.com/spf13/cast"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/encoding"
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/logger"
 	xslice "gitlab.wanzhuangkj.com/tush/xpkg/utils/xslice"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xerrors/xerror"

gin/xctx/ctx.go → gin/ctxUtils/ctx.go

-package xctx
+package ctxUtils
 
 import (
 	"context"
@@ -11,18 +11,11 @@ import (
 	"go.uber.org/zap"
 )
 
-var (
+const (
 	GinContextKey       = "gin_context"
-
-	ContextTraceIDKey = "X-Request-ID"
 	KeyConfigFile       = "config_file"
 	KeyConfigCenter     = "config_center"
-
-	// HeaderXRequestIDKey header request id key
-	HeaderXRequestIDKey = "X-Request-ID"
-
 	HeaderXTimestampKey = "Timestamp"
-
 	KeyReqBody          = "req-body"
 	KeyRspBody          = "rsp-body"
 	KeyTid              = "tid"
@@ -34,8 +27,11 @@ var (
 	KeyUName            = "uname"
 	KeyToken            = "token"
 	KeyUser             = "user"
+)
 
-	//KeyResp = "resp"
+var (
+	HeaderXRequestIDKey = "X-Request-ID"
+	ContextTraceIDKey   = "X-Request-ID"
 )
 
 var (

gin/middleware/auth.go

@@ -4,8 +4,8 @@ package middleware
 import (
 	"github.com/gin-gonic/gin"
 	"gitlab.wanzhuangkj.com/tush/xpkg/errcode"
+	"gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
-	"gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
 	"gitlab.wanzhuangkj.com/tush/xpkg/jwt"
 	"gitlab.wanzhuangkj.com/tush/xpkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf"
@@ -102,8 +102,8 @@ func Auth(opts ...JwtOption) gin.HandlerFunc {
 			}
 		} else {
 			xsfID, _ := xsf.ParseString(claims.UID)
-			c.Set(xctx.KeyUID, xsfID)
-			c.Set(xctx.KeyUName, claims.Name)
+			c.Set(ctxUtils.KeyUID, xsfID)
+			c.Set(ctxUtils.KeyUName, claims.Name)
 		}
 
 		c.Next()

gin/middleware/logging.go

@@ -2,11 +2,13 @@ package middleware
 
 import (
 	"bytes"
+	"encoding/json"
+	"gitlab.wanzhuangkj.com/tush/xpkg/utils/uriUtils"
 	"io"
 	"net/http"
 	"time"
 
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/ips"
 
 	"github.com/gin-gonic/gin"
@@ -184,6 +186,13 @@ func Logging(opts ...Option) gin.HandlerFunc {
 		}
 
 		c.Set(ctxUtil.KeyReqBody, buf.Bytes())
+		if c.Request.Method == http.MethodGet && buf.Len() == 0 {
+			paramMap, err := uriUtils.URLValuePairsToMap(c.Request.URL.RawQuery)
+			if err == nil {
+				val, _ := json.Marshal(paramMap)
+				c.Set(ctxUtil.KeyReqBody, val)
+			}
+		}
 
 		reqID := ""
 		if o.traceIDFrom == 1 {

gin/middleware/logging_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/gin-gonic/gin"
 
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
 	"gitlab.wanzhuangkj.com/tush/xpkg/httpcli"
 	"gitlab.wanzhuangkj.com/tush/xpkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/utils"

gin/middleware/recovery.go

@@ -3,7 +3,7 @@ package middleware
 import (
 	"net/http"
 
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"

gin/middleware/requstid.go

@@ -2,7 +2,7 @@ package middleware
 
 import (
 	"context"
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 	"net/http"
 	"strconv"
 	"time"

gin/middleware/requstid_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/utils"
 
 	"github.com/gin-gonic/gin"

gin/middleware/sync_ratelimiter/sync_ratelimiter.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/redis/go-redis/v9"
-	"gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
+	"gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 	"go.uber.org/zap"
 	"strconv"
 	"sync"
@@ -27,13 +27,13 @@ func (d *RedisDatastore) Add(ctx context.Context, key string, start, value int64
 	c, err := d.client.IncrBy(ctx, k, value).Result()
 	if err != nil {
 		if d.logger != nil {
-			d.logger.Error(fmt.Sprintf("[SlideWindow] add fail,[k:%s add:%d]", k, value), zap.String("err", err.Error()), zap.String("cost", time.Since(startTime).String()), xctx.CtxTraceIDField(ctx))
+			d.logger.Error(fmt.Sprintf("[SlideWindow] add fail,[k:%s add:%d]", k, value), zap.String("err", err.Error()), zap.String("cost", time.Since(startTime).String()), ctxUtils.CtxTraceIDField(ctx))
 		}
 		return 0, err
 	}
 	_, _ = d.client.Expire(ctx, k, d.ttl).Result()
 	if d.logger != nil {
-		d.logger.Info(fmt.Sprintf("[SlideWindow] add success,[k:%s add:%d -> %d]", k, value, c), zap.String("cost", time.Since(startTime).String()), xctx.CtxTraceIDField(ctx))
+		d.logger.Info(fmt.Sprintf("[SlideWindow] add success,[k:%s add:%d -> %d]", k, value, c), zap.String("cost", time.Since(startTime).String()), ctxUtils.CtxTraceIDField(ctx))
 	}
 	return c, err
 }
@@ -47,12 +47,12 @@ func (d *RedisDatastore) Get(ctx context.Context, key string, start int64) (int6
 			err = nil
 		}
 		if d.logger != nil {
-			d.logger.Error(fmt.Sprintf("[SlideWindow] get fail [k:%s]", k), zap.String("err", err.Error()), zap.String("cost", time.Since(startTime).String()), xctx.CtxTraceIDField(ctx))
+			d.logger.Error(fmt.Sprintf("[SlideWindow] get fail [k:%s]", k), zap.String("err", err.Error()), zap.String("cost", time.Since(startTime).String()), ctxUtils.CtxTraceIDField(ctx))
 		}
 		return 0, err
 	}
 	if d.logger != nil {
-		d.logger.Info(fmt.Sprintf("[SlideWindow] get success [k:%s v:%s]", k, value), zap.String("cost", time.Since(startTime).String()), xctx.CtxTraceIDField(ctx))
+		d.logger.Info(fmt.Sprintf("[SlideWindow] get success [k:%s v:%s]", k, value), zap.String("cost", time.Since(startTime).String()), ctxUtils.CtxTraceIDField(ctx))
 	}
 	return strconv.ParseInt(value, 10, 64)
 }

gin/response/response.go

@@ -9,7 +9,7 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/errcode"
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
+	ctxUtils "gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xerrors/xerror"
 )
@@ -30,7 +30,7 @@ func newResp(c *gin.Context, code int, msg string, data interface{}) *Result {
 		Code:      code,
 		Msg:       msg,
 		TimeStamp: time.Now().Unix(),
-		TraceID:   ctxUtil.GetGinCtxTid(c),
+		TraceID:   ctxUtils.GetGinCtxTid(c),
 	}
 
 	// ensure that the data field is not nil on return, note that it is not nil when resp.data=[]interface {}, it is serialized to null
@@ -59,7 +59,7 @@ func writeJSON(c *gin.Context, code int, res interface{}) {
 	writeContentType(c.Writer, jsonContentType)
 	if res != nil {
 		resBytes, _ := json.Marshal(res)
-		c.Set(ctxUtil.KeyRspBody, resBytes)
+		c.Set(ctxUtils.KeyRspBody, resBytes)
 		c.Writer.Write(resBytes)
 	}
 	//err := json.NewEncoder(c.Writer).Encode(res)
@@ -181,10 +181,10 @@ func Error(c *gin.Context, err error) {
 		msg = err.Error()
 		if xerr, ok := err.(*xerror.Error); ok {
 			if !errcode.IsSysDefinedError(xerr.Code()) {
-				logger.Error("api failed.", logger.Err(err), ctxUtil.GinTraceIDField(c))
+				logger.Error("api failed.", logger.Err(err), ctxUtils.GinTraceIDField(c))
 			}
 		} else {
-			logger.Error("api failed.", logger.Err(err), ctxUtil.GinTraceIDField(c))
+			logger.Error("api failed.", logger.Err(err), ctxUtils.GinTraceIDField(c))
 		}
 	}
 	// 使用respJSONWith200函数返回错误信息。

goredis/logger.go

@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"time"
 
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/logger"
 
 	"github.com/redis/go-redis/v9"

grpc/interceptor/requstid.go

@@ -2,7 +2,7 @@ package interceptor
 
 import (
 	"context"
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 	"sync"
 
 	grpc_metadata "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata"

httpcli/httpcli.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
+	"gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/utils/xjson"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xerrors/xerror"
@@ -255,7 +255,7 @@ func (req *Request) push(ctx context.Context) (*Response, error) {
 		buf = bytes.NewBufferString(req.body)
 	}
 
-	logger.Info("httpcli req", logger.String("body", buf.String()), xctx.CtxTraceIDField(ctx))
+	logger.Info("httpcli req", logger.String("body", buf.String()), ctxUtils.CtxTraceIDField(ctx))
 	return req.send(ctx, buf, buf)
 }
 
@@ -291,14 +291,14 @@ func getRequestBody(buf *bytes.Buffer, maxLen int) []byte {
 }
 
 func (req *Request) send(ctx context.Context, body io.Reader, buf *bytes.Buffer) (*Response, error) {
-	logger.Info("httpcli req", logger.String("url", req.url), xctx.CtxTraceIDField(ctx))
+	logger.Info("httpcli req", logger.String("url", req.url), ctxUtils.CtxTraceIDField(ctx))
 	req.request, req.err = http.NewRequest(req.method, req.url, body)
 	if req.err != nil {
 		return nil, req.err
 	}
 	if buf != nil {
-		requestID := xctx.CtxRequestID(ctx)
-		xctx.SetVal(ctx, fmt.Sprintf("oApiReq-%s", requestID), buf.Bytes())
+		requestID := ctxUtils.CtxRequestID(ctx)
+		ctxUtils.SetVal(ctx, fmt.Sprintf("oApiReq-%s", requestID), buf.Bytes())
 	}
 	if req.customRequest != nil {
 		req.customRequest(req.request, buf)
@@ -310,7 +310,7 @@ func (req *Request) send(ctx context.Context, body io.Reader, buf *bytes.Buffer)
 		}
 	}
 
-	req.request.Header.Add(xctx.HeaderXRequestIDKey, xctx.CtxRequestID(ctx))
+	req.request.Header.Add(ctxUtils.HeaderXRequestIDKey, ctxUtils.CtxRequestID(ctx))
 
 	if req.timeout < 1 {
 		req.timeout = defaultTimeout
@@ -327,7 +327,7 @@ func (req *Request) send(ctx context.Context, body io.Reader, buf *bytes.Buffer)
 		err = retry.Retry(func() error {
 			response, err := client.Do(req.request)
 			if err != nil {
-				logger.Info("httpcli fail", logger.Any("err", err), xctx.CtxTraceIDField(ctx))
+				logger.Info("httpcli fail", logger.Any("err", err), ctxUtils.CtxTraceIDField(ctx))
 				return xerror.Wrap(err, "client do")
 			}
 			if response != nil {
@@ -342,8 +342,8 @@ func (req *Request) send(ctx context.Context, body io.Reader, buf *bytes.Buffer)
 					return xerror.New(err.Error())
 				}
 				bodyBuf := bytes.NewBuffer(body)
-				xctx.SetVal(ctx, fmt.Sprintf("oApiRsp-%s", xctx.CtxRequestID(ctx)), bodyBuf.Bytes())
-				logger.Info("httpcli rsp", logger.Any("body", bodyBuf.String()), xctx.CtxTraceIDField(ctx))
+				ctxUtils.SetVal(ctx, fmt.Sprintf("oApiRsp-%s", ctxUtils.CtxRequestID(ctx)), bodyBuf.Bytes())
+				logger.Info("httpcli rsp", logger.Any("body", bodyBuf.String()), ctxUtils.CtxTraceIDField(ctx))
 				if body != nil {
 					resp.Body = io.NopCloser(bodyBuf)
 				}
@@ -380,8 +380,8 @@ func (req *Request) send(ctx context.Context, body io.Reader, buf *bytes.Buffer)
 				err = xerror.New(e.Error())
 			}
 			bodyBuf := bytes.NewBuffer(body)
-			xctx.SetVal(ctx, fmt.Sprintf("oApiRsp-%s", xctx.CtxRequestID(ctx)), bodyBuf.Bytes())
-			logger.Info("httpcli rsp", logger.Any("body", bodyBuf.String()), xctx.CtxTraceIDField(ctx))
+			ctxUtils.SetVal(ctx, fmt.Sprintf("oApiRsp-%s", ctxUtils.CtxRequestID(ctx)), bodyBuf.Bytes())
+			logger.Info("httpcli rsp", logger.Any("body", bodyBuf.String()), ctxUtils.CtxTraceIDField(ctx))
 			if body != nil {
 				resp.Body = io.NopCloser(bodyBuf)
 			}
@@ -389,7 +389,7 @@ func (req *Request) send(ctx context.Context, body io.Reader, buf *bytes.Buffer)
 	}
 
 	if err != nil {
-		logger.Error("httpcli fail", logger.Any("err", err), xctx.CtxTraceIDField(ctx))
+		logger.Error("httpcli fail", logger.Any("err", err), ctxUtils.CtxTraceIDField(ctx))
 	}
 
 	req.response = resp

utils/uriUtils/uriUtils.go

+package uriUtils
+
+import (
+	"net/url"
+)
+
+func URLValuePairsToMap(query string) (map[string]any, error) {
+	values, err := url.ParseQuery(query)
+	if err != nil {
+		return nil, err
+	}
+
+	data := make(map[string]interface{})
+	for key, val := range values {
+		if len(val) == 1 {
+			data[key] = val[0]
+		} else {
+			data[key] = val
+		}
+	}
+	return data, nil
+}

utils/wg/wg.go

@@ -2,7 +2,7 @@ package wg
 
 import (
 	"context"
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xerrors/xerror"
 	"sync"

ws/ws.go

@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/xctx"
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/jwt"
 	"gitlab.wanzhuangkj.com/tush/xpkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf"