From d4c1f642018b4af97be507d15da9d6a320e8e540 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Fri, 19 Aug 2022 15:29:13 +0800
Subject: [PATCH] tt

---
 platformapi/tiktok/tiktok_const.go |  3 ++-
 platformapi/tiktok/tiktok_pay.go   | 11 +++++++----
 platformapi/tiktok/tiktok_test.go  | 14 +++++++-------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/platformapi/tiktok/tiktok_const.go b/platformapi/tiktok/tiktok_const.go
index 6389987d..60aee0c4 100644
--- a/platformapi/tiktok/tiktok_const.go
+++ b/platformapi/tiktok/tiktok_const.go
@@ -12,7 +12,8 @@ const (
 	TiktokTokenUrl        = "oauth/access_token/"
 	TiktokRefreshTokenUrl = "oauth/renew_refresh_token/"
 
-	salt                = "TUsUuzcfWriQ8ZXUQOrxPcScjEGlgMSjJaDMCtVy"
+	salt                = "TUsUuzcfWriQ8ZXUQOrxPcScjEGlgMSjJaDMCtVy" //京西菜市
+	salt2               = "Ab25GOMdO2FukyGvgW8HtEzwQtBgNak6ffKUyebD" //京西到家
 	ResponseCodeSuccess = "SUCCESS"
 	ResponseCodeFail    = "FAIL"
 )
diff --git a/platformapi/tiktok/tiktok_pay.go b/platformapi/tiktok/tiktok_pay.go
index de37bdb8..97f7e83a 100644
--- a/platformapi/tiktok/tiktok_pay.go
+++ b/platformapi/tiktok/tiktok_pay.go
@@ -32,8 +32,11 @@ func (a *API) Sign(paramsMap map[string]interface{}) string {
 			paramsArr = append(paramsArr, value)
 		}
 	}
-
-	paramsArr = append(paramsArr, salt)
+	if a.clientKey == TiktokJXDJAppID {
+		paramsArr = append(paramsArr, salt2)
+	} else {
+		paramsArr = append(paramsArr, salt)
+	}
 	sort.Strings(paramsArr)
 	return fmt.Sprintf("%x", md5.Sum([]byte(strings.Join(paramsArr, "&"))))
 }
@@ -59,8 +62,8 @@ func (a *API) CreateOrderByTicktock(param *TickTokCreateOrder) (string, string,
 // 获取抖音token
 func (a *API) GetTiktokToken() error {
 	tokenReq := make(map[string]interface{}, 3)
-	tokenReq["appid"] = TiktokJXDJAppID
-	tokenReq["secret"] = TiktokJXDJSecret
+	tokenReq["appid"] = a.clientKey
+	tokenReq["secret"] = a.clientSecret
 	//tokenReq["appid"] = TiktokAppId
 	//tokenReq["secret"] = TiktokSecret
 	tokenReq["grant_type"] = "client_credential"
diff --git a/platformapi/tiktok/tiktok_test.go b/platformapi/tiktok/tiktok_test.go
index 35e1c480..1a316d31 100644
--- a/platformapi/tiktok/tiktok_test.go
+++ b/platformapi/tiktok/tiktok_test.go
@@ -40,12 +40,12 @@ func TestCode343(t *testing.T) {
 	fmt.Println(data)
 }
 
-func TestCode343(t *testing.T) {
-	a := New("5c8492ec2744fb72bb6cc356983f3cfc317f85d4", "ttaceeda5333d7a7ab01")
-	data, err := a.GetTiktokOauth("-j_QmmDM7B-mjKKk9wcijMeUTAV75mNXbJI4rqabt1IMkDGEmmw1M0-azYJwoXNOrWaDeXlw4xNivEd-uobXuuZrtt7bNn-6AMzf8jvkXp6Jm3LPcP56KisO9w4")
-	fmt.Println(err)
-	fmt.Println(data)
-}
+//func TestCode343(t *testing.T) {
+//	a := New("5c8492ec2744fb72bb6cc356983f3cfc317f85d4", "ttaceeda5333d7a7ab01")
+//	data, err := a.GetTiktokOauth("-j_QmmDM7B-mjKKk9wcijMeUTAV75mNXbJI4rqabt1IMkDGEmmw1M0-azYJwoXNOrWaDeXlw4xNivEd-uobXuuZrtt7bNn-6AMzf8jvkXp6Jm3LPcP56KisO9w4")
+//	fmt.Println(err)
+//	fmt.Println(data)
+//}
 
 func TestCode22(t *testing.T) {
 	fmt.Println(2&4 != 0)
@@ -59,7 +59,7 @@ func TestCode22(t *testing.T) {
 }
 
 func TestGetToken(t *testing.T) {
-	a := New("5c08a0465cf0f996af254a03b6c2548defef87ad", "tta6a1d01c399f264201")
+	a := New("5c8492ec2744fb72bb6cc356983f3cfc317f85d4", "ttaceeda5333d7a7ab01")
 	//a := New("5c08a0465cf0f996af254a03b6c2548defef87ad", "tta6a1d01c399f264201")
 	err := a.GetTiktokToken()
 	fmt.Println(err)