From 8a54dde637efbd53ddad16d181ba6ea2f2f560c9 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Thu, 18 Aug 2022 10:40:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E6=8A=96=E9=9F=B3?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/auth2/auth2.go                          |  1 +
 .../auth2/authprovider/douyin/tiktop_mini.go     | 16 ++++++++++++----
 conf/app.conf                                    | 12 ++++++++----
 globals/api/api.go                               |  7 +++++--
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go
index bfa3970e0..f838bfffc 100644
--- a/business/auth2/auth2.go
+++ b/business/auth2/auth2.go
@@ -306,6 +306,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string
 					}
 				}
 			}
+
 		}
 	} else {
 		err = ErrIllegalAuthType
diff --git a/business/auth2/authprovider/douyin/tiktop_mini.go b/business/auth2/authprovider/douyin/tiktop_mini.go
index 7b4b7a5ca..24600b2c3 100644
--- a/business/auth2/authprovider/douyin/tiktop_mini.go
+++ b/business/auth2/authprovider/douyin/tiktop_mini.go
@@ -1,11 +1,11 @@
 package douyin
 
 import (
-	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
-
+	"git.rosy.net.cn/baseapi/platformapi/tiktok"
 	"git.rosy.net.cn/baseapi/platformapi/weixinapi"
 	"git.rosy.net.cn/jx-callback/business/auth2"
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider"
+	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
@@ -30,8 +30,8 @@ func init() {
 
 func (a *TiktopMiniAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, err error) {
 	globals.SugarLogger.Debugf("toktok mini VerifySecret jsCode:%s", code)
-
-	sessionInfo, err := api.TiktokApi.GetTiktokOauth(code)
+	appID, _ := weixin.SplitJsCode(code)
+	sessionInfo, err := getTikTokApp(appID).GetTiktokOauth(code)
 	globals.SugarLogger.Debug("toktok mini VerifySecret sessionInfo:", sessionInfo)
 	if err == nil {
 		sessionKey := sessionInfo.Data.SessionKey
@@ -88,3 +88,11 @@ func getWxApp(appID string) (miniApi *weixinapi.API) {
 	}
 	return miniApi
 }
+
+func getTikTokApp(appID string) (TikTokMini *tiktok.API) {
+	TikTokMini = api.TiktokApi
+	if len(appID) > 0 && appID == api.TiktokJXDJApiID {
+		TikTokMini = api.TiktokJXDJApi
+	}
+	return TikTokMini
+}
diff --git a/conf/app.conf b/conf/app.conf
index cb86de876..a5c49e6a3 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -211,7 +211,8 @@ tiktokAppKey = "tta6a1d01c399f264201"
 tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad"
 
 tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序
-tiktokJXDJSecret="9285b20dce3c46179204a5aa4d92ca96ee1ed5c9"
+TiktokJXDJApiID="ttaceeda5333d7a7ab01"
+tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4"
 #国美
 gomeiAppKey  = "N0R033L2QQFR53"
 gomeiAppSecret  = "686ffc3e31c24594838baed045563790"
@@ -336,7 +337,8 @@ tiktokAppKey = "tta6a1d01c399f264201"
 tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad"
 
 tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序
-tiktokJXDJSecret="9285b20dce3c46179204a5aa4d92ca96ee1ed5c9"
+TiktokJXDJApiID="ttaceeda5333d7a7ab01"
+tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4"
 #国美
 gomeiAppKey  = "N0R033L2QQFR53"
 gomeiAppSecret  = "686ffc3e31c24594838baed045563790"
@@ -441,7 +443,8 @@ tiktokAppKey = "tta6a1d01c399f264201"
 tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad"
 
 tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序
-tiktokJXDJSecret="9285b20dce3c46179204a5aa4d92ca96ee1ed5c9"
+TiktokJXDJApiID="ttaceeda5333d7a7ab01"
+tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4"
 #国美
 gomeiAppKey  = "N0R033L2QQFR53"
 gomeiAppSecret  = "686ffc3e31c24594838baed045563790"
@@ -629,7 +632,8 @@ tiktokAppKey = "tta6a1d01c399f264201"
 tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad"
 
 tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序
-tiktokJXDJSecret="9285b20dce3c46179204a5aa4d92ca96ee1ed5c9"
+TiktokJXDJApiID="ttaceeda5333d7a7ab01"
+tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4"
 #国美
 gomeiAppKey  = "N0R033L2QQFR53"
 gomeiAppSecret  = "686ffc3e31c24594838baed045563790"
\ No newline at end of file
diff --git a/globals/api/api.go b/globals/api/api.go
index dcb70038f..3a2068c64 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -112,8 +112,11 @@ var (
 	Cacher    cache.ICacher
 	SMSClient *aliyunsmsclient.SmsClient
 
-	TiktokApi *tiktok.API // 抖音api
-	GuoMeiApi *gomei.API  // 国美api
+	TiktokApi       *tiktok.API // 抖音api
+	TiktokJXDJApi   *tiktok.API //抖音京西到家api
+	TiktokApiID     string      //抖音商城ID
+	TiktokJXDJApiID string      //抖音京西到家ID
+	GuoMeiApi       *gomei.API  // 国美api
 
 	EnterpriseChatHeadApi *enterprise.API // 企业微信api
 	EnterpriseChatMin     *enterprise.API // 企业微信小程序api