From a181d55338b9ef9971d09ca1dad61cd5b9db3017 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 14:16:14 +0800 Subject: [PATCH 01/19] dd add --- platformapi/dingdingapi/qrcode.go | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/platformapi/dingdingapi/qrcode.go b/platformapi/dingdingapi/qrcode.go index 52b8eb22..fd293be4 100644 --- a/platformapi/dingdingapi/qrcode.go +++ b/platformapi/dingdingapi/qrcode.go @@ -22,3 +22,34 @@ func (a *API) GetUserInfoByCode(code string) (userInfo *QRCodeUserInfo, err erro } return nil, err } + +type UserGetByUnionIdRsp struct { + ContactType int64 `json:"contact_type"` + UserID string `json:"userid"` +} + +//根据union获取用户user_id +func (a *API) GetByUnionID(unionID string) (userInfo *UserGetByUnionIdRsp, err error) { + result, err := a.AccessAPI("user/getbyunionid", nil, map[string]interface{}{ + "unionid": unionID, + }) + if err != nil { + return nil, err + } else { + tmpResult := result["result"].(map[string]interface{}) + return &UserGetByUnionIdRsp{ + ContactType: utils.ForceInterface2Int64(tmpResult["contact_type"]), + UserID: utils.Interface2String(tmpResult["userid"]), + }, nil + } + return nil, err +} + +//根据user_id获取用户 +func (a *API) GetUser(userID string) (userDetail map[string]interface{}, err error) { + result, err := a.AccessAPI("user/get", utils.Params2Map("userid", userID), nil) + if err != nil { + return nil, err + } + return result, nil +} From aaffe9877696c5466224c5dbc5d779ae6a43f534 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 14:37:24 +0800 Subject: [PATCH 02/19] dd add --- platformapi/dingdingapi/qrcode.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/platformapi/dingdingapi/qrcode.go b/platformapi/dingdingapi/qrcode.go index fd293be4..04b57400 100644 --- a/platformapi/dingdingapi/qrcode.go +++ b/platformapi/dingdingapi/qrcode.go @@ -1,6 +1,9 @@ package dingdingapi -import "git.rosy.net.cn/baseapi/utils" +import ( + "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/globals" +) type QRCodeUserInfo struct { Nickname string `json:"nick"` @@ -33,7 +36,9 @@ func (a *API) GetByUnionID(unionID string) (userInfo *UserGetByUnionIdRsp, err e result, err := a.AccessAPI("user/getbyunionid", nil, map[string]interface{}{ "unionid": unionID, }) + globals.SugarLogger.Debug("result=================", result) if err != nil { + globals.SugarLogger.Debug("err=================", err) return nil, err } else { tmpResult := result["result"].(map[string]interface{}) @@ -42,7 +47,7 @@ func (a *API) GetByUnionID(unionID string) (userInfo *UserGetByUnionIdRsp, err e UserID: utils.Interface2String(tmpResult["userid"]), }, nil } - return nil, err + //return nil, err } //根据user_id获取用户 From 158c00c82b1f4ac216ef5589c1083333afec20dd Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 14:42:24 +0800 Subject: [PATCH 03/19] dd add --- platformapi/dingdingapi/qrcode.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformapi/dingdingapi/qrcode.go b/platformapi/dingdingapi/qrcode.go index 04b57400..aff00f18 100644 --- a/platformapi/dingdingapi/qrcode.go +++ b/platformapi/dingdingapi/qrcode.go @@ -33,7 +33,7 @@ type UserGetByUnionIdRsp struct { //根据union获取用户user_id func (a *API) GetByUnionID(unionID string) (userInfo *UserGetByUnionIdRsp, err error) { - result, err := a.AccessAPI("user/getbyunionid", nil, map[string]interface{}{ + result, err := a.AccessAPI("topapi/user/getbyunionid", nil, map[string]interface{}{ "unionid": unionID, }) globals.SugarLogger.Debug("result=================", result) From 0720dcf87b3e2fd0f5820d6d2b4053b0a019ba8a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 14:51:49 +0800 Subject: [PATCH 04/19] dd add --- platformapi/dingdingapi/qrcode.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/platformapi/dingdingapi/qrcode.go b/platformapi/dingdingapi/qrcode.go index aff00f18..2c718228 100644 --- a/platformapi/dingdingapi/qrcode.go +++ b/platformapi/dingdingapi/qrcode.go @@ -33,9 +33,7 @@ type UserGetByUnionIdRsp struct { //根据union获取用户user_id func (a *API) GetByUnionID(unionID string) (userInfo *UserGetByUnionIdRsp, err error) { - result, err := a.AccessAPI("topapi/user/getbyunionid", nil, map[string]interface{}{ - "unionid": unionID, - }) + result, err := a.AccessAPI("topapi/user/getbyunionid", utils.Params2Map("unionid", unionID), nil) globals.SugarLogger.Debug("result=================", result) if err != nil { globals.SugarLogger.Debug("err=================", err) From 68afa907409d0f5ee03b0e0d3508383920f61236 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 15:02:18 +0800 Subject: [PATCH 05/19] dd add --- platformapi/dingdingapi/qrcode.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platformapi/dingdingapi/qrcode.go b/platformapi/dingdingapi/qrcode.go index 2c718228..a2992939 100644 --- a/platformapi/dingdingapi/qrcode.go +++ b/platformapi/dingdingapi/qrcode.go @@ -32,7 +32,8 @@ type UserGetByUnionIdRsp struct { } //根据union获取用户user_id -func (a *API) GetByUnionID(unionID string) (userInfo *UserGetByUnionIdRsp, err error) { +func (a *API) GetByUnionID(unionID string) (*UserGetByUnionIdRsp, error) { + //userInfo := new(UserGetByUnionIdRsp) result, err := a.AccessAPI("topapi/user/getbyunionid", utils.Params2Map("unionid", unionID), nil) globals.SugarLogger.Debug("result=================", result) if err != nil { @@ -49,7 +50,7 @@ func (a *API) GetByUnionID(unionID string) (userInfo *UserGetByUnionIdRsp, err e } //根据user_id获取用户 -func (a *API) GetUser(userID string) (userDetail map[string]interface{}, err error) { +func (a *API) GetUser(userID string) (map[string]interface{}, error) { result, err := a.AccessAPI("user/get", utils.Params2Map("userid", userID), nil) if err != nil { return nil, err From 1839690faab5b495320a03cd5e048e45850096e2 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 17:15:29 +0800 Subject: [PATCH 06/19] dd rollback --- platformapi/dingdingapi/qrcode.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/platformapi/dingdingapi/qrcode.go b/platformapi/dingdingapi/qrcode.go index a2992939..2523b4d9 100644 --- a/platformapi/dingdingapi/qrcode.go +++ b/platformapi/dingdingapi/qrcode.go @@ -2,7 +2,6 @@ package dingdingapi import ( "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" ) type QRCodeUserInfo struct { @@ -35,9 +34,7 @@ type UserGetByUnionIdRsp struct { func (a *API) GetByUnionID(unionID string) (*UserGetByUnionIdRsp, error) { //userInfo := new(UserGetByUnionIdRsp) result, err := a.AccessAPI("topapi/user/getbyunionid", utils.Params2Map("unionid", unionID), nil) - globals.SugarLogger.Debug("result=================", result) if err != nil { - globals.SugarLogger.Debug("err=================", err) return nil, err } else { tmpResult := result["result"].(map[string]interface{}) @@ -46,7 +43,6 @@ func (a *API) GetByUnionID(unionID string) (*UserGetByUnionIdRsp, error) { UserID: utils.Interface2String(tmpResult["userid"]), }, nil } - //return nil, err } //根据user_id获取用户 From a4ef782ae34815265e0e9c53582fb1482c6bc106 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 15 Aug 2022 13:56:47 +0800 Subject: [PATCH 07/19] 1 --- platformapi/ebaiapi/order.go | 1 + platformapi/q_bida/QBiDa_test.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/platformapi/ebaiapi/order.go b/platformapi/ebaiapi/order.go index 1654bf79..7fbd27cc 100644 --- a/platformapi/ebaiapi/order.go +++ b/platformapi/ebaiapi/order.go @@ -559,6 +559,7 @@ func (a *API) OrderDisagreeRefund(orderID, refuseReason string) (err error) { return err } +//售后 同意用户多次部分取消 func (a *API) OrderPartRefund(orderID string, removeSkuList []*RefundSku) (err error) { _, err = a.AccessAPI("order.manyTimesPartrefund", map[string]interface{}{ "order_id": orderID, diff --git a/platformapi/q_bida/QBiDa_test.go b/platformapi/q_bida/QBiDa_test.go index 0c7d5e6c..1a993a32 100644 --- a/platformapi/q_bida/QBiDa_test.go +++ b/platformapi/q_bida/QBiDa_test.go @@ -37,7 +37,7 @@ func TestGatAllFee(t *testing.T) { DeliveryType: 0, GoodsValue: 1000, SendAddress: "四川省成都市金牛区二环北路一段10号万科加州湾V派616", - ReceiveAddress: "北京市北京市朝阳区来广营地区中铁国际城乐享汇大厦3号楼1132", + ReceiveAddress: "北京市北京市朝阳区容达路7号太极产业园", Type: 0, Weight: 1, Length: 100, From cd69af4ac4f6a1cf0474cc3f4e43287bc6314c96 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 16 Aug 2022 17:49:38 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E7=AD=BE?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/alipayapi/utils.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/platformapi/alipayapi/utils.go b/platformapi/alipayapi/utils.go index 50eb0c23..a81b2a77 100644 --- a/platformapi/alipayapi/utils.go +++ b/platformapi/alipayapi/utils.go @@ -41,6 +41,17 @@ func (a *API) SystemAuthToken(grantType, code, refreshToken string) (tokenInfo * if refreshToken != "" { params["refresh_token"] = refreshToken } + + // 获取证书 + appCertSN, aliPayRootCertSN, aliPayPublicCertSN, err := SetCertSnByPath(appCertPath, aliPayRootCertPath, AliPayPublicCertPath) + if err != nil { + return nil, err + } + + params["app_cert_sn"] = appCertSN + params["alipay_public_cert_sn"] = aliPayPublicCertSN + params["alipay_root_cert_sn"] = aliPayRootCertSN + retVal, err := a.AccessAPI("alipay.system.oauth.token", params, nil, false) if err == nil { err = utils.Map2StructByJson(retVal, &tokenInfo, false) From 68b6a7c745b9a6a05bd238b340f917a80e433af5 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 17 Aug 2022 09:52:41 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/alipayapi/utils.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platformapi/alipayapi/utils.go b/platformapi/alipayapi/utils.go index a81b2a77..53d07f46 100644 --- a/platformapi/alipayapi/utils.go +++ b/platformapi/alipayapi/utils.go @@ -1,6 +1,8 @@ package alipayapi -import "git.rosy.net.cn/baseapi/utils" +import ( + "git.rosy.net.cn/baseapi/utils" +) const ( GrantTypeCode = "authorization_code" @@ -41,7 +43,6 @@ func (a *API) SystemAuthToken(grantType, code, refreshToken string) (tokenInfo * if refreshToken != "" { params["refresh_token"] = refreshToken } - // 获取证书 appCertSN, aliPayRootCertSN, aliPayPublicCertSN, err := SetCertSnByPath(appCertPath, aliPayRootCertPath, AliPayPublicCertPath) if err != nil { From b65467d2367877ca8b40c1b555c4b73f1786488e Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 17 Aug 2022 10:15:33 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/alipayapi/pay_for_user.go | 16 ++++++++-------- platformapi/alipayapi/utils.go | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/platformapi/alipayapi/pay_for_user.go b/platformapi/alipayapi/pay_for_user.go index ed70a2a9..442dc687 100644 --- a/platformapi/alipayapi/pay_for_user.go +++ b/platformapi/alipayapi/pay_for_user.go @@ -14,8 +14,8 @@ import ( const ( AliPayPublicCertPath = "./config/alipayCertPublicKey_RSA2.crt" // 支付宝公钥证书文件路径 - aliPayRootCertPath = "./config/alipayRootCert.crt" // 支付宝根证书文件路径 - appCertPath = "./config/appCertPublicKey_2019110769024042.crt" // 应用公钥证书路径 + AliPayRootCertPath = "./config/alipayRootCert.crt" // 支付宝根证书文件路径 + AppCertPath = "./config/appCertPublicKey_2019110769024042.crt" // 应用公钥证书路径 MinWithdrawalMoney = 50 // 最小提现金额，不用审核 ) @@ -71,7 +71,7 @@ func (a *API) Withdrawal4AliPay(param *WithdrawalParam) (*Withdrawal4AliPayRes, param.PayeeInfo.IdentityType = "ALIPAY_LOGON_ID" // 获取证书 - appCertSN, aliPayRootCertSN, aliPayPublicCertSN, err := SetCertSnByPath(appCertPath, aliPayRootCertPath, AliPayPublicCertPath) + appCertSN, aliPayRootCertSN, aliPayPublicCertSN, err := SetCertSnByPath(AppCertPath, AliPayRootCertPath, AliPayPublicCertPath) if err != nil { return nil, err } @@ -94,15 +94,15 @@ func (a *API) Withdrawal4AliPay(param *WithdrawalParam) (*Withdrawal4AliPayRes, } // SetCertSnByPath 通过应用公钥证书路径设置 app_cert_sn、alipay_root_cert_sn、alipay_cert_sn -// appCertPath：应用公钥证书路径 -// aliPayRootCertPath：支付宝根证书文件路径 +// AppCertPath：应用公钥证书路径 +// AliPayRootCertPath：支付宝根证书文件路径 // aliPayPublicCertPath：支付宝公钥证书文件路径 -func SetCertSnByPath(appCertPath, aliPayRootCertPath, aliPayPublicCertPath string) (string, string, string, error) { - appCertSn, err := GetCertSN(appCertPath) +func SetCertSnByPath(AppCertPath, AliPayRootCertPath, aliPayPublicCertPath string) (string, string, string, error) { + appCertSn, err := GetCertSN(AppCertPath) if err != nil { return "", "", "", fmt.Errorf("get app_cert_sn return err, but alse return alipay client. err: %w", err) } - rootCertSn, err := GetRootCertSN(aliPayRootCertPath) + rootCertSn, err := GetRootCertSN(AliPayRootCertPath) if err != nil { return "", "", "", fmt.Errorf("get alipay_root_cert_sn return err, but alse return alipay client. err: %w", err) } diff --git a/platformapi/alipayapi/utils.go b/platformapi/alipayapi/utils.go index 53d07f46..fc86368e 100644 --- a/platformapi/alipayapi/utils.go +++ b/platformapi/alipayapi/utils.go @@ -44,7 +44,7 @@ func (a *API) SystemAuthToken(grantType, code, refreshToken string) (tokenInfo * params["refresh_token"] = refreshToken } // 获取证书 - appCertSN, aliPayRootCertSN, aliPayPublicCertSN, err := SetCertSnByPath(appCertPath, aliPayRootCertPath, AliPayPublicCertPath) + appCertSN, aliPayRootCertSN, aliPayPublicCertSN, err := SetCertSnByPath(AppCertPath, AliPayRootCertPath, AliPayPublicCertPath) if err != nil { return nil, err } From c784f9fbad2acac4d923b65cbb13b09a33043582 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 17 Aug 2022 10:32:37 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/alipayapi/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformapi/alipayapi/utils.go b/platformapi/alipayapi/utils.go index fc86368e..413fa178 100644 --- a/platformapi/alipayapi/utils.go +++ b/platformapi/alipayapi/utils.go @@ -44,7 +44,7 @@ func (a *API) SystemAuthToken(grantType, code, refreshToken string) (tokenInfo * params["refresh_token"] = refreshToken } // 获取证书 - appCertSN, aliPayRootCertSN, aliPayPublicCertSN, err := SetCertSnByPath(AppCertPath, AliPayRootCertPath, AliPayPublicCertPath) + appCertSN, aliPayRootCertSN, aliPayPublicCertSN, err := SetCertSnByPath("./config/appCertPublicKey_2019110769024042.crt", "./config/alipayRootCert.crt", "./config/alipayCertPublicKey_RSA2.crt") if err != nil { return nil, err } From 3f4600c2384a9b1417c17f9d2bcc955affb88403 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 17 Aug 2022 10:58:20 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/alipayapi/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformapi/alipayapi/utils.go b/platformapi/alipayapi/utils.go index 413fa178..fc86368e 100644 --- a/platformapi/alipayapi/utils.go +++ b/platformapi/alipayapi/utils.go @@ -44,7 +44,7 @@ func (a *API) SystemAuthToken(grantType, code, refreshToken string) (tokenInfo * params["refresh_token"] = refreshToken } // 获取证书 - appCertSN, aliPayRootCertSN, aliPayPublicCertSN, err := SetCertSnByPath("./config/appCertPublicKey_2019110769024042.crt", "./config/alipayRootCert.crt", "./config/alipayCertPublicKey_RSA2.crt") + appCertSN, aliPayRootCertSN, aliPayPublicCertSN, err := SetCertSnByPath(AppCertPath, AliPayRootCertPath, AliPayPublicCertPath) if err != nil { return nil, err } From 811e2d862f443a0d3d4dc06a6086536b67c1f028 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 17 Aug 2022 11:16:15 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=85=AC?= =?UTF-8?q?=E9=92=A5=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/alipayapi/utils.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/platformapi/alipayapi/utils.go b/platformapi/alipayapi/utils.go index fc86368e..816ce68b 100644 --- a/platformapi/alipayapi/utils.go +++ b/platformapi/alipayapi/utils.go @@ -5,8 +5,11 @@ import ( ) const ( - GrantTypeCode = "authorization_code" - GrantTypeRefresh = "refresh_token" + GrantTypeCode = "authorization_code" + AliPayPublicCertPath2 = "./conf/alipayCertPublicKey_RSA2.crt" // 支付宝公钥证书文件路径 + AliPayRootCertPath2 = "./conf/alipayRootCert.crt" // 支付宝根证书文件路径 + AppCertPath2 = "./conf/appCertPublicKey_2019110769024042.crt" // 应用公钥证书路径 + GrantTypeRefresh = "refresh_token" ) type TokenInfo struct { @@ -44,7 +47,7 @@ func (a *API) SystemAuthToken(grantType, code, refreshToken string) (tokenInfo * params["refresh_token"] = refreshToken } // 获取证书 - appCertSN, aliPayRootCertSN, aliPayPublicCertSN, err := SetCertSnByPath(AppCertPath, AliPayRootCertPath, AliPayPublicCertPath) + appCertSN, aliPayRootCertSN, aliPayPublicCertSN, err := SetCertSnByPath(AppCertPath2, AliPayRootCertPath2, AliPayPublicCertPath2) if err != nil { return nil, err } From 19a038837e66d360a8e12c831915470c76bd67fb Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 17 Aug 2022 17:33:21 +0800 Subject: [PATCH 14/19] tiktok --- platformapi/tiktok/tiktok_token.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platformapi/tiktok/tiktok_token.go b/platformapi/tiktok/tiktok_token.go index 614b2818..443eca8b 100644 --- a/platformapi/tiktok/tiktok_token.go +++ b/platformapi/tiktok/tiktok_token.go @@ -3,6 +3,7 @@ package tiktok import ( "errors" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/globals" ) // 获取抖音登录授权2 @@ -12,6 +13,7 @@ func (a *API) GetTiktokOauth(code string) (*TiktokOauthResone, error) { tokenReq["code"] = code tokenReq["secret"] = a.GetSecret() tokenReq["anonymous_code"] = "" + globals.SugarLogger.Debug("打印appid,secret", tokenReq["appid"], tokenReq["secret"]) result, err := a.AccessAPI2(GetTiktokOauth, tokenReq) if err != nil { return nil, err From 960c497d35973ed84b7e42a3768f47e4ae17b49e Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 13:51:40 +0800 Subject: [PATCH 15/19] tt --- platformapi/tiktok/tiktok_test.go | 7 +++++++ platformapi/tiktok/tiktok_token.go | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/platformapi/tiktok/tiktok_test.go b/platformapi/tiktok/tiktok_test.go index 2ec29134..c29f3679 100644 --- a/platformapi/tiktok/tiktok_test.go +++ b/platformapi/tiktok/tiktok_test.go @@ -33,6 +33,13 @@ func TestCode2(t *testing.T) { fmt.Println(data) } +func TestCode343(t *testing.T) { + a := New("5c8492ec2744fb72bb6cc356983f3cfc317f85d4", "ttaceeda5333d7a7ab01") + data, err := a.GetTiktokOauth("e8_JIyo4H2IKJrfcuAP3q2WSBp00B_vQmTtf5YKcFFRqDEzubRleNWhxvqujCLFqxp8CrOpR0aIXKAt66fGy0uhypCTt8w-JIyItQAspqyy2qpa9FkbYlgmFZV8") + fmt.Println(err) + fmt.Println(data) +} + func TestCode22(t *testing.T) { fmt.Println(2&4 != 0) fmt.Println(2&2 != 0) diff --git a/platformapi/tiktok/tiktok_token.go b/platformapi/tiktok/tiktok_token.go index 443eca8b..3f67e788 100644 --- a/platformapi/tiktok/tiktok_token.go +++ b/platformapi/tiktok/tiktok_token.go @@ -18,7 +18,7 @@ func (a *API) GetTiktokOauth(code string) (*TiktokOauthResone, error) { if err != nil { return nil, err } - + globals.SugarLogger.Debug("从抖音获取的result==========================", result) oauthAccessToken := &TiktokOauthResone{} if err := utils.Map2StructByJson(result, oauthAccessToken, false); err != nil { return nil, err From 52b7662609a60e941d807bf81c0ae1902b306cf3 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 15:49:23 +0800 Subject: [PATCH 16/19] tt --- platformapi/tiktok/tiktok_pay_model.go | 20 +++++++++++--------- platformapi/tiktok/tiktok_test.go | 2 +- platformapi/tiktok/tiktok_token.go | 4 +--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/platformapi/tiktok/tiktok_pay_model.go b/platformapi/tiktok/tiktok_pay_model.go index 0937c82e..6dba3ff7 100644 --- a/platformapi/tiktok/tiktok_pay_model.go +++ b/platformapi/tiktok/tiktok_pay_model.go @@ -38,15 +38,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"` } // 预下单 diff --git a/platformapi/tiktok/tiktok_test.go b/platformapi/tiktok/tiktok_test.go index c29f3679..a26e507b 100644 --- a/platformapi/tiktok/tiktok_test.go +++ b/platformapi/tiktok/tiktok_test.go @@ -35,7 +35,7 @@ func TestCode2(t *testing.T) { func TestCode343(t *testing.T) { a := New("5c8492ec2744fb72bb6cc356983f3cfc317f85d4", "ttaceeda5333d7a7ab01") - data, err := a.GetTiktokOauth("e8_JIyo4H2IKJrfcuAP3q2WSBp00B_vQmTtf5YKcFFRqDEzubRleNWhxvqujCLFqxp8CrOpR0aIXKAt66fGy0uhypCTt8w-JIyItQAspqyy2qpa9FkbYlgmFZV8") + data, err := a.GetTiktokOauth("L7ItxFupOS4loNPC5fBq9JtnphlXJtKwrmvDqvMoK5dbqZ03uf8Cyoc_1bnoc_SzEARSi5FEhzZHROyv37b6dzEAUkzhm1RcQYYJtPfFV2FKWiDH5kYX1xIAFLY") fmt.Println(err) fmt.Println(data) } diff --git a/platformapi/tiktok/tiktok_token.go b/platformapi/tiktok/tiktok_token.go index 3f67e788..614b2818 100644 --- a/platformapi/tiktok/tiktok_token.go +++ b/platformapi/tiktok/tiktok_token.go @@ -3,7 +3,6 @@ package tiktok import ( "errors" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" ) // 获取抖音登录授权2 @@ -13,12 +12,11 @@ func (a *API) GetTiktokOauth(code string) (*TiktokOauthResone, error) { tokenReq["code"] = code tokenReq["secret"] = a.GetSecret() tokenReq["anonymous_code"] = "" - globals.SugarLogger.Debug("打印appid,secret", tokenReq["appid"], tokenReq["secret"]) result, err := a.AccessAPI2(GetTiktokOauth, tokenReq) if err != nil { return nil, err } - globals.SugarLogger.Debug("从抖音获取的result==========================", result) + oauthAccessToken := &TiktokOauthResone{} if err := utils.Map2StructByJson(result, oauthAccessToken, false); err != nil { return nil, err From 75679bf4d1997ab9acefcb60f0a15669797c338a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 16:13:56 +0800 Subject: [PATCH 17/19] tt --- platformapi/tiktok/tiktok.go | 2 +- platformapi/tiktok/tiktok_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platformapi/tiktok/tiktok.go b/platformapi/tiktok/tiktok.go index 13bf25b5..40d7592e 100644 --- a/platformapi/tiktok/tiktok.go +++ b/platformapi/tiktok/tiktok.go @@ -36,7 +36,7 @@ func (a *API) AccessAPI2(url string, params map[string]interface{}) (retVal map[ } err = platformapi.AccessPlatformAPIWithRetry(a.client, func() *http.Request { - request, _ := http.NewRequest(http.MethodPost, url, strings.NewReader(string(data))) + request, _ := http.NewRequest(http.MethodGet, url, strings.NewReader(string(data))) request.Header.Set("Content-Type", "application/json") return request }, diff --git a/platformapi/tiktok/tiktok_test.go b/platformapi/tiktok/tiktok_test.go index a26e507b..ef35e321 100644 --- a/platformapi/tiktok/tiktok_test.go +++ b/platformapi/tiktok/tiktok_test.go @@ -35,7 +35,7 @@ func TestCode2(t *testing.T) { func TestCode343(t *testing.T) { a := New("5c8492ec2744fb72bb6cc356983f3cfc317f85d4", "ttaceeda5333d7a7ab01") - data, err := a.GetTiktokOauth("L7ItxFupOS4loNPC5fBq9JtnphlXJtKwrmvDqvMoK5dbqZ03uf8Cyoc_1bnoc_SzEARSi5FEhzZHROyv37b6dzEAUkzhm1RcQYYJtPfFV2FKWiDH5kYX1xIAFLY") + data, err := a.GetTiktokOauth("0G3WBJXM4kuYlM0UmbRsrg9Bx_7YOQJflKewL6F7qe5aQDoy9j2mxgigESyPMlXzPNnvYsn1Swix-3pabUfqS-_2_H3WzOI6aeU_bSW10LzA-gq-8j797BU4iL0") fmt.Println(err) fmt.Println(data) } From 8b6fe6e92be4d6f39986fae8ab8d3de1e9a0d7a2 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 16:36:11 +0800 Subject: [PATCH 18/19] tt --- platformapi/tiktok/tiktok.go | 2 +- platformapi/tiktok/tiktok_test.go | 2 +- platformapi/tiktok/tiktok_token.go | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/platformapi/tiktok/tiktok.go b/platformapi/tiktok/tiktok.go index 40d7592e..13bf25b5 100644 --- a/platformapi/tiktok/tiktok.go +++ b/platformapi/tiktok/tiktok.go @@ -36,7 +36,7 @@ func (a *API) AccessAPI2(url string, params map[string]interface{}) (retVal map[ } err = platformapi.AccessPlatformAPIWithRetry(a.client, func() *http.Request { - request, _ := http.NewRequest(http.MethodGet, url, strings.NewReader(string(data))) + request, _ := http.NewRequest(http.MethodPost, url, strings.NewReader(string(data))) request.Header.Set("Content-Type", "application/json") return request }, diff --git a/platformapi/tiktok/tiktok_test.go b/platformapi/tiktok/tiktok_test.go index ef35e321..7da2d9a5 100644 --- a/platformapi/tiktok/tiktok_test.go +++ b/platformapi/tiktok/tiktok_test.go @@ -35,7 +35,7 @@ func TestCode2(t *testing.T) { func TestCode343(t *testing.T) { a := New("5c8492ec2744fb72bb6cc356983f3cfc317f85d4", "ttaceeda5333d7a7ab01") - data, err := a.GetTiktokOauth("0G3WBJXM4kuYlM0UmbRsrg9Bx_7YOQJflKewL6F7qe5aQDoy9j2mxgigESyPMlXzPNnvYsn1Swix-3pabUfqS-_2_H3WzOI6aeU_bSW10LzA-gq-8j797BU4iL0") + data, err := a.GetTiktokOauth("ghUxJ6g1xQbW6_rfnoTRlHUnWZ2THaPXJuxekaQ0-kz_5gw-94onRi982egQshVtaS3Nl5tLj929_1BVBmO3hm0JHJqdj9MDUloLSBBXSn-j0sX0DA6JPOyCaFM&ttaceeda5333d7a7ab01") fmt.Println(err) fmt.Println(data) } diff --git a/platformapi/tiktok/tiktok_token.go b/platformapi/tiktok/tiktok_token.go index 614b2818..7ef8c04d 100644 --- a/platformapi/tiktok/tiktok_token.go +++ b/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"] = "" + result, err := a.AccessAPI2(GetTiktokOauth, tokenReq) if err != nil { return nil, err From 909cc9ab3fecac1be8382afdd6f4546295d83a15 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 19 Aug 2022 09:22:22 +0800 Subject: [PATCH 19/19] tt --- platformapi/tiktok/tiktok.go | 3 +++ platformapi/tiktok/tiktok_pay_model.go | 6 ++++-- platformapi/tiktok/tiktok_test.go | 4 ++-- platformapi/tiktok/tiktok_token.go | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/platformapi/tiktok/tiktok.go b/platformapi/tiktok/tiktok.go index 13bf25b5..ffec9be8 100644 --- a/platformapi/tiktok/tiktok.go +++ b/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 } diff --git a/platformapi/tiktok/tiktok_pay_model.go b/platformapi/tiktok/tiktok_pay_model.go index 6dba3ff7..a3f9fcc4 100644 --- a/platformapi/tiktok/tiktok_pay_model.go +++ b/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 diff --git a/platformapi/tiktok/tiktok_test.go b/platformapi/tiktok/tiktok_test.go index 7da2d9a5..387e16d5 100644 --- a/platformapi/tiktok/tiktok_test.go +++ b/platformapi/tiktok/tiktok_test.go @@ -28,14 +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("ghUxJ6g1xQbW6_rfnoTRlHUnWZ2THaPXJuxekaQ0-kz_5gw-94onRi982egQshVtaS3Nl5tLj929_1BVBmO3hm0JHJqdj9MDUloLSBBXSn-j0sX0DA6JPOyCaFM&ttaceeda5333d7a7ab01") + data, err := a.GetTiktokOauth("eDpIjQ2VdK4MC8wE9ORO63adZECE8no_yNLXQYPaILyLUXF24K02PNcs84lQeeJn68EQJPIiV6DO5z3vHoqLom4dr4Fy4KMcZK7O4a3yAHK0Vgs9Vc-2u9vLwAg") fmt.Println(err) fmt.Println(data) } diff --git a/platformapi/tiktok/tiktok_token.go b/platformapi/tiktok/tiktok_token.go index 7ef8c04d..18aac462 100644 --- a/platformapi/tiktok/tiktok_token.go +++ b/platformapi/tiktok/tiktok_token.go @@ -14,7 +14,7 @@ func (a *API) GetTiktokOauth(code string) (*TiktokOauthResone, error) { 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 @@ -28,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 }