From faef1d74e0655e6d51c22af8143545bf8f098e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Tue, 28 Dec 2021 17:31:57 +0800 Subject: [PATCH] update service log --- service/dingdanxia/app.go | 15 +++++++-------- service/eastiot/app.go | 14 ++++++-------- service/ejiaofei/app.go | 14 ++++++-------- service/jd/app.go | 13 ++++++------- service/kashangwl/app.go | 13 ++++++------- service/meituan/app.go | 18 ++++++++---------- service/pinduoduo/app.go | 15 +++++++-------- service/pintoto/app.go | 9 ++++----- service/taobao/app.go | 13 ++++++------- service/wechatmp/app.go | 17 ++++++++--------- service/wechatpayapiv3/app.go | 13 ++++++------- service/wechatqy/app.go | 9 ++++----- service/wechatunion/app.go | 19 +++++++++---------- service/wikeyun/app.go | 9 ++++----- 14 files changed, 87 insertions(+), 104 deletions(-) diff --git a/service/dingdanxia/app.go b/service/dingdanxia/app.go index be7d089c..c50634d4 100644 --- a/service/dingdanxia/app.go +++ b/service/dingdanxia/app.go @@ -2,14 +2,15 @@ package dingdanxia import ( "errors" + "fmt" + "go.uber.org/zap" "gopkg.in/dtapps/go-library.v3/utils/gohttp" - "gopkg.in/dtapps/go-library.v3/utils/golog" "net/http" ) type App struct { ApiKey string - ZapLog golog.App // 日志服务 + ZapLog *zap.Logger // 日志服务 } func (app *App) request(url string, params map[string]interface{}, method string) ([]byte, error) { @@ -20,18 +21,16 @@ func (app *App) request(url string, params map[string]interface{}, method string // 请求 get, err := gohttp.Get(url, params) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "dingdanxia.log" - app.ZapLog.Logger.Sugar().Info(get) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(fmt.Sprintf("%s", get.Body)) } return get.Body, err case http.MethodPost: // 请求 postJson, err := gohttp.PostForm(url, params) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "dingdanxia.log" - app.ZapLog.Logger.Sugar().Info(postJson) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(fmt.Sprintf("%s", postJson.Body)) } return postJson.Body, err default: diff --git a/service/eastiot/app.go b/service/eastiot/app.go index dbbf02a7..7d2ac717 100644 --- a/service/eastiot/app.go +++ b/service/eastiot/app.go @@ -2,8 +2,8 @@ package eastiot import ( "errors" + "go.uber.org/zap" "gopkg.in/dtapps/go-library.v3/utils/gohttp" - "gopkg.in/dtapps/go-library.v3/utils/golog" "net/http" "time" ) @@ -11,7 +11,7 @@ import ( type App struct { AppID string ApiKey string - ZapLog golog.App // 日志服务 + ZapLog *zap.Logger // 日志服务 } func (app *App) request(url string, params map[string]interface{}, method string) ([]byte, error) { @@ -25,18 +25,16 @@ func (app *App) request(url string, params map[string]interface{}, method string // 请求 get, err := gohttp.Get(url, params) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "eastiot.log" - app.ZapLog.Logger.Sugar().Info(get) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(get) } return get.Body, err case http.MethodPost: // 请求 postJson, err := gohttp.PostForm(url, params) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "eastiot.log" - app.ZapLog.Logger.Sugar().Info(postJson) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(postJson) } return postJson.Body, err default: diff --git a/service/ejiaofei/app.go b/service/ejiaofei/app.go index ec12afbc..d9b35be9 100644 --- a/service/ejiaofei/app.go +++ b/service/ejiaofei/app.go @@ -3,8 +3,8 @@ package ejiaofei import ( "errors" "fmt" + "go.uber.org/zap" "gopkg.in/dtapps/go-library.v3/utils/gohttp" - "gopkg.in/dtapps/go-library.v3/utils/golog" "gopkg.in/dtapps/go-library.v3/utils/gomd5" "net/http" ) @@ -14,7 +14,7 @@ type App struct { Pwd string Key string signStr string - ZapLog golog.App // 日志服务 + ZapLog *zap.Logger // 日志服务 } func (app *App) request(url string, params map[string]interface{}, method string) ([]byte, error) { @@ -28,18 +28,16 @@ func (app *App) request(url string, params map[string]interface{}, method string // 请求 get, err := gohttp.Get(url, params) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "ejiaofei.log" - app.ZapLog.Logger.Sugar().Info(get) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(get) } return get.Body, err case http.MethodPost: // 请求 postJson, err := gohttp.PostForm(url, params) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "ejiaofei.log" - app.ZapLog.Logger.Sugar().Info(postJson) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(postJson) } return postJson.Body, err default: diff --git a/service/jd/app.go b/service/jd/app.go index e1e7e6b8..02c6f75f 100644 --- a/service/jd/app.go +++ b/service/jd/app.go @@ -2,14 +2,14 @@ package jd import ( "encoding/json" + "go.uber.org/zap" "gopkg.in/dtapps/go-library.v3/utils/gohttp" - "gopkg.in/dtapps/go-library.v3/utils/golog" ) type App struct { - AppKey string // 应用Key - SecretKey string // 密钥 - ZapLog golog.App // 日志服务 + AppKey string // 应用Key + SecretKey string // 密钥 + ZapLog *zap.Logger // 日志服务 } type ErrResp struct { @@ -24,9 +24,8 @@ func (app *App) request(params map[string]interface{}) (resp []byte, err error) // 发送请求 httpGet, err := gohttp.PostForm("https://api.jd.com/routerjson", params) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "jd.log" - app.ZapLog.Logger.Sugar().Info(httpGet) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(httpGet) } // 检查错误 var errResp ErrResp diff --git a/service/kashangwl/app.go b/service/kashangwl/app.go index 0e02e52b..1de708cd 100644 --- a/service/kashangwl/app.go +++ b/service/kashangwl/app.go @@ -2,16 +2,16 @@ package kashangwl import ( "encoding/json" + "go.uber.org/zap" "gopkg.in/dtapps/go-library.v3/utils/gohttp" - "gopkg.in/dtapps/go-library.v3/utils/golog" "time" ) // App 卡商网服务 type App struct { - CustomerId int // 商家编号 - CustomerKey string // 商家密钥 - ZapLog golog.App // 日志服务 + CustomerId int // 商家编号 + CustomerKey string // 商家密钥 + ZapLog *zap.Logger // 日志服务 } func (app *App) request(url string, params map[string]interface{}) ([]byte, error) { @@ -25,9 +25,8 @@ func (app *App) request(url string, params map[string]interface{}) ([]byte, erro // 请求 postJson, err := gohttp.PostJson(url, paramsStr) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "kashangwl.log" - app.ZapLog.Logger.Sugar().Info(postJson.Body) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(postJson.Body) } return postJson.Body, err } diff --git a/service/meituan/app.go b/service/meituan/app.go index 7d5e78de..69a1091e 100644 --- a/service/meituan/app.go +++ b/service/meituan/app.go @@ -3,16 +3,16 @@ package meituan import ( "encoding/json" "errors" + "go.uber.org/zap" "gopkg.in/dtapps/go-library.v3/utils/gohttp" - "gopkg.in/dtapps/go-library.v3/utils/golog" "net/http" ) // App 美团联盟 type App struct { - Secret string // 秘钥 - AppKey string // 渠道标记 - ZapLog golog.App // 日志服务 + Secret string // 秘钥 + AppKey string // 渠道标记 + ZapLog *zap.Logger // 日志服务 } func (app *App) request(url string, params map[string]interface{}, method string) (resp []byte, err error) { @@ -21,9 +21,8 @@ func (app *App) request(url string, params map[string]interface{}, method string // 请求 get, err := gohttp.Get(url, params) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "meituan.log" - app.ZapLog.Logger.Sugar().Info(get) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(get) } return get.Body, err case http.MethodPost: @@ -31,9 +30,8 @@ func (app *App) request(url string, params map[string]interface{}, method string paramsStr, err := json.Marshal(params) postJson, err := gohttp.PostJson(url, paramsStr) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "meituan.log" - app.ZapLog.Logger.Sugar().Info(postJson) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(postJson) } return postJson.Body, err default: diff --git a/service/pinduoduo/app.go b/service/pinduoduo/app.go index 6b8a5934..4836c243 100644 --- a/service/pinduoduo/app.go +++ b/service/pinduoduo/app.go @@ -3,8 +3,8 @@ package pinduoduo import ( "encoding/json" "fmt" + "go.uber.org/zap" "gopkg.in/dtapps/go-library.v3/utils/gohttp" - "gopkg.in/dtapps/go-library.v3/utils/golog" "gopkg.in/dtapps/go-library.v3/utils/gostring" "regexp" "strconv" @@ -13,10 +13,10 @@ import ( // App 公共请求参数 type App struct { - ClientId string // POP分配给应用的client_id - ClientSecret string // POP分配给应用的client_secret - Pid string // 推广位 - ZapLog golog.App // 日志服务 + ClientId string // POP分配给应用的client_id + ClientSecret string // POP分配给应用的client_secret + Pid string // 推广位 + ZapLog *zap.Logger // 日志服务 } type ErrResp struct { @@ -40,9 +40,8 @@ func (app *App) request(params map[string]interface{}) (resp []byte, err error) // 发送请求 httpGet, err := gohttp.Get("https://gw-api.pinduoduo.com/api/router", params) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "pinduoduo.log" - app.ZapLog.Logger.Sugar().Info(httpGet) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(httpGet) } // 检查错误 var errResp ErrResp diff --git a/service/pintoto/app.go b/service/pintoto/app.go index ce603912..ebf476d3 100644 --- a/service/pintoto/app.go +++ b/service/pintoto/app.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" "fmt" - "gopkg.in/dtapps/go-library.v3/utils/golog" + "go.uber.org/zap" "io/ioutil" "math" "net/http" @@ -17,7 +17,7 @@ import ( type App struct { AppKey string AppSecret string - ZapLog golog.App // 日志服务 + ZapLog *zap.Logger // 日志服务 } type ErrResp struct { @@ -55,9 +55,8 @@ func (app *App) request(url string, params map[string]interface{}) ([]byte, erro body, err := ioutil.ReadAll(response.Body) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "pintoto.log" - app.ZapLog.Logger.Sugar().Info(response.Body) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(response.Body) } // 检查错误 diff --git a/service/taobao/app.go b/service/taobao/app.go index 7bcba354..03cfa845 100644 --- a/service/taobao/app.go +++ b/service/taobao/app.go @@ -3,8 +3,8 @@ package taobao import ( "encoding/json" "fmt" + "go.uber.org/zap" "gopkg.in/dtapps/go-library.v3/utils/gohttp" - "gopkg.in/dtapps/go-library.v3/utils/golog" "gopkg.in/dtapps/go-library.v3/utils/gostring" "regexp" "strconv" @@ -12,9 +12,9 @@ import ( // App 公共请求参数 type App struct { - AppKey string // 应用Key - AppSecret string // 密钥 - ZapLog golog.App // 日志服务 + AppKey string // 应用Key + AppSecret string // 密钥 + ZapLog *zap.Logger // 日志服务 } type ErrResp struct { ErrorResponse struct { @@ -32,9 +32,8 @@ func (app *App) request(params map[string]interface{}) (resp []byte, err error) // 发送请求 httpGet, err := gohttp.Get("https://eco.taobao.com/router/rest", params) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "taobao.log" - app.ZapLog.Logger.Sugar().Info(httpGet) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(httpGet) } // 检查错误 var errResp ErrResp diff --git a/service/wechatmp/app.go b/service/wechatmp/app.go index b944c642..196551b2 100644 --- a/service/wechatmp/app.go +++ b/service/wechatmp/app.go @@ -3,18 +3,18 @@ package wechatmp import ( "bytes" "encoding/json" - "gopkg.in/dtapps/go-library.v3/utils/golog" + "go.uber.org/zap" "io/ioutil" "net/http" ) // App 微信小程序服务 type App struct { - AppId string // 小程序唯一凭证，即 AppID - AppSecret string // 小程序唯一凭证密钥，即 AppSecret - AccessToken string // 接口调用凭证 - JsapiTicket string // 签名凭证 - ZapLog golog.App // 日志服务 + AppId string // 小程序唯一凭证，即 AppID + AppSecret string // 小程序唯一凭证密钥，即 AppSecret + AccessToken string // 接口调用凭证 + JsapiTicket string // 签名凭证 + ZapLog *zap.Logger // 日志服务 } func (app *App) request(url string, params map[string]interface{}, method string) (resp []byte, err error) { @@ -39,9 +39,8 @@ func (app *App) request(url string, params map[string]interface{}, method string resp, err = ioutil.ReadAll(response.Body) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "wechatmp.log" - app.ZapLog.Logger.Sugar().Info(response.Body) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(response.Body) } // 检查请求错误 diff --git a/service/wechatpayapiv3/app.go b/service/wechatpayapiv3/app.go index 09d5494e..7dac82b3 100644 --- a/service/wechatpayapiv3/app.go +++ b/service/wechatpayapiv3/app.go @@ -3,7 +3,7 @@ package wechatpayapiv3 import ( "bytes" "encoding/json" - "gopkg.in/dtapps/go-library.v3/utils/golog" + "go.uber.org/zap" "gopkg.in/dtapps/go-library.v3/utils/gorequest" "io/ioutil" "net/http" @@ -16,9 +16,9 @@ type App struct { MchId string // 微信支付的商户id AesKey string ApiV3 string - PrivateSerialNo string // 私钥证书号 - MchPrivateKey string // 商户私有证书内容 apiclient_key.pem - ZapLog golog.App // 日志服务 + PrivateSerialNo string // 私钥证书号 + MchPrivateKey string // 商户私有证书内容 apiclient_key.pem + ZapLog *zap.Logger // 日志服务 } // ErrResp 错误返回 @@ -72,9 +72,8 @@ func (app *App) request(url string, params map[string]interface{}, method string } // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "wechatpayapiv3.log" - app.ZapLog.Logger.Sugar().Info(result) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(result) } // 检查请求错误 diff --git a/service/wechatqy/app.go b/service/wechatqy/app.go index 0517dae0..f474f5bc 100644 --- a/service/wechatqy/app.go +++ b/service/wechatqy/app.go @@ -2,13 +2,13 @@ package wechatqy import ( "encoding/json" + "go.uber.org/zap" "gopkg.in/dtapps/go-library.v3/utils/gohttp" - "gopkg.in/dtapps/go-library.v3/utils/golog" ) type App struct { Key string - ZapLog golog.App // 日志服务 + ZapLog *zap.Logger // 日志服务 } func (app *App) request(url string, params map[string]interface{}) (body []byte, err error) { @@ -17,9 +17,8 @@ func (app *App) request(url string, params map[string]interface{}) (body []byte, // 请求 postJson, err := gohttp.PostJson(url, paramsStr) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "wechatqy.log" - app.ZapLog.Logger.Sugar().Info(postJson) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(postJson) } return postJson.Body, err } diff --git a/service/wechatunion/app.go b/service/wechatunion/app.go index 5fc1895f..e666167e 100644 --- a/service/wechatunion/app.go +++ b/service/wechatunion/app.go @@ -2,24 +2,24 @@ package wechatunion import ( "encoding/json" + "go.uber.org/zap" "gopkg.in/dtapps/go-library.v3/utils/gohttp" - "gopkg.in/dtapps/go-library.v3/utils/golog" "net/http" ) type App struct { - AppId string // 小程序唯一凭证，即 AppID - AppSecret string // 小程序唯一凭证密钥，即 AppSecret - AccessToken string // 接口调用凭证 - ZapLog golog.App // 日志服务 + AppId string // 小程序唯一凭证，即 AppID + AppSecret string // 小程序唯一凭证密钥，即 AppSecret + AccessToken string // 接口调用凭证 + ZapLog *zap.Logger // 日志服务 } func (app *App) request(url string, params map[string]interface{}, method string) (resp []byte, err error) { if method == http.MethodGet { get, err := gohttp.Get(url, params) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.Logger.Sugar().Info(get) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(get) } return get.Body, err } else { @@ -27,9 +27,8 @@ func (app *App) request(url string, params map[string]interface{}, method string paramsStr, err := json.Marshal(params) postJson, err := gohttp.PostJson(url, paramsStr) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "wechatunion.log" - app.ZapLog.Logger.Sugar().Info(postJson) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(postJson) } return postJson.Body, err } diff --git a/service/wikeyun/app.go b/service/wikeyun/app.go index 2a432fda..d90727e4 100644 --- a/service/wikeyun/app.go +++ b/service/wikeyun/app.go @@ -2,8 +2,8 @@ package wikeyun import ( "fmt" + "go.uber.org/zap" "gopkg.in/dtapps/go-library.v3/utils/gohttp" - "gopkg.in/dtapps/go-library.v3/utils/golog" ) type App struct { @@ -11,7 +11,7 @@ type App struct { AppKey int AppSecret string ClientIP string - ZapLog golog.App // 日志服务 + ZapLog *zap.Logger // 日志服务 } func (app *App) request(url string, params map[string]interface{}) (resp []byte, err error) { @@ -21,9 +21,8 @@ func (app *App) request(url string, params map[string]interface{}) (resp []byte, requestUrl := fmt.Sprintf("%s?app_key=%d×tamp=%s&client=%s&format=%s&v=%s&sign=%s", url, app.AppKey, sign.Timestamp, sign.Client, sign.Format, sign.V, sign.Sign) postForm, err := gohttp.PostForm(requestUrl, params) // 日志 - if app.ZapLog.Logger != nil { - app.ZapLog.LogName = "wikeyun.log" - app.ZapLog.Logger.Sugar().Info(postForm) + if app.ZapLog != nil { + app.ZapLog.Sugar().Info(postForm) } return postForm.Body, err }