strip handlers

cuigang · Dec 10, 2019 · d50f30d · d50f30d
1 parent f853355
commit d50f30d
Show file tree

Hide file tree

Showing 21 changed files with 43 additions and 934 deletions.
diff --git a/broker/service/handler/handler.go b/broker/service/handler/handler.go
diff --git a/client/selector/router/router.go b/client/selector/router/router.go
@@ -11,7 +11,7 @@ import (
 	"github.com/micro/go-micro/client/selector"
 	"github.com/micro/go-micro/registry"
 	"github.com/micro/go-micro/router"
-	pb "github.com/micro/go-micro/router/proto"
+	pb "github.com/micro/go-micro/router/service/proto"
 )
 
 type routerSelector struct {

diff --git a/go.mod b/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/miekg/dns v1.1.22
 	github.com/mitchellh/hashstructure v1.0.0
 	github.com/nats-io/nats.go v1.9.1
-	github.com/nlopes/slack v0.6.1-0.20191106133607-d06c2a2b3249 // indirect
+	github.com/nlopes/slack v0.6.1-0.20191106133607-d06c2a2b3249
 	github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c
 	github.com/pkg/errors v0.8.1
 	github.com/stretchr/testify v1.4.0

diff --git a/network/default.go b/network/default.go
@@ -12,11 +12,11 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/micro/go-micro/client"
 	rtr "github.com/micro/go-micro/client/selector/router"
-	pbNet "github.com/micro/go-micro/network/proto"
 	"github.com/micro/go-micro/network/resolver/dns"
+	pbNet "github.com/micro/go-micro/network/service/proto"
 	"github.com/micro/go-micro/proxy"
 	"github.com/micro/go-micro/router"
-	pbRtr "github.com/micro/go-micro/router/proto"
+	pbRtr "github.com/micro/go-micro/router/service/proto"
 	"github.com/micro/go-micro/server"
 	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/tunnel"

diff --git a/network/node.go b/network/node.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	pb "github.com/micro/go-micro/network/proto"
+	pb "github.com/micro/go-micro/network/service/proto"
 )
 
 var (

diff --git a/network/node_test.go b/network/node_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	pb "github.com/micro/go-micro/network/proto"
+	pb "github.com/micro/go-micro/network/service/proto"
 )
 
 var (

diff --git a/network/service/handler/handler.go b/network/service/handler/handler.go