diff --git a/controllers/event.go b/controllers/event.go index ad2041623..441706f37 100644 --- a/controllers/event.go +++ b/controllers/event.go @@ -1,6 +1,7 @@ package controllers import ( + "git.rosy.net.cn/baseapi/platformapi/weixinapi" "log" "net/http" "time" @@ -99,8 +100,14 @@ func (c *EventController) GetCheckVendorCookie() { func (c *EventController) GetWeixinUnlimited() { c.callGetWeixinUnlimited(func(params *tEventGetWeixinUnlimitedParams) (retVal interface{}, errCode string, err error) { result := make(map[string]interface{}, 2) + var wxApi *weixinapi.API + if web.BConfig.RunMode == "jxgy" { + wxApi = api.WeixinMiniAPI + } else { + wxApi = api.WeixinMiniAPI2 + } // 微信小程序二维码 - weChatQr, err := api.WeixinMiniAPI2.GetUnlimited(params.Scene, params.Page) + weChatQr, err := wxApi.GetUnlimited(params.Scene, params.Page) if err != nil || result == nil { return retVal, "", err } @@ -111,19 +118,17 @@ func (c *EventController) GetWeixinUnlimited() { } result["wxcode"] = weChatQrCode - if web.BConfig.RunMode != "jxgy" { - // 抖音小程序二维码 - tiktok, err := api.TiktokApi.GetTiktokQrCode(params.Scene) - if err != nil || result == nil { - return result, "", err - } - tiktokName := "tiktok" + utils.Int64ToStr(time.Now().Unix()) + ".jpg" - tiktokQrCode, err := jxutils.UploadExportContent([]byte(tiktok["fakeData"].(string)), tiktokName) - if err != nil || result == nil { - return result, "", err - } - result["tiktok"] = tiktokQrCode + // 抖音小程序二维码 + tiktok, err := api.TiktokApi.GetTiktokQrCode(params.Scene) + if err != nil || result == nil { + return result, "", err } + tiktokName := "tiktok" + utils.Int64ToStr(time.Now().Unix()) + ".jpg" + tiktokQrCode, err := jxutils.UploadExportContent([]byte(tiktok["fakeData"].(string)), tiktokName) + if err != nil || result == nil { + return result, "", err + } + result["tiktok"] = tiktokQrCode return result, "", err }) diff --git a/globals/api/api.go b/globals/api/api.go index a7f336c07..9e937b34c 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -80,8 +80,8 @@ var ( QywxAPI *qywxapi.API //企业微信 WeixinAPI *weixinapi.API // 微信公众号 WeixinMiniAPI *weixinapi.API // 小程序 - WeixinMiniAPI2 *weixinapi.API // 小程序2 - WeixinMiniAPIsc *weixinapi.API //小程序商超 + WeixinMiniAPI2 *weixinapi.API // 小程序2 菜市商城 + WeixinMiniAPIsc *weixinapi.API //小程序商城 WeixinMiniAPIPrint *weixinapi.API //小程序打印机 WeixinApp *weixinapi.API // app微信登录(商家端App微信授权) WeixinApp2 *weixinapi.API // app微信登录(菜市端App微信授权)