feat(requests): 添加请求头批量设置和追踪ID功能
- 新增 AddHeaders 方法支持批量添加请求头参数 - 新增 RefererHeader 结构体用于管理 Referer 和 TraceId - 添加随机字符串生成工具包 random - 集成 MD5 加密和追踪 ID 生成功能 - 修改 IP 服务域名从 ip.gaore.com 到 ip.gaore.com.hk - 在客户端请求中自动添加 Referer 和 Traceparent 头信息
This commit is contained in:
parent
156ea6409c
commit
84c58c3756
@ -44,6 +44,27 @@ type Client struct {
|
||||
httpProxy string
|
||||
httpsProxy string
|
||||
noProxy string
|
||||
|
||||
header *requests.RefererHeader
|
||||
}
|
||||
|
||||
func (client *Client) SetRefererHeader(header *requests.RefererHeader) {
|
||||
client.header = header
|
||||
}
|
||||
|
||||
func (client *Client) getRefererHeader() map[string]string {
|
||||
var header *requests.RefererHeader
|
||||
if client.header == nil {
|
||||
header = &requests.RefererHeader{
|
||||
TraceId: utils.MakeTraceId(),
|
||||
}
|
||||
} else {
|
||||
header = client.header
|
||||
}
|
||||
return map[string]string{
|
||||
"Referer": header.Referer,
|
||||
"Traceparent": header.TraceId,
|
||||
}
|
||||
}
|
||||
|
||||
func (client *Client) GetNoProxy() string {
|
||||
@ -216,7 +237,7 @@ func (client *Client) DoAction(request requests.AcsRequest, response responses.A
|
||||
}
|
||||
|
||||
func (client *Client) DoActionWithSigner(request requests.AcsRequest, response responses.AcsResponse, signer auth.Signer) (err error) {
|
||||
|
||||
request.AddHeaders(client.getRefererHeader())
|
||||
httpRequest, err := client.buildRequestWithSigner(request, signer)
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
@ -55,6 +55,11 @@ type Host struct {
|
||||
Func func(string, string) string
|
||||
}
|
||||
|
||||
type RefererHeader struct {
|
||||
Referer string
|
||||
TraceId string
|
||||
}
|
||||
|
||||
var debug utils.Debug
|
||||
|
||||
func init() {
|
||||
@ -96,6 +101,7 @@ type AcsRequest interface {
|
||||
GetBodyReader() io.Reader
|
||||
|
||||
AddHeaderParam(key, value string)
|
||||
AddHeaders(headers map[string]string)
|
||||
addQueryParam(key, value string)
|
||||
addFormParam(key, value string)
|
||||
addJsonParam(string, interface{})
|
||||
@ -236,6 +242,12 @@ func (request *baseRequest) AddHeaderParam(key, val string) {
|
||||
request.Headers[key] = val
|
||||
}
|
||||
|
||||
func (request *baseRequest) AddHeaders(headers map[string]string) {
|
||||
for key, val := range headers {
|
||||
request.Headers[key] = val
|
||||
}
|
||||
}
|
||||
|
||||
func (request *baseRequest) addQueryParam(key, val string) {
|
||||
request.QueryParams[key] = val
|
||||
}
|
||||
|
||||
69
sdk/utils/random/str_random.go
Normal file
69
sdk/utils/random/str_random.go
Normal file
@ -0,0 +1,69 @@
|
||||
package random
|
||||
|
||||
import (
|
||||
"math/rand"
|
||||
"time"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
type Mode int // 随机数模式
|
||||
|
||||
const (
|
||||
Letter Mode = iota
|
||||
Number
|
||||
LetterNumber
|
||||
LetterHex
|
||||
)
|
||||
|
||||
const (
|
||||
letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
numbers = "0123456789"
|
||||
lettersHex = "0123456789abcdef"
|
||||
letterIdBit = 6
|
||||
letterIdxMask = 1<<letterIdBit - 1
|
||||
letterIdxMax = 63 / letterIdBit
|
||||
)
|
||||
|
||||
func StrRandom(n int64) string {
|
||||
return Random(n, Letter)
|
||||
}
|
||||
|
||||
func NumRandom(n int64) string {
|
||||
return Random(n, Number)
|
||||
}
|
||||
|
||||
func Random(n int64, mode ...Mode) string {
|
||||
var baseStr string
|
||||
mode = append(mode, LetterNumber)
|
||||
switch mode[0] {
|
||||
case LetterHex:
|
||||
baseStr = lettersHex
|
||||
case Letter:
|
||||
baseStr = letters
|
||||
case Number:
|
||||
baseStr = numbers
|
||||
case LetterNumber:
|
||||
fallthrough
|
||||
default:
|
||||
baseStr = letters + numbers
|
||||
}
|
||||
return random(n, baseStr)
|
||||
}
|
||||
|
||||
func random(n int64, baseStr string) string {
|
||||
|
||||
var src = rand.NewSource(time.Now().UnixNano())
|
||||
b := make([]byte, n)
|
||||
for i, cache, remain := n-1, src.Int63(), letterIdxMax; i >= 0; {
|
||||
if remain == 0 {
|
||||
cache, remain = src.Int63(), letterIdxMax
|
||||
}
|
||||
if idx := int(cache & letterIdxMask); idx < len(baseStr) {
|
||||
b[i] = baseStr[idx]
|
||||
i--
|
||||
}
|
||||
cache >>= letterIdBit
|
||||
remain--
|
||||
}
|
||||
return *(*string)(unsafe.Pointer(&b))
|
||||
}
|
||||
@ -5,8 +5,8 @@ import (
|
||||
"crypto/rand"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/utils/random"
|
||||
"hash"
|
||||
rand2 "math/rand"
|
||||
"net/url"
|
||||
"reflect"
|
||||
"sort"
|
||||
@ -36,11 +36,7 @@ func NewUUID() UUID {
|
||||
}
|
||||
|
||||
func RandStringBytes(n int) string {
|
||||
b := make([]byte, n)
|
||||
for i := range b {
|
||||
b[i] = letterBytes[rand2.Intn(len(letterBytes))]
|
||||
}
|
||||
return string(b)
|
||||
return random.StrRandom(int64(n))
|
||||
}
|
||||
|
||||
func newFromHash(h hash.Hash, ns UUID, name string) UUID {
|
||||
@ -109,3 +105,12 @@ func InitStructWithDefaultTag(bean interface{}) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func Md5(data string) string {
|
||||
s := md5.Sum([]byte(data))
|
||||
return hex.EncodeToString(s[:])
|
||||
}
|
||||
|
||||
func MakeTraceId() string {
|
||||
return fmt.Sprintf("00-%s-%s-01", random.Random(32, random.LetterHex), random.Random(16, random.LetterHex))
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@ const (
|
||||
)
|
||||
|
||||
var HOST = requests.Host{
|
||||
Default: "ip.gaore.com",
|
||||
Default: "ip.gaore.com.hk",
|
||||
Func: func(s string, area string) string {
|
||||
if area != "" {
|
||||
fmt.Println("ip.gaore.com." + area)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user