- update log

master
李光春 11 months ago
parent 19b44285e3
commit 49df014426

@ -1,5 +1,5 @@
package go_library
func Version() string {
return "1.0.151"
return "1.0.152"
}

@ -30,10 +30,6 @@ type Client struct {
alipayRSA2 string // 支付宝公钥
aes string // 接口内容加密方式
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package alipayopen
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,7 +1,5 @@
package alipayopen
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetAppId() string {
return c.config.appId
}
@ -21,7 +19,3 @@ func (c *Client) GetAlipayRSA2() string {
func (c *Client) GetAes() string {
return c.config.aes
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -27,9 +27,6 @@ func (c *Client) request(ctx context.Context, param map[string]interface{}) (gor
}
// 记录日志
if c.log.status {
go c.log.client.MiddlewareCustom(ctx, gostring.ToString(params["method"]), request)
}
if c.zap.status {
go c.zap.client.MiddlewareCustom(ctx, gostring.ToString(params["method"]), request)
}

@ -16,10 +16,6 @@ type Client struct {
config struct {
key string
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package amap
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,11 +1,5 @@
package amap
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetKey() string {
return c.config.key
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -29,9 +29,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 记录日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -14,10 +14,6 @@ type Client struct {
config struct {
ak string
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package baidu
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,11 +1,5 @@
package baidu
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetAk() string {
return c.config.ak
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -29,9 +29,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 记录日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -16,10 +16,6 @@ type Client struct {
config struct {
token string
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package caiyunapp
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,15 +1,9 @@
package caiyunapp
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetToken() string {
return c.config.token
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}
func (c *Client) getApiUrl() string {
return apiUrl + "/" + c.config.token
}

@ -29,9 +29,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 记录日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -2,7 +2,6 @@ package cloudflare
import (
"github.com/dtapps/go-library/utils/dorm"
"github.com/dtapps/go-library/utils/golog"
"github.com/dtapps/go-library/utils/gorequest"
"gorm.io/gorm"
)
@ -17,9 +16,8 @@ type ConfigClient struct {
}
type Client struct {
client *gorequest.App // 请求客户端
log *golog.ApiClient // 日志服务
config *ConfigClient // 配置
client *gorequest.App // 请求客户端
config *ConfigClient // 配置
}
func NewClient(config *ConfigClient) (*Client, error) {
@ -29,25 +27,5 @@ func NewClient(config *ConfigClient) (*Client, error) {
c.client = gorequest.NewHttp()
if c.config.PgsqlDb != nil {
c.log, err = golog.NewApiClient(
golog.WithGormClient(c.config.PgsqlDb),
golog.WithTableName(logTable),
)
if err != nil {
return nil, err
}
}
if c.config.MongoDb != nil {
c.log, err = golog.NewApiClient(
golog.WithMongoClient(c.config.MongoDb),
golog.WithDatabaseName(c.config.DatabaseName),
golog.WithCollectionName(logTable),
)
if err != nil {
return nil, err
}
}
return c, nil
}

@ -1,8 +1,11 @@
package cloudflare
import "github.com/dtapps/go-library/utils/gorequest"
import (
"context"
"github.com/dtapps/go-library/utils/gorequest"
)
func (c *Client) request(url string, params map[string]interface{}, method string) (gorequest.Response, error) {
func (c *Client) request(ctx context.Context, url string, params map[string]interface{}, method string) (gorequest.Response, error) {
// 创建请求
client := c.client
@ -20,18 +23,12 @@ func (c *Client) request(url string, params map[string]interface{}, method strin
client.SetParams(params)
// 发起请求
request, err := client.Request()
request, err := client.Request(ctx)
if err != nil {
return gorequest.Response{}, err
}
// 日志
if c.config.PgsqlDb != nil {
go c.log.GormMiddleware(request)
}
if c.config.MongoDb != nil {
go c.log.MongoMiddleware(request)
}
return request, err
}

@ -16,10 +16,6 @@ type Client struct {
config struct {
apiKey string // 密钥
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package dingdanxia
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,11 +1,5 @@
package dingdanxia
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetApiKey() string {
return c.config.apiKey
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -33,9 +33,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 记录日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -18,10 +18,6 @@ type Client struct {
secret string
accessToken string
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -8,15 +8,6 @@ func (c *Client) Config(secret, accessToken string) *Client {
return c
}
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,7 +1,5 @@
package dingtalk
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetSecret() string {
return c.config.secret
}
@ -9,7 +7,3 @@ func (c *Client) GetSecret() string {
func (c *Client) GetAccessToken() string {
return c.config.accessToken
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -29,9 +29,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 记录日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -14,10 +14,6 @@ type Client struct {
config struct {
ua string // 用户代理
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package douyin
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,7 +1 @@
package douyin
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -32,9 +32,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 记录日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -18,10 +18,6 @@ type Client struct {
appId string
apiKey string
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package eastiot
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,7 +1,5 @@
package eastiot
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetAppId() string {
return c.config.appId
}
@ -9,7 +7,3 @@ func (c *Client) GetAppId() string {
func (c *Client) GetApiKey() string {
return c.config.apiKey
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -37,9 +37,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 记录日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -21,10 +21,6 @@ type Client struct {
key string
signStr string // 需要签名的字符串
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package ejiaofei
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,7 +1,5 @@
package ejiaofei
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetUserId() string {
return c.config.userId
}
@ -13,7 +11,3 @@ func (c *Client) GetPwd() string {
func (c *Client) GetKey() string {
return c.config.key
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -38,9 +38,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 记录日志
if c.log.status {
go c.log.client.MiddlewareXml(ctx, request)
}
if c.zap.status {
go c.zap.client.MiddlewareXml(ctx, request)
}

@ -16,10 +16,6 @@ type Client struct {
config struct {
key string
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -7,15 +7,6 @@ func (c *Client) Config(key string) *Client {
return c
}
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,11 +1,5 @@
package feishu
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetKey() string {
return c.config.key
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -26,9 +26,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 记录日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -1,7 +1,6 @@
package gddata
import (
"github.com/dtapps/go-library/utils/golog"
"github.com/dtapps/go-library/utils/gorequest"
)
@ -16,10 +15,6 @@ type Client struct {
config struct {
token string
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
}
// NewClient 创建实例化

@ -1,17 +1,6 @@
package gddata
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) Config(token string) *Client {
c.config.token = token
return c
}
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}

@ -34,9 +34,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 记录日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
return request, err
}

@ -1,7 +1,6 @@
package gitee
import (
"github.com/dtapps/go-library/utils/golog"
"github.com/dtapps/go-library/utils/gorequest"
"gorm.io/gorm"
)
@ -14,9 +13,8 @@ type ConfigClient struct {
}
type Client struct {
client *gorequest.App // 请求客户端
log *golog.ApiClient // 日志服务
config *ConfigClient // 配置
client *gorequest.App // 请求客户端
config *ConfigClient // 配置
}
func NewClient(config *ConfigClient) (*Client, error) {
@ -26,15 +24,5 @@ func NewClient(config *ConfigClient) (*Client, error) {
c.client = gorequest.NewHttp()
if c.config.PgsqlDb != nil {
c.log, err = golog.NewApiClient(
golog.WithGormClient(c.config.PgsqlDb),
golog.WithTableName(logTable),
)
if err != nil {
return nil, err
}
}
return c, nil
}

@ -26,9 +26,6 @@ func (c *Client) request(url string, params map[string]interface{}, method strin
}
// 日志
if c.config.PgsqlDb != nil {
go c.log.GormMiddleware(request)
}
return request, err
}

@ -22,10 +22,6 @@ type Client struct {
siteId string // 网站ID/APP ID
positionId string // 推广位id
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package jd
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,7 +1,5 @@
package jd
import "github.com/dtapps/go-library/utils/golog"
// GetAppKey 应用Key
func (c *Client) GetAppKey() string {
return c.config.appKey
@ -21,7 +19,3 @@ func (c *Client) GetSiteId() string {
func (c *Client) GetPositionId() string {
return c.config.positionId
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -28,9 +28,6 @@ func (c *Client) request(ctx context.Context, params map[string]interface{}) (go
}
// 记录日志
if c.log.status {
go c.log.client.MiddlewareCustom(ctx, fmt.Sprintf("%s", params["method"]), request)
}
if c.zap.status {
go c.zap.client.MiddlewareCustom(ctx, fmt.Sprintf("%s", params["method"]), request)
}

@ -19,14 +19,6 @@ type Client struct {
customerId int64 // 商家编号
customerKey string // 商家密钥
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
cacheLog struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务
@ -45,7 +37,6 @@ func NewClient(config *ClientConfig) (*Client, error) {
c.config.customerId = config.CustomerId
c.config.customerKey = config.CustomerKey
c.cacheLog.status = config.CacheLogStatus
c.cacheZap.status = config.CacheLogStatus
c.requestClient = gorequest.NewHttp()

@ -2,17 +2,6 @@ package kashangwl
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
c.cacheLog.client = apiClient
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,7 +1,5 @@
package kashangwl
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetCustomerId() int64 {
return c.config.customerId
}
@ -9,7 +7,3 @@ func (c *Client) GetCustomerId() int64 {
func (c *Client) GetCustomerKey() string {
return c.config.customerKey
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -37,9 +37,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}
@ -74,11 +71,8 @@ func (c *Client) requestCache(ctx context.Context, url string, params map[string
}
// 日志
if c.cacheLog.status {
go c.cacheLog.client.Middleware(ctx, request)
}
if c.cacheLog.status {
go c.cacheLog.client.Middleware(ctx, request)
if c.cacheZap.status {
go c.cacheZap.client.Middleware(ctx, request)
}
return request, err

@ -15,10 +15,6 @@ type Client struct {
config struct {
ua string // 用户代理
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package kuaishou
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,7 +1 @@
package kuaishou
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -19,10 +19,6 @@ type Client struct {
environment string // 环境
keyAgent string
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package leshuazf
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,13 +1,13 @@
package leshuazf
func (c *Client) GetEnvironment() string {
return c.config.Environment
return c.config.environment
}
func (c *Client) GetAgentId() string {
return c.config.AgentId
return c.config.agentId
}
func (c *Client) GetKeyAgent() string {
return c.config.KeyAgent
return c.config.keyAgent
}

@ -44,9 +44,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -18,10 +18,6 @@ type Client struct {
secret string // 秘钥
appKey string // 渠道标记
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package meituan
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,7 +1,5 @@
package meituan
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetAppKey() string {
return c.config.appKey
}
@ -9,7 +7,3 @@ func (c *Client) GetAppKey() string {
func (c *Client) GetSecret() string {
return c.config.secret
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -29,9 +29,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -16,10 +16,6 @@ type Client struct {
config struct {
vendor string
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -29,9 +29,6 @@ func (c *Client) request(ctx context.Context, url string, param map[string]inter
}
// 日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -7,11 +7,7 @@ import (
type Client struct {
client *gorequest.App // 请求服务
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务
}

@ -2,15 +2,6 @@ package pconline
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -23,9 +23,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -24,10 +24,6 @@ type Client struct {
mediaId string // 媒体ID
pid string // 推广位
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -7,15 +7,6 @@ func (c *Client) ConfigPid(pid string) *Client {
return c
}
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,7 +1,5 @@
package pinduoduo
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetClientId() string {
return c.config.clientId
}
@ -17,7 +15,3 @@ func (c *Client) GetMediaId() string {
func (c *Client) GetPid() string {
return c.config.pid
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -24,9 +24,6 @@ func (c *Client) request(ctx context.Context, params map[string]interface{}) (go
}
// 日志
if c.log.status {
go c.log.client.MiddlewareCustom(ctx, fmt.Sprintf("%s", params["type"]), request)
}
if c.zap.status {
go c.zap.client.MiddlewareCustom(ctx, fmt.Sprintf("%s", params["type"]), request)
}

@ -20,10 +20,6 @@ type Client struct {
appKey string
appSecret string
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package pintoto
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,7 +1,5 @@
package pintoto
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetAppKey() string {
return c.config.appKey
}
@ -9,7 +7,3 @@ func (c *Client) GetAppKey() string {
func (c *Client) GetAppSecret() string {
return c.config.appSecret
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -35,9 +35,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 记录日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -1,7 +1,6 @@
package qiniu
import (
"github.com/dtapps/go-library/utils/golog"
"github.com/dtapps/go-library/utils/gorequest"
)
@ -18,10 +17,6 @@ type Client struct {
accessKey string
secretKey string
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
}
// NewClient 创建实例化

@ -16,10 +16,6 @@ type Client struct {
config struct {
key string
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package qq
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,11 +1,5 @@
package qq
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetKey() string {
return c.config.key
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -29,9 +29,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 记录日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -16,10 +16,6 @@ type Client struct {
apiUser string // API_USER
apiKey string // API_KEY
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package sendcloud
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,9 +1,9 @@
package sendcloud
func (c *Client) GetApiUser() string {
return c.config.ApiUser
return c.config.apiUser
}
func (c *Client) GetApiKey() string {
return c.config.ApiKey
return c.config.apiKey
}

@ -34,9 +34,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -20,10 +20,6 @@ type Client struct {
appSecret string // 密钥
adzoneId int64 // mm_xxx_xxx_xxx的第三位
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -2,15 +2,6 @@ package taobao
import "github.com/dtapps/go-library/utils/golog"
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -1,7 +1,5 @@
package taobao
import "github.com/dtapps/go-library/utils/golog"
func (c *Client) GetAppKey() string {
return c.config.appKey
}
@ -13,7 +11,3 @@ func (c *Client) GetAppSecret() string {
func (c *Client) GetAdzoneId() int64 {
return c.config.adzoneId
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -24,9 +24,6 @@ func (c *Client) request(ctx context.Context, params map[string]interface{}) (go
}
// 记录日志
if c.log.status {
go c.log.client.MiddlewareCustom(ctx, fmt.Sprintf("%s", params["method"]), request)
}
if c.zap.status {
go c.zap.client.MiddlewareCustom(ctx, fmt.Sprintf("%s", params["method"]), request)
}

@ -30,10 +30,6 @@ type Client struct {
redisClient *dorm.RedisClient // 缓存数据库
wechatAccessTokenPrefix string // AccessToken
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -12,15 +12,6 @@ func (c *Client) ConfigApp(appId, appSecret string) *Client {
return c
}
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigRedisClient 缓存数据库
func (c *Client) ConfigRedisClient(client *dorm.RedisClient) {
c.cache.redisClient = client

@ -2,7 +2,6 @@ package wechatminiprogram
import (
"context"
"github.com/dtapps/go-library/utils/golog"
)
func (c *Client) GetAppId() string {
@ -20,7 +19,3 @@ func (c *Client) getAccessToken(ctx context.Context) string {
c.config.accessToken = c.GetAccessToken(ctx)
return c.config.accessToken
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

@ -32,9 +32,6 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
}
// 记录日志
if c.log.status {
go c.log.client.Middleware(ctx, request)
}
if c.zap.status {
go c.zap.client.Middleware(ctx, request)
}

@ -33,10 +33,6 @@ type Client struct {
wechatAccessTokenPrefix string // AccessToken
wechatJsapiTicketPrefix string // JsapiTicket
}
log struct {
status bool // 状态
client *golog.ApiClient // 日志服务
}
zap struct {
status bool // 状态
client *golog.ApiZapLog // 日志服务

@ -9,15 +9,6 @@ func (c *Client) ConfigApp(appId, appSecret string) *Client {
return c
}
// ConfigApiClientFun 日志配置
func (c *Client) ConfigApiClientFun(apiClientFun golog.ApiClientFun) {
apiClient := apiClientFun()
if apiClient != nil {
c.log.client = apiClient
c.log.status = true
}
}
// ConfigZapClientFun 日志配置
func (c *Client) ConfigZapClientFun(apiZapLogFun golog.ApiZapLogFun) {
apiZapLog := apiZapLogFun()

@ -2,7 +2,6 @@ package wechatoffice
import (
"context"
"github.com/dtapps/go-library/utils/golog"
)
func (c *Client) GetAppId() string {
@ -22,7 +21,3 @@ func (c *Client) getJsapiTicket(ctx context.Context) string {
c.config.jsapiTicket = c.GetJsapiTicket(ctx)
return c.config.jsapiTicket
}
func (c *Client) GetLog() *golog.ApiClient {
return c.log.client
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save