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

- change app info for weixin mini program.

Browse Source
This commit is contained in:
gazebo
2018-12-28 10:35:01 +08:00
parent 000ef7d6c3
commit 74b29acd4e
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,7 +162,7 @@ func (a *AutherMiniProgram) BindWeiXin(ctx *jxcontext.Context, code, nickName st
if err = dao.GetEntity(db, user, "Tel"); err != nil { if err = dao.GetEntity(db, user, "Tel"); err != nil {
return auth.ConvertErr2NoUser(err, loginInfo.ID) return auth.ConvertErr2NoUser(err, loginInfo.ID)
} }
sessionInfo, err := api.WeixinAPI.SNSCode2Session(code) sessionInfo, err := api.WeixinMiniAPI.SNSCode2Session(code)
if err != nil { if err != nil {
return err return err
} }
@@ -176,7 +176,7 @@ func (a *AutherMiniProgram) BindWeiXin(ctx *jxcontext.Context, code, nickName st
func (a *AutherMiniProgram) Login(mobileNum, code string) (userID string, err error) { func (a *AutherMiniProgram) Login(mobileNum, code string) (userID string, err error) {
globals.SugarLogger.Debugf("AutherMiniProgram Login mobileNum:%s, code:%s", mobileNum, code) globals.SugarLogger.Debugf("AutherMiniProgram Login mobileNum:%s, code:%s", mobileNum, code)
sessionInfo, err := api.WeixinAPI.SNSCode2Session(code) sessionInfo, err := api.WeixinMiniAPI.SNSCode2Session(code)
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -205,7 +205,7 @@ func (a *AutherMiniProgram) DecryptData(ctx *jxcontext.Context, encryptedData, i
if err = api.Cacher.GetAs(composeSessionKeyCacheKey(ctx.GetLoginInfo().ID), &sessionKey); err != nil { if err = api.Cacher.GetAs(composeSessionKeyCacheKey(ctx.GetLoginInfo().ID), &sessionKey); err != nil {
return "", err return "", err
} }
decryptedData, err := api.WeixinAPI.SNSDecodeMiniProgramData(encryptedData, sessionKey, iv) decryptedData, err := api.WeixinMiniAPI.SNSDecodeMiniProgramData(encryptedData, sessionKey, iv)
if err != nil { if err != nil {
return "", err return "", err
} }

6
conf/app.conf
View File

@@ -36,6 +36,10 @@ qiniuBucket = "jingxistandardlib"
showAppID = 82806 showAppID = 82806
showAppSecret = "384f911735334bf7a150f3bd3bdf0c1e" showAppSecret = "384f911735334bf7a150f3bd3bdf0c1e"
weixinMiniAppID = "wx4b5930c13f8b1170"
weixinMiniSecret = "2a57228a716ce991a52739f0ff41111d"
[dev] [dev]
jdToken = "c8854ef2-f80a-45ee-aceb-dc8014d646f8" jdToken = "c8854ef2-f80a-45ee-aceb-dc8014d646f8"
jdAppKey = "06692746f7224695ad4788ce340bc854" jdAppKey = "06692746f7224695ad4788ce340bc854"
@@ -58,7 +62,7 @@ dadaSourceID = "73753"
weixinAppID = "wxbf235770edaabc5c" weixinAppID = "wxbf235770edaabc5c"
weixinSecret = "ba32b269a068a5b72486a0beafd171e8" weixinSecret = "ba32b269a068a5b72486a0beafd171e8"
weixinToken = "16_B70uVmPKcF7GYvwAIKscYYYB3DEmJDJ_M4SY8v9qmjwidciGEiuiJCuxKUTVf5nghCbeQOLzLrjnKUend6o8wtBFsn_lr5S1zBpAlUI43O53zHnAGUzwcMXT5T2sIHomUGTLV2OnTYJhFDJhEVKhADAULA" weixinToken = "17_roSCZgkCxhRnyFVtei0KdfHwdGP8PmLzJFhCieka4_X4_d-lgfaTxF6oIS6FE5lkgLbrtstSsO6HyDNHKsHJmpB8YOtJYN4sO-AezdWLF78M2phL0K8xCRjB9YE9-Ci64GCqS50o6LcVqux8ORVbACAFIM"
dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true" dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true"

18
globals/api/api.go
View File

@@ -20,13 +20,15 @@ import (
) )
var ( var (
JdAPI *jdapi.API JdAPI *jdapi.API
ElmAPI *elmapi.API ElmAPI *elmapi.API
EbaiAPI *ebaiapi.API EbaiAPI *ebaiapi.API
MtpsAPI *mtpsapi.API MtpsAPI *mtpsapi.API
DadaAPI *dadaapi.API DadaAPI *dadaapi.API
MtwmAPI *mtwmapi.API MtwmAPI *mtwmapi.API
WeixinAPI *weixinapi.API WeixinAPI *weixinapi.API
WeixinMiniAPI *weixinapi.API
AutonaviAPI *autonavi.API AutonaviAPI *autonavi.API
QiniuAPI *qbox.Mac QiniuAPI *qbox.Mac
ShowAPI *showapi.API ShowAPI *showapi.API
@@ -55,6 +57,8 @@ func Init() {
WeixinAPI.SetToken(weixinToken) WeixinAPI.SetToken(weixinToken)
} }
} }
WeixinMiniAPI = weixinapi.New(beego.AppConfig.String("weixinMiniAppID"), beego.AppConfig.String("weixinMiniSecret"))
AutonaviAPI = autonavi.New(beego.AppConfig.String("autonaviKey")) AutonaviAPI = autonavi.New(beego.AppConfig.String("autonaviKey"))
QiniuAPI = qbox.NewMac(beego.AppConfig.String("qiniuAK"), beego.AppConfig.String("qiniuSK")) QiniuAPI = qbox.NewMac(beego.AppConfig.String("qiniuAK"), beego.AppConfig.String("qiniuSK"))
if !beego.AppConfig.DefaultBool("disableEbai", false) { if !beego.AppConfig.DefaultBool("disableEbai", false) {