diff --git a/consul/consul.go b/consul/consul.go index d674451..bc72dd2 100644 --- a/consul/consul.go +++ b/consul/consul.go @@ -4,6 +4,7 @@ import ( "context" "github.com/gogf/gf/contrib/registry/consul/v2" "github.com/gogf/gf/v2/frame/g" + "github.com/gogf/gf/v2/net/gsel" "github.com/gogf/gf/v2/net/gsvc" ) @@ -18,4 +19,5 @@ func init() { panic(err) } gsvc.SetRegistry(registry) + gsel.SetBuilder(gsel.NewBuilderRoundRobin()) } diff --git a/http/http.go b/http/http.go index c675ec4..afcad70 100644 --- a/http/http.go +++ b/http/http.go @@ -8,10 +8,8 @@ import ( "gitee.com/red-future---jilin-g/common/jaeger" "gitee.com/red-future---jilin-g/common/middleware" "gitee.com/red-future---jilin-g/common/utils" - "github.com/gogf/gf/contrib/registry/consul/v2" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/net/ghttp" - "github.com/gogf/gf/v2/net/gsel" "github.com/gogf/gf/v2/net/gsvc" "github.com/gogf/gf/v2/os/glog" "github.com/gogf/gf/v2/util/gconv" @@ -65,17 +63,8 @@ func init() { `) - Httpserver.BindMiddlewareDefault(ghttp.MiddlewareCORS, ghttp.MiddlewareHandlerResponse, middleware.Limiter, jaeger.NewTracer) //使用默认http返回结构 + Httpserver.BindMiddlewareDefault(ghttp.MiddlewareHandlerResponse) go Httpserver.Run() - - consulCfg, _ := g.Cfg().Get(context.Background(), "consul.address") - consulAddr := consulCfg.String() - registry, err := consul.New(consul.WithAddress(consulAddr)) - if err != nil { - panic(err) - } - gsvc.SetRegistry(registry) - gsel.SetBuilder(gsel.NewBuilderRoundRobin()) Httpclient.SetDiscovery(gsvc.GetRegistry()) } func RouteRegister(controllers []interface{}) { @@ -86,6 +75,7 @@ func RouteRegister(controllers []interface{}) { return fmt.Sprintf("/%s", strings.ToLower(s)) }) Httpserver.Group(convertedStr, func(group *ghttp.RouterGroup) { + group.Middleware(middleware.Limiter, jaeger.NewTracer) group.Bind(t) }) }