Merge pull request 'feat: 升级HTTP请求, 支持自定义message location 和 解析整个响应body' (#12) from feature/upgrade_response_parse into master

Reviewed-on: #12

httpclient/define/request.go

@@ -9,6 +9,7 @@ package define
 
 import (
 	"context"
+
 	"go.uber.org/zap"
 )
 
@@ -28,10 +29,11 @@ type Request struct {
 	FullUrl              string                    `json:"full_url"`               // 完整的请求URL
 	ContentType          string                    `json:"content_type"`           // 请求类型
 	Method               string                    `json:"method"`                 // 请求方法
-	DataField           string                    `json:"data_field"`             // 数据字段
+	DataField            string                    `json:"data_field"`             // 数据字段,// 数据字段 BODY_ROOT 代表整个BODY 都是带解析数据
 	CodeField            string                    `json:"code_field"`             // 业务状态码字段
 	CodeLocation         string                    `json:"code_location"`          // 业务状态码位置
 	MessageField         string                    `json:"message_field"`          // code描述字段
+	MessageFieldLocation string                    `json:"message_field_location"` // code 描述字段位置
 	DataReceiver         any                       `json:"-"`                      // 响应data部分数据解析
 	SuccessHttpCodeList  []int                     `json:"success_http_code_list"` // 哪些http状态码视为成功, 不配置, 默认2xx
 	SuccessCodeList      []string                  `json:"success_code_list"`      // 哪些业务状态码视为成功

httpclient/implement/response.go

@@ -10,12 +10,13 @@ package implement
 import (
 	"errors"
 	"fmt"
+	"net/http"
+	"strings"
+
 	"git.zhangdeman.cn/zhangdeman/consts"
 	"git.zhangdeman.cn/zhangdeman/network/httpclient/define"
 	"git.zhangdeman.cn/zhangdeman/serialize"
 	"github.com/tidwall/gjson"
-	"net/http"
-	"strings"
 )
 
 // Response 响应结果解析
@@ -98,21 +99,35 @@ func (r *Response) fillResponseBody(reqCfg *define.Request, response *define.Res
 		return errors.New("response body Marshal error :" + err.Error())
 	}
 	response.Data = string(jsonByte)
-	if strings.ToLower(reqCfg.CodeLocation) == "header" {
-		if reqCfg.CodeField == "code" {
+	if strings.ToUpper(reqCfg.CodeLocation) == consts.ResponseDataLocationHeader.String() {
+		if reqCfg.CodeField == "" || reqCfg.CodeField == "code" {
 			response.Code = fmt.Sprintf("%v", response.HttpCode)
-			response.Message = response.RestyResponse.Status()
 		} else {
 			response.Code = response.RestyResponse.Header().Get(reqCfg.CodeField)
-			response.Message = response.RestyResponse.Header().Get(reqCfg.MessageField)
 		}
 	} else {
 		// 统一认为Body
 		response.Code = gjson.Get(response.Data, reqCfg.CodeField).String()
+	}
+
+	if reqCfg.MessageFieldLocation == "" {
+		reqCfg.MessageFieldLocation = reqCfg.CodeLocation
+	}
+
+	if strings.ToUpper(reqCfg.MessageFieldLocation) == consts.ResponseDataLocationBody.String() {
+		// header, 统一使用 http status
+		response.Message = response.RestyResponse.Status()
+	} else {
 		response.Message = gjson.Get(response.Data, reqCfg.MessageField).String()
 	}
 
-	businessData := gjson.Get(response.Data, reqCfg.DataField)
+	var businessData gjson.Result
+	if reqCfg.DataField == "" || reqCfg.DataField == consts.ResponseDataLocationBodyRoot.String() {
+		// 整个Body都是数据
+		businessData = gjson.Parse(response.Data)
+	} else {
+		businessData = gjson.Get(response.Data, reqCfg.DataField)
+	}
 	if businessData.Value() == nil {
 		// data为空指针, 归一化成空对象
 		response.Body = map[string]any{}