|
|
@@ -1,6 +1,7 @@
|
|
|
package credential
|
|
|
|
|
|
import (
|
|
|
+ "context"
|
|
|
"encoding/json"
|
|
|
"fmt"
|
|
|
"sync"
|
|
|
@@ -33,7 +34,7 @@ type DefaultAccessToken struct {
|
|
|
}
|
|
|
|
|
|
// NewDefaultAccessToken new DefaultAccessToken
|
|
|
-func NewDefaultAccessToken(appID, appSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenHandle {
|
|
|
+func NewDefaultAccessToken(appID, appSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
|
|
|
if cache == nil {
|
|
|
panic("cache is ineed")
|
|
|
}
|
|
|
@@ -56,6 +57,11 @@ type ResAccessToken struct {
|
|
|
|
|
|
// GetAccessToken 获取access_token,先从cache中获取，没有则从服务端获取
|
|
|
func (ak *DefaultAccessToken) GetAccessToken() (accessToken string, err error) {
|
|
|
+ return ak.GetAccessTokenContext(context.Background())
|
|
|
+}
|
|
|
+
|
|
|
+// GetAccessTokenContext 获取access_token,先从cache中获取，没有则从服务端获取
|
|
|
+func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (accessToken string, err error) {
|
|
|
// 先从cache中取
|
|
|
accessTokenCacheKey := fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.appID)
|
|
|
if val := ak.cache.Get(accessTokenCacheKey); val != nil {
|
|
|
@@ -73,7 +79,7 @@ func (ak *DefaultAccessToken) GetAccessToken() (accessToken string, err error) {
|
|
|
|
|
|
// cache失效，从微信服务器获取
|
|
|
var resAccessToken ResAccessToken
|
|
|
- resAccessToken, err = GetTokenFromServer(fmt.Sprintf(accessTokenURL, ak.appID, ak.appSecret))
|
|
|
+ resAccessToken, err = GetTokenFromServerContext(ctx, fmt.Sprintf(accessTokenURL, ak.appID, ak.appSecret))
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
@@ -97,7 +103,7 @@ type WorkAccessToken struct {
|
|
|
}
|
|
|
|
|
|
// NewWorkAccessToken new WorkAccessToken
|
|
|
-func NewWorkAccessToken(corpID, corpSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenHandle {
|
|
|
+func NewWorkAccessToken(corpID, corpSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
|
|
|
if cache == nil {
|
|
|
panic("cache the not exist")
|
|
|
}
|
|
|
@@ -112,6 +118,11 @@ func NewWorkAccessToken(corpID, corpSecret, cacheKeyPrefix string, cache cache.C
|
|
|
|
|
|
// GetAccessToken 企业微信获取access_token,先从cache中获取，没有则从服务端获取
|
|
|
func (ak *WorkAccessToken) GetAccessToken() (accessToken string, err error) {
|
|
|
+ return ak.GetAccessTokenContext(context.Background())
|
|
|
+}
|
|
|
+
|
|
|
+// GetAccessTokenContext 企业微信获取access_token,先从cache中获取，没有则从服务端获取
|
|
|
+func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessToken string, err error) {
|
|
|
// 加上lock，是为了防止在并发获取token时，cache刚好失效，导致从微信服务器上获取到不同token
|
|
|
ak.accessTokenLock.Lock()
|
|
|
defer ak.accessTokenLock.Unlock()
|
|
|
@@ -124,7 +135,7 @@ func (ak *WorkAccessToken) GetAccessToken() (accessToken string, err error) {
|
|
|
|
|
|
// cache失效，从微信服务器获取
|
|
|
var resAccessToken ResAccessToken
|
|
|
- resAccessToken, err = GetTokenFromServer(fmt.Sprintf(workAccessTokenURL, ak.CorpID, ak.CorpSecret))
|
|
|
+ resAccessToken, err = GetTokenFromServerContext(ctx, fmt.Sprintf(workAccessTokenURL, ak.CorpID, ak.CorpSecret))
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
@@ -140,8 +151,13 @@ func (ak *WorkAccessToken) GetAccessToken() (accessToken string, err error) {
|
|
|
|
|
|
// GetTokenFromServer 强制从微信服务器获取token
|
|
|
func GetTokenFromServer(url string) (resAccessToken ResAccessToken, err error) {
|
|
|
+ return GetTokenFromServerContext(context.Background(), url)
|
|
|
+}
|
|
|
+
|
|
|
+// GetTokenFromServerContext 强制从微信服务器获取token
|
|
|
+func GetTokenFromServerContext(ctx context.Context, url string) (resAccessToken ResAccessToken, err error) {
|
|
|
var body []byte
|
|
|
- body, err = util.HTTPGet(url)
|
|
|
+ body, err = util.HTTPGetContext(ctx, url)
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
okhowang