From a9fc81919f2022b6b8522cd930f15c82077b6a3c Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Fri, 27 Oct 2023 14:20:10 +0800
Subject: [PATCH] 1

---
 platformapi/baidunavi/baidunavi.go | 14 +++++++----
 platformapi/ebaiapi/im_test.go     | 39 ++++++++++--------------------
 2 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/platformapi/baidunavi/baidunavi.go b/platformapi/baidunavi/baidunavi.go
index c142bc4f..20fd5040 100644
--- a/platformapi/baidunavi/baidunavi.go
+++ b/platformapi/baidunavi/baidunavi.go
@@ -2,6 +2,7 @@ package baidunavi
 
 import (
 	"crypto/md5"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"git.rosy.net.cn/baseapi/platformapi"
@@ -210,7 +211,7 @@ func (a *API) BatchCoordinateConvert(coords []*Coordinate, fromCoordSys, toCoord
 
 	result, err := a.AccessAPI2("geoconv/v1/", params)
 	if err == nil {
-		err = utils.Map2StructByJson(result, &outCoords, false)
+		err = utils.Map2StructByJson(result[resultKey], &outCoords, false)
 	}
 	return outCoords, err
 }
@@ -231,13 +232,13 @@ func (a *API) DirectionLiteRide(coords []*Coordinate) (retVal interface{}, err e
 
 	resp, err := a.AccessAPI2(apiStr, param)
 	if err == nil {
-		return resp, nil
+		return resp[resultKey], nil
 	}
 
 	return nil, nil
 }
 
-func (a *API) AccessAPI2(apiStr string, param url.Values) (retVal interface{}, err error) {
+func (a *API) AccessAPI2(apiStr string, param url.Values) (retVal map[string]interface{}, err error) {
 
 	for _, v := range BaiduAKList {
 		param.Add("ak", v)
@@ -264,9 +265,12 @@ func (a *API) AccessAPI2(apiStr string, param url.Values) (retVal interface{}, e
 		if err1 != nil || err2 != nil {
 			continue
 		}
-		result := string(body)
+		//result := string(body)
+		//result := map[string]interface{}{}
+
+		err = json.Unmarshal(body, &retVal)
 		if err == nil {
-			return result, nil
+			return retVal, nil
 		}
 	}
 	return nil, errors.New("所有百度应用额度均用完")
diff --git a/platformapi/ebaiapi/im_test.go b/platformapi/ebaiapi/im_test.go
index 0d5b58bc..d9b9ea62 100644
--- a/platformapi/ebaiapi/im_test.go
+++ b/platformapi/ebaiapi/im_test.go
@@ -18,30 +18,17 @@ func TestAPI_UpdateIMStatus(t *testing.T) {
 	fmt.Printf("err=%v", err)
 }
 
-func TestParseMultilayerJson(t *testing.T) {
-	//	//var data1 = `{"subBizType": "SEND_MESSAGE","bizType": "IM","payload": {"senderId":"20235760123","receiverIds":["105872382789","30506545123","20235760456"],"createTime":1642647893901,"groupId":"$2$10514249123$PNM","msgId": "1654907240123.PNM","contentType": "1","content":"{"text":"测试消息"}"},"platformShopId": "32267818868"}`
-	//	var data8 = `{
-	//	"subBizType": "SEND_MESSAGE",
-	//	"bizType": "IM",
-	//	"payload": {
-	//		"senderId": "102000022769889",
-	//		"receiverIds": ["102000022769889", "30507511668"],
-	//		"createTime": 1680579669946,
-	//		"groupId": "$2$10996707119$PNM",
-	//		"msgId": "1734454964456.PNM",
-	//		"contentType": 8,
-	//		"content": "{\"elements\":[{\"elementContent\":\"{\\\"atAll\\\":false,\\\"defaultNick\\\":\\\"\\\",\\\"uid\\\":{\\\"appUid\\\":\\\"30507511668\\\",\\\"domain\\\":\\\"eleme\\\"}}\",\"elementType\":3},{\"elementContent\":\"{\\\"extensions\\\":{},\\\"text\\\":\\\"@商家 我选的就是退一个杯子呀\\\"}\",\"elementType\":1}]}"
-	//	},
-	//	"platformShopId": "507511668"
-	//}`
-	//	//retVal1 := ParseMultilayerJson(data1)
-	//	//fmt.Println(utils.Format4Output(retVal1, false))
-	//	//retVal8 := ParseMultilayerJson(data8)
-	//	//fmt.Println(utils.Format4Output(retVal8, false))
-	//	temp := ImMessageSent{}
-	//	err := json.Unmarshal([]byte(data8), &temp)
-	//	if err != nil {
-	//		fmt.Println(err)
-	//	}
-	//	fmt.Println(temp)
+func TestSendMsg(t *testing.T) {
+	err := api.BusinessSendMsg(&BusinessSendMsgReq{
+		PlatformShopId: "1157916361",
+		BizType:        IMType,
+		SubBizType:     SubTypeDef,
+		Payload: BusinessMsgPayload{
+			GroupId:     "$2$13205337818$PNM",
+			ReceiverIds: []string{"301157916361", "10154538612", "321921188187760"},
+			Content:     "{\"text\": \"现在是20231027 10:04:44\"}",
+			ContentType: "1",
+		},
+	})
+	fmt.Println(err)
 }