diff --git a/go.mod b/go.mod index 325d5aa..286d370 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.18.0 require ( github.com/dromara/carbon/v2 v2.6.4 go.uber.org/zap v1.27.0 + github.com/gogf/gf/v2 v2.7.2 ) require go.uber.org/multierr v1.10.0 // indirect diff --git a/go.sum b/go.sum index 226bc9a..dbb1a47 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/dromara/carbon/v2 v2.6.4 h1:cpIansyiEIEed3OlEIqo1IXj86qu0x6pf/E2keL2wYo= github.com/dromara/carbon/v2 v2.6.4/go.mod h1:Baj3A1uBBctJmpZWJd6/+WWnmIuY2pobR6IOpB6xigc= +github.com/gogf/gf/v2 v2.7.2/go.mod h1:EBXneAg/wes86rfeh68XC0a2JBNQylmT7Sp6/8Axk88= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/log.go b/log/log.go similarity index 81% rename from log.go rename to log/log.go index 5e6ffee..4181be8 100644 --- a/log.go +++ b/log/log.go @@ -1,9 +1,10 @@ -package common_structure +package log import ( + "context" "fmt" - "github.com/dromara/carbon/v2" + "github.com/gogf/gf/v2/frame/g" "go.uber.org/zap" ) @@ -83,3 +84,33 @@ func handleLog(log *LogInfo) { log.Result = nil } } + +func GFInfo(ctx context.Context, log *LogInfo) { + handleLog(log) + g.Log().Info(ctx, log) +} + +func GFWarning(ctx context.Context, log *LogInfo) { + handleLog(log) + g.Log().Warning(ctx, log) +} + +func GFError(ctx context.Context, log *LogInfo) { + handleLog(log) + g.Log().Error(ctx, log) +} + +func GFDebug(ctx context.Context, log *LogInfo) { + handleLog(log) + g.Log().Debug(ctx, log) +} + +func GFPanic(ctx context.Context, log *LogInfo) { + handleLog(log) + g.Log().Panic(ctx, log) +} + +func GFFatal(ctx context.Context, log *LogInfo) { + handleLog(log) + g.Log().Fatal(ctx, log) +}