From 74b29acd4e91a672b114d9377cbbc58aab7bcd9b Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 28 Dec 2018 10:35:01 +0800
Subject: [PATCH] - change app info for weixin mini program.

---
 business/jxcallback/auth/weixin/weixin.go |  6 +++---
 conf/app.conf                             |  6 +++++-
 globals/api/api.go                        | 18 +++++++++++-------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/business/jxcallback/auth/weixin/weixin.go b/business/jxcallback/auth/weixin/weixin.go
index 9c7feeef6..6a5a9e195 100644
--- a/business/jxcallback/auth/weixin/weixin.go
+++ b/business/jxcallback/auth/weixin/weixin.go
@@ -162,7 +162,7 @@ func (a *AutherMiniProgram) BindWeiXin(ctx *jxcontext.Context, code, nickName st
 	if err = dao.GetEntity(db, user, "Tel"); err != nil {
 		return auth.ConvertErr2NoUser(err, loginInfo.ID)
 	}
-	sessionInfo, err := api.WeixinAPI.SNSCode2Session(code)
+	sessionInfo, err := api.WeixinMiniAPI.SNSCode2Session(code)
 	if err != nil {
 		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) {
 	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 {
 		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 {
 		return "", err
 	}
-	decryptedData, err := api.WeixinAPI.SNSDecodeMiniProgramData(encryptedData, sessionKey, iv)
+	decryptedData, err := api.WeixinMiniAPI.SNSDecodeMiniProgramData(encryptedData, sessionKey, iv)
 	if err != nil {
 		return "", err
 	}
diff --git a/conf/app.conf b/conf/app.conf
index a1ac0b46d..5a7d11162 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -36,6 +36,10 @@ qiniuBucket = "jingxistandardlib"
 
 showAppID = 82806
 showAppSecret = "384f911735334bf7a150f3bd3bdf0c1e"
+
+weixinMiniAppID  = "wx4b5930c13f8b1170"
+weixinMiniSecret = "2a57228a716ce991a52739f0ff41111d"
+
 [dev]
 jdToken  = "c8854ef2-f80a-45ee-aceb-dc8014d646f8"
 jdAppKey = "06692746f7224695ad4788ce340bc854"
@@ -58,7 +62,7 @@ dadaSourceID    = "73753"
 
 weixinAppID  = "wxbf235770edaabc5c"
 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"
 
diff --git a/globals/api/api.go b/globals/api/api.go
index b1275ea54..fe18e336b 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -20,13 +20,15 @@ import (
 )
 
 var (
-	JdAPI       *jdapi.API
-	ElmAPI      *elmapi.API
-	EbaiAPI     *ebaiapi.API
-	MtpsAPI     *mtpsapi.API
-	DadaAPI     *dadaapi.API
-	MtwmAPI     *mtwmapi.API
-	WeixinAPI   *weixinapi.API
+	JdAPI         *jdapi.API
+	ElmAPI        *elmapi.API
+	EbaiAPI       *ebaiapi.API
+	MtpsAPI       *mtpsapi.API
+	DadaAPI       *dadaapi.API
+	MtwmAPI       *mtwmapi.API
+	WeixinAPI     *weixinapi.API
+	WeixinMiniAPI *weixinapi.API
+
 	AutonaviAPI *autonavi.API
 	QiniuAPI    *qbox.Mac
 	ShowAPI     *showapi.API
@@ -55,6 +57,8 @@ func Init() {
 			WeixinAPI.SetToken(weixinToken)
 		}
 	}
+	WeixinMiniAPI = weixinapi.New(beego.AppConfig.String("weixinMiniAppID"), beego.AppConfig.String("weixinMiniSecret"))
+
 	AutonaviAPI = autonavi.New(beego.AppConfig.String("autonaviKey"))
 	QiniuAPI = qbox.NewMac(beego.AppConfig.String("qiniuAK"), beego.AppConfig.String("qiniuSK"))
 	if !beego.AppConfig.DefaultBool("disableEbai", false) {