Merge branch 'master' of e.coding.net:rosydev/baseapi

platformapi/tiktok/tiktok.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"git.rosy.net.cn/baseapi/platformapi"
+	"git.rosy.net.cn/jx-callback/globals"
 	"net/http"
 	"strings"
 )
@@ -34,6 +35,7 @@ func (a *API) AccessAPI2(url string, params map[string]interface{}) (retVal map[
 	if err != nil {
 		return nil, err
 	}
+	globals.SugarLogger.Debug("进入AccessAPI2，DATA=================", data)
 	err = platformapi.AccessPlatformAPIWithRetry(a.client,
 		func() *http.Request {
 			request, _ := http.NewRequest(http.MethodPost, url, strings.NewReader(string(data)))
@@ -48,5 +50,6 @@ func (a *API) AccessAPI2(url string, params map[string]interface{}) (retVal map[
 			retVal = jsonResult1
 			return platformapi.ErrLevelSuccess, nil
 		})
+	globals.SugarLogger.Debug("我也不知道哪里出错，返回一下retVal", retVal)
 	return retVal, err
 }

platformapi/tiktok/tiktok_pay_model.go

@@ -8,8 +8,10 @@ const (
 	GetTiktokOauth  = "https://developer.toutiao.com/api/apps/v2/jscode2session"      // 获取抖音授权
 	GetTiktokQrCode = "https://developer.toutiao.com/api/apps/qrcode"                 // 获取小程序二维码
 
-	TiktokAppId  = "tta6a1d01c399f264201"
-	TiktokSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad"
+	TiktokAppId      = "tta6a1d01c399f264201"
+	TiktokSecret     = "5c08a0465cf0f996af254a03b6c2548defef87ad"
+	TiktokJXDJAppID  = "ttaceeda5333d7a7ab01"
+	tiktokJXDJSecret = "5c8492ec2744fb72bb6cc356983f3cfc317f85d4"
 )
 
 // OauthAccessTokenResData access_token
@@ -38,15 +40,17 @@ type OauthAccessTokenRes struct {
 
 // 抖音登录返回值
 type TiktokOauthResone struct {
-	ErrNo   int64  `json:"err_no"`
-	ErrTips string `json:"err_tips"`
-	Data    *struct {
-		SessionKey      string `json:"session_key"`
-		OpenId          string `json:"openid"` // 授权用户唯一标识
-		AnonymousOpenid string `json:"anonymous_openid"`
-		Unionid         string `json:"unionid"`
-		Dopenid         string `json:"dopenid"`
-	}
+	ErrNo   int64       `json:"err_no"`
+	ErrTips string      `json:"err_tips"`
+	Data    *TiktokData `json:"data"`
+}
+
+type TiktokData struct {
+	SessionKey      string `json:"session_key"`
+	OpenId          string `json:"openid"` // 授权用户唯一标识
+	AnonymousOpenid string `json:"anonymous_openid"`
+	Unionid         string `json:"unionid"`
+	Dopenid         string `json:"dopenid"`
 }
 
 // 预下单

platformapi/tiktok/tiktok_test.go

@@ -28,7 +28,14 @@ func TestCode(t *testing.T) {
 
 func TestCode2(t *testing.T) {
 	a := New("5c08a0465cf0f996af254a03b6c2548defef87ad ", "tta6a1d01c399f264201")
-	data, err := a.GetTiktokOauth("CCRHRLfkl8kSHXuuZTDWQayoqHVXF2Vl4qrt173jxfWhg6Q1pZCbjRO0TzTGNPZd5vTW8UcjRupxfmEIdM06WSmAjwhvr-Ak_Pg9gJfHfrq2KvLH5eYL4C68BXM")
+	data, err := a.GetTiktokOauth("tYIYf03MgvPekdeWj91W3RhdzQMCovGG_QugelFswhWiZLdIwMFlMtC7PHZbl-JjrkwaonexoEahd1GDCS6K5jK4W7oegChlysU3kCw72cL965P0MWMyXdO_qeA")
+	fmt.Println(err)
+	fmt.Println(data)
+}
+
+func TestCode343(t *testing.T) {
+	a := New("5c8492ec2744fb72bb6cc356983f3cfc317f85d4", "ttaceeda5333d7a7ab01")
+	data, err := a.GetTiktokOauth("eDpIjQ2VdK4MC8wE9ORO63adZECE8no_yNLXQYPaILyLUXF24K02PNcs84lQeeJn68EQJPIiV6DO5z3vHoqLom4dr4Fy4KMcZK7O4a3yAHK0Vgs9Vc-2u9vLwAg")
 	fmt.Println(err)
 	fmt.Println(data)
 }

platformapi/tiktok/tiktok_token.go

@@ -3,15 +3,18 @@ package tiktok
 import (
 	"errors"
 	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/globals"
 )
 
 // 获取抖音登录授权2
 func (a *API) GetTiktokOauth(code string) (*TiktokOauthResone, error) {
+	globals.SugarLogger.Debug("初始code=============", code)
 	tokenReq := make(map[string]interface{}, 3)
 	tokenReq["appid"] = a.GetAppID()
 	tokenReq["code"] = code
 	tokenReq["secret"] = a.GetSecret()
 	tokenReq["anonymous_code"] = ""
+	globals.SugarLogger.Debug("输出tokenReq", tokenReq)
 	result, err := a.AccessAPI2(GetTiktokOauth, tokenReq)
 	if err != nil {
 		return nil, err
@@ -25,6 +28,7 @@ func (a *API) GetTiktokOauth(code string) (*TiktokOauthResone, error) {
 	if oauthAccessToken.ErrNo != 0 {
 		return nil, errors.New(oauthAccessToken.ErrTips)
 	}
+	globals.SugarLogger.Debug("再来输出一下oauthAccessToken", oauthAccessToken)
 	return oauthAccessToken, nil
 }