Merge 0e7907e9ac into 990ba6ede9

miniprogram/config/config.go

@@ -14,5 +14,4 @@ type Config struct {
 	Token          string `json:"token"`            // token
 	EncodingAESKey string `json:"encoding_aes_key"` // EncodingAESKey
 	Cache          cache.Cache
-	UseStableAK    bool // use the stable access_token
 }

miniprogram/miniprogram.go

@@ -34,13 +34,7 @@ type MiniProgram struct {
 
 // NewMiniProgram 实例化小程序 API
 func NewMiniProgram(cfg *config.Config) *MiniProgram {
-	var defaultAkHandle credential.AccessTokenContextHandle
-	const cacheKeyPrefix = credential.CacheKeyMiniProgramPrefix
-	if cfg.UseStableAK {
-		defaultAkHandle = credential.NewStableAccessToken(cfg.AppID, cfg.AppSecret, cacheKeyPrefix, cfg.Cache)
-	} else {
-		defaultAkHandle = credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, cacheKeyPrefix, cfg.Cache)
-	}
+	defaultAkHandle := credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, credential.CacheKeyMiniProgramPrefix, cfg.Cache)
 	ctx := &context.Context{
 		Config:            cfg,
 		AccessTokenHandle: defaultAkHandle,

officialaccount/config/config.go

@@ -11,5 +11,4 @@ type Config struct {
 	Token          string `json:"token"`            // token
 	EncodingAESKey string `json:"encoding_aes_key"` // EncodingAESKey
 	Cache          cache.Cache
-	UseStableAK    bool // use the stable access_token
 }

officialaccount/officialaccount.go

@@ -49,13 +49,7 @@ type OfficialAccount struct {
 
 // NewOfficialAccount 实例化公众号API
 func NewOfficialAccount(cfg *config.Config) *OfficialAccount {
-	var defaultAkHandle credential.AccessTokenContextHandle
-	const cacheKeyPrefix = credential.CacheKeyOfficialAccountPrefix
-	if cfg.UseStableAK {
-		defaultAkHandle = credential.NewStableAccessToken(cfg.AppID, cfg.AppSecret, cacheKeyPrefix, cfg.Cache)
-	} else {
-		defaultAkHandle = credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, cacheKeyPrefix, cfg.Cache)
-	}
+	defaultAkHandle := credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, credential.CacheKeyOfficialAccountPrefix, cfg.Cache)
 	ctx := &context.Context{
 		Config:            cfg,
 		AccessTokenHandle: defaultAkHandle,