优化灰度

drivers/plugins/ip-restriction/restriction.go

@@ -22,7 +22,7 @@ func (I *IPHandler) DoFilter(ctx eocontext.EoContext, next eocontext.IChain) (er
 }
 
 func (I *IPHandler) doRestriction(ctx http_service.IHttpContext) error {
-	realIP := ctx.Request().ReadIP()
+	realIP := ctx.Request().RealIp()
 	if I.filter != nil {
 		ok, err := I.filter(realIP)
 		if !ok {

drivers/router/http-router/http-handler.go

@@ -68,7 +68,7 @@ func (h *httpHandler) ServeHTTP(ctx eocontext.EoContext) {
 
 	ctx.SetLabel("method", httpContext.Request().Method())
 	ctx.SetLabel("path", httpContext.Request().URI().RequestURI())
-	ctx.SetLabel("ip", httpContext.Request().ReadIP())
+	ctx.SetLabel("ip", httpContext.Request().RealIp())
 
 	ctx.SetCompleteHandler(h.completeHandler)
 	ctx.SetApp(h.service)

node/dubbo2-context/context.go

@@ -53,6 +53,10 @@ type DubboContext struct {
 	acceptTime          time.Time
 }
 
+func (d *DubboContext) RealIP() string {
+	return d.netIP.String()
+}
+
 func (d *DubboContext) Response() dubbo2_context.IResponse {
 
 	return d.response

node/grpc-context/context.go

@@ -59,6 +59,11 @@ type Context struct {
 	errChan                   chan error
 }
 
+func (c *Context) RealIP() string {
+	//TODO implement me
+	panic("implement me")
+}
+
 func (c *Context) EnableTls(b bool) {
 	c.tls = b
 }

node/http-context/clone.go

@@ -34,6 +34,10 @@ type cloneContext struct {
 	responseError error
 }
 
+func (ctx *cloneContext) RealIP() string {
+	return ctx.org.RealIP()
+}
+
 func (ctx *cloneContext) GetUpstreamHostHandler() eoscContext.UpstreamHostHandler {
 	return ctx.upstreamHostHandler
 }

node/http-context/context.go

@@ -37,6 +37,10 @@ type HttpContext struct {
 	port                int
 }
 
+func (ctx *HttpContext) RealIP() string {
+	return ctx.Request().RealIp()
+}
+
 func (ctx *HttpContext) GetUpstreamHostHandler() eoscContext.UpstreamHostHandler {
 	return ctx.upstreamHostHandler
 }

node/http-context/request-reader.go

@@ -49,7 +49,7 @@ func (r *RequestReader) URI() http_service.IURIReader {
 	return &r.uri
 }
 
-func (r *RequestReader) ReadIP() string {
+func (r *RequestReader) RealIp() string {
 	if r.realIP == "" {
 		realIP := r.headers.GetHeader("x-real-ip")
 		if realIP == "" {

upstream/ip-hash/ip_hash.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"github.com/eolinker/apinto/upstream/balance"
 	eoscContext "github.com/eolinker/eosc/eocontext"
-	http_service "github.com/eolinker/eosc/eocontext/http-context"
 	"hash/crc32"
 )
 
@@ -43,12 +42,8 @@ func (r *ipHash) Select(ctx eoscContext.EoContext) (eoscContext.INode, int, erro
 
 // Next 由现有节点根据ip_hash决策出一个可用节点
 func (r *ipHash) Next(org eoscContext.EoContext) (eoscContext.INode, int, error) {
-	httpContext, err := http_service.Assert(org)
-	if err != nil {
-		return nil, 0, err
-	}
 
-	readIp := httpContext.Request().ReadIP()
+	readIp := org.RealIP()
 	nodes := org.GetApp().Nodes()
 	size := len(nodes)
 	if size < 1 {