From ea93cbf9d48631586f4d320f7de2251c9e410e83 Mon Sep 17 00:00:00 2001
From: "leitao.zhang" <leitao.zhang@phpstu.com>
Date: Tue, 22 Dec 2020 11:04:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=89=80=E6=9C=89=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B5=8C=E5=A5=97=EF=BC=8C=E6=89=80=E6=9C=89=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=9D=87=E8=BF=94=E5=9B=9E=E5=81=A5=E5=BA=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .beagle.yml                            | 37 +++++++++----
 src/handler/proxyhandler.go            | 72 ++++++++++++++------------
 src/router/middleware/header/header.go |  2 +-
 3 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/.beagle.yml b/.beagle.yml
index 05a1676..8e69b88 100644
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -2,33 +2,48 @@ workspace:
   path: src/gitlab.wodcloud.com/apaas/apaas-meshproxy
 clone:
   git:
-    image: registry.cn-qingdao.aliyuncs.com/wod/devops-git:1.0
+    image: registry.cn-qingdao.aliyuncs.com/wod-devops/git:1.5.0
     dns: 223.5.5.5
 pipeline:
   go:
-    image: registry.cn-qingdao.aliyuncs.com/wod/devops-go:1.14.4-stretch
+    image: registry.cn-qingdao.aliyuncs.com/wod-devops/go:1.13.1-stretch
     dns: 223.5.5.5
     environment:
       - GOPROXY=https://goproxy.cn,direct
     main: src
     binary: proxy
     volumes:
-      #      - /cache/gopath/pkg:/drone/pkg
       - /data/cache/gopath/pkg:/drone/pkg
-
-  docker:
+  docker-dev:
     dns: 223.5.5.5
-    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
+    image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    base: registry.cn-qingdao.aliyuncs.com/wod/alpine-glibc:3.8
+    repo: wod/apaas-meshproxy
+    version: v3.0.0
+    channel: alpha
+    registry: registry.cn-qingdao.aliyuncs.com
+    secrets:
+      - source: REGISTRY_USER_ALIYUN
+        target: REGISTRY_USER
+      - source: REGISTRY_PASSWORD_ALIYUN
+        target: REGISTRY_PASSWORD
+    when:
+      branch: [dev]
+  docker-master:
+    dns: 223.5.5.5
+    image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     base: registry.cn-qingdao.aliyuncs.com/wod/alpine-glibc:3.8
     repo: wod/apaas-meshproxy
     version: "v3.0.0"
-    registry: hub.gy.wodcloud.com
+    registry: registry.cn-qingdao.aliyuncs.com
     secrets:
-      - source: REGISTRY_USER_GUIZHOU
+      - source: REGISTRY_USER_ALIYUN
         target: REGISTRY_USER
-      - source: REGISTRY_PASSWORD_GUIZHOU
+      - source: REGISTRY_PASSWORD_ALIYUN
         target: REGISTRY_PASSWORD
-
-
+    when:
+      branch: [master]
diff --git a/src/handler/proxyhandler.go b/src/handler/proxyhandler.go
index bffd39c..6d9f658 100644
--- a/src/handler/proxyhandler.go
+++ b/src/handler/proxyhandler.go
@@ -12,7 +12,6 @@ import (
 	"github.com/vulcand/oxy/testutils"
 	"gitlab.wodcloud.com/apaas/apaas-meshproxy/src/model"
 	"gitlab.wodcloud.com/apaas/apaas-meshproxy/src/service"
-	"gitlab.wodcloud.com/apaas/apaas-meshproxy/src/tools"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -248,39 +247,44 @@ func getHost(httpurl string) (path string) {
 
 func HealthCheck(c *gin.Context) {
 	res := model.WebRes{}
-	apiId := c.Param("apiid")
-	proxyData, err := service.GetReqPath(apiId)
-	if err != nil {
-		res.Data = err.Error()
-		c.JSON(500, res)
-		return
-	}
-	var requstMethod string
-	//获取真实地址1GET 2POST 3 PUT 4 DELETE
-	if proxyData.ReqType == 1 {
-		requstMethod = "GET"
-	} else if proxyData.ReqType == 2 {
-		requstMethod = "POST"
-	} else if proxyData.ReqType == 3 {
-		requstMethod = "PUT"
-	} else if proxyData.ReqType == 4 {
-		requstMethod = "DELETE"
-	}
-	header := make(map[string]string, 0)
-	resp, err := tools.ProxySendRes(c.Request, requstMethod, proxyData.ReqUrl, "", header)
-	if err != nil {
-		res.Data = err.Error()
-		c.JSON(500, res)
-		return
-	}
-	fmt.Println(resp)
-	if resp.StatusCode < 400 {
-		res.Data = "success"
-	} else {
-		res.Data = "fail"
-	}
 	res.Success = 1
-	//请求真实地址根据返回状态码判断是否服务可用
+	res.Data = "success"
 	c.JSON(200, res)
-	return
+
+	//
+	//apiId := c.Param("apiid")
+	//proxyData, err := service.GetReqPath(apiId)
+	//if err != nil {
+	//	res.Data = err.Error()
+	//	c.JSON(500, res)
+	//	return
+	//}
+	//var requstMethod string
+	////获取真实地址1GET 2POST 3 PUT 4 DELETE
+	//if proxyData.ReqType == 1 {
+	//	requstMethod = "GET"
+	//} else if proxyData.ReqType == 2 {
+	//	requstMethod = "POST"
+	//} else if proxyData.ReqType == 3 {
+	//	requstMethod = "PUT"
+	//} else if proxyData.ReqType == 4 {
+	//	requstMethod = "DELETE"
+	//}
+	//header := make(map[string]string, 0)
+	//resp, err := tools.ProxySendRes(c.Request, requstMethod, proxyData.ReqUrl, "", header)
+	//if err != nil {
+	//	res.Data = err.Error()
+	//	c.JSON(500, res)
+	//	return
+	//}
+	//fmt.Println(resp)
+	//if resp.StatusCode < 400 {
+	//	res.Data = "success"
+	//} else {
+	//	res.Data = "fail"
+	//}
+	//res.Success = 1
+	////请求真实地址根据返回状态码判断是否服务可用
+	//c.JSON(200, res)
+	//return
 }
diff --git a/src/router/middleware/header/header.go b/src/router/middleware/header/header.go
index 5713546..050e32b 100644
--- a/src/router/middleware/header/header.go
+++ b/src/router/middleware/header/header.go
@@ -50,7 +50,7 @@ func Options(c *gin.Context) {
 // and resource access headers.
 func Secure(c *gin.Context) {
 	c.Header("Access-Control-Allow-Origin", "*")
-	c.Header("X-Frame-Options", "DENY")
+	c.Header("X-Frame-Options", "ALLOWALL")
 	c.Header("X-Content-Type-Options", "nosniff")
 	c.Header("X-XSS-Protection", "1; mode=block")
 	if c.Request.TLS != nil {
-- 
2.26.0