From 644092916ccf3d965ef44bb68eb5806064170a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 12 Aug 2020 14:00:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=B0=8F=E7=A8=8B=E5=BA=8Fappid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/auth2/authprovider/weixin/weixin_mini.go | 3 +++
 conf/app.conf                                     | 2 ++
 globals/api/api.go                                | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/business/auth2/authprovider/weixin/weixin_mini.go b/business/auth2/authprovider/weixin/weixin_mini.go
index 072ea9573..56643e410 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.WeixinMiniAppID3 {
+		miniApi = api.WeixinMiniAPI3
+	}
 	return miniApi
 }
 
diff --git a/conf/app.conf b/conf/app.conf
index af6c64a6d..4729834d5 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -209,6 +209,8 @@ weixinAppID  = "wx2bb99eb5d2c9b82c"
 weixinSecret = "6bbbed1443cc062c20a015a64c07a531"
 weixinMiniAppID2  = "wx4b5930c13f8b1170"
 weixinMiniSecret2 = "2a57228a716ce991a52739f0ff41111d"
+weixinMiniAppID3  = "wx18111a41fd17f24f"
+weixinMiniSecret3 = "c79ac6e1b2d6d7968e72a9658a8b6715"
 
 yinbaoAppKey = "682628966212343269"
 yinbaoAppID = "18C0E0867E467DBC26EFF5E957B02EC4"
diff --git a/globals/api/api.go b/globals/api/api.go
index 1cc86b19f..98d089a49 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -60,7 +60,9 @@ var (
 	WeixinAPI        *weixinapi.API // 微信公众号
 	WeixinMiniAPI    *weixinapi.API // 小程序
 	WeixinMiniAPI2   *weixinapi.API // 小程序2
+	WeixinMiniAPI3   *weixinapi.API // 小程序3
 	WeixinMiniAppID2 string
+	WeixinMiniAppID3 string
 	WxpayAPI         *wxpayapi.API       // 微信支付API
 	TLpayAPI         *tonglianpayapi.API //通联收银宝api
 
@@ -210,6 +212,9 @@ func Init() {
 		WeixinMiniAPI2 = weixinapi.New(WeixinMiniAppID2, beego.AppConfig.String("weixinMiniSecret2"))
 	}
 	WeixinPageAPI = weixinapi.New(beego.AppConfig.String("weixinPageAppID"), beego.AppConfig.String("weixinPageSecret"))
+	if WeixinMiniAppID3 = beego.AppConfig.String("weixinMiniAppID3"); WeixinMiniAppID3 != "" {
+		WeixinMiniAPI3 = weixinapi.New(WeixinMiniAppID2, beego.AppConfig.String("weixinMiniSecret3"))
+	}
 	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"),