diff --git a/client.go b/client.go index 84b8d1d..de551f3 100644 --- a/client.go +++ b/client.go @@ -17,16 +17,18 @@ type ConfigClient struct { ComponentAppSecret string // 第三方平台 app_secret MessageToken string MessageKey string - GormClient *dorm.GormClient // 日志数据库 - LogClient *golog.GoLog // 日志驱动 - LogDebug bool // 日志开关 + RedisClient *dorm.RedisClient // 缓存数据库 + GormClient *dorm.GormClient // 日志数据库 + LogClient *golog.GoLog // 日志驱动 + LogDebug bool // 日志开关 } // Client 微信公众号服务 type Client struct { - requestClient *gorequest.App // 请求服务 - logClient *golog.ApiClient // 日志服务 - config *ConfigClient // 配置 + requestClient *gorequest.App // 请求服务 + redisClient *dorm.RedisClient // 缓存服务 + logClient *golog.ApiClient // 日志服务 + config *ConfigClient // 配置 } func NewClient(config *ConfigClient) (*Client, error) { @@ -36,6 +38,8 @@ func NewClient(config *ConfigClient) (*Client, error) { c.requestClient = gorequest.NewHttp() + c.redisClient = config.RedisClient + if c.config.GormClient.Db != nil { c.logClient, err = golog.NewApiClient(&golog.ApiClientConfig{ GormClient: c.config.GormClient, diff --git a/const.go b/const.go index 1a9c71e..7cc8aec 100644 --- a/const.go +++ b/const.go @@ -8,4 +8,4 @@ const ( logTable = "wechatopen" ) -const Version = "1.0.11" +const Version = "1.0.12" diff --git a/redis.go b/redis.go index f5050d1..e548776 100644 --- a/redis.go +++ b/redis.go @@ -16,16 +16,16 @@ func (c *Client) SetComponentVerifyTicket(ctx context.Context, componentVerifyTi if componentVerifyTicket == "" { return "" } - c.config.RedisClient.Set(ctx, c.getComponentVerifyTicketCacheKeyName(), componentVerifyTicket, time.Hour*12) + c.redisClient.Set(ctx, c.getComponentVerifyTicketCacheKeyName(), componentVerifyTicket, time.Hour*12) return c.GetComponentVerifyTicket(ctx) } // GetComponentVerifyTicket 获取微信后台推送的ticke func (c *Client) GetComponentVerifyTicket(ctx context.Context) string { - if c.config.RedisClient.Db == nil { + if c.redisClient.Db == nil { return c.config.ComponentVerifyTicket } - result, _ := c.config.RedisClient.Get(ctx, c.getComponentVerifyTicketCacheKeyName()).Result() + result, _ := c.redisClient.Get(ctx, c.getComponentVerifyTicketCacheKeyName()).Result() return result } @@ -39,16 +39,16 @@ func (c *Client) SetComponentAccessToken(ctx context.Context, componentAccessTok if componentAccessToken == "" { return "" } - c.config.RedisClient.Set(ctx, c.getComponentAccessTokenCacheKeyName(), componentAccessToken, time.Second*7200) + c.redisClient.Set(ctx, c.getComponentAccessTokenCacheKeyName(), componentAccessToken, time.Second*7200) return c.GetComponentAccessToken(ctx) } // GetComponentAccessToken 获取令牌 func (c *Client) GetComponentAccessToken(ctx context.Context) string { - if c.config.RedisClient.Db == nil { + if c.redisClient.Db == nil { return c.config.ComponentAccessToken } - result, _ := c.config.RedisClient.Db.Get(ctx, c.getComponentAccessTokenCacheKeyName()).Result() + result, _ := c.redisClient.Db.Get(ctx, c.getComponentAccessTokenCacheKeyName()).Result() return result } @@ -75,16 +75,16 @@ func (c *Client) SetAuthorizerAccessToken(ctx context.Context, authorizerAccessT if authorizerAccessToken == "" { return "" } - c.config.RedisClient.Set(ctx, c.getAuthorizerAccessTokenCacheKeyName(), authorizerAccessToken, time.Hour*2) + c.redisClient.Set(ctx, c.getAuthorizerAccessTokenCacheKeyName(), authorizerAccessToken, time.Hour*2) return c.GetComponentAccessToken(ctx) } // GetAuthorizerAccessToken 获取授权方令牌 func (c *Client) GetAuthorizerAccessToken(ctx context.Context) string { - if c.config.RedisClient.Db == nil { + if c.redisClient.Db == nil { return c.config.AuthorizerAccessToken } - result, _ := c.config.RedisClient.Get(ctx, c.getAuthorizerAccessTokenCacheKeyName()).Result() + result, _ := c.redisClient.Get(ctx, c.getAuthorizerAccessTokenCacheKeyName()).Result() return result } @@ -110,22 +110,22 @@ func (c *Client) SetPreAuthCode(ctx context.Context, preAuthCode string) string if preAuthCode == "" { return "" } - c.config.RedisClient.Set(ctx, c.getPreAuthCodeCacheKeyName(), preAuthCode, time.Second*1700) + c.redisClient.Set(ctx, c.getPreAuthCodeCacheKeyName(), preAuthCode, time.Second*1700) return c.GetComponentAccessToken(ctx) } // GetPreAuthCode 获取预授权码 func (c *Client) GetPreAuthCode(ctx context.Context) string { - if c.config.RedisClient.Db == nil { + if c.redisClient.Db == nil { return c.config.AuthorizerAccessToken } - result, _ := c.config.RedisClient.Get(ctx, c.getPreAuthCodeCacheKeyName()).Result() + result, _ := c.redisClient.Get(ctx, c.getPreAuthCodeCacheKeyName()).Result() return result } // DelPreAuthCode 删除预授权码 func (c *Client) DelPreAuthCode(ctx context.Context) error { - return c.config.RedisClient.Del(ctx, c.getPreAuthCodeCacheKeyName()).Err() + return c.redisClient.Del(ctx, c.getPreAuthCodeCacheKeyName()).Err() } // MonitorPreAuthCode 监控预授权码