Merge branch 'dev'

.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.0
+    version: v3.0.1
     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.0-alpha
-    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.0
+    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.1-alpha
+    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.1
     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.0
+    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.1
     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.0"
+    version: "v3.0.1"
     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.0-alpha-arm64
-    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.0-arm64
+    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.1-alpha-arm64
+    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.1-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.0-arm64
+    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.1-arm64
     target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0-arm64
     registry: registry.cn-qingdao.aliyuncs.com
     secrets:

go.sum

@@ -22,6 +22,7 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=

src/handler/proxyhandler.go

@@ -73,7 +73,7 @@ func Proxy(c *gin.Context) {
 		c.JSON(200, res)
 		return
 	}
-
+	fmt.Println("判断是否为静态文件")
 	//如果是静态文件
 	if CheckStaticFile(c.Request.URL.Path) {
 		host := getHost(proxyData.ReqUrl)
@@ -92,6 +92,7 @@ func Proxy(c *gin.Context) {
 		c.Request.Host = host
 		fwd.ServeHTTP(c.Writer, c.Request)
 	} else {
+		fmt.Println("开始代理")
 		roundTripper := http.DefaultTransport.(*http.Transport)
 		//roundTripper.ForceAttemptHTTP2 = false
 		roundTripper.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
@@ -161,6 +162,7 @@ func Proxy(c *gin.Context) {
 			return
 		}
 		reqURL := testutils.ParseURI(proxyData.ReqUrl)
+		fmt.Println(reqURL)
 		if reqURL.RawQuery == "" {
 			reqURL.RawQuery = c.Request.URL.RawQuery
 		} else {