update

database/mysql.go

@@ -9,7 +9,7 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/mysql"
-	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
+	utils "gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 func InitMysql(dbConfig *config.Database) (*sgorm.DB, error) {

pkg/httpcli/httpcli.go

@@ -22,7 +22,7 @@ import (
 	retryutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/retryutils"
 )
 
-const defaultTimeout = 30 * time.Second
+const defaultTimeout = 60 * time.Second
 
 type Request struct {
 	cli         *http.Client

pkg/logger/logger.go

@@ -192,14 +192,14 @@ func checkNil() {
 
 func InitZapWriter(logger *zap.Logger) *ZapWriter {
 	return &ZapWriter{
-		logger: logger,
-		level:  logger.Level(),
+		L:     logger,
+		level: logger.Level(),
 	}
 }
 
 type ZapWriter struct {
-	logger *zap.Logger
-	level  zapcore.Level // 日志级别（如 Info、Error）
+	L     *zap.Logger
+	level zapcore.Level // 日志级别（如 Info、Error）
 }
 
 // 实现 io.Writer 接口
@@ -207,9 +207,9 @@ func (w *ZapWriter) Write(p []byte) (n int, err error) {
 	msg := strings.TrimSuffix(string(p), "\n") // 去除 Gin 日志自带的换行符
 	switch w.level {
 	case zapcore.ErrorLevel:
-		w.logger.Error(msg)
+		w.L.Error(msg)
 	default:
-		w.logger.Info(msg)
+		w.L.Info(msg)
 	}
 	return len(p), nil
 }

pkg/sgorm/glog/glog.go

@@ -3,12 +3,14 @@ package glog
 
 import (
 	"context"
+	"errors"
 	"runtime"
 	"strconv"
 	"strings"
 	"time"
 
 	"go.uber.org/zap"
+	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 )
 
@@ -17,15 +19,16 @@ const (
 )
 
 type gormLogger struct {
-	gLog         *zap.Logger
-	requestIDKey string
-	logLevel     logger.LogLevel
+	gLog                      *zap.Logger
+	requestIDKey              string
+	IgnoreRecordNotFoundError bool
+	logLevel                  logger.LogLevel
 }
 
 // NewCustomGormLogger custom gorm logger
-func NewCustomGormLogger(l *zap.Logger, requestIDKey string, logLevel logger.LogLevel) logger.Interface {
+func NewCustomGormLogger(l *zap.Logger, requestIDKey string, logLevel logger.LogLevel, opts ...zap.Option) logger.Interface {
 	if l == nil {
-		l, _ = zap.NewProduction()
+		l, _ = zap.NewProduction(opts...)
 	}
 	if requestIDKey == "" {
 		requestIDKey = "X-Request-ID"
@@ -34,9 +37,10 @@ func NewCustomGormLogger(l *zap.Logger, requestIDKey string, logLevel logger.Log
 		logLevel = logger.Info
 	}
 	return &gormLogger{
-		gLog:         l,
-		requestIDKey: requestIDKey,
-		logLevel:     logLevel,
+		gLog:                      l,
+		requestIDKey:              requestIDKey,
+		logLevel:                  logLevel,
+		IgnoreRecordNotFoundError: true,
 	}
 }
 
@@ -97,14 +101,24 @@ func (l *gormLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql
 
 	sql = clearSql(sql)
 	if err != nil {
-		l.gLog.Warn("[gorm]",
-			zap.Error(err),
-			zap.String("sql", sql),
-			rowsField,
-			zap.String("cost", cost),
-			fileLineField,
-			requestIDField(ctx, l.requestIDKey),
-		)
+		if errors.Is(err, gorm.ErrRecordNotFound) && l.IgnoreRecordNotFoundError {
+			l.gLog.Info("[gorm]",
+				zap.String("sql", sql),
+				rowsField,
+				zap.String("cost", cost),
+				fileLineField,
+				requestIDField(ctx, l.requestIDKey),
+			)
+		} else {
+			l.gLog.Warn("[gorm]",
+				zap.Error(err),
+				zap.String("sql", sql),
+				rowsField,
+				zap.String("cost", cost),
+				fileLineField,
+				requestIDField(ctx, l.requestIDKey),
+			)
+		}
 		return
 	}
 

pkg/sgorm/mysql/mysql.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"log"
 	"os"
+	"time"
 
 	"github.com/uptrace/opentelemetry-go-extra/otelgorm"
 	mysqlDriver "gorm.io/driver/mysql"
@@ -83,12 +84,12 @@ func gormConfig(o *options) *gorm.Config {
 	// print SQL
 	if o.isLog {
 		if o.gLog == nil {
-			config.Logger = logger.Default.LogMode(o.logLevel)
+			config.Logger = defaultLogger().LogMode(o.logLevel)
 		} else {
 			config.Logger = glog.NewCustomGormLogger(o.gLog, o.requestIDKey, o.logLevel)
 		}
 	} else {
-		config.Logger = logger.Default.LogMode(logger.Silent)
+		config.Logger = defaultLogger().LogMode(logger.Silent)
 	}
 
 	// print only slow queries
@@ -96,9 +97,10 @@ func gormConfig(o *options) *gorm.Config {
 		config.Logger = logger.New(
 			log.New(os.Stdout, "\r\n", log.LstdFlags), // use the standard output asWriter
 			logger.Config{
-				SlowThreshold: o.slowThreshold,
-				Colorful:      true,
-				LogLevel:      logger.Warn, // set the logging level, only above the specified level will output the slow query log
+				SlowThreshold:             o.slowThreshold,
+				Colorful:                  true,
+				LogLevel:                  logger.Warn, // set the logging level, only above the specified level will output the slow query log
+				IgnoreRecordNotFoundError: true,
 			},
 		)
 	}
@@ -106,6 +108,15 @@ func gormConfig(o *options) *gorm.Config {
 	return config
 }
 
+func defaultLogger() logger.Interface {
+	return logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{
+		SlowThreshold:             200 * time.Millisecond,
+		LogLevel:                  logger.Warn,
+		IgnoreRecordNotFoundError: true,
+		Colorful:                  true,
+	})
+}
+
 func rwSeparationPlugin(o *options) gorm.Plugin {
 	slaves := []gorm.Dialector{}
 	for _, dsn := range o.slavesDsn {

xutils/ctxutils/ctx.go

@@ -118,11 +118,11 @@ func CtxTraceIDField(c context.Context) zap.Field {
 }
 
 func NewEmptyCtx() context.Context {
-	return context.WithValue(context.Background(), ContextTraceIDKey, GenerateTid())
+	return context.WithValue(context.TODO(), ContextTraceIDKey, GenerateTid())
 }
 
 func NewCtx(ctx context.Context) context.Context {
-	return context.WithValue(context.Background(), ContextTraceIDKey, ctx.Value(ContextTraceIDKey))
+	return context.WithValue(context.TODO(), ContextTraceIDKey, ctx.Value(ContextTraceIDKey))
 }
 
 func GetCtxString(c context.Context, key string) string {

xutils/retryutils/retry_utils.go

@@ -112,7 +112,7 @@ func Retry(retryFunc RetryFunc, opts ...Option) error {
 			select {
 			case <-after:
 			case <-config.context.Done():
-				return errors.New("retry is cancelled")
+				return errors.New("retry is cancelled, because request timeout or cancelled")
 			}
 		} else {
 			return nil