diff --git a/business/auth2/authprovider/weixin/weixin_mini.go b/business/auth2/authprovider/weixin/weixin_mini.go index 072ea9573..c8668948f 100644 --- a/business/auth2/authprovider/weixin/weixin_mini.go +++ b/business/auth2/authprovider/weixin/weixin_mini.go @@ -92,6 +92,9 @@ func getWxApp(appID string) (miniApi *weixinapi.API) { if len(appID) > 0 && appID == api.WeixinMiniAppID2 { miniApi = api.WeixinMiniAPI2 } + if len(appID) > 0 && appID == api.WeixinMiniAppIDsc { + miniApi = api.WeixinMiniAPIsc + } return miniApi } diff --git a/conf/app.conf b/conf/app.conf index 0e0940587..2437fa4d7 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -60,6 +60,9 @@ weixinPageSecret = "c7a84ed3ef3ae04ac78e02fb593ffbe5" weixinMiniAppID = "wx08a5c2a8581414ff" weixinMiniSecret = "e7ec67c86cbd4dfa531af7af7533cdc9" +weixinMiniAppIDsc = "wx6be9ae15444fa83f" +weixinMiniSecretsc = "606ac9ff3e98016cee266704c933e687" + wxpayAppID = "wx4b5930c13f8b1170" wxpayAppKey = "XKJPOIHJ233adf01KJIXlIeQDSDKFJAD" wxpayAppMchID = "1390686702" diff --git a/globals/api/api.go b/globals/api/api.go index 0439d8562..64c1a4f5b 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -60,19 +60,21 @@ var ( EbaiAPI *ebaiapi.API Ebai2API *ebaiapi.API - MtwmAPI *mtwmapi.API - Mtwm2API *mtwmapi.API - MtpsAPI *mtpsapi.API - DadaAPI *dadaapi.API - WeixinAPI *weixinapi.API // 微信公众号 - WeixinMiniAPI *weixinapi.API // 小程序 - WeixinMiniAPI2 *weixinapi.API // 小程序2 - WeixinApp *weixinapi.API // app微信登录 - WeixinMiniAppID2 string - WeixinMiniAppID3 string - WxpayAPI *wxpayapi.API // 微信支付API - TLpayAPI *tonglianpayapi.API //通联收银宝api - FnAPI *fnpsapi.API //蜂鸟配送api + MtwmAPI *mtwmapi.API + Mtwm2API *mtwmapi.API + MtpsAPI *mtpsapi.API + DadaAPI *dadaapi.API + WeixinAPI *weixinapi.API // 微信公众号 + WeixinMiniAPI *weixinapi.API // 小程序 + WeixinMiniAPI2 *weixinapi.API // 小程序2 + WeixinMiniAPIsc *weixinapi.API //小程序商超 + WeixinApp *weixinapi.API // app微信登录 + WeixinMiniAppID2 string + WeixinMiniAppID3 string + WeixinMiniAppIDsc string + WxpayAPI *wxpayapi.API // 微信支付API + TLpayAPI *tonglianpayapi.API //通联收银宝api + FnAPI *fnpsapi.API //蜂鸟配送api YinBaoAPI *yinbaoapi.API //银豹平台api @@ -228,6 +230,9 @@ func Init() { if WeixinMiniAppID3 = beego.AppConfig.String("weixinMiniAppID3"); WeixinMiniAppID3 != "" { WeixinApp = weixinapi.New(WeixinMiniAppID3, beego.AppConfig.String("weixinMiniSecret3")) } + if WeixinMiniAppIDsc = beego.AppConfig.String("weixinMiniAppIDsc"); WeixinMiniAppIDsc != "" { + WeixinMiniAPIsc = weixinapi.New(WeixinMiniAppIDsc, beego.AppConfig.String("weixinMiniSecretsc")) + } if globals.WxpayNotifyURL != "" { // WxpayAPI = wxpayapi.New(beego.AppConfig.String("wxpayAppID"), beego.AppConfig.String("wxpayAppKey"), beego.AppConfig.String("wxpayAppMchID")) WxpayAPI = wxpayapi.NewWithCertificate(beego.AppConfig.String("wxpayAppID"), beego.AppConfig.String("wxpayAppKey"), beego.AppConfig.String("wxpayAppMchID"),