liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- change according to weixinapi refactor

Browse Source
This commit is contained in:
gazebo
2019-02-21 16:37:00 +08:00
parent 9e7a41c80e
commit 3d338cf441
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/auth/weixin/weixin.go
View File

@@ -78,7 +78,7 @@ func getSNSInfoFromCache(openID string) (wxUserinfo *weixinapi.SNSUserInfo, pass
func GetWeiXinUserInfo(code string, state string) (userInfo *UserInfoExt, err error) { func GetWeiXinUserInfo(code string, state string) (userInfo *UserInfoExt, err error) {
globals.SugarLogger.Debugf("GetUserInfo code:%s", code) globals.SugarLogger.Debugf("GetUserInfo code:%s", code)
if state == "" { if state == "" {
token, err2 := api.WeixinAPI.SNSGetToken(code) token, err2 := api.WeixinAPI.SNSRetrieveToken(code)
if err = err2; err == nil { if err = err2; err == nil {
wxUserinfo, err2 := api.WeixinAPI.SNSGetUserInfo(token.AccessToken, token.OpenID) wxUserinfo, err2 := api.WeixinAPI.SNSGetUserInfo(token.AccessToken, token.OpenID)
if err = err2; err == nil { if err = err2; err == nil {

4
business/jxutils/tasks/configrefresh.go
View File

@@ -106,7 +106,7 @@ func RefreshWeixinToken() error {
return RefreshConfig("wechat", weixinTokenExpires, func() (string, string) { return RefreshConfig("wechat", weixinTokenExpires, func() (string, string) {
globals.SugarLogger.Debugf("RefreshWeixinToken RunMode:%s", beego.BConfig.RunMode) globals.SugarLogger.Debugf("RefreshWeixinToken RunMode:%s", beego.BConfig.RunMode)
if beego.BConfig.RunMode == "prod" { 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)) globals.SugarLogger.Debugf("RefreshWeixinToken tokenInfo:%s", utils.Format4Output(tokenInfo, true))
return tokenInfo.AccessToken, "" return tokenInfo.AccessToken, ""
} else { } else {
@@ -115,7 +115,7 @@ func RefreshWeixinToken() error {
} }
return "", "" return "", ""
}, func(value string) { }, func(value string) {
api.WeixinAPI.SetToken(value) api.WeixinAPI.CBSetToken(value)
}) })
} }

2
business/jxutils/weixinmsg/weixinmsg.go
View File

@@ -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)) 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) 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 return err

2
globals/api/api.go
View File

@@ -58,7 +58,7 @@ func Init() {
WeixinAPI = weixinapi.New(beego.AppConfig.String("weixinAppID"), beego.AppConfig.String("weixinSecret")) WeixinAPI = weixinapi.New(beego.AppConfig.String("weixinAppID"), beego.AppConfig.String("weixinSecret"))
// 这个主要是用于调试阶段使用，生产环境中用的是自动刷新那套 // 这个主要是用于调试阶段使用，生产环境中用的是自动刷新那套
if weixinToken := beego.AppConfig.DefaultString("weixinToken", ""); weixinToken != "" { if weixinToken := beego.AppConfig.DefaultString("weixinToken", ""); weixinToken != "" {
WeixinAPI.SetToken(weixinToken) WeixinAPI.CBSetToken(weixinToken)
} }
} }
WeixinMiniAPI = weixinapi.New(beego.AppConfig.String("weixinMiniAppID"), beego.AppConfig.String("weixinMiniSecret")) WeixinMiniAPI = weixinapi.New(beego.AppConfig.String("weixinMiniAppID"), beego.AppConfig.String("weixinMiniSecret"))