diff --git a/service/demo/config/config.yaml b/service/demo/config/config.yaml index 0791c986ae1f3ee6a549535ff6b4637b3e07cfe6..5454667294b51a5b66767df0051b3007e3252484 100644 --- a/service/demo/config/config.yaml +++ b/service/demo/config/config.yaml @@ -1,6 +1,6 @@ Server: Name: "service.demo" - ConsulServer: + ConsulAddr: - 192.168.233.1:8500 Grpc: Addr: "" # 为空随机端口, 使用注册中心服务发现 diff --git a/service/demo/internal/conf/conf.go b/service/demo/internal/conf/conf.go index c18a4a7031f070f188cedd07d86071dd76ee9f32..e972851867441149fb09ea5dfbc63ea0dd8f939e 100644 --- a/service/demo/internal/conf/conf.go +++ b/service/demo/internal/conf/conf.go @@ -23,10 +23,10 @@ type Config struct { } type Server struct { - Name string - ConsulServer []string - EtcdServer []string - Grpc struct { + Name string + ConsulAddr []string + EtcdAddr []string + Grpc struct { Addr string } Http struct { diff --git a/service/demo/internal/server/grpc.go b/service/demo/internal/server/grpc.go index 40e75db6a696a09392180e05504b2e6ff38c4c34..3cdd0747c23d1d8d6431e44e4fe921b5251dd196 100644 --- a/service/demo/internal/server/grpc.go +++ b/service/demo/internal/server/grpc.go @@ -14,8 +14,8 @@ import ( ) func NewMicroServer(conf *conf.Config, svc *service.DemoService) micro.Service { - reg := consul.NewRegistry(registry.Addrs(conf.Server.ConsulServer...)) - //reg := etcd.NewRegistry(registry.Addrs(conf.Server.EtcdServer...)) + reg := consul.NewRegistry(registry.Addrs(conf.Server.ConsulAddr...)) + //reg := etcd.NewRegistry(registry.Addrs(conf.Server.EtcdAddr...)) opt := []micro.Option{ micro.Server(grpc.NewServer()), micro.Name(conf.Server.Name), diff --git a/service/member/config/config.yaml b/service/member/config/config.yaml index 0ae802f55b6ec9c0ee1f625a0759c06e3be99909..a0057519a0ba87267ce1c38ad236d6b2eccea2aa 100644 --- a/service/member/config/config.yaml +++ b/service/member/config/config.yaml @@ -1,6 +1,6 @@ Server: Name: "service.member" - ConsulServer: + ConsulAddr: - 192.168.233.1:8500 Grpc: Addr: "" # 为空随机端口, 使用注册中心服务发现 diff --git a/service/member/internal/conf/conf.go b/service/member/internal/conf/conf.go index ea5a3d20c78b05c39356e8bd412380669ddd1a6a..c197d5424b2d9c711c8b4acc1dd95106610c360f 100644 --- a/service/member/internal/conf/conf.go +++ b/service/member/internal/conf/conf.go @@ -25,10 +25,10 @@ type Config struct { } type Server struct { - Name string - ConsulServer []string - EtcdServer []string - Grpc struct { + Name string + ConsulAddr []string + EtcdAddr []string + Grpc struct { Addr string } Http struct { diff --git a/service/member/internal/server/grpc.go b/service/member/internal/server/grpc.go index 34be647ee2b356682d261785dafeefa5fac633f3..1b347771731288a60d8e90d71adfa303a035e1b5 100644 --- a/service/member/internal/server/grpc.go +++ b/service/member/internal/server/grpc.go @@ -14,8 +14,8 @@ import ( ) func NewMicroServer(conf *conf.Config, svc *service.MemberService) micro.Service { - reg := consul.NewRegistry(registry.Addrs(conf.Server.ConsulServer...)) - //reg := etcd.NewRegistry(registry.Addrs(conf.Server.EtcdServer...)) + reg := consul.NewRegistry(registry.Addrs(conf.Server.ConsulAddr...)) + //reg := etcd.NewRegistry(registry.Addrs(conf.Server.EtcdAddr...)) opt := []micro.Option{ micro.Server(grpc.NewServer()), micro.Name(conf.Server.Name), diff --git a/service/wallet/client/client.go b/service/wallet/client/client.go index ad79da65f76bdaae3977c65b3a509013aba47639..d7e4a6f409c8b40126c6fc173a1a27d7641e35b9 100644 --- a/service/wallet/client/client.go +++ b/service/wallet/client/client.go @@ -4,47 +4,29 @@ import ( "github.com/asim/go-micro/plugins/client/grpc/v4" "github.com/asim/go-micro/plugins/registry/consul/v4" "go-micro.dev/v4" - "go-micro.dev/v4/client" "go-micro.dev/v4/registry" - "go-micro.dev/v4/selector" "gomicro-base/api/member" "gomicro-base/service/wallet/internal/conf" ) var ( - microService micro.Service - cf *conf.Config + cf *conf.Config + memberSvc member.MemberService ) func NewMicroClient(c *conf.Config) { cf = c - microRegistry := consul.NewRegistry(registry.Addrs(c.Server.ConsulServer...)) + microRegistry := consul.NewRegistry(registry.Addrs(c.Server.ConsulAddr...)) // 轮询访问 - newSelector := selector.NewSelector( - selector.Registry(microRegistry), - selector.SetStrategy(selector.RoundRobin), - ) - microService = micro.NewService( + microService := micro.NewService( micro.Client(grpc.NewClient()), - micro.Selector(newSelector), + micro.Registry(microRegistry), micro.WrapClient(NewTimeoutWrapper), - //micro.WrapClient(NewLogWrapper), ) -} - -func GetService() micro.Service { - return microService -} - -func GetClient() client.Client { - return microService.Client() -} - -func Reconnect() { - NewMicroClient(cf) + memberSvc = member.NewMemberService(conf.Conf.Client.Member, microService.Client()) } func GetMemberSvc() member.MemberService { - return member.NewMemberService(conf.Conf.Client.Member, microService.Client()) + return memberSvc } diff --git a/service/wallet/config/config.yaml b/service/wallet/config/config.yaml index 7622c04d1dfb67c957b5ce245813d45ce0b45d5c..3d1896ea93329c3b70ae50da2e2f52d3f778b43c 100644 --- a/service/wallet/config/config.yaml +++ b/service/wallet/config/config.yaml @@ -1,6 +1,6 @@ Server: Name: "service.wallet" - ConsulServer: + ConsulAddr: - 192.168.233.1:8500 Grpc: Addr: "" # 为空随机端口, 使用注册中心服务发现 diff --git a/service/wallet/internal/conf/conf.go b/service/wallet/internal/conf/conf.go index 3bbfdcaaf51702a0d10a9a0548afe770b23b4c6a..55242552c13445a61865af14eb8389d76e5459ca 100644 --- a/service/wallet/internal/conf/conf.go +++ b/service/wallet/internal/conf/conf.go @@ -26,10 +26,10 @@ type Config struct { } type Server struct { - Name string - ConsulServer []string - EtcdServer []string - Grpc struct { + Name string + ConsulAddr []string + EtcdAddr []string + Grpc struct { Addr string } Http struct { diff --git a/service/wallet/internal/server/grpc.go b/service/wallet/internal/server/grpc.go index c44e0d9e735e83f684b4ba14f61ee7e70631e8fb..0f4d5647f9169970bafd1ed2c4d5c213f7380065 100644 --- a/service/wallet/internal/server/grpc.go +++ b/service/wallet/internal/server/grpc.go @@ -14,8 +14,8 @@ import ( ) func NewMicroServer(conf *conf.Config, svc *service.WalletService) micro.Service { - reg := consul.NewRegistry(registry.Addrs(conf.Server.ConsulServer...)) - //reg := etcd.NewRegistry(registry.Addrs(conf.Server.EtcdServer...)) + reg := consul.NewRegistry(registry.Addrs(conf.Server.ConsulAddr...)) + //reg := etcd.NewRegistry(registry.Addrs(conf.Server.EtcdAddr...)) opt := []micro.Option{ micro.Server(grpc.NewServer()), micro.Name(conf.Server.Name), diff --git a/tool/gateway/gateway.go b/tool/gateway/gateway.go index 3206cdbbd86f3af3ab740b27d2efeccdaff8396c..3f9d8b57a063fb97bbbb9631f3feb3951eff6d4f 100644 --- a/tool/gateway/gateway.go +++ b/tool/gateway/gateway.go @@ -12,7 +12,6 @@ import ( "go-micro.dev/v4/client" "go-micro.dev/v4/errors" "go-micro.dev/v4/registry" - "go-micro.dev/v4/selector" "net/http" "os" "sync" @@ -74,15 +73,10 @@ func main() { func start() { microRegistry = consul.NewRegistry(registry.Addrs(consulAddr...)) - // 轮询访问 - newSelector := selector.NewSelector( - selector.Registry(microRegistry), - selector.SetStrategy(selector.RoundRobin), - ) service := micro.NewService( micro.Client(grpc.NewClient()), - micro.Selector(newSelector), + micro.Registry(microRegistry), micro.WrapClient(NewTimeoutWrapper), ) microClient = service.Client()