dtapps
/
go-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases 40 Wiki Activity

- update log

Browse Source 
- update time
master
李光春 2 years ago
parent e32ebfd1d5
commit eb6edc7646
6 changed files with 77 additions and 48 deletions
Show Stats Download Patch File Download Diff File

72
utils/golog/api_mongo.go
Unescape View File

@ -51,53 +51,53 @@ func (c *ApiClient) MongoQuery() *dorm.MongoClient {
// MongoMiddleware 中间件 // MongoMiddleware 中间件
func (c *ApiClient) MongoMiddleware(request gorequest.Response) { func (c *ApiClient) MongoMiddleware(request gorequest.Response) {
c.mongoRecord(apiMongoLog{ c.mongoRecord(apiMongoLog{
RequestTime: gotime.SetCurrent(request.RequestTime).Timestamp(), //【请求】时间 RequestTime: gotime.SetCurrent(request.RequestTime).Timestamp, //【请求】时间
RequestUri: request.RequestUri, //【请求】链接 RequestUri: request.RequestUri, //【请求】链接
RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接
RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口
RequestMethod: request.RequestMethod, //【请求】方式 RequestMethod: request.RequestMethod, //【请求】方式
RequestParams: request.RequestParams, //【请求】参数 RequestParams: request.RequestParams, //【请求】参数
RequestHeader: request.RequestHeader, //【请求】头部 RequestHeader: request.RequestHeader, //【请求】头部
ResponseHeader: request.ResponseHeader, //【返回】头部 ResponseHeader: request.ResponseHeader, //【返回】头部
ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码
ResponseBody: request.ResponseBody, //【返回】内容 ResponseBody: request.ResponseBody, //【返回】内容
ResponseContentLength: request.ResponseContentLength, //【返回】大小 ResponseContentLength: request.ResponseContentLength, //【返回】大小
ResponseTime: gotime.SetCurrent(request.ResponseTime).Timestamp(), //【返回】时间 ResponseTime: gotime.SetCurrent(request.ResponseTime).Timestamp, //【返回】时间
}) })
} }
// MongoMiddlewareXml 中间件 // MongoMiddlewareXml 中间件
func (c *ApiClient) MongoMiddlewareXml(request gorequest.Response) { func (c *ApiClient) MongoMiddlewareXml(request gorequest.Response) {
c.mongoRecord(apiMongoLog{ c.mongoRecord(apiMongoLog{
RequestTime: gotime.SetCurrent(request.RequestTime).Timestamp(), //【请求】时间 RequestTime: gotime.SetCurrent(request.RequestTime).Timestamp, //【请求】时间
RequestUri: request.RequestUri, //【请求】链接 RequestUri: request.RequestUri, //【请求】链接
RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接
RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口
RequestMethod: request.RequestMethod, //【请求】方式 RequestMethod: request.RequestMethod, //【请求】方式
RequestParams: request.RequestParams, //【请求】参数 RequestParams: request.RequestParams, //【请求】参数
RequestHeader: request.RequestHeader, //【请求】头部 RequestHeader: request.RequestHeader, //【请求】头部
ResponseHeader: request.ResponseHeader, //【返回】头部 ResponseHeader: request.ResponseHeader, //【返回】头部
ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码
ResponseBody: dorm.XmlDecodeNoError(request.ResponseBody), //【返回】内容 ResponseBody: dorm.XmlDecodeNoError(request.ResponseBody), //【返回】内容
ResponseContentLength: request.ResponseContentLength, //【返回】大小 ResponseContentLength: request.ResponseContentLength, //【返回】大小
ResponseTime: gotime.SetCurrent(request.ResponseTime).Timestamp(), //【返回】时间 ResponseTime: gotime.SetCurrent(request.ResponseTime).Timestamp, //【返回】时间
}) })
} }
// MongoMiddlewareCustom 中间件 // MongoMiddlewareCustom 中间件
func (c *ApiClient) MongoMiddlewareCustom(api string, request gorequest.Response) { func (c *ApiClient) MongoMiddlewareCustom(api string, request gorequest.Response) {
c.mongoRecord(apiMongoLog{ c.mongoRecord(apiMongoLog{
RequestTime: gotime.SetCurrent(request.RequestTime).Timestamp(), //【请求】时间 RequestTime: gotime.SetCurrent(request.RequestTime).Timestamp, //【请求】时间
RequestUri: request.RequestUri, //【请求】链接 RequestUri: request.RequestUri, //【请求】链接
RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接
RequestApi: api, //【请求】接口 RequestApi: api, //【请求】接口
RequestMethod: request.RequestMethod, //【请求】方式 RequestMethod: request.RequestMethod, //【请求】方式
RequestParams: request.RequestParams, //【请求】参数 RequestParams: request.RequestParams, //【请求】参数
RequestHeader: request.RequestHeader, //【请求】头部 RequestHeader: request.RequestHeader, //【请求】头部
ResponseHeader: request.ResponseHeader, //【返回】头部 ResponseHeader: request.ResponseHeader, //【返回】头部
ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码
ResponseBody: request.ResponseBody, //【返回】内容 ResponseBody: request.ResponseBody, //【返回】内容
ResponseContentLength: request.ResponseContentLength, //【返回】大小 ResponseContentLength: request.ResponseContentLength, //【返回】大小
ResponseTime: gotime.SetCurrent(request.ResponseTime).Timestamp(), //【返回】时间 ResponseTime: gotime.SetCurrent(request.ResponseTime).Timestamp, //【返回】时间
}) })
} }

8
utils/golog/gin_mongo.go
Unescape View File

@ -131,7 +131,7 @@ func (c *GinClient) MongoMiddleware() gin.HandlerFunc {
if len(jsonBody) > 0 { if len(jsonBody) > 0 {
c.mongoRecord(ginMongoLog{ c.mongoRecord(ginMongoLog{
TraceId: ginCtx.MustGet("trace_id").(string), //【系统】链编号 TraceId: ginCtx.MustGet("trace_id").(string), //【系统】链编号
RequestTime: gotime.SetCurrent(requestTime).Timestamp(), //【请求】时间 RequestTime: gotime.SetCurrent(requestTime).Timestamp, //【请求】时间
RequestUri: host + ginCtx.Request.RequestURI, //【请求】请求链接 RequestUri: host + ginCtx.Request.RequestURI, //【请求】请求链接
RequestUrl: ginCtx.Request.RequestURI, //【请求】请求链接 RequestUrl: ginCtx.Request.RequestURI, //【请求】请求链接
RequestApi: gorequest.UriFilterExcludeQueryString(ginCtx.Request.RequestURI), //【请求】请求接口 RequestApi: gorequest.UriFilterExcludeQueryString(ginCtx.Request.RequestURI), //【请求】请求接口
@ -148,7 +148,7 @@ func (c *GinClient) MongoMiddleware() gin.HandlerFunc {
RequestIpCity: requestClientIpCity, //【请求】请求客户端城市 RequestIpCity: requestClientIpCity, //【请求】请求客户端城市
RequestIpIsp: requestClientIpIsp, //【请求】请求客户端运营商 RequestIpIsp: requestClientIpIsp, //【请求】请求客户端运营商
RequestHeader: ginCtx.Request.Header, //【请求】请求头 RequestHeader: ginCtx.Request.Header, //【请求】请求头
ResponseTime: gotime.SetCurrent(gotime.Current().Time).Timestamp(), //【返回】时间 ResponseTime: gotime.SetCurrent(gotime.Current().Time).Timestamp, //【返回】时间
ResponseCode: responseCode, //【返回】状态码 ResponseCode: responseCode, //【返回】状态码
ResponseData: c.jsonUnmarshal(responseBody), //【返回】数据 ResponseData: c.jsonUnmarshal(responseBody), //【返回】数据
CostTime: endTime - startTime, //【系统】花费时间 CostTime: endTime - startTime, //【系统】花费时间
@ -156,7 +156,7 @@ func (c *GinClient) MongoMiddleware() gin.HandlerFunc {
} else { } else {
c.mongoRecord(ginMongoLog{ c.mongoRecord(ginMongoLog{
TraceId: ginCtx.MustGet("trace_id").(string), //【系统】链编号 TraceId: ginCtx.MustGet("trace_id").(string), //【系统】链编号
RequestTime: gotime.SetCurrent(requestTime).Timestamp(), //【请求】时间 RequestTime: gotime.SetCurrent(requestTime).Timestamp, //【请求】时间
RequestUri: host + ginCtx.Request.RequestURI, //【请求】请求链接 RequestUri: host + ginCtx.Request.RequestURI, //【请求】请求链接
RequestUrl: ginCtx.Request.RequestURI, //【请求】请求链接 RequestUrl: ginCtx.Request.RequestURI, //【请求】请求链接
RequestApi: gorequest.UriFilterExcludeQueryString(ginCtx.Request.RequestURI), //【请求】请求接口 RequestApi: gorequest.UriFilterExcludeQueryString(ginCtx.Request.RequestURI), //【请求】请求接口
@ -173,7 +173,7 @@ func (c *GinClient) MongoMiddleware() gin.HandlerFunc {
RequestIpCity: requestClientIpCity, //【请求】请求客户端城市 RequestIpCity: requestClientIpCity, //【请求】请求客户端城市
RequestIpIsp: requestClientIpIsp, //【请求】请求客户端运营商 RequestIpIsp: requestClientIpIsp, //【请求】请求客户端运营商
RequestHeader: ginCtx.Request.Header, //【请求】请求头 RequestHeader: ginCtx.Request.Header, //【请求】请求头
ResponseTime: gotime.SetCurrent(gotime.Current().Time).Timestamp(), //【返回】时间 ResponseTime: gotime.SetCurrent(gotime.Current().Time).Timestamp, //【返回】时间
ResponseCode: responseCode, //【返回】状态码 ResponseCode: responseCode, //【返回】状态码
ResponseData: c.jsonUnmarshal(responseBody), //【返回】数据 ResponseData: c.jsonUnmarshal(responseBody), //【返回】数据
CostTime: endTime - startTime, //【系统】花费时间 CostTime: endTime - startTime, //【系统】花费时间

7
utils/gotime/gotime.go
Unescape View File

@ -23,9 +23,10 @@ const (
// Pro 结构体 // Pro 结构体
type Pro struct { type Pro struct {
Time time.Time Time time.Time
loc *time.Location Timestamp int64 // Unix
Error error loc *time.Location
Error error
} }
// NewPro 初始化结构体 // NewPro 初始化结构体

28
utils/gotime/today.go
Unescape View File

@ -9,8 +9,11 @@ import (
// Current 获取当前的时间 // Current 获取当前的时间
func Current() Pro { func Current() Pro {
p := NewPro() p := NewPro()
p.loc, p.Error = time.LoadLocation("Asia/Shanghai") p.loc, p.Error = time.LoadLocation("Asia/Shanghai")
if p.Error != nil { if p.Error != nil {
// Docker部署golang应用时时区问题 https://www.ddhigh.com/2018/03/01/golang-docker-timezone.html // Docker部署golang应用时时区问题 https://www.ddhigh.com/2018/03/01/golang-docker-timezone.html
log.Printf("【gotime】时区错误：%v\n", p.Error) log.Printf("【gotime】时区错误：%v\n", p.Error)
@ -18,13 +21,20 @@ func Current() Pro {
} else { } else {
p.Time = time.Now().In(p.loc) p.Time = time.Now().In(p.loc)
} }
p.Timestamp = p.Time.Unix()
return p return p
} }
// SetCurrent 设置当前的时间 // SetCurrent 设置当前的时间
func SetCurrent(sTime time.Time) Pro { func SetCurrent(sTime time.Time) Pro {
p := NewPro() p := NewPro()
p.Time = sTime p.Time = sTime
p.Timestamp = p.Time.Unix()
return p return p
} }
@ -36,15 +46,19 @@ func SetCurrentParse(str string) Pro {
p.loc, p.Error = time.LoadLocation("Asia/Shanghai") p.loc, p.Error = time.LoadLocation("Asia/Shanghai")
layout := DateTimeFormat layout := DateTimeFormat
if str == "" || str == "0" || str == "0000-00-00 00:00:00" || str == "0000-00-00" || str == "00:00:00" { if str == "" || str == "0" || str == "0000-00-00 00:00:00" || str == "0000-00-00" || str == "00:00:00" {
return p return p
} }
if len(str) == 10 && strings.Count(str, "-") == 2 { if len(str) == 10 && strings.Count(str, "-") == 2 {
layout = DateFormat layout = DateFormat
} }
if strings.Index(str, "T") == 10 { if strings.Index(str, "T") == 10 {
layout = RFC3339Format layout = RFC3339Format
} }
if _, err := strconv.ParseInt(str, 10, 64); err == nil { if _, err := strconv.ParseInt(str, 10, 64); err == nil {
switch len(str) { switch len(str) {
case 8: case 8:
@ -53,16 +67,25 @@ func SetCurrentParse(str string) Pro {
layout = ShortDateTimeFormat layout = ShortDateTimeFormat
} }
} }
location, _ := time.ParseInLocation(layout, str, p.loc) location, _ := time.ParseInLocation(layout, str, p.loc)
p.Time = location p.Time = location
p.Timestamp = p.Time.Unix()
return p return p
} }
// SetCurrentUnix 设置当前的时间 Unix时间戳 // SetCurrentUnix 设置当前的时间 Unix时间戳
func SetCurrentUnix(ts int64) Pro { func SetCurrentUnix(ts int64) Pro {
p := NewPro() p := NewPro()
p.Time = time.Unix(ts, 0) p.Time = time.Unix(ts, 0)
p.Timestamp = p.Time.Unix()
return p return p
} }
@ -86,11 +109,6 @@ func (p Pro) ToTimeFormat() string {
return p.Time.Format(TimeFormat) return p.Time.Format(TimeFormat)
} }
// Timestamp 今天此刻时间戳
func (p Pro) Timestamp() int64 {
return p.Time.Unix()
}
// TimestampWithSecond 今天此刻时间戳 // TimestampWithSecond 今天此刻时间戳
func (p Pro) TimestampWithSecond() int64 { func (p Pro) TimestampWithSecond() int64 {
return p.Time.Unix() return p.Time.Unix()

5
utils/gotime/tomorrow.go
Unescape View File

@ -4,12 +4,17 @@ import "time"
// Tomorrow 明天 // Tomorrow 明天
func Tomorrow() Pro { func Tomorrow() Pro {
p := NewPro() p := NewPro()
location, err := time.LoadLocation("Asia/Shanghai") location, err := time.LoadLocation("Asia/Shanghai")
if err != nil { if err != nil {
p.Time = time.Now().Add(time.Hour*8).AddDate(0, 0, +1) p.Time = time.Now().Add(time.Hour*8).AddDate(0, 0, +1)
} else { } else {
p.Time = time.Now().In(location).AddDate(0, 0, +1) p.Time = time.Now().In(location).AddDate(0, 0, +1)
} }
p.Timestamp = p.Time.Unix()
return p return p
} }

5
utils/gotime/yesterday.go
Unescape View File

@ -6,12 +6,17 @@ import (
// Yesterday 昨天 // Yesterday 昨天
func Yesterday() Pro { func Yesterday() Pro {
p := NewPro() p := NewPro()
location, err := time.LoadLocation("Asia/Shanghai") location, err := time.LoadLocation("Asia/Shanghai")
if err != nil { if err != nil {
p.Time = time.Now().Add(time.Hour*8).AddDate(0, 0, -1) p.Time = time.Now().Add(time.Hour*8).AddDate(0, 0, -1)
} else { } else {
p.Time = time.Now().In(location).AddDate(0, 0, -1) p.Time = time.Now().In(location).AddDate(0, 0, -1)
} }
p.Timestamp = p.Time.Unix()
return p return p
} }

Write Preview
Loading…
Cancel
Save