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

platformapi/jdapi/sku.go

@@ -2,6 +2,7 @@ package jdapi
 
 import (
 	"fmt"
+	"git.rosy.net.cn/jx-callback/globals"
 	"regexp"
 	"strings"
 
@@ -368,6 +369,7 @@ func (a *API) ChangeShopCategoryOrder(pid int64, childIds []int64) error {
 		KeyChildIds: childIds,
 	}
 	_, err := a.AccessAPINoPage("pms/changeShopCategoryOrder", params, nil, nil, nullResultParser)
+	globals.SugarLogger.Debugf("changeShopCategoryOrder === %v", err)
 	return err
 }
 

platformapi/kuaishou_mini/kuaishou_test.go

@@ -1,7 +1,9 @@
 package kuaishou_mini
 
 import (
+	"encoding/base64"
 	"git.rosy.net.cn/baseapi"
+	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/globals"
 	"go.uber.org/zap"
 	"testing"
@@ -26,3 +28,37 @@ func TestAuthLogin(t *testing.T) {
 	globals.SugarLogger.Debugf("open_id := %s", openId)
 	globals.SugarLogger.Debugf("err := %v", err)
 }
+
+func TestDecryptUserMsg(t *testing.T) {
+	encryptedData := "ipj6OPhMqb35MZbKafvdWbCqJ3a7kb4BPGGClijFMB1VEy4x8p91ERyfjC1Yl15jfuL+3Viy2r5E+bls9b3Qxg=="
+	iv := "J4UVoNNj5pHD/7MLdw9I8w=="
+	sessionKey := "6gUP5PZCqw+NUM/hW0zXMg=="
+	data, err := DecryptUserMsg(sessionKey, iv, encryptedData)
+	globals.SugarLogger.Debugf("data := %s", data)
+	globals.SugarLogger.Debugf("err := %v", err)
+}
+func DecryptUserMsg(sessionKey, iv, msg string) (string, error) {
+	decodeMsg, err := base64.StdEncoding.DecodeString(msg)
+	if err != nil {
+		return "", err
+	}
+	decodeIv, err := base64.StdEncoding.DecodeString(iv)
+	if err != nil {
+		return "", err
+	}
+	decodeSessionKey, err := base64.StdEncoding.DecodeString(sessionKey)
+	if err != nil {
+		return "", err
+	}
+
+	userInfo, err := utils.AESCBC16Decrypt(decodeSessionKey, decodeIv, decodeMsg)
+	if err != nil {
+		return "", err
+	}
+	//result := &TikTokDecryptInfo{}
+	//if err := json.Unmarshal(userInfo, result); err != nil {
+	//	return "", err
+	//}
+	//return result.PhoneNumber, nil
+	return string(userInfo), nil
+}