gateway/httpclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-on: #2
This commit is contained in:
白茶清欢
2025-12-13 22:16:30 +08:00
parent 5a23821ac4 793e5d6156
commit 3b6bd5f05b
2 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
client.go
View File

@ -9,15 +9,17 @@ package httpclient
import ( import (
"fmt" "fmt"
"git.zhangdeman.cn/gateway/httpclient/cache"
"git.zhangdeman.cn/gateway/httpclient/define"
"git.zhangdeman.cn/gateway/httpclient/validate"
"git.zhangdeman.cn/zhangdeman/serialize"
"github.com/go-resty/resty/v2"
"github.com/tidwall/gjson"
"net/http" "net/http"
"strings" "strings"
"time" "time"
"git.zhangdeman.cn/gateway/httpclient/cache"
"git.zhangdeman.cn/gateway/httpclient/define"
"git.zhangdeman.cn/gateway/httpclient/validate"
"git.zhangdeman.cn/zhangdeman/consts"
"git.zhangdeman.cn/zhangdeman/serialize"
"github.com/go-resty/resty/v2"
"github.com/tidwall/gjson"
) )
// NewHttpClient 获取http client // NewHttpClient 获取http client
@ -329,9 +331,31 @@ func (hc *HttpClient) fillResponseCookie(response *define.Response) {
// Date : 21:38 2024/6/5 // Date : 21:38 2024/6/5
func (hc *HttpClient) fillResponseBody(response *define.Response) { func (hc *HttpClient) fillResponseBody(response *define.Response) {
response.Data = string(response.RestyResponse.Body()) response.Data = string(response.RestyResponse.Body())
response.Code = gjson.Get(response.Data, hc.reqConfig.CodeField).String() if hc.reqConfig.CodeFieldLocation == consts.ResponseDataLocationBody.String() {
response.Message = gjson.Get(response.Data, hc.reqConfig.MessageField).String() // 状态码位置在body
businessData := gjson.Get(response.Data, hc.reqConfig.DataField) response.Code = gjson.Get(response.Data, hc.reqConfig.CodeField).String()
} else {
// 非 Body 认为是 header
response.Code = fmt.Sprintf("%v", response.HttpCode)
}
if hc.reqConfig.MessageFieldLocation == "" {
// 未单独指定 message 字段位置, 则和code 同位置
hc.reqConfig.MessageFieldLocation = hc.reqConfig.CodeFieldLocation
}
if hc.reqConfig.CodeFieldLocation == consts.ResponseDataLocationBody.String() {
// 状态码位置在body
response.Message = gjson.Get(response.Data, hc.reqConfig.MessageField).String()
} else {
// 非 Body 认为是 header
response.Message = response.RestyResponse.Status()
}
var businessData gjson.Result
if hc.reqConfig.DataField == "" || hc.reqConfig.DataField == consts.ResponseDataLocationBodyRoot.String() {
// 整个 Body 均是数据
businessData = gjson.Parse(response.Data)
} else {
businessData = gjson.Get(response.Data, hc.reqConfig.DataField)
}
if businessData.Value() == nil { if businessData.Value() == nil {
// data为空指针, 归一化成空对象 // data为空指针, 归一化成空对象
response.Body = map[string]any{} response.Body = map[string]any{}

34
define/request.go
View File

@ -13,22 +13,24 @@ package define
// //
// Date : 17:10 2024/5/24 // Date : 17:10 2024/5/24
type Request struct { type Request struct {
PathParam map[string]string `json:"path_param"` // 替换url中的占位符 PathParam map[string]string `json:"path_param"` // 替换url中的占位符
Body map[string]any `json:"body"` // 请求Body Body map[string]any `json:"body"` // 请求Body
Header map[string]string `json:"header"` // 请求Header Header map[string]string `json:"header"` // 请求Header
Cookie map[string]string `json:"cookie"` // 请求Cookie Cookie map[string]string `json:"cookie"` // 请求Cookie
Query map[string]string `json:"query"` // 请求query Query map[string]string `json:"query"` // 请求query
FullUrl string `json:"full_url"` // 完整的请求URL FullUrl string `json:"full_url"` // 完整的请求URL
ContentType string `json:"content_type"` // 请求类型 ContentType string `json:"content_type"` // 请求类型
Method string `json:"method"` // 请求方法 Method string `json:"method"` // 请求方法
DataField string `json:"data_field"` // 数据字段 DataField string `json:"data_field"` // 数据字段 BODY_ROOT 代表整个BODY 都是带解析数据
CodeField string `json:"code_field"` // 业务状态码字段 CodeField string `json:"code_field"` // 业务状态码字段
MessageField string `json:"message_field"` // code描述字段 CodeFieldLocation string `json:"code_field_location"` // 业务状态码字段位置
DataReceiver interface{} `json:"-"` // 响应data部分数据解析 MessageField string `json:"message_field"` // code描述字段
SuccessCodeList []string `json:"success_code_list"` // 哪些业务状态码视为成功 MessageFieldLocation string `json:"message_field_location"` // code 描述字段位置
ConnectTimeout int64 `json:"connect_timeout"` // 连接超时时间: ms DataReceiver interface{} `json:"-"` // 响应data部分数据解析
ReadTimeout int64 `json:"read_timeout"` // 读取超时时间 SuccessCodeList []string `json:"success_code_list"` // 哪些业务状态码视为成功
RetryRule *RequestRetryRule `json:"retry_rule"` // 重试规则 ConnectTimeout int64 `json:"connect_timeout"` // 连接超时时间: ms
ReadTimeout int64 `json:"read_timeout"` // 读取超时时间
RetryRule *RequestRetryRule `json:"retry_rule"` // 重试规则
} }
// RequestRetryRule 重试规则 // RequestRetryRule 重试规则