update encode time and context

gohp · Sep 27, 2022 · c9d33e9 · c9d33e9
1 parent 3093016
commit c9d33e9
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 89 deletions.
diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ c.SetCaller(true)
 
 ```go
 import (
- "github.com/wzyonggege/logger"
+ "github.com/gohp/logger"
 )
 
 ...
@@ -91,7 +91,7 @@ logger.Debugf("debug level test: %s", "111")
 5. with args
 ```go
 import (
- "github.com/wzyonggege/logger"
+ "github.com/gohp/logger"
 )
 
 ...
@@ -116,28 +116,4 @@ BenchmarkLogger/logde_logger_without_fields_write_into_file-4             200000
 BenchmarkLogger/logde_logger_with_fields_write_into_file-4                100000             12606 ns/op
 ```
 
-6. sentry
-
-```go
-c := logger.New()
-c.SetDivision("time")     // 设置归档方式，"time"时间归档 "size" 文件大小归档，文件大小等可以在配置文件配置
-c.SetTimeUnit(logger.Day) // 时间归档 可以设置切割单位
-c.SetEncoding("json")     // 输出格式 "json" 或者 "console"
-//c.Stacktrace = true
-
-c.SetInfoFile("./logs/server.log")      // 设置info级别日志
-c.SetErrorFile("./logs/server_err.log") // 设置warn级别日志
-
-c.SentryConfig = logger.SentryLoggerConfig{
-    DSN:              "sentry dsn",
-    Debug:            true,
-    AttachStacktrace: true,
-    Environment:      "dev",
-    Tags: map[string]string{
-        "source": "demo",
-    },
-}
-
-c.InitLogger()
-```
 
diff --git a/example/main.go b/example/main.go
@@ -1,10 +1,11 @@
 package main
 
 import (
+	"context"
 	"errors"
+	"github.com/gin-gonic/gin"
 	"github.com/gohp/logger"
 	"github.com/spf13/pflag"
-	"time"
 )
 
 var (
@@ -17,28 +18,43 @@ func init() {
 
 func main() {
 	c := logger.New()
-	c.SetDivision("time")     // 设置归档方式，"time"时间归档 "size" 文件大小归档，文件大小等可以在配置文件配置
-	c.SetTimeUnit(logger.Day) // 时间归档 可以设置切割单位
-	c.SetEncoding("json")     // 输出格式 "json" 或者 "console"
-	//c.Stacktrace = true
-
+	c.SetDivision("time")                   // 设置归档方式，"time"时间归档 "size" 文件大小归档，文件大小等可以在配置文件配置
+	c.SetTimeUnit(logger.Day)               // 时间归档 可以设置切割单位
+	c.SetEncoding("json")                   // 输出格式 "json" 或者 "console"
+	c.Stacktrace = true                     // 添加 Stacktrace, 默认false
 	c.SetInfoFile("./logs/server.log")      // 设置info级别日志
 	c.SetErrorFile("./logs/server_err.log") // 设置warn级别日志
-	c.InitLogger()
+	c.SetEncodeTime("2006-01-02 15:04:05")  // 设置时间格式
+	c.InitLogger()                          // 初始化
 
 	logger.Info("info level test")
 	logger.Error("dsdadadad level test", logger.WithError(errors.New("sabhksasas")))
 	logger.Error("121212121212 error")
 	logger.Warn("warn level test")
 	logger.Debug("debug level test")
-
-	time.Sleep(2 * time.Second) // 避免程序结束太快，没有上传sentry
-
 	logger.Infof("info level test: %s", "111")
 	logger.Errorf("error level test: %s", "111")
 	logger.Warnf("warn level test: %s", "111")
 	logger.Debugf("debug level test: %s", "111")
-
 	logger.Info("this is a log", logger.With("Trace", "12345677"))
 	logger.Info("this is a log", logger.WithError(errors.New("this is a new error")))
+
+	// AddContext for context.Context
+	ctx := context.Background()
+	ctx = logger.AddContext(ctx, logger.With("trace", "12345678"))
+	logger.Ctx(ctx).Info("info logger with ctx value")
+	logger.Ctx(ctx).Error("warn logger with ctx value")
+
+	// GAddContext for gin
+	g := gin.New()
+	g.Use(func(c *gin.Context) {
+		logger.GAddContext(c, logger.With("trace", "12345678"))
+		c.Next()
+	})
+	g.GET("/", func(c *gin.Context) {
+		logger.Ctx(c).Infof("get request url: %v", c.Request.URL)
+		return
+	})
+	g.Run()
+	// {"level":"info","time":"2022-09-27 16:23:08","msg":"get request: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36"}
 }
diff --git a/go.mod b/go.mod
@@ -4,13 +4,13 @@ go 1.17
 
 require (
 	github.com/BurntSushi/toml v1.2.0
-	github.com/gin-gonic/gin v1.8.1
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/spf13/pflag v1.0.5
 	go.uber.org/zap v1.23.0
 )
 
 require (
+	github.com/gin-gonic/gin v1.8.1
 	github.com/jonboulle/clockwork v0.3.0 // indirect
 	github.com/lestrrat-go/strftime v1.0.6 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
@@ -34,9 +34,8 @@ require (
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
+	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
 	golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 // indirect
 	golang.org/x/text v0.3.6 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,7 +1,6 @@
 github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
 github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
-github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -53,7 +52,6 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
 github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU=
 github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -64,63 +62,37 @@ github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6po
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo=
 github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
 github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
 go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 h1:siQdpVirKtzPhKl3lZWozZraCFObP8S1v6PRp0bLrtU=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
@@ -136,4 +108,3 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/logde.go b/logde.go
@@ -1,6 +1,7 @@
 package logger
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"github.com/BurntSushi/toml"
@@ -13,7 +14,6 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
-	"strconv"
 	"time"
 )
 
@@ -57,9 +57,9 @@ type LogOptions struct {
 	LevelSeparate bool     `json:"level_separate" yaml:"level_separate" toml:"level_separate"`
 	TimeUnit      TimeUnit `json:"time_unit" yaml:"time_unit" toml:"time_unit"`
 	Stacktrace    bool     `json:"stacktrace" yaml:"stacktrace" toml:"stacktrace"`
-	//SentryConfig  SentryLoggerConfig `json:"sentry_config" yaml:"sentry_config" toml:"sentry_config"`
-	closeDisplay int
-	caller       bool
+	EncodeTime    string   `json:"encode_time" yaml:"encode_time" toml:"encode_time"`
+	closeDisplay  int
+	caller        bool
 }
 
 func infoLevel() zap.LevelEnablerFunc {
@@ -122,6 +122,10 @@ func (c *LogOptions) SetDivision(division string) {
 	c.Division = division
 }
 
+func (c *LogOptions) SetEncodeTime(format string) {
+	c.EncodeTime = format
+}
+
 func (c *LogOptions) CloseConsoleDisplay() {
 	c.closeDisplay = 1
 }
@@ -163,6 +167,9 @@ func (c *LogOptions) InitLogger() *Log {
 	if c.Encoding == "" {
 		c.Encoding = _defaultEncoding
 	}
+	if c.EncodeTime == "" {
+		c.EncodeTime = RFC3339
+	}
 	encoder := _encoderNameToConstructor[c.Encoding]
 
 	encoderConfig := zapcore.EncoderConfig{
@@ -174,7 +181,7 @@ func (c *LogOptions) InitLogger() *Log {
 		StacktraceKey:  "stacktrace",
 		LineEnding:     zapcore.DefaultLineEnding,
 		EncodeLevel:    zapcore.LowercaseLevelEncoder,
-		EncodeTime:     zapcore.ISO8601TimeEncoder,
+		EncodeTime:     zapcore.TimeEncoderOfLayout(c.EncodeTime),
 		EncodeDuration: zapcore.SecondsDurationEncoder,
 		EncodeCaller:   zapcore.FullCallerEncoder,
 	}
@@ -314,34 +321,51 @@ func WithError(err error) zap.Field {
 	return zap.NamedError("error", err)
 }
 
-// 给指定的context添加字段（关键方法）
-func AddContext(ctx *gin.Context, fields ...zap.Field) {
-	l, _ := ctx.Get(strconv.Itoa(0))
+func AddContext(ctx context.Context, fields ...zap.Field) context.Context {
+	l := ctx.Value("_logger_ctx_val")
+	logArgs, ok := l.([]zap.Field)
+	if ok || logArgs == nil {
+		logArgs = append(logArgs, fields...)
+		ctx = context.WithValue(ctx, "_logger_ctx_val", logArgs)
+	}
+	return ctx
+}
+
+func GAddContext(ctx *gin.Context, fields ...zap.Field) {
+	l, _ := ctx.Get("_logger_ctx_val")
 	logArgs, ok := l.([]zap.Field)
 	if ok || logArgs == nil {
 		logArgs = append(logArgs, fields...)
-		ctx.Set(strconv.Itoa(0), logArgs)
+		ctx.Set("_logger_ctx_val", logArgs)
 	}
 }
 
-// 从指定的context返回一个zap实例（关键方法）
-func WithContext(ctx *gin.Context) *Log {
+func withContext(ctx context.Context) *Log {
 	if ctx == nil {
 		return nil
 	}
-	l, _ := ctx.Get(strconv.Itoa(0))
+	l := ctx.Value("_logger_ctx_val")
 	logArgs, _ := l.([]zap.Field)
 
 	ctxLogger := &Log{
 		L: Logger.L,
 	}
-
 	if len(logArgs) > 0 {
 		ctxLogger.L = ctxLogger.L.With(logArgs...)
 	}
 	return ctxLogger
 }
 
+// WithContext old used
+func WithContext(ctx context.Context) *Log {
+	return withContext(ctx)
+}
+
+// Ctx new func
+func Ctx(ctx context.Context) *Log {
+	return withContext(ctx)
+}
+
 func (l *Log) Info(msg string, args ...zap.Field) {
 	l.L.Info(msg, args...)
 }

diff --git a/unit.go b/unit.go
@@ -7,11 +7,12 @@ import (
 type TimeUnit string
 
 const (
-	Minute = "minute"
-	Hour   = "hour"
-	Day    = "day"
-	Month  = "month"
-	Year   = "year"
+	Minute  = "minute"
+	Hour    = "hour"
+	Day     = "day"
+	Month   = "month"
+	Year    = "year"
+	RFC3339 = "2006-01-02T15:04:05Z07:00"
 )
 
 func (t TimeUnit) Format() string {