diff --git a/business/jxcallback/auth/weixin/weixin.go b/business/jxcallback/auth/weixin/weixin.go index 10f6976a6..a8dee6276 100644 --- a/business/jxcallback/auth/weixin/weixin.go +++ b/business/jxcallback/auth/weixin/weixin.go @@ -78,7 +78,7 @@ func getSNSInfoFromCache(openID string) (wxUserinfo *weixinapi.SNSUserInfo, pass func GetWeiXinUserInfo(code string, state string) (userInfo *UserInfoExt, err error) { globals.SugarLogger.Debugf("GetUserInfo code:%s", code) if state == "" { - token, err2 := api.WeixinAPI.SNSGetToken(code) + token, err2 := api.WeixinAPI.SNSRetrieveToken(code) if err = err2; err == nil { wxUserinfo, err2 := api.WeixinAPI.SNSGetUserInfo(token.AccessToken, token.OpenID) if err = err2; err == nil { diff --git a/business/jxutils/tasks/configrefresh.go b/business/jxutils/tasks/configrefresh.go index af7ad3cae..fca976629 100644 --- a/business/jxutils/tasks/configrefresh.go +++ b/business/jxutils/tasks/configrefresh.go @@ -106,7 +106,7 @@ func RefreshWeixinToken() error { return RefreshConfig("wechat", weixinTokenExpires, func() (string, string) { globals.SugarLogger.Debugf("RefreshWeixinToken RunMode:%s", beego.BConfig.RunMode) if beego.BConfig.RunMode == "prod" { - if tokenInfo, err := api.WeixinAPI.RefreshToken(); err == nil { + if tokenInfo, err := api.WeixinAPI.CBRefreshToken(); err == nil { globals.SugarLogger.Debugf("RefreshWeixinToken tokenInfo:%s", utils.Format4Output(tokenInfo, true)) return tokenInfo.AccessToken, "" } else { @@ -115,7 +115,7 @@ func RefreshWeixinToken() error { } return "", "" }, func(value string) { - api.WeixinAPI.SetToken(value) + api.WeixinAPI.CBSetToken(value) }) } diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go index 8fdc421f0..6b7b2879d 100644 --- a/business/jxutils/weixinmsg/weixinmsg.go +++ b/business/jxutils/weixinmsg/weixinmsg.go @@ -145,7 +145,7 @@ func SmartMessageTemplateSend(userOpenID, templateID, downloadURL, miniPageURL s } } globals.SugarLogger.Debugf("SmartMessageTemplateSend openID:%s, templateID:%s, downloadURL:%s, miniProgram:%s", userOpenID, templateID, downloadURL, utils.Format4Output(miniProgram, true)) - if err = api.WeixinAPI.MessageTemplateSend(userOpenID, templateID, downloadURL, miniProgram, data); err != nil { + if err = api.WeixinAPI.CBMessageTemplateSend(userOpenID, templateID, downloadURL, miniProgram, data); err != nil { globals.SugarLogger.Debugf("SmartMessageTemplateSend openID:%s, templateID:%s, downloadURL:%s, miniProgram:%s, failed with error:%v", userOpenID, templateID, downloadURL, utils.Format4Output(miniProgram, true), err) } return err diff --git a/globals/api/api.go b/globals/api/api.go index 70d46ea1b..923cad0d2 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -58,7 +58,7 @@ func Init() { WeixinAPI = weixinapi.New(beego.AppConfig.String("weixinAppID"), beego.AppConfig.String("weixinSecret")) // 这个主要是用于调试阶段使用,生产环境中用的是自动刷新那套 if weixinToken := beego.AppConfig.DefaultString("weixinToken", ""); weixinToken != "" { - WeixinAPI.SetToken(weixinToken) + WeixinAPI.CBSetToken(weixinToken) } } WeixinMiniAPI = weixinapi.New(beego.AppConfig.String("weixinMiniAppID"), beego.AppConfig.String("weixinMiniSecret"))