From 9ca2b657c3228a415459dbf81f19d7c3e80e746d Mon Sep 17 00:00:00 2001 From: CHENGHAO Date: Fri, 11 Mar 2022 11:13:51 +0800 Subject: [PATCH] bug fix --- .beagle.yml | 16 ++++++++-------- src/handler/proxyhandler.go | 8 ++++++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.beagle.yml b/.beagle.yml index 0cf2eb6..a78ca41 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -30,7 +30,7 @@ pipeline: base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3.12 dockerfile: build/dockerfile repo: wod/apaas-meshproxy - version: v3.0.2 + version: v3.0.3 channel: alpha args: "TARGETOS=linux,TARGETARCH=amd64" registry: registry.cn-qingdao.aliyuncs.com @@ -47,8 +47,8 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.2-alpha - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.2 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.3-alpha + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.3 registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -63,7 +63,7 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.2 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.3 target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0 registry: registry.cn-qingdao.aliyuncs.com secrets: @@ -83,7 +83,7 @@ pipeline: base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3.12-arm64 dockerfile: build/dockerfile repo: wod/apaas-meshproxy - version: "v3.0.2" + version: "v3.0.3" channel: alpha-arm64 args: "TARGETOS=linux,TARGETARCH=arm64" registry: registry.cn-qingdao.aliyuncs.com @@ -100,8 +100,8 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.2-alpha-arm64 - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.2-arm64 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.3-alpha-arm64 + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.3-arm64 registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -116,7 +116,7 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.2-arm64 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.3-arm64 target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0-arm64 registry: registry.cn-qingdao.aliyuncs.com secrets: diff --git a/src/handler/proxyhandler.go b/src/handler/proxyhandler.go index ddd7e6a..c4241e9 100644 --- a/src/handler/proxyhandler.go +++ b/src/handler/proxyhandler.go @@ -177,10 +177,12 @@ func Proxy(c *gin.Context) { reqURL := testutils.ParseURI(proxyData.ReqUrl) fmt.Println(reqURL) if reqURL.RawQuery == "" { - reqURL.RawQuery = c.Request.URL.RawQuery + //reqURL.RawQuery = c.Request.URL.RawQuery + reqURL.RawQuery = c.Request.URL.Query().Encode() } else { if c.Request.URL.RawQuery != "" { - oldQ := c.Request.URL.Query() + //oldQ := c.Request.URL.Query() + oldQ := reqURL.Query() newQ := c.Request.URL.Query() for k, v := range newQ { if len(v) > 1 { @@ -198,6 +200,8 @@ func Proxy(c *gin.Context) { } } reqURL.RawQuery = oldQ.Encode() + } else { + reqURL.RawQuery = reqURL.Query().Encode() } } -- 2.26.0