dtapps
/
golog
1
0
Fork 0
Code Issues Pull Requests Projects Releases 95 Wiki Activity

- update gin
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details

Browse Source
master v1.0.31
李光春 2 years ago
parent 65ec9457b0
commit b6ebc957a4
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File

2
const.go
Unescape View File

@ -1,3 +1,3 @@
package golog
const Version = "1.0.30"
const Version = "1.0.31"

21
gin_gorm.go
Unescape View File

@ -6,6 +6,7 @@ import (
"encoding/json"
"github.com/gin-gonic/gin"
"go.dtapp.net/gojson"
"go.dtapp.net/gorequest"
"go.dtapp.net/gotime"
"go.dtapp.net/gotrace_id"
"go.dtapp.net/gourl"
@ -97,6 +98,8 @@ func (c *GinClient) GormMiddleware() gin.HandlerFunc {
go func() {
var ctx = gotrace_id.SetGinTraceIdContext(context.Background(), ginCtx)
// 解析请求内容
var xmlBody map[string]string
var jsonBody map[string]interface{}
@ -105,19 +108,21 @@ func (c *GinClient) GormMiddleware() gin.HandlerFunc {
xmlBody = goxml.XmlDecode(string(data))
}
clientIp := gorequest.ClientIp(ginCtx.Request)
requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp := "", "", "", "", ""
if c.ipService != nil {
if net.ParseIP(ginCtx.ClientIP()).To4() != nil {
if net.ParseIP(clientIp).To4() != nil {
// 判断是不是IPV4
_, info := c.ipService.Ipv4(ginCtx.ClientIP())
_, info := c.ipService.Ipv4(clientIp)
requestClientIpCountry = info.Country
requestClientIpRegion = info.Region
requestClientIpProvince = info.Province
requestClientIpCity = info.City
requestClientIpIsp = info.ISP
} else if net.ParseIP(ginCtx.ClientIP()).To16() != nil {
} else if net.ParseIP(clientIp).To16() != nil {
// 判断是不是IPV6
info := c.ipService.Ipv6(ginCtx.ClientIP())
info := c.ipService.Ipv6(clientIp)
requestClientIpCountry = info.Country
requestClientIpProvince = info.Province
requestClientIpCity = info.City
@ -145,7 +150,7 @@ func (c *GinClient) GormMiddleware() gin.HandlerFunc {
RequestReferer: ginCtx.Request.Referer(), //【请求】请求referer
RequestBody: datatypes.JSON(gojson.JsonEncodeNoError(jsonBody)), //【请求】请求主体
RequestUrlQuery: datatypes.JSON(gojson.JsonEncodeNoError(ginCtx.Request.URL.Query())), //【请求】请求URL参数
RequestIp: ginCtx.ClientIP(), //【请求】请求客户端Ip
RequestIp: clientIp, //【请求】请求客户端Ip
RequestIpCountry: requestClientIpCountry, //【请求】请求客户端城市
RequestIpRegion: requestClientIpRegion, //【请求】请求客户端区域
RequestIpProvince: requestClientIpProvince, //【请求】请求客户端省份
@ -159,7 +164,7 @@ func (c *GinClient) GormMiddleware() gin.HandlerFunc {
})
if err != nil {
if c.config.logDebug == true {
c.logClient.Errorf(gotrace_id.SetGinTraceIdContext(context.Background(), ginCtx), err.Error())
c.logClient.Errorf(ctx, err.Error())
}
}
} else {
@ -175,7 +180,7 @@ func (c *GinClient) GormMiddleware() gin.HandlerFunc {
RequestReferer: ginCtx.Request.Referer(), //【请求】请求referer
RequestBody: datatypes.JSON(gojson.JsonEncodeNoError(xmlBody)), //【请求】请求主体
RequestUrlQuery: datatypes.JSON(gojson.JsonEncodeNoError(ginCtx.Request.URL.Query())), //【请求】请求URL参数
RequestIp: ginCtx.ClientIP(), //【请求】请求客户端Ip
RequestIp: clientIp, //【请求】请求客户端Ip
RequestIpCountry: requestClientIpCountry, //【请求】请求客户端城市
RequestIpRegion: requestClientIpRegion, //【请求】请求客户端区域
RequestIpProvince: requestClientIpProvince, //【请求】请求客户端省份
@ -189,7 +194,7 @@ func (c *GinClient) GormMiddleware() gin.HandlerFunc {
})
if err != nil {
if c.config.logDebug == true {
c.logClient.Errorf(gotrace_id.SetGinTraceIdContext(context.Background(), ginCtx), "[log.gormRecord]%s", err.Error())
c.logClient.Errorf(ctx, "[log.gormRecord]%s", err.Error())
}
}
}

4
go.mod
Unescape View File

@ -7,12 +7,12 @@ require (
github.com/natefinch/lumberjack v2.0.0+incompatible
github.com/rs/zerolog v1.27.0
github.com/sirupsen/logrus v1.9.0
go.dtapp.net/dorm v1.0.27
go.dtapp.net/dorm v1.0.28
go.dtapp.net/goip v1.0.25
go.dtapp.net/gojson v1.0.1
go.dtapp.net/gorequest v1.0.27
go.dtapp.net/gotime v1.0.5
go.dtapp.net/gotrace_id v1.0.5
go.dtapp.net/gotrace_id v1.0.6
go.dtapp.net/gourl v1.0.0
go.dtapp.net/goxml v1.0.1
go.uber.org/zap v1.22.0

8
go.sum
Unescape View File

@ -509,8 +509,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.27 h1:TnRWVfYYjfvZ1Zi2cyb41ZmsbytB4+5fN/FVnodd2NQ=
go.dtapp.net/dorm v1.0.27/go.mod h1:bHG7BmgeLaAlc56myYF63lwZAIuMeWRAqHBb/L84dLM=
go.dtapp.net/dorm v1.0.28 h1:Igd/K1Hj0IbKLN4lZUxRWXViLtlYjYKVvHcuHscFYuM=
go.dtapp.net/dorm v1.0.28/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=
@ -523,8 +523,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.5 h1:znUwvMcX7ADQn8f750yIb5xJa9tJ4P0fHb5tSo7EFeg=
go.dtapp.net/gotrace_id v1.0.5/go.mod h1:476T5KMJw9c6DM/rJn7y6d28hcNDv4+wew4sd+powes=
go.dtapp.net/gotrace_id v1.0.6 h1:q6s8jy50vt1820b69JKQaFqbhGS5yJGMVtocwOGOPO0=
go.dtapp.net/gotrace_id v1.0.6/go.mod h1:o5kSzNK4s3GrrKpkRKXtAhArtBG1e5N5O5KGPlBlWG4=
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=

Write Preview
Loading…
Cancel
Save