diff --git a/api_gorm.go b/api_gorm.go index 5a6f438..31abb13 100644 --- a/api_gorm.go +++ b/api_gorm.go @@ -9,6 +9,7 @@ import ( "go.dtapp.net/gourl" "gorm.io/datatypes" "gorm.io/gorm" + "log" "time" "unicode/utf8" ) @@ -63,7 +64,7 @@ func (c *ApiClient) GormMiddleware(ctx context.Context, request gorequest.Respon if request.ResponseHeader.Get("Content-Type") == "image/jpeg" || request.ResponseHeader.Get("Content-Type") == "image/png" { return } - c.gormRecord(ctx, apiPostgresqlLog{ + err := c.gormRecord(ctx, apiPostgresqlLog{ RequestTime: request.RequestTime, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 RequestUrl: gourl.UriParse(request.RequestUri).Url, //【请求】链接 @@ -78,11 +79,14 @@ func (c *ApiClient) GormMiddleware(ctx context.Context, request gorequest.Respon ResponseTime: request.ResponseTime, //【返回】时间 SdkVersion: sdkVersion, //【程序】Sdk版本 }) + if err != nil { + log.Println("log.GormMiddleware：", err.Error()) + } } // GormMiddlewareXml 中间件 func (c *ApiClient) GormMiddlewareXml(ctx context.Context, request gorequest.Response, sdkVersion string) { - c.gormRecord(ctx, apiPostgresqlLog{ + err := c.gormRecord(ctx, apiPostgresqlLog{ RequestTime: request.RequestTime, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 RequestUrl: gourl.UriParse(request.RequestUri).Url, //【请求】链接 @@ -97,11 +101,14 @@ func (c *ApiClient) GormMiddlewareXml(ctx context.Context, request gorequest.Res ResponseTime: request.ResponseTime, //【返回】时间 SdkVersion: sdkVersion, //【程序】Sdk版本 }) + if err != nil { + log.Println("log.GormMiddlewareXml：", err.Error()) + } } // GormMiddlewareCustom 中间件 func (c *ApiClient) GormMiddlewareCustom(ctx context.Context, api string, request gorequest.Response, sdkVersion string) { - c.gormRecord(ctx, apiPostgresqlLog{ + err := c.gormRecord(ctx, apiPostgresqlLog{ RequestTime: request.RequestTime, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 RequestUrl: gourl.UriParse(request.RequestUri).Url, //【请求】链接 @@ -116,4 +123,7 @@ func (c *ApiClient) GormMiddlewareCustom(ctx context.Context, api string, reques ResponseTime: request.ResponseTime, //【返回】时间 SdkVersion: sdkVersion, //【程序】Sdk版本 }) + if err != nil { + log.Println("log.GormMiddlewareCustom：", err.Error()) + } } diff --git a/const.go b/const.go index f4bd6c2..73f208b 100644 --- a/const.go +++ b/const.go @@ -1,3 +1,3 @@ package golog -const Version = "1.0.25" +const Version = "1.0.26" diff --git a/gin_gorm.go b/gin_gorm.go index 9e24378..e24e77e 100644 --- a/gin_gorm.go +++ b/gin_gorm.go @@ -12,6 +12,7 @@ import ( "gorm.io/datatypes" "gorm.io/gorm" "io/ioutil" + "log" "net" "time" ) @@ -132,7 +133,7 @@ func (c *GinClient) GormMiddleware() gin.HandlerFunc { host = "https://" + ginCtx.Request.Host } if len(jsonBody) > 0 { - c.gormRecord(ginPostgresqlLog{ + err := c.gormRecord(ginPostgresqlLog{ TraceId: gotrace_id.GetGinTraceId(ginCtx), //【系统】链编号 RequestTime: requestTime, //【请求】时间 RequestUri: host + ginCtx.Request.RequestURI, //【请求】请求链接 @@ -156,8 +157,11 @@ func (c *GinClient) GormMiddleware() gin.HandlerFunc { ResponseData: datatypes.JSON(responseBody), //【返回】数据 CostTime: endTime - startTime, //【系统】花费时间 }) + if err != nil { + log.Println("log.gormRecord：", err.Error()) + } } else { - c.gormRecord(ginPostgresqlLog{ + err := c.gormRecord(ginPostgresqlLog{ TraceId: gotrace_id.GetGinTraceId(ginCtx), //【系统】链编号 RequestTime: requestTime, //【请求】时间 RequestUri: host + ginCtx.Request.RequestURI, //【请求】请求链接 @@ -181,6 +185,9 @@ func (c *GinClient) GormMiddleware() gin.HandlerFunc { ResponseData: datatypes.JSON(responseBody), //【返回】数据 CostTime: endTime - startTime, //【系统】花费时间 }) + if err != nil { + log.Println("log.gormRecord：", err.Error()) + } } } }() diff --git a/go.mod b/go.mod index 66670a1..f44d6f9 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,12 @@ go 1.19 require ( github.com/gin-gonic/gin v1.8.1 github.com/natefinch/lumberjack v2.0.0+incompatible - go.dtapp.net/dorm v1.0.17 + go.dtapp.net/dorm v1.0.19 go.dtapp.net/goip v1.0.25 go.dtapp.net/gojson v1.0.1 go.dtapp.net/gorequest v1.0.26 go.dtapp.net/gotime v1.0.5 - go.dtapp.net/gotrace_id v1.0.0 + go.dtapp.net/gotrace_id v1.0.2 go.dtapp.net/gourl v1.0.0 go.dtapp.net/goxml v1.0.1 go.mongodb.org/mongo-driver v1.10.1 diff --git a/go.sum b/go.sum index 127e9c7..a656bf2 100644 --- a/go.sum +++ b/go.sum @@ -501,8 +501,8 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -go.dtapp.net/dorm v1.0.17 h1:3VQKUl05CDxFg3T1c/M8wYf2I+H+oVGBDh4NCV30nn0= -go.dtapp.net/dorm v1.0.17/go.mod h1:bHG7BmgeLaAlc56myYF63lwZAIuMeWRAqHBb/L84dLM= +go.dtapp.net/dorm v1.0.19 h1:3uH4tYZ5zH4knx9o6BJlE3rFiWNWTyMxlpt0Cwoq7zE= +go.dtapp.net/dorm v1.0.19/go.mod h1:bHG7BmgeLaAlc56myYF63lwZAIuMeWRAqHBb/L84dLM= go.dtapp.net/goip v1.0.25 h1:GSgQkR7dc28TX8E1mF3wAy+EEGZ++tgqc8Q85OKZPEY= go.dtapp.net/goip v1.0.25/go.mod h1:dKeNuWJttH4AvvYVHV0FagB6BVvFM1HGDKFxLKr+hkQ= go.dtapp.net/gojson v1.0.1 h1:MHeSGlq1KxzL7rCkm18fhwW4GNORHohdDMmxY5PupKY= @@ -515,8 +515,8 @@ go.dtapp.net/gostring v1.0.6 h1:XqNaThEfHpweLofru5sBqm1UUzc9JWsXyB/M/rTk29w= go.dtapp.net/gostring v1.0.6/go.mod h1:AMnnLjyNxH+cphxyASJGYCzWpVrkP5RncuVo8xL8s3E= go.dtapp.net/gotime v1.0.5 h1:12aNgB2ULpP6QgQHEUkLilZ4ASvhpFxMFQkBwn0par8= go.dtapp.net/gotime v1.0.5/go.mod h1:Gq7eNLr2iMLP18UNWONRq4V3Uhf/ADp4bIrS+Tc6ktY= -go.dtapp.net/gotrace_id v1.0.0 h1:nlI8KEEf2l394SCzmJxffEIiOBfR4kIOuobBhpRSV3g= -go.dtapp.net/gotrace_id v1.0.0/go.mod h1:HDwMY1vLoC759z6VGKVgCpIqwKQTDYV9DNdxiyN1OeQ= +go.dtapp.net/gotrace_id v1.0.2 h1:wSc7dYzkAwSz3MbPu2Io4XqHe0l0dIaJe3vlpDAZrXY= +go.dtapp.net/gotrace_id v1.0.2/go.mod h1:476T5KMJw9c6DM/rJn7y6d28hcNDv4+wew4sd+powes= go.dtapp.net/gourl v1.0.0 h1:Zbe0GiMFyyRy2+bjbVsYulakH5d58w3CDZkUPonlMoQ= go.dtapp.net/gourl v1.0.0/go.mod h1:x9A/pJ3iKDTb6Gu2RtJy2iHg56IowXIcIGQdogqpGjs= go.dtapp.net/goxml v1.0.1 h1:WODsjNpmHTtoeLsXgOjC81qRbu4aXZ3LKBHApNGaPjY=