修改输出日志

gin/middleware/logging.go

@@ -5,6 +5,7 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/httpcli/entity"
 	"io"
 	"net/http"
+	"strings"
 	"time"
 
 	ctxUtils "gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
@@ -16,7 +17,8 @@ import (
 
 var (
 	// Print body max length
-	defaultMaxLength = 300
+	defaultMaxLength      = 300
+	defaultMediaMaxLength = 300
 
 	// default zap log
 	defaultLogger, _ = zap.NewProduction()
@@ -37,19 +39,21 @@ type Option func(*options)
 
 func defaultOptions() *options {
 	return &options{
-		maxLength:    defaultMaxLength,
-		log:          defaultLogger,
-		ignoreRoutes: defaultIgnoreRoutes,
-		traceIDFrom:  0,
+		maxLength:      defaultMaxLength,
+		mediaMaxLength: defaultMediaMaxLength,
+		log:            defaultLogger,
+		ignoreRoutes:   defaultIgnoreRoutes,
+		traceIDFrom:    0,
 	}
 }
 
 type options struct {
-	maxLength    int
-	appName      string
-	log          *zap.Logger
-	ignoreRoutes map[string]struct{}
-	traceIDFrom  int // 0: ignore, 1: from context, 2: from header
+	maxLength      int
+	mediaMaxLength int
+	appName        string
+	log            *zap.Logger
+	ignoreRoutes   map[string]struct{}
+	traceIDFrom    int // 0: ignore, 1: from context, 2: from header
 }
 
 func (o *options) apply(opts ...Option) {
@@ -68,6 +72,15 @@ func WithMaxLen(maxLen int) Option {
 	}
 }
 
+func WithMediaMaxLen(maxLen int) Option {
+	return func(o *options) {
+		if maxLen < len(contentMark) {
+			panic("mediaMaxLength should be greater than or equal to 8")
+		}
+		o.mediaMaxLength = maxLen
+	}
+}
+
 // WithLog set log
 func WithLog(log *zap.Logger) Option {
 	return func(o *options) {
@@ -220,6 +233,11 @@ func Logging(opts ...Option) gin.HandlerFunc {
 		// processing requests
 		c.Next()
 
+		contentType := c.Writer.Header().Get("Content-Type")
+		isMedia := false
+		if strings.Contains(contentType, "image") {
+			isMedia = true
+		}
 		//print return message after processing
 		fields = []zap.Field{
 			zap.Int("code", c.Writer.Status()),
@@ -229,7 +247,11 @@ func Logging(opts ...Option) gin.HandlerFunc {
 			zap.String("cost", time.Since(start).String()),
 			zap.Int("size", newWriter.body.Len()),
 			zap.Any("header", c.Writer.Header()),
-			zap.ByteString("body", getResponseBody(newWriter.body, o.maxLength)),
+		}
+		if isMedia {
+			fields = append(fields, zap.ByteString("body", getResponseBody(newWriter.body, o.mediaMaxLength)))
+		} else {
+			fields = append(fields, zap.ByteString("body", getResponseBody(newWriter.body, o.maxLength)))
 		}
 		if reqID != "" {
 			fields = append(fields, zap.String(ctxUtils.ContextTraceIDKey.String(), reqID))

utils/retryUtils/retryUtils.go

-package xretry
+package retryUtils
 
 import (
 	"context"