worker/req.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"io/ioutil"
 	"net/http"
+	"strconv"
 	"strings"
 	"videoplayer/proto"
 )
@@ -129,12 +130,6 @@ func SyncDataFromMasterReq(url string, token string) proto.UserSync {
 	return userSync
 }
 
-type Response struct {
-	Code    int            `json:"code"`
-	Message string         `json:"message"`
-	Data    proto.UserSync `json:"data"`
-}
-
 // 获取数据,全量及增量
 func SyncDataFromMasterReq2(url string, data proto.SyncUserReq) (proto.UserSync, error) {
 	defer func() {
@@ -165,16 +160,20 @@ func SyncDataFromMasterReq2(url string, data proto.SyncUserReq) (proto.UserSync,
 	}
 	defer resp.Body.Close()
 	//解析数据
-	responseBod, err := io.ReadAll(resp.Body)
+	var m map[string]string
+	err = json.NewDecoder(resp.Body).Decode(&m)
 	if err != nil {
 		return res, err
 	}
-	var response Response
-	err = json.Unmarshal(responseBod, &response)
-	if err != nil {
+	code, _ := strconv.Atoi(m["code"])
+	if code != 0 {
+		return res, err
+	}
+	err = json.Unmarshal([]byte(m["data"]), &res)
+	if err != nil {
+		fmt.Println("SyncDataFromMasterReq2 error decode data:", err)
 		return res, err
 	}
-	res = response.Data
 	fmt.Println("SyncDataFromMasterReq2 result add data:", len(res.Add), "update data:", len(res.Update), "delete data:", len(res.Delete))
 	return res, nil
 }