diff --git a/log/log.go b/log/log.go index 22ac1a5..da5bcb1 100644 --- a/log/log.go +++ b/log/log.go @@ -3,7 +3,7 @@ package log import ( "context" "fmt" - "github.com/gogf/gf/v2/frame/g" + "github.com/gogf/gf/v2/os/glog" "go.uber.org/zap" ) @@ -96,43 +96,43 @@ func HandleLog(log *LogInfo) { log.Result = processValue(log.Result) } -func GFInfo(ctx context.Context, log *LogInfo) { +func GFInfo(ctx context.Context, g *glog.Logger, log *LogInfo) { HandleLog(log) - g.Log().Info(ctx, log) + g.Info(ctx, log) } -func GFWarning(ctx context.Context, log *LogInfo) { +func GFWarning(ctx context.Context, g *glog.Logger, log *LogInfo) { HandleLog(log) - g.Log().Warning(ctx, log) + g.Warning(ctx, log) } -func GFError(ctx context.Context, log *LogInfo) { +func GFError(ctx context.Context, g *glog.Logger, log *LogInfo) { HandleLog(log) - g.Log().Error(ctx, log) + g.Error(ctx, log) } -func GFDebug(ctx context.Context, log *LogInfo) { +func GFDebug(ctx context.Context, g *glog.Logger, log *LogInfo) { HandleLog(log) - g.Log().Debug(ctx, log) + g.Debug(ctx, log) } -func GFPanic(ctx context.Context, log *LogInfo) { +func GFPanic(ctx context.Context, g *glog.Logger, log *LogInfo) { HandleLog(log) - g.Log().Panic(ctx, log) + g.Panic(ctx, log) } -func GFFatal(ctx context.Context, log *LogInfo) { +func GFFatal(ctx context.Context, g *glog.Logger, log *LogInfo) { HandleLog(log) - g.Log().Fatal(ctx, log) + g.Fatal(ctx, log) } -func (l *LogInfo) GFCommonHandelResult(ctx context.Context, result interface{}, err error) { +func (l *LogInfo) GFCommonHandelResult(ctx context.Context, g *glog.Logger, result interface{}, err error) { if err != nil { l.Result = err - GFError(ctx, l) + GFError(ctx, g, l) } else { l.Result = result - GFInfo(ctx, l) + GFInfo(ctx, g, l) } }