Commit f77c3f1b authored by gaoshiyao's avatar gaoshiyao

更新路由设置

parent 6e6512f7
...@@ -3,12 +3,12 @@ package handler ...@@ -3,12 +3,12 @@ package handler
import ( import (
"fmt" "fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/sirupsen/logrus"
"gitlab.wodcloud.com/apaas/apaas-meshproxy/src/client" "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/client"
"gitlab.wodcloud.com/apaas/apaas-meshproxy/src/tools"
"net/http" "net/http"
"strings"
"github.com/vulcand/oxy/forward" "github.com/vulcand/oxy/forward"
"github.com/vulcand/oxy/testutils"
"gitlab.wodcloud.com/apaas/apaas-meshproxy/src/config" "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/config"
) )
...@@ -24,16 +24,29 @@ func Proxy(c *gin.Context) { ...@@ -24,16 +24,29 @@ func Proxy(c *gin.Context) {
c.String(200, "缓存计数失败!") c.String(200, "缓存计数失败!")
return return
} }
req := c.Request var result []byte
baseUrl := "http://" + req.Host + req.URL.Path var err error
req.URL = testutils.ParseURI(getProxyURL(req)) switch strings.ToUpper(config.ProxyConf.Method) {
req.RequestURI = getRequestURI(req) case "GET":
req.Host = req.URL.Host result, err = tools.ProxySend(c.Request, "GET", config.ProxyConf.Url, "", nil)
logrus.Info("************************************") }
logrus.Info("* 调用地址:", baseUrl) if err != nil {
logrus.Info("* 转发地址:", req.URL) c.Error(err)
logrus.Info("************************************") return
fwd.ServeHTTP(c.Writer, req) }
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 { func getProxyURL(req *http.Request) string {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment