From b4d462695a9c892d79474d54c76d94eeb998d448 Mon Sep 17 00:00:00 2001 From: lingxin <961347548@qq.com> Date: Mon, 11 Aug 2025 12:07:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++++ lxzap/lxzap.go | 2 +- lxzap/zapGorm2.go | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4720374..a56c483 100644 --- a/README.md +++ b/README.md @@ -82,3 +82,7 @@ type User struct { #### 变更 - 修改GORM封装方法中的AND,使其代替原本的Ors函数,防止SQL注入 +### v1.0.7 2025-08-11 + +#### 变更 +- 修改日志打印栈信息 diff --git a/lxzap/lxzap.go b/lxzap/lxzap.go index f893bca..02d45cf 100644 --- a/lxzap/lxzap.go +++ b/lxzap/lxzap.go @@ -157,7 +157,7 @@ func Log(msg any, ctx context.Context) { v := ctx.Value("X-Span-ID") spanId := fmt.Sprintf("%v", v) //zap.L().Info(`spanId:"` + spanId + `"log:` + msg) - zap.L().Info("fmt", + zap.L().WithOptions(zap.AddCallerSkip(1)).Info("fmt", zap.Any("content", msg), zap.String("spanId", spanId)) } diff --git a/lxzap/zapGorm2.go b/lxzap/zapGorm2.go index 40e3854..9fa9cfb 100644 --- a/lxzap/zapGorm2.go +++ b/lxzap/zapGorm2.go @@ -90,6 +90,8 @@ func (l Logger) Trace(ctx context.Context, begin time.Time, fc func() (string, i var ( gormPackage = filepath.Join("gorm.io", "gorm") zapgormPackage = filepath.Join("moul.io", "zapgorm2") + zapgormlxdb = filepath.Join("lxDb", "sql") + zapgormmodel = filepath.Join("model", "") ) func (l Logger) logger() *zap.Logger { @@ -101,6 +103,8 @@ func (l Logger) logger() *zap.Logger { case strings.HasSuffix(file, "_test.go"): case strings.Contains(file, gormPackage): case strings.Contains(file, zapgormPackage): + case strings.Contains(file, zapgormlxdb): + case strings.Contains(file, zapgormmodel): default: return l.ZapLogger.WithOptions(zap.AddCallerSkip(i - 1)) }