diff --git a/service/eastiot/pgsql.go b/service/eastiot/pgsql.go index d71cfe3a..1a182091 100644 --- a/service/eastiot/pgsql.go +++ b/service/eastiot/pgsql.go @@ -2,18 +2,18 @@ package eastiot import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/ejiaofei/pgsql.go b/service/ejiaofei/pgsql.go index 893f3b74..7953f43e 100644 --- a/service/ejiaofei/pgsql.go +++ b/service/ejiaofei/pgsql.go @@ -2,19 +2,19 @@ package ejiaofei import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gomongo" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -22,6 +22,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: datatypes.JSON(gojson.JsonEncodeNoError(gomongo.XmlDecodeNoError(request.ResponseBody))), //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/feishu/pgsql.go b/service/feishu/pgsql.go index 50aeb8a2..b313ed92 100644 --- a/service/feishu/pgsql.go +++ b/service/feishu/pgsql.go @@ -2,18 +2,18 @@ package feishu import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/jd/pgsql.go b/service/jd/pgsql.go index 970438c3..39a439a2 100644 --- a/service/jd/pgsql.go +++ b/service/jd/pgsql.go @@ -2,17 +2,17 @@ package jd import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(api string, request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(api string, request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 RequestApi: api, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(api string, request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/kashangwl/pgsql.go b/service/kashangwl/pgsql.go index dc213a67..b0f1a24a 100644 --- a/service/kashangwl/pgsql.go +++ b/service/kashangwl/pgsql.go @@ -2,18 +2,18 @@ package kashangwl import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/kuaishou/mongo.go b/service/kuaishou/mongo.go index 4f6d7e06..b85c82fe 100644 --- a/service/kuaishou/mongo.go +++ b/service/kuaishou/mongo.go @@ -2,7 +2,7 @@ package kuaishou import ( "go.dtapp.net/library/utils/gomongo" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -13,8 +13,8 @@ type mongoZap struct { RequestUrl string `json:"request_url" bson:"request_url"` //【请求】链接 RequestApi string `json:"request_api" bson:"request_api"` //【请求】接口 RequestMethod string `json:"request_method" bson:"request_method"` //【请求】方式 - RequestParams gorequest2.Params `json:"request_params" bson:"request_params"` //【请求】参数 - RequestHeader gorequest2.Headers `json:"request_header" bson:"request_header"` //【请求】头部 + RequestParams gorequest.Params `json:"request_params" bson:"request_params"` //【请求】参数 + RequestHeader gorequest.Headers `json:"request_header" bson:"request_header"` //【请求】头部 ResponseHeader http.Header `json:"response_header" bson:"response_header"` //【返回】头部 ResponseStatusCode int `json:"response_status_code" bson:"response_status_code"` //【返回】状态码 ResponseBody map[string]interface{} `json:"response_body" bson:"response_body"` //【返回】内容 @@ -30,12 +30,12 @@ func (m *mongoZap) TableName() string { return "kuaishou" } -func (app *App) mongoLog(request gorequest2.Response) { +func (app *App) mongoLog(request gorequest.Response) { _, _ = app.mongo.Model(&mongoZap{}).InsertOne(mongoZap{ RequestTime: gomongo.BsonTime(request.RequestTime), //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: request.RequestParams, //【请求】参数 RequestHeader: request.RequestHeader, //【请求】头部 diff --git a/service/kuaishou/pgsql.go b/service/kuaishou/pgsql.go index a97fe6ab..01464062 100644 --- a/service/kuaishou/pgsql.go +++ b/service/kuaishou/pgsql.go @@ -2,18 +2,18 @@ package kuaishou import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/leshuazf/mongo.go b/service/leshuazf/mongo.go index a05d444d..b020187e 100644 --- a/service/leshuazf/mongo.go +++ b/service/leshuazf/mongo.go @@ -2,7 +2,7 @@ package leshuazf import ( "go.dtapp.net/library/utils/gomongo" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -13,8 +13,8 @@ type mongoZap struct { RequestUrl string `json:"request_url" bson:"request_url"` //【请求】链接 RequestApi string `json:"request_api" bson:"request_api"` //【请求】接口 RequestMethod string `json:"request_method" bson:"request_method"` //【请求】方式 - RequestParams gorequest2.Params `json:"request_params" bson:"request_params"` //【请求】参数 - RequestHeader gorequest2.Headers `json:"request_header" bson:"request_header"` //【请求】头部 + RequestParams gorequest.Params `json:"request_params" bson:"request_params"` //【请求】参数 + RequestHeader gorequest.Headers `json:"request_header" bson:"request_header"` //【请求】头部 ResponseHeader http.Header `json:"response_header" bson:"response_header"` //【返回】头部 ResponseStatusCode int `json:"response_status_code" bson:"response_status_code"` //【返回】状态码 ResponseBody map[string]interface{} `json:"response_body" bson:"response_body"` //【返回】内容 @@ -30,12 +30,12 @@ func (m *mongoZap) TableName() string { return "leshuazf" } -func (app *App) mongoLog(request gorequest2.Response) { +func (app *App) mongoLog(request gorequest.Response) { _, _ = app.mongo.Model(&mongoZap{}).InsertOne(mongoZap{ RequestTime: gomongo.BsonTime(request.RequestTime), //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: request.RequestParams, //【请求】参数 RequestHeader: request.RequestHeader, //【请求】头部 diff --git a/service/leshuazf/pgsql.go b/service/leshuazf/pgsql.go index 5df8053c..046f2409 100644 --- a/service/leshuazf/pgsql.go +++ b/service/leshuazf/pgsql.go @@ -3,17 +3,17 @@ package leshuazf import ( "go.dtapp.net/library/utils/gojson" "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { +func (app *App) postgresqlLog(request gorequest.Response) { app.log.Api.Record(golog.ApiPostgresqlLog{ RequestTime: request.RequestTime, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 diff --git a/service/meituan/api.generate_link.go b/service/meituan/api.generate_link.go index 45f95d9b..f3078121 100644 --- a/service/meituan/api.generate_link.go +++ b/service/meituan/api.generate_link.go @@ -2,7 +2,7 @@ package meituan import ( "encoding/json" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -15,11 +15,11 @@ type ApiGenerateLinkResponse struct { type ApiGenerateLinkResult struct { Result ApiGenerateLinkResponse // 结果 Body []byte // 内容 - Http gorequest2.Response // 请求 + Http gorequest.Response // 请求 Err error // 错误 } -func NewApiGenerateLinkResult(result ApiGenerateLinkResponse, body []byte, http gorequest2.Response, err error) *ApiGenerateLinkResult { +func NewApiGenerateLinkResult(result ApiGenerateLinkResponse, body []byte, http gorequest.Response, err error) *ApiGenerateLinkResult { return &ApiGenerateLinkResult{Result: result, Body: body, Http: http, Err: err} } @@ -27,14 +27,14 @@ func NewApiGenerateLinkResult(result ApiGenerateLinkResponse, body []byte, http // https://union.meituan.com/v2/apiDetail?id=25 func (app *App) ApiGenerateLink(actId int64, sid string, linkType, shortLink int) *ApiGenerateLinkResult { // 参数 - param := gorequest2.NewParams() + param := gorequest.NewParams() param.Set("actId", actId) // 活动id，可以在联盟活动列表中查看获取 param.Set("appkey", app.appKey) // 媒体名称，可在推广者备案-媒体管理中查询 param.Set("sid", sid) // 推广位sid，支持通过接口自定义创建，不受平台200个上限限制，长度不能超过64个字符，支持小写字母和数字，历史已创建的推广位不受这个约束 param.Set("linkType", linkType) // 投放链接的类型 param.Set("shortLink", shortLink) // 获取长链还是短链 // 转换 - params := gorequest2.NewParamsWith(param) + params := gorequest.NewParamsWith(param) params["sign"] = app.getSign(app.secret, params) // 请求 request, err := app.request("https://openapi.meituan.com/api/generateLink", params, http.MethodGet) diff --git a/service/meituan/api.getqualityscorebysid.go b/service/meituan/api.getqualityscorebysid.go index 6a74f667..962c3c20 100644 --- a/service/meituan/api.getqualityscorebysid.go +++ b/service/meituan/api.getqualityscorebysid.go @@ -2,7 +2,7 @@ package meituan import ( "encoding/json" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "go.dtapp.net/library/utils/gotime" "net/http" ) @@ -24,19 +24,19 @@ type ApiGetQuaLitYsCoreBySidResponse struct { type ApiGetQuaLitYsCoreBySidResult struct { Result ApiGetQuaLitYsCoreBySidResponse // 结果 Body []byte // 内容 - Http gorequest2.Response // 请求 + Http gorequest.Response // 请求 Err error // 错误 } -func NewApiGetQuaLitYsCoreBySidResult(result ApiGetQuaLitYsCoreBySidResponse, body []byte, http gorequest2.Response, err error) *ApiGetQuaLitYsCoreBySidResult { +func NewApiGetQuaLitYsCoreBySidResult(result ApiGetQuaLitYsCoreBySidResponse, body []byte, http gorequest.Response, err error) *ApiGetQuaLitYsCoreBySidResult { return &ApiGetQuaLitYsCoreBySidResult{Result: result, Body: body, Http: http, Err: err} } // ApiGetQuaLitYsCoreBySid 优选sid质量分&复购率查询 // https://union.meituan.com/v2/apiDetail?id=28 -func (app *App) ApiGetQuaLitYsCoreBySid(notMustParams ...gorequest2.Params) *ApiGetQuaLitYsCoreBySidResult { +func (app *App) ApiGetQuaLitYsCoreBySid(notMustParams ...gorequest.Params) *ApiGetQuaLitYsCoreBySidResult { // 参数 - params := gorequest2.NewParamsWith(notMustParams...) + params := gorequest.NewParamsWith(notMustParams...) // 请求时刻10位时间戳(秒级)，有效期60s params["ts"] = gotime.Current().Timestamp() params["appkey"] = app.appKey diff --git a/service/meituan/api.mini_code.go b/service/meituan/api.mini_code.go index 850d9318..fac31ad2 100644 --- a/service/meituan/api.mini_code.go +++ b/service/meituan/api.mini_code.go @@ -2,7 +2,7 @@ package meituan import ( "encoding/json" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -15,11 +15,11 @@ type ApiMiniCodeResponse struct { type ApiMiniCodeResult struct { Result ApiMiniCodeResponse // 结果 Body []byte // 内容 - Http gorequest2.Response // 请求 + Http gorequest.Response // 请求 Err error // 错误 } -func NewApiMiniCodeResult(result ApiMiniCodeResponse, body []byte, http gorequest2.Response, err error) *ApiMiniCodeResult { +func NewApiMiniCodeResult(result ApiMiniCodeResponse, body []byte, http gorequest.Response, err error) *ApiMiniCodeResult { return &ApiMiniCodeResult{Result: result, Body: body, Http: http, Err: err} } @@ -27,12 +27,12 @@ func NewApiMiniCodeResult(result ApiMiniCodeResponse, body []byte, http goreques // https://union.meituan.com/v2/apiDetail?id=26 func (app *App) ApiMiniCode(actId int64, sid string) *ApiMiniCodeResult { // 参数 - param := gorequest2.NewParams() + param := gorequest.NewParams() param.Set("appkey", app.appKey) param.Set("sid", sid) param.Set("actId", actId) // 转换 - params := gorequest2.NewParamsWith(param) + params := gorequest.NewParamsWith(param) params["sign"] = app.getSign(app.secret, params) // 请求 request, err := app.request("https://openapi.meituan.com/api/miniCode", params, http.MethodGet) diff --git a/service/meituan/api.order.go b/service/meituan/api.order.go index 2c4e437f..c0451375 100644 --- a/service/meituan/api.order.go +++ b/service/meituan/api.order.go @@ -2,7 +2,7 @@ package meituan import ( "encoding/json" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -35,21 +35,21 @@ type ApiOrderResponse struct { } type ApiOrderResult struct { - Result ApiOrderResponse // 结果 - Body []byte // 内容 - Http gorequest2.Response // 请求 - Err error // 错误 + Result ApiOrderResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 } -func NewApiOrderResult(result ApiOrderResponse, body []byte, http gorequest2.Response, err error) *ApiOrderResult { +func NewApiOrderResult(result ApiOrderResponse, body []byte, http gorequest.Response, err error) *ApiOrderResult { return &ApiOrderResult{Result: result, Body: body, Http: http, Err: err} } // ApiOrder 单订单查询接口（新版） // https://union.meituan.com/v2/apiDetail?id=24 -func (app *App) ApiOrder(notMustParams ...gorequest2.Params) *ApiOrderResult { +func (app *App) ApiOrder(notMustParams ...gorequest.Params) *ApiOrderResult { // 参数 - params := gorequest2.NewParamsWith(notMustParams...) + params := gorequest.NewParamsWith(notMustParams...) // 请求时刻10位时间戳(秒级)，有效期60s params["appkey"] = app.appKey params["sign"] = app.getSign(app.secret, params) diff --git a/service/meituan/api.order_list.go b/service/meituan/api.order_list.go index 413eccdf..a1c22a03 100644 --- a/service/meituan/api.order_list.go +++ b/service/meituan/api.order_list.go @@ -2,7 +2,7 @@ package meituan import ( "encoding/json" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "go.dtapp.net/library/utils/gotime" "net/http" ) @@ -36,19 +36,19 @@ type ApiOrderListResponse struct { type ApiOrderListResult struct { Result ApiOrderListResponse // 结果 Body []byte // 内容 - Http gorequest2.Response // 请求 + Http gorequest.Response // 请求 Err error // 错误 } -func NewApiOrderListResult(result ApiOrderListResponse, body []byte, http gorequest2.Response, err error) *ApiOrderListResult { +func NewApiOrderListResult(result ApiOrderListResponse, body []byte, http gorequest.Response, err error) *ApiOrderListResult { return &ApiOrderListResult{Result: result, Body: body, Http: http, Err: err} } // ApiOrderList 订单列表查询接口（新版） // https://union.meituan.com/v2/apiDetail?id=23 -func (app *App) ApiOrderList(notMustParams ...gorequest2.Params) *ApiOrderListResult { +func (app *App) ApiOrderList(notMustParams ...gorequest.Params) *ApiOrderListResult { // 参数 - params := gorequest2.NewParamsWith(notMustParams...) + params := gorequest.NewParamsWith(notMustParams...) // 请求时刻10位时间戳(秒级)，有效期60s params["ts"] = gotime.Current().Timestamp() params["appkey"] = app.appKey diff --git a/service/meituan/pgsql.go b/service/meituan/pgsql.go index 4650883c..97e9464f 100644 --- a/service/meituan/pgsql.go +++ b/service/meituan/pgsql.go @@ -2,18 +2,18 @@ package meituan import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/meituan/poi.area.go b/service/meituan/poi.area.go index 2da93b0d..e4840dce 100644 --- a/service/meituan/poi.area.go +++ b/service/meituan/poi.area.go @@ -2,7 +2,7 @@ package meituan import ( "encoding/json" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -19,13 +19,13 @@ type PoiAreaResponse struct { } type PoiAreaResult struct { - Result PoiAreaResponse // 结果 - Body []byte // 内容 - Http gorequest2.Response // 请求 - Err error // 错误 + Result PoiAreaResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 } -func NewPoiAreaResult(result PoiAreaResponse, body []byte, http gorequest2.Response, err error) *PoiAreaResult { +func NewPoiAreaResult(result PoiAreaResponse, body []byte, http gorequest.Response, err error) *PoiAreaResult { return &PoiAreaResult{Result: result, Body: body, Http: http, Err: err} } @@ -33,9 +33,9 @@ func NewPoiAreaResult(result PoiAreaResponse, body []byte, http gorequest2.Respo // https://openapi.meituan.com/#api-0.%E5%9F%BA%E7%A1%80%E6%95%B0%E6%8D%AE-GetHttpsOpenapiMeituanComPoiAreaCityid1 func (app *App) PoiArea(cityID int) *PoiAreaResult { // 参数 - param := gorequest2.NewParams() + param := gorequest.NewParams() param.Set("cityid", cityID) - params := gorequest2.NewParamsWith(param) + params := gorequest.NewParamsWith(param) // 请求 request, err := app.request("https://openapi.meituan.com/poi/area", params, http.MethodGet) // 定义 diff --git a/service/meituan/poi.category.go b/service/meituan/poi.category.go index 01bb3c26..09769da7 100644 --- a/service/meituan/poi.category.go +++ b/service/meituan/poi.category.go @@ -2,7 +2,7 @@ package meituan import ( "encoding/json" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -21,11 +21,11 @@ type PoiCategoryResponse struct { type PoiCategoryResult struct { Result PoiCategoryResponse // 结果 Body []byte // 内容 - Http gorequest2.Response // 请求 + Http gorequest.Response // 请求 Err error // 错误 } -func NewPoiCategoryResult(result PoiCategoryResponse, body []byte, http gorequest2.Response, err error) *PoiCategoryResult { +func NewPoiCategoryResult(result PoiCategoryResponse, body []byte, http gorequest.Response, err error) *PoiCategoryResult { return &PoiCategoryResult{Result: result, Body: body, Http: http, Err: err} } @@ -33,9 +33,9 @@ func NewPoiCategoryResult(result PoiCategoryResponse, body []byte, http goreques // https://openapi.meituan.com/#api-0.%E5%9F%BA%E7%A1%80%E6%95%B0%E6%8D%AE-GetHttpsOpenapiMeituanComPoiDistrictCityid1 func (app *App) PoiCategory(cityID int) *PoiCategoryResult { // 参数 - param := gorequest2.NewParams() + param := gorequest.NewParams() param.Set("cityid", cityID) - params := gorequest2.NewParamsWith(param) + params := gorequest.NewParamsWith(param) // 请求 request, err := app.request("https://openapi.meituan.com/poi/category", params, http.MethodGet) // 定义 diff --git a/service/meituan/poi.district.go b/service/meituan/poi.district.go index 0e8bc0c9..7c826133 100644 --- a/service/meituan/poi.district.go +++ b/service/meituan/poi.district.go @@ -2,7 +2,7 @@ package meituan import ( "encoding/json" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -17,11 +17,11 @@ type PoiDistrictResponse struct { type PoiDistrictResult struct { Result PoiDistrictResponse // 结果 Body []byte // 内容 - Http gorequest2.Response // 请求 + Http gorequest.Response // 请求 Err error // 错误 } -func NewPoiDistrictResult(result PoiDistrictResponse, body []byte, http gorequest2.Response, err error) *PoiDistrictResult { +func NewPoiDistrictResult(result PoiDistrictResponse, body []byte, http gorequest.Response, err error) *PoiDistrictResult { return &PoiDistrictResult{Result: result, Body: body, Http: http, Err: err} } @@ -29,9 +29,9 @@ func NewPoiDistrictResult(result PoiDistrictResponse, body []byte, http goreques // https://openapi.meituan.com/#api-0.%E5%9F%BA%E7%A1%80%E6%95%B0%E6%8D%AE-GetHttpsOpenapiMeituanComPoiDistrictCityid1 func (app *App) PoiDistrict(cityID int) *PoiDistrictResult { // 参数 - param := gorequest2.NewParams() + param := gorequest.NewParams() param.Set("cityid", cityID) - params := gorequest2.NewParamsWith(param) + params := gorequest.NewParamsWith(param) // 请求 request, err := app.request("https://openapi.meituan.com/poi/district", params, http.MethodGet) // 定义 diff --git a/service/pconline/app.go b/service/pconline/app.go index 902b2afd..2893bdad 100644 --- a/service/pconline/app.go +++ b/service/pconline/app.go @@ -1,8 +1,7 @@ package pconline import ( - "go.dtapp.net/library/golog" - golog2 "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" @@ -12,7 +11,7 @@ type App struct { mongo *gomongo.Client // 日志数据库 pgsql *gorm.DB // pgsql数据库 client *gorequest.App // 请求客户端 - log *golog2.Api // 日志服务 + log *golog.Api // 日志服务 logTableName string // 日志表名 logStatus bool // 日志状态 } diff --git a/service/pconline/mongo.go b/service/pconline/mongo.go index 46eaa471..bc500bc0 100644 --- a/service/pconline/mongo.go +++ b/service/pconline/mongo.go @@ -2,7 +2,7 @@ package pconline import ( "go.dtapp.net/library/utils/gomongo" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -13,8 +13,8 @@ type mongoZap struct { RequestUrl string `json:"request_url" bson:"request_url"` //【请求】链接 RequestApi string `json:"request_api" bson:"request_api"` //【请求】接口 RequestMethod string `json:"request_method" bson:"request_method"` //【请求】方式 - RequestParams gorequest2.Params `json:"request_params" bson:"request_params"` //【请求】参数 - RequestHeader gorequest2.Headers `json:"request_header" bson:"request_header"` //【请求】头部 + RequestParams gorequest.Params `json:"request_params" bson:"request_params"` //【请求】参数 + RequestHeader gorequest.Headers `json:"request_header" bson:"request_header"` //【请求】头部 ResponseHeader http.Header `json:"response_header" bson:"response_header"` //【返回】头部 ResponseStatusCode int `json:"response_status_code" bson:"response_status_code"` //【返回】状态码 ResponseBody map[string]interface{} `json:"response_body" bson:"response_body"` //【返回】内容 @@ -30,12 +30,12 @@ func (m *mongoZap) TableName() string { return "pconline" } -func (app *App) mongoLog(request gorequest2.Response) { +func (app *App) mongoLog(request gorequest.Response) { _, _ = app.mongo.Model(&mongoZap{}).InsertOne(mongoZap{ RequestTime: gomongo.BsonTime(request.RequestTime), //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: request.RequestParams, //【请求】参数 RequestHeader: request.RequestHeader, //【请求】头部 diff --git a/service/pconline/pgsql.go b/service/pconline/pgsql.go index f5e67714..3acee624 100644 --- a/service/pconline/pgsql.go +++ b/service/pconline/pgsql.go @@ -2,18 +2,18 @@ package pconline import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Api.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Api.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/pinduoduo/pgsql.go b/service/pinduoduo/pgsql.go index 863b3b74..e4e2ffd5 100644 --- a/service/pinduoduo/pgsql.go +++ b/service/pinduoduo/pgsql.go @@ -2,17 +2,17 @@ package pinduoduo import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(api string, request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(api string, request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 RequestApi: api, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(api string, request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/pintoto/pgsql.go b/service/pintoto/pgsql.go index f2ef6ef4..be5b1bbb 100644 --- a/service/pintoto/pgsql.go +++ b/service/pintoto/pgsql.go @@ -2,18 +2,18 @@ package pintoto import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/sendcloud/mongo.go b/service/sendcloud/mongo.go index 6a333b7b..a7fe3dab 100644 --- a/service/sendcloud/mongo.go +++ b/service/sendcloud/mongo.go @@ -1,25 +1,25 @@ package sendcloud import ( - gomongo2 "go.dtapp.net/library/utils/gomongo" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gomongo" + "go.dtapp.net/library/utils/gorequest" "net/http" ) // 日志 type mongoZap struct { - RequestTime gomongo2.BsonTime `json:"request_time" bson:"request_time"` //【请求】时间 + RequestTime gomongo.BsonTime `json:"request_time" bson:"request_time"` //【请求】时间 RequestUri string `json:"request_uri" bson:"request_uri"` //【请求】链接 RequestUrl string `json:"request_url" bson:"request_url"` //【请求】链接 RequestApi string `json:"request_api" bson:"request_api"` //【请求】接口 RequestMethod string `json:"request_method" bson:"request_method"` //【请求】方式 - RequestParams gorequest2.Params `json:"request_params" bson:"request_params"` //【请求】参数 - RequestHeader gorequest2.Headers `json:"request_header" bson:"request_header"` //【请求】头部 + RequestParams gorequest.Params `json:"request_params" bson:"request_params"` //【请求】参数 + RequestHeader gorequest.Headers `json:"request_header" bson:"request_header"` //【请求】头部 ResponseHeader http.Header `json:"response_header" bson:"response_header"` //【返回】头部 ResponseStatusCode int `json:"response_status_code" bson:"response_status_code"` //【返回】状态码 ResponseBody map[string]interface{} `json:"response_body" bson:"response_body"` //【返回】内容 ResponseContentLength int64 `json:"response_content_length" bson:"response_content_length"` //【返回】大小 - ResponseTime gomongo2.BsonTime `json:"response_time" bson:"response_time"` //【返回】时间 + ResponseTime gomongo.BsonTime `json:"response_time" bson:"response_time"` //【返回】时间 } func (m *mongoZap) Database() string { @@ -30,19 +30,19 @@ func (m *mongoZap) TableName() string { return "sendcloud" } -func (app *App) mongoLog(request gorequest2.Response) { +func (app *App) mongoLog(request gorequest.Response) { _, _ = app.mongo.Model(&mongoZap{}).InsertOne(mongoZap{ - RequestTime: gomongo2.BsonTime(request.RequestTime), //【请求】时间 - RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 - RequestMethod: request.RequestMethod, //【请求】方式 - RequestParams: request.RequestParams, //【请求】参数 - RequestHeader: request.RequestHeader, //【请求】头部 - ResponseHeader: request.ResponseHeader, //【返回】头部 - ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 - ResponseBody: gomongo2.JsonDecodeNoError(request.ResponseBody), //【返回】内容 - ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: gomongo2.BsonTime(request.ResponseTime), //【返回】时间 + RequestTime: gomongo.BsonTime(request.RequestTime), //【请求】时间 + RequestUri: request.RequestUri, //【请求】链接 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 + RequestMethod: request.RequestMethod, //【请求】方式 + RequestParams: request.RequestParams, //【请求】参数 + RequestHeader: request.RequestHeader, //【请求】头部 + ResponseHeader: request.ResponseHeader, //【返回】头部 + ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 + ResponseBody: gomongo.JsonDecodeNoError(request.ResponseBody), //【返回】内容 + ResponseContentLength: request.ResponseContentLength, //【返回】大小 + ResponseTime: gomongo.BsonTime(request.ResponseTime), //【返回】时间 }) } diff --git a/service/sendcloud/pgsql.go b/service/sendcloud/pgsql.go index 89cdc2bb..bf747561 100644 --- a/service/sendcloud/pgsql.go +++ b/service/sendcloud/pgsql.go @@ -3,17 +3,17 @@ package sendcloud import ( "go.dtapp.net/library/utils/gojson" "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { +func (app *App) postgresqlLog(request gorequest.Response) { app.log.Record(golog.ApiPostgresqlLog{ RequestTime: request.RequestTime, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 diff --git a/service/taobao/pgsql.go b/service/taobao/pgsql.go index b5b73182..aecccdd2 100644 --- a/service/taobao/pgsql.go +++ b/service/taobao/pgsql.go @@ -2,17 +2,17 @@ package taobao import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(api string, request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(api string, request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 RequestApi: api, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(api string, request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/wechatminiprogram/pgsql.go b/service/wechatminiprogram/pgsql.go index cfc8af70..a7dcc8fb 100644 --- a/service/wechatminiprogram/pgsql.go +++ b/service/wechatminiprogram/pgsql.go @@ -2,25 +2,25 @@ package wechatminiprogram import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - body := golog2.ApiPostgresqlLog{} - body.RequestTime = golog2.TimeString{Time: request.RequestTime} //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + body := golog.ApiPostgresqlLog{} + body.RequestTime = golog.TimeString{Time: request.RequestTime} //【请求】时间 body.RequestUri = request.RequestUri //【请求】链接 - body.RequestUrl = gorequest2.UriParse(request.RequestUri).Url //【请求】链接 - body.RequestApi = gorequest2.UriParse(request.RequestUri).Path //【请求】接口 + body.RequestUrl = gorequest.UriParse(request.RequestUri).Url //【请求】链接 + body.RequestApi = gorequest.UriParse(request.RequestUri).Path //【请求】接口 body.RequestMethod = request.RequestMethod //【请求】方式 body.RequestParams = datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)) //【请求】参数 body.RequestHeader = datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)) //【请求】头部 body.ResponseHeader = datatypes.JSON(gojson.JsonEncodeNoError(request.ResponseHeader)) //【返回】头部 body.ResponseStatusCode = request.ResponseStatusCode //【返回】状态码 body.ResponseContentLength = request.ResponseContentLength //【返回】大小 - body.ResponseTime = golog2.TimeString{Time: request.ResponseTime} //【返回】时间 + body.ResponseTime = golog.TimeString{Time: request.ResponseTime} //【返回】时间 if request.ResponseHeader.Get("Content-Type") == "image/jpeg" || request.ResponseHeader.Get("Content-Type") == "image/png" { } else { body.ResponseBody = request.ResponseBody //【返回】内容 diff --git a/service/wechatoffice/pgsql.go b/service/wechatoffice/pgsql.go index ce1a9b7c..4b1ca70d 100644 --- a/service/wechatoffice/pgsql.go +++ b/service/wechatoffice/pgsql.go @@ -2,18 +2,18 @@ package wechatoffice import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/wechatopen/pgsql.go b/service/wechatopen/pgsql.go index 83028800..651f56df 100644 --- a/service/wechatopen/pgsql.go +++ b/service/wechatopen/pgsql.go @@ -2,18 +2,18 @@ package wechatopen import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/wechatopen/wxa.business.getuserphonenumber.go b/service/wechatopen/wxa.business.getuserphonenumber.go index 41aab071..252d108a 100644 --- a/service/wechatopen/wxa.business.getuserphonenumber.go +++ b/service/wechatopen/wxa.business.getuserphonenumber.go @@ -3,7 +3,7 @@ package wechatopen import ( "encoding/json" "fmt" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -24,11 +24,11 @@ type WxaBusinessGetUserPhoneNumberResponse struct { type WxaBusinessGetUserPhoneNumberResult struct { Result WxaBusinessGetUserPhoneNumberResponse // 结果 Body []byte // 内容 - Http gorequest2.Response // 请求 + Http gorequest.Response // 请求 Err error // 错误 } -func NewWxaBusinessGetUserPhoneNumberResult(result WxaBusinessGetUserPhoneNumberResponse, body []byte, http gorequest2.Response, err error) *WxaBusinessGetUserPhoneNumberResult { +func NewWxaBusinessGetUserPhoneNumberResult(result WxaBusinessGetUserPhoneNumberResponse, body []byte, http gorequest.Response, err error) *WxaBusinessGetUserPhoneNumberResult { return &WxaBusinessGetUserPhoneNumberResult{Result: result, Body: body, Http: http, Err: err} } @@ -36,7 +36,7 @@ func NewWxaBusinessGetUserPhoneNumberResult(result WxaBusinessGetUserPhoneNumber // https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/phonenumber/phonenumber.getPhoneNumber.html func (app *App) WxaBusinessGetUserPhoneNumber(code string) *WxaBusinessGetUserPhoneNumberResult { // 参数 - params := gorequest2.NewParams() + params := gorequest.NewParams() params.Set("code", code) // 请求 request, err := app.request(fmt.Sprintf("https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s", app.GetAuthorizerAccessToken()), params, http.MethodPost) diff --git a/service/wechatopen/wxa.commit.go b/service/wechatopen/wxa.commit.go index a25a4083..11bb3ab2 100644 --- a/service/wechatopen/wxa.commit.go +++ b/service/wechatopen/wxa.commit.go @@ -3,7 +3,7 @@ package wechatopen import ( "encoding/json" "fmt" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -13,21 +13,21 @@ type WxaCommitResponse struct { } type WxaCommitResult struct { - Result WxaCommitResponse // 结果 - Body []byte // 内容 - Http gorequest2.Response // 请求 - Err error // 错误 + Result WxaCommitResponse // 结果 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 } -func NewWxaCommitResult(result WxaCommitResponse, body []byte, http gorequest2.Response, err error) *WxaCommitResult { +func NewWxaCommitResult(result WxaCommitResponse, body []byte, http gorequest.Response, err error) *WxaCommitResult { return &WxaCommitResult{Result: result, Body: body, Http: http, Err: err} } // WxaCommit 上传小程序代码并生成体验版 // https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/code/commit.html -func (app *App) WxaCommit(notMustParams ...gorequest2.Params) *WxaCommitResult { +func (app *App) WxaCommit(notMustParams ...gorequest.Params) *WxaCommitResult { // 参数 - params := gorequest2.NewParamsWith(notMustParams...) + params := gorequest.NewParamsWith(notMustParams...) // 请求 request, err := app.request(fmt.Sprintf("https://api.weixin.qq.com/wxa/commit?access_token=%s", app.GetAuthorizerAccessToken()), params, http.MethodPost) // 定义 diff --git a/service/wechatpayapiv2/mongodb.go b/service/wechatpayapiv2/mongodb.go index caaa771e..95aab8be 100644 --- a/service/wechatpayapiv2/mongodb.go +++ b/service/wechatpayapiv2/mongodb.go @@ -2,7 +2,7 @@ package wechatpayapiv2 import ( "go.dtapp.net/library/utils/gomongo" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -13,8 +13,8 @@ type mongoZap struct { RequestUrl string `json:"request_url" bson:"request_url"` //【请求】链接 RequestApi string `json:"request_api" bson:"request_api"` //【请求】接口 RequestMethod string `json:"request_method" bson:"request_method"` //【请求】方式 - RequestParams gorequest2.Params `json:"request_params" bson:"request_params"` //【请求】参数 - RequestHeader gorequest2.Headers `json:"request_header" bson:"request_header"` //【请求】头部 + RequestParams gorequest.Params `json:"request_params" bson:"request_params"` //【请求】参数 + RequestHeader gorequest.Headers `json:"request_header" bson:"request_header"` //【请求】头部 ResponseHeader http.Header `json:"response_header" bson:"response_header"` //【返回】头部 ResponseStatusCode int `json:"response_status_code" bson:"response_status_code"` //【返回】状态码 ResponseBody map[string]interface{} `json:"response_body" bson:"response_body"` //【返回】内容 @@ -31,12 +31,12 @@ func (m *mongoZap) TableName() string { return "wechatpayapiv2" } -func (app *App) mongoLog(request gorequest2.Response) { +func (app *App) mongoLog(request gorequest.Response) { _, _ = app.mongo.Model(&mongoZap{}).InsertOne(mongoZap{ RequestTime: gomongo.BsonTime(request.RequestTime), //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: request.RequestParams, //【请求】参数 RequestHeader: request.RequestHeader, //【请求】头部 diff --git a/service/wechatpayapiv2/pgsql.go b/service/wechatpayapiv2/pgsql.go index cbe23bd2..a7657a34 100644 --- a/service/wechatpayapiv2/pgsql.go +++ b/service/wechatpayapiv2/pgsql.go @@ -2,19 +2,19 @@ package wechatpayapiv2 import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gomongo" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -22,6 +22,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: datatypes.JSON(gojson.JsonEncodeNoError(gomongo.XmlDecodeNoError(request.ResponseBody))), //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/wechatpayapiv3/mongo.go b/service/wechatpayapiv3/mongo.go index ca8b6404..bb944894 100644 --- a/service/wechatpayapiv3/mongo.go +++ b/service/wechatpayapiv3/mongo.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "go.dtapp.net/library/utils/gomongo" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -13,8 +13,8 @@ type mongoZap struct { RequestUrl string `json:"request_url" bson:"request_url"` //【请求】链接 RequestApi string `json:"request_api" bson:"request_api"` //【请求】接口 RequestMethod string `json:"request_method" bson:"request_method"` //【请求】方式 - RequestParams gorequest2.Params `json:"request_params" bson:"request_params"` //【请求】参数 - RequestHeader gorequest2.Headers `json:"request_header" bson:"request_header"` //【请求】头部 + RequestParams gorequest.Params `json:"request_params" bson:"request_params"` //【请求】参数 + RequestHeader gorequest.Headers `json:"request_header" bson:"request_header"` //【请求】头部 ResponseHeader http.Header `json:"response_header" bson:"response_header"` //【返回】头部 ResponseStatusCode int `json:"response_status_code" bson:"response_status_code"` //【返回】状态码 ResponseBody map[string]interface{} `json:"response_body" bson:"response_body"` //【返回】内容 @@ -30,12 +30,12 @@ func (m *mongoZap) TableName() string { return "wechatpayapiv3" } -func (app *App) mongoLog(request gorequest2.Response) { +func (app *App) mongoLog(request gorequest.Response) { _, _ = app.mongo.Model(&mongoZap{}).InsertOne(mongoZap{ RequestTime: gomongo.BsonTime(request.RequestTime), //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: request.RequestParams, //【请求】参数 RequestHeader: request.RequestHeader, //【请求】头部 diff --git a/service/wechatpayapiv3/pgsql.go b/service/wechatpayapiv3/pgsql.go index 3afa2d14..a35e6f3b 100644 --- a/service/wechatpayapiv3/pgsql.go +++ b/service/wechatpayapiv3/pgsql.go @@ -2,18 +2,18 @@ package wechatpayapiv3 import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/wechatpayopen/pay.partner.transactions.id.go b/service/wechatpayopen/pay.partner.transactions.id.go index db7d8f4f..dba89a2f 100644 --- a/service/wechatpayopen/pay.partner.transactions.id.go +++ b/service/wechatpayopen/pay.partner.transactions.id.go @@ -3,7 +3,7 @@ package wechatpayopen import ( "encoding/json" "fmt" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -54,11 +54,11 @@ type PayPartnerTransactionsIdResponse struct { type PayPartnerTransactionsIdResult struct { Result PayPartnerTransactionsIdResponse // 结果 Body []byte // 内容 - Http gorequest2.Response // 请求 + Http gorequest.Response // 请求 Err error // 错误 } -func NewPayPartnerTransactionsIdResult(result PayPartnerTransactionsIdResponse, body []byte, http gorequest2.Response, err error) *PayPartnerTransactionsIdResult { +func NewPayPartnerTransactionsIdResult(result PayPartnerTransactionsIdResponse, body []byte, http gorequest.Response, err error) *PayPartnerTransactionsIdResult { return &PayPartnerTransactionsIdResult{Result: result, Body: body, Http: http, Err: err} } @@ -66,7 +66,7 @@ func NewPayPartnerTransactionsIdResult(result PayPartnerTransactionsIdResponse, // https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter4_5_2.shtml func (app *App) PayPartnerTransactionsId(transactionId string) *PayPartnerTransactionsIdResult { // 参数 - params := gorequest2.NewParams() + params := gorequest.NewParams() // 请求 // 请求 request, err := app.request(fmt.Sprintf("https://api.mch.weixin.qq.com/v3/pay/partner/transactions/id/%s?sp_mchid=%s&sub_mchid=%s", transactionId, app.spMchId, app.subMchId), params, http.MethodGet) diff --git a/service/wechatpayopen/pay.partner.transactions.jsapi.go b/service/wechatpayopen/pay.partner.transactions.jsapi.go index 6d7b356d..57448428 100644 --- a/service/wechatpayopen/pay.partner.transactions.jsapi.go +++ b/service/wechatpayopen/pay.partner.transactions.jsapi.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "encoding/json" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -13,19 +13,19 @@ type PayPartnerTransactionsJsapiResponse struct { type PayPartnerTransactionsJsapiResult struct { Result PayPartnerTransactionsJsapiResponse // 结果 Body []byte // 内容 - Http gorequest2.Response // 请求 + Http gorequest.Response // 请求 Err error // 错误 } -func NewPayPartnerTransactionsJsapiResult(result PayPartnerTransactionsJsapiResponse, body []byte, http gorequest2.Response, err error) *PayPartnerTransactionsJsapiResult { +func NewPayPartnerTransactionsJsapiResult(result PayPartnerTransactionsJsapiResponse, body []byte, http gorequest.Response, err error) *PayPartnerTransactionsJsapiResult { return &PayPartnerTransactionsJsapiResult{Result: result, Body: body, Http: http, Err: err} } // PayPartnerTransactionsJsapi JSAPI下单 // https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter4_5_1.shtml -func (app *App) PayPartnerTransactionsJsapi(notMustParams ...gorequest2.Params) *PayPartnerTransactionsJsapiResult { +func (app *App) PayPartnerTransactionsJsapi(notMustParams ...gorequest.Params) *PayPartnerTransactionsJsapiResult { // 参数 - params := gorequest2.NewParamsWith(notMustParams...) + params := gorequest.NewParamsWith(notMustParams...) params.Set("sp_appid", app.spAppid) // 服务商应用ID params.Set("sp_mchid", app.spMchId) // 服务商户号 params.Set("sub_appid", app.subAppid) // 子商户应用ID diff --git a/service/wechatpayopen/pay.partner.transactions.out-trade-no.close.go b/service/wechatpayopen/pay.partner.transactions.out-trade-no.close.go index 47e23c19..2842febb 100644 --- a/service/wechatpayopen/pay.partner.transactions.out-trade-no.close.go +++ b/service/wechatpayopen/pay.partner.transactions.out-trade-no.close.go @@ -2,17 +2,17 @@ package wechatpayopen import ( "fmt" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) type PayPartnerTransactionsOutTradeNoCloseResult struct { - Body []byte // 内容 - Http gorequest2.Response // 请求 - Err error // 错误 + Body []byte // 内容 + Http gorequest.Response // 请求 + Err error // 错误 } -func NewPayPartnerTransactionsOutTradeNoCloseResult(body []byte, http gorequest2.Response, err error) *PayPartnerTransactionsOutTradeNoCloseResult { +func NewPayPartnerTransactionsOutTradeNoCloseResult(body []byte, http gorequest.Response, err error) *PayPartnerTransactionsOutTradeNoCloseResult { return &PayPartnerTransactionsOutTradeNoCloseResult{Body: body, Http: http, Err: err} } @@ -20,7 +20,7 @@ func NewPayPartnerTransactionsOutTradeNoCloseResult(body []byte, http gorequest2 // https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter4_5_3.shtml func (app *App) PayPartnerTransactionsOutTradeNoClose(outTradeNo string) *PayPartnerTransactionsOutTradeNoCloseResult { // 参数 - params := gorequest2.NewParams() + params := gorequest.NewParams() params.Set("sp_mchid", app.spMchId) // 服务商户号 params.Set("sub_mchid", app.subMchId) // 子商户号 // 请求 diff --git a/service/wechatpayopen/pay.partner.transactions.out-trade-no.go b/service/wechatpayopen/pay.partner.transactions.out-trade-no.go index aaf6f2b5..2444f78a 100644 --- a/service/wechatpayopen/pay.partner.transactions.out-trade-no.go +++ b/service/wechatpayopen/pay.partner.transactions.out-trade-no.go @@ -3,7 +3,7 @@ package wechatpayopen import ( "encoding/json" "fmt" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" ) @@ -57,11 +57,11 @@ type PayPartnerTransactionsOutTradeNoResponse struct { type PayPartnerTransactionsOutTradeNoResult struct { Result PayPartnerTransactionsOutTradeNoResponse // 结果 Body []byte // 内容 - Http gorequest2.Response // 请求 + Http gorequest.Response // 请求 Err error // 错误 } -func NewPayPartnerTransactionsOutTradeNoResult(result PayPartnerTransactionsOutTradeNoResponse, body []byte, http gorequest2.Response, err error) *PayPartnerTransactionsOutTradeNoResult { +func NewPayPartnerTransactionsOutTradeNoResult(result PayPartnerTransactionsOutTradeNoResponse, body []byte, http gorequest.Response, err error) *PayPartnerTransactionsOutTradeNoResult { return &PayPartnerTransactionsOutTradeNoResult{Result: result, Body: body, Http: http, Err: err} } @@ -69,7 +69,7 @@ func NewPayPartnerTransactionsOutTradeNoResult(result PayPartnerTransactionsOutT // https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter4_5_2.shtml func (app *App) PayPartnerTransactionsOutTradeNo(outTradeNo string) *PayPartnerTransactionsOutTradeNoResult { // 参数 - params := gorequest2.NewParams() + params := gorequest.NewParams() // 请求 request, err := app.request(fmt.Sprintf("https://api.mch.weixin.qq.com/v3/pay/partner/transactions/out-trade-no/%s?sp_mchid=%s&sub_mchid=%s", outTradeNo, app.spMchId, app.subMchId), params, http.MethodGet) if err != nil { diff --git a/service/wechatpayopen/pgsql.go b/service/wechatpayopen/pgsql.go index 79c36557..af6038e7 100644 --- a/service/wechatpayopen/pgsql.go +++ b/service/wechatpayopen/pgsql.go @@ -2,18 +2,18 @@ package wechatpayopen import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/wechatpayopen/refund.domestic.refunds.go b/service/wechatpayopen/refund.domestic.refunds.go index a16b3778..b472d84d 100644 --- a/service/wechatpayopen/refund.domestic.refunds.go +++ b/service/wechatpayopen/refund.domestic.refunds.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "encoding/json" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" "time" ) @@ -52,19 +52,19 @@ type RefundDomesticRefundsResponse struct { type RefundDomesticRefundsResult struct { Result RefundDomesticRefundsResponse // 结果 Body []byte // 内容 - Http gorequest2.Response // 请求 + Http gorequest.Response // 请求 Err error // 错误 } -func NewRefundDomesticRefundsResult(result RefundDomesticRefundsResponse, body []byte, http gorequest2.Response, err error) *RefundDomesticRefundsResult { +func NewRefundDomesticRefundsResult(result RefundDomesticRefundsResponse, body []byte, http gorequest.Response, err error) *RefundDomesticRefundsResult { return &RefundDomesticRefundsResult{Result: result, Body: body, Http: http, Err: err} } // RefundDomesticRefunds 申请退款API // https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter4_5_9.shtml -func (app *App) RefundDomesticRefunds(notMustParams ...gorequest2.Params) *RefundDomesticRefundsResult { +func (app *App) RefundDomesticRefunds(notMustParams ...gorequest.Params) *RefundDomesticRefundsResult { // 参数 - params := gorequest2.NewParamsWith(notMustParams...) + params := gorequest.NewParamsWith(notMustParams...) params.Set("sub_mchid", app.subMchId) // 子商户号 // 请求 request, err := app.request("https://api.mch.weixin.qq.com/v3/refund/domestic/refunds", params, http.MethodPost) diff --git a/service/wechatpayopen/refund.domestic.refunds.out_refund_no.go b/service/wechatpayopen/refund.domestic.refunds.out_refund_no.go index 34d9740d..80cda2df 100644 --- a/service/wechatpayopen/refund.domestic.refunds.out_refund_no.go +++ b/service/wechatpayopen/refund.domestic.refunds.out_refund_no.go @@ -2,7 +2,7 @@ package wechatpayopen import ( "encoding/json" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" "net/http" "time" ) @@ -52,11 +52,11 @@ type RefundDomesticRefundsOutRefundNoResponse struct { type RefundDomesticRefundsOutRefundNoResult struct { Result RefundDomesticRefundsOutRefundNoResponse // 结果 Body []byte // 内容 - Http gorequest2.Response // 请求 + Http gorequest.Response // 请求 Err error // 错误 } -func NewRefundDomesticRefundsOutRefundNoResult(result RefundDomesticRefundsOutRefundNoResponse, body []byte, http gorequest2.Response, err error) *RefundDomesticRefundsOutRefundNoResult { +func NewRefundDomesticRefundsOutRefundNoResult(result RefundDomesticRefundsOutRefundNoResponse, body []byte, http gorequest.Response, err error) *RefundDomesticRefundsOutRefundNoResult { return &RefundDomesticRefundsOutRefundNoResult{Result: result, Body: body, Http: http, Err: err} } @@ -64,7 +64,7 @@ func NewRefundDomesticRefundsOutRefundNoResult(result RefundDomesticRefundsOutRe // https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter4_5_9.shtml func (app *App) RefundDomesticRefundsOutRefundNo(outRefundNo string) *RefundDomesticRefundsOutRefundNoResult { // 参数 - params := gorequest2.NewParams() + params := gorequest.NewParams() // 请求 request, err := app.request("https://api.mch.weixin.qq.com/v3/refund/domestic/refunds/"+outRefundNo+"?sub_mchid="+app.subMchId, params, http.MethodGet) if err != nil { diff --git a/service/wechatqy/pgsql.go b/service/wechatqy/pgsql.go index 928a26d5..c804d438 100644 --- a/service/wechatqy/pgsql.go +++ b/service/wechatqy/pgsql.go @@ -2,18 +2,18 @@ package wechatqy import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/wechatqy/webhook.send.go b/service/wechatqy/webhook.send.go index 6a4257ca..ec3da087 100644 --- a/service/wechatqy/webhook.send.go +++ b/service/wechatqy/webhook.send.go @@ -3,7 +3,7 @@ package wechatqy import ( "encoding/json" "fmt" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/gorequest" ) type WebhookSendResponse struct { @@ -17,19 +17,19 @@ type WebhookSendResponse struct { type WebhookSendResult struct { Result WebhookSendResponse // 结果 Body []byte // 内容 - Http gorequest2.Response // 请求 + Http gorequest.Response // 请求 Err error // 错误 } -func NewWebhookSendResult(result WebhookSendResponse, body []byte, http gorequest2.Response, err error) *WebhookSendResult { +func NewWebhookSendResult(result WebhookSendResponse, body []byte, http gorequest.Response, err error) *WebhookSendResult { return &WebhookSendResult{Result: result, Body: body, Http: http, Err: err} } // WebhookSend 发送应用消息 // https://developer.work.weixin.qq.com/document/path/90372 -func (app *App) WebhookSend(notMustParams ...gorequest2.Params) *WebhookSendResult { +func (app *App) WebhookSend(notMustParams ...gorequest.Params) *WebhookSendResult { // 参数 - params := gorequest2.NewParamsWith(notMustParams...) + params := gorequest.NewParamsWith(notMustParams...) // 请求 request, err := app.request(fmt.Sprintf("https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=%s&type=%s", app.key, "text"), params) // 定义 diff --git a/service/wechatunion/pgsql.go b/service/wechatunion/pgsql.go index d11c9d4c..875f0fdb 100644 --- a/service/wechatunion/pgsql.go +++ b/service/wechatunion/pgsql.go @@ -2,18 +2,18 @@ package wechatunion import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/weishi/pgsql.go b/service/weishi/pgsql.go index 897a32c8..3d16c999 100644 --- a/service/weishi/pgsql.go +++ b/service/weishi/pgsql.go @@ -2,18 +2,18 @@ package weishi import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (ws *WeiShi) postgresqlLog(request gorequest2.Response) { - ws.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (ws *WeiShi) postgresqlLog(request gorequest.Response) { + ws.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (ws *WeiShi) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) } diff --git a/service/wikeyun/pgsql.go b/service/wikeyun/pgsql.go index f1d1a797..95666340 100644 --- a/service/wikeyun/pgsql.go +++ b/service/wikeyun/pgsql.go @@ -2,18 +2,18 @@ package wikeyun import ( "go.dtapp.net/library/utils/gojson" - golog2 "go.dtapp.net/library/utils/golog" - gorequest2 "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 -func (app *App) postgresqlLog(request gorequest2.Response) { - app.log.Record(golog2.ApiPostgresqlLog{ - RequestTime: golog2.TimeString{Time: request.RequestTime}, //【请求】时间 +func (app *App) postgresqlLog(request gorequest.Response) { + app.log.Record(golog.ApiPostgresqlLog{ + RequestTime: golog.TimeString{Time: request.RequestTime}, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 - RequestUrl: gorequest2.UriParse(request.RequestUri).Url, //【请求】链接 - RequestApi: gorequest2.UriParse(request.RequestUri).Path, //【请求】接口 + RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 + RequestApi: gorequest.UriParse(request.RequestUri).Path, //【请求】接口 RequestMethod: request.RequestMethod, //【请求】方式 RequestParams: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)), //【请求】参数 RequestHeader: datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)), //【返回】头部 @@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest2.Response) { ResponseStatusCode: request.ResponseStatusCode, //【返回】状态码 ResponseBody: request.ResponseBody, //【返回】内容 ResponseContentLength: request.ResponseContentLength, //【返回】大小 - ResponseTime: golog2.TimeString{Time: request.ResponseTime}, //【返回】时间 + ResponseTime: golog.TimeString{Time: request.ResponseTime}, //【返回】时间 }) }