From f77c3f1bab98e5cd7a633aa0875de7c2c0a9c195 Mon Sep 17 00:00:00 2001
From: gaoshiyao <gaoshiyao@bd-apaas.com>
Date: Wed, 6 Nov 2019 20:06:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B7=AF=E7=94=B1=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/handler/proxyhandler.go | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/handler/proxyhandler.go b/src/handler/proxyhandler.go
index 360be74..b2d57d6 100644
--- a/src/handler/proxyhandler.go
+++ b/src/handler/proxyhandler.go
@@ -3,12 +3,12 @@ package handler
 import (
 	"fmt"
 	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
 	"gitlab.wodcloud.com/apaas/apaas-meshproxy/src/client"
+	"gitlab.wodcloud.com/apaas/apaas-meshproxy/src/tools"
 	"net/http"
+	"strings"
 
 	"github.com/vulcand/oxy/forward"
-	"github.com/vulcand/oxy/testutils"
 	"gitlab.wodcloud.com/apaas/apaas-meshproxy/src/config"
 )
 
@@ -24,16 +24,29 @@ func Proxy(c *gin.Context) {
 		c.String(200, "缓存计数失败!")
 		return
 	}
-	req := c.Request
-	baseUrl := "http://" + req.Host + req.URL.Path
-	req.URL = testutils.ParseURI(getProxyURL(req))
-	req.RequestURI = getRequestURI(req)
-	req.Host = req.URL.Host
-	logrus.Info("************************************")
-	logrus.Info("* 调用地址：", baseUrl)
-	logrus.Info("* 转发地址：", req.URL)
-	logrus.Info("************************************")
-	fwd.ServeHTTP(c.Writer, req)
+	var result []byte
+	var err error
+	switch strings.ToUpper(config.ProxyConf.Method) {
+	case "GET":
+		result, err = tools.ProxySend(c.Request, "GET", config.ProxyConf.Url, "", nil)
+	}
+	if err != nil {
+		c.Error(err)
+		return
+	}
+
+	c.Writer.Write(result)
+	//
+	//req := c.Request
+	//baseUrl := "http://" + req.Host + req.URL.Path
+	//req.URL = testutils.ParseURI(getProxyURL(req))
+	//req.RequestURI = getRequestURI(req)
+	//req.Host = req.URL.Host
+	//logrus.Info("************************************")
+	//logrus.Info("* 调用地址：", baseUrl)
+	//logrus.Info("* 转发地址：", req.URL)
+	//logrus.Info("************************************")
+	//fwd.ServeHTTP(c.Writer, req)
 }
 
 func getProxyURL(req *http.Request) string {
-- 
2.26.0