diff --git a/business/jxutils/tasks/configrefresh.go b/business/jxutils/tasks/configrefresh.go index 3041941d4..9bfd49ca7 100644 --- a/business/jxutils/tasks/configrefresh.go +++ b/business/jxutils/tasks/configrefresh.go @@ -136,6 +136,34 @@ func RefreshWeixinToken() (err error) { return err } +func RefreshWeixin2Token() (err error) { + if api.WeixinMiniAPI2 != nil { + err = RefreshConfig("wechat2", weixinTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) { + globals.SugarLogger.Debugf("=========globals.IsMainProductEnv() = :%s", utils.Format4Output(globals.IsMainProductEnv(), false)) + if globals.IsMainProductEnv() { + if tokenInfo, err := api.WeixinMiniAPI2.CBRetrieveToken(); err == nil { + token = tokenInfo.AccessToken + } else { + globals.SugarLogger.Errorf("RefreshWeixin2Token RefreshToken failed with error:%v", err) + } + } else { + tokenInfo := getWX2TokenFromRemote(api.WeixinMiniAPI2.CBGetToken()) + globals.SugarLogger.Debugf("=========globals.tokenInfo() = :%s", utils.Format4Output(tokenInfo, false)) + globals.SugarLogger.Debugf("=========globals.CBGetToken() = :%s", utils.Format4Output(api.WeixinMiniAPI2.CBGetToken(), false)) + if tokenInfo != nil { + expireTimeStr = utils.Time2Str(time.Now().Add(-weixinTokenExpires)) + token = tokenInfo.Token + } + } + return token, expireTimeStr, "" + }, func(value, v2 string) { + syseventhub.SysEventHub.OnNewWX2Token(value) + api.WeixinMiniAPI2.CBSetToken(value) + }) + } + return err +} + func RefreshFnToken() (err error) { if api.FnAPI != nil { err = RefreshConfig("fn", fnTokenExpires, func() (token string, expireTimeStr string, refreshToken string) { @@ -191,30 +219,6 @@ func RefreshQywxToken() (err error) { return err } -func RefreshWeixin2Token() (err error) { - if api.WeixinMiniAPI2 != nil { - err = RefreshConfig("wechat2", weixinTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) { - if globals.IsMainProductEnv() { - if tokenInfo, err := api.WeixinMiniAPI2.CBRetrieveToken(); err == nil { - token = tokenInfo.AccessToken - } else { - globals.SugarLogger.Errorf("RefreshWeixin2Token RefreshToken failed with error:%v", err) - } - } else { - if tokenInfo := getWX2TokenFromRemote(api.WeixinMiniAPI2.CBGetToken()); tokenInfo != nil { - expireTimeStr = utils.Time2Str(time.Now().Add(-weixinTokenExpires)) - token = tokenInfo.Token - } - } - return token, expireTimeStr, "" - }, func(value, v2 string) { - syseventhub.SysEventHub.OnNewWX2Token(value) - api.WeixinMiniAPI2.CBSetToken(value) - }) - } - return err -} - func RefreshWeixin3Token() (err error) { // if api.WeixinMiniAPI3 != nil { // err = RefreshConfig("wechat3", weixinTokenExpires, func() (token string, expireTimeStr string) { diff --git a/controllers/event.go b/controllers/event.go index 9003a6db5..4137d05e5 100644 --- a/controllers/event.go +++ b/controllers/event.go @@ -106,7 +106,6 @@ func (c *EventController) GetWeixinUnlimited() { // wxApi = api.WeixinMiniAPI2 //} // 微信小程序二维码 - globals.SugarLogger.Debugf("========%s", utils.Format4Output(api.WeixinMiniAPI2, false)) weChatQr, err := api.WeixinMiniAPI2.GetUnlimited(params.Scene, params.Page) if err != nil || result == nil { return retVal, "", err diff --git a/globals/api/api.go b/globals/api/api.go index 9e937b34c..bdd988fd6 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -79,9 +79,9 @@ var ( DadaAPI *dadaapi.API QywxAPI *qywxapi.API //企业微信 WeixinAPI *weixinapi.API // 微信公众号 - WeixinMiniAPI *weixinapi.API // 小程序 + WeixinMiniAPI *weixinapi.API // 小程序 (果园商家) WeixinMiniAPI2 *weixinapi.API // 小程序2 菜市商城 - WeixinMiniAPIsc *weixinapi.API //小程序商城 + WeixinMiniAPIsc *weixinapi.API //小程序商城 (菜市商家) WeixinMiniAPIPrint *weixinapi.API //小程序打印机 WeixinApp *weixinapi.API // app微信登录(商家端App微信授权) WeixinApp2 *weixinapi.API // app微信登录(菜市端App微信授权)