bug fix

.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:

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()
 			}
 		}