diff --git a/client.go b/client.go index aada4e4..6e157cf 100644 --- a/client.go +++ b/client.go @@ -44,11 +44,11 @@ type Client struct { mchSslKey string // pem key 内容 } log struct { - gormClient *dorm.GormClient // 日志数据库 gorm bool // 日志开关 + gormClient *dorm.GormClient // 日志数据库 logGormClient *golog.ApiClient // 日志服务 - mongoClient *dorm.MongoClient // 日志数据库 mongo bool // 日志开关 + mongoClient *dorm.MongoClient // 日志数据库 logMongoClient *golog.ApiClient // 日志服务 } } @@ -71,7 +71,7 @@ func NewClient(config *ClientConfig) (*Client, error) { c.requestClient = gorequest.NewHttp() gormClient := config.GormClientFun() - if gormClient.Db != nil { + if gormClient != nil && gormClient.Db != nil { c.log.logGormClient, err = golog.NewApiGormClient(func() (*dorm.GormClient, string) { return gormClient, logTable }, config.Debug) @@ -79,11 +79,11 @@ func NewClient(config *ClientConfig) (*Client, error) { return nil, err } c.log.gorm = true + c.log.gormClient = gormClient } - c.log.gormClient = gormClient mongoClient, databaseName := config.MongoClientFun() - if mongoClient.Db != nil { + if mongoClient != nil && mongoClient.Db != nil { c.log.logMongoClient, err = golog.NewApiMongoClient(func() (*dorm.MongoClient, string, string) { return mongoClient, databaseName, logTable }, config.Debug) @@ -91,8 +91,8 @@ func NewClient(config *ClientConfig) (*Client, error) { return nil, err } c.log.mongo = true + c.log.mongoClient = mongoClient } - c.log.mongoClient = mongoClient return c, nil } diff --git a/const.go b/const.go index 2babc89..6893667 100644 --- a/const.go +++ b/const.go @@ -14,7 +14,7 @@ const ( // SDK 相关信息 const ( - Version = "1.0.9" // SDK 版本 + Version = "1.0.10" // SDK 版本 UserAgentFormat = "WechatPay-Go/%s (%s) GO/%s" // UserAgent中的信息 ) diff --git a/request.go b/request.go index 4eaaf87..9b69851 100644 --- a/request.go +++ b/request.go @@ -40,10 +40,10 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte } // 日志 - if c.log.gorm == true { + if c.log.gorm { go c.log.logGormClient.GormMiddleware(ctx, request, Version) } - if c.log.mongo == true { + if c.log.mongo { go c.log.logMongoClient.MongoMiddleware(ctx, request, Version) }