From 819b5807a89d20b0840dedd22a1fc23dce0a68f7 Mon Sep 17 00:00:00 2001 From: CaiCandong <1290147055@qq.com> Date: Thu, 20 Mar 2025 23:40:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=99=90=E5=AE=9A=E4=B8=8B=E5=8F=AA?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=B3=A8=E5=85=A5=20x-=20=E5=BC=80=E5=A4=B4?= =?UTF-8?q?=E7=9A=84=20headers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- relay/adaptor/common.go | 12 ++++++------ relay/adaptor/common_test.go | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/relay/adaptor/common.go b/relay/adaptor/common.go index ff47af3e..37f4394a 100644 --- a/relay/adaptor/common.go +++ b/relay/adaptor/common.go @@ -3,16 +3,17 @@ package adaptor import ( "errors" "fmt" - "github.com/gin-gonic/gin" - "github.com/songquanpeng/one-api/common/client" - "github.com/songquanpeng/one-api/relay/meta" "io" "net/http" "strings" + + "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common/client" + "github.com/songquanpeng/one-api/relay/meta" ) const ( - extraRequestHeaderPrefix = "X-Oneapi-" + extraRequestHeaderPrefix = "X-" ) func SetupCommonRequestHeader(c *gin.Context, req *http.Request, meta *meta.Meta) { @@ -20,9 +21,8 @@ func SetupCommonRequestHeader(c *gin.Context, req *http.Request, meta *meta.Meta req.Header.Set("Accept", c.Request.Header.Get("Accept")) for key, values := range c.Request.Header { if strings.HasPrefix(key, extraRequestHeaderPrefix) { - headerKey := strings.TrimPrefix(key, extraRequestHeaderPrefix) for _, value := range values { - req.Header.Add(headerKey, value) + req.Header.Add(key, value) } } } diff --git a/relay/adaptor/common_test.go b/relay/adaptor/common_test.go index 4c51fdb8..4c44f67d 100644 --- a/relay/adaptor/common_test.go +++ b/relay/adaptor/common_test.go @@ -17,7 +17,7 @@ func TestSetupCommonRequestHeader(t *testing.T) { } c.Request.Header.Set("Content-Type", "application/json") c.Request.Header.Set("Accept", "application/json") - c.Request.Header.Set("x-oneapi-test-header", "test-value") + c.Request.Header.Set("x-test-header", "test-value") // 创建测试用的http请求 req, _ := http.NewRequest("GET", "http://example.com", nil) @@ -33,5 +33,5 @@ func TestSetupCommonRequestHeader(t *testing.T) { // 验证结果 assert.Equal(t, "application/json", req.Header.Get("Content-Type")) assert.Equal(t, "application/json", req.Header.Get("Accept")) - assert.Equal(t, "test-value", req.Header.Get("test-header")) + assert.Equal(t, "test-value", req.Header.Get("x-test-header")) }