添加Zookeeper支持

api/rpc/rpc.go

@@ -24,12 +24,21 @@ var RpcLogicObj *RpcLogic
 
 func InitLogicRpcClient() {
 	once.Do(func() {
-		d := client.NewEtcdV3Discovery(
-			config.Conf.Common.CommonEtcd.BasePath,
-			config.Conf.Common.CommonEtcd.ServerPathLogic,
-			[]string{config.Conf.Common.CommonEtcd.Host},
-			nil,
-		)
+		var d client.ServiceDiscovery
+		if config.Conf.Common.Registy == "etcd" {
+			d = client.NewEtcdV3Discovery(
+				config.Conf.Common.CommonEtcd.BasePath,
+				config.Conf.Common.CommonEtcd.ServerPathLogic,
+				[]string{config.Conf.Common.CommonEtcd.Host},
+				nil,
+			)
+		}
+		if config.Conf.Common.Registy == "zookeeper" {
+			d = client.NewZookeeperDiscovery(config.Conf.Common.CommonZookeeper.BasePath,
+				config.Conf.Common.CommonZookeeper.ServerPathLogic,
+				[]string{config.Conf.Common.CommonZookeeper.Host},
+				nil)
+		}
 		LogicRpcClient = client.NewXClient(config.Conf.Common.CommonEtcd.ServerPathLogic, client.Failtry, client.RandomSelect, d, client.DefaultOption)
 		RpcLogicObj = new(RpcLogic)
 	})

config/config.go

@@ -131,6 +131,12 @@ type CommonEtcd struct {
 	ServerPathLogic   string `mapstructure:"serverPathLogic"`
 	ServerPathConnect string `mapstructure:"serverPathConnect"`
 }
+type CommonZookeeper struct {
+	Host              string `mapstructure:"host"`
+	BasePath          string `mapstructure:"basePath"`
+	ServerPathLogic   string `mapstructure:"serverPathLogic"`
+	ServerPathConnect string `mapstructure:"serverPathConnect"`
+}
 
 type CommonRedis struct {
 	RedisAddress  string `mapstructure:"redisAddress"`
@@ -139,8 +145,10 @@ type CommonRedis struct {
 }
 
 type Common struct {
-	CommonEtcd  CommonEtcd  `mapstructure:"common-etcd"`
-	CommonRedis CommonRedis `mapstructure:"common-redis"`
+	Registy         string          `mapstructure:"registy"`
+	CommonEtcd      CommonEtcd      `mapstructure:"common-etcd"`
+	CommonZookeeper CommonZookeeper `mapstructure:"common-zookeeper"`
+	CommonRedis     CommonRedis     `mapstructure:"common-redis"`
 }
 
 type ConnectBase struct {

config/dev/common.toml

@@ -1,9 +1,17 @@
+registy = "zookeeper"
+
 [common-etcd]
 host = "127.0.0.1:2379"
 basePath = "/gochat_srv"
 serverPathLogic = "LogicRpc"
 serverPathConnect = "ConnectRpc"
 
+[common-zookeeper]
+host = "127.0.0.1:2181"
+basePath = "/gochat_srv"
+serverPathLogic = "LogicRpc"
+serverPathConnect = "ConnectRpc"
+
 [common-redis]
 redisAddress = "127.0.0.1:6379"
 redisPassword = ""

config/prod/common.toml

@@ -1,9 +1,17 @@
+registy = "zookeeper"
+
 [common-etcd]
 host = "127.0.0.1:2379"
 basePath = "/gochat_srv"
 serverPathLogic = "LogicRpc"
 serverPathConnect = "ConnectRpc"
 
+[common-zookeeper]
+host = "127.0.0.1:2181"
+basePath = "/gochat_srv"
+serverPathLogic = "LogicRpc"
+serverPathConnect = "ConnectRpc"
+
 [common-redis]
 redisAddress = "127.0.0.1:6379"
 redisPassword = ""

connect/rpc.go

@@ -30,12 +30,21 @@ type RpcConnect struct {
 
 func (c *Connect) InitLogicRpcClient() (err error) {
 	once.Do(func() {
-		d := client.NewEtcdV3Discovery(
-			config.Conf.Common.CommonEtcd.BasePath,
-			config.Conf.Common.CommonEtcd.ServerPathLogic,
-			[]string{config.Conf.Common.CommonEtcd.Host},
-			nil,
-		)
+		var d client.ServiceDiscovery
+		if config.Conf.Common.Registy == "etcd" {
+			d = client.NewEtcdV3Discovery(
+				config.Conf.Common.CommonEtcd.BasePath,
+				config.Conf.Common.CommonEtcd.ServerPathLogic,
+				[]string{config.Conf.Common.CommonEtcd.Host},
+				nil,
+			)
+		}
+		if config.Conf.Common.Registy == "zookeeper" {
+			d = client.NewZookeeperDiscovery(config.Conf.Common.CommonZookeeper.BasePath,
+				config.Conf.Common.CommonZookeeper.ServerPathLogic,
+				[]string{config.Conf.Common.CommonZookeeper.Host},
+				nil)
+		}
 		logicRpcClient = client.NewXClient(config.Conf.Common.CommonEtcd.ServerPathLogic, client.Failtry, client.RandomSelect, d, client.DefaultOption)
 	})
 	if logicRpcClient == nil {
@@ -168,16 +177,34 @@ func (c *Connect) createConnectTcpRpcServer(network string, addr string) {
 }
 
 func addRegistryPlugin(s *server.Server, network string, addr string) {
-	r := &serverplugin.EtcdV3RegisterPlugin{
-		ServiceAddress: network + "@" + addr,
-		EtcdServers:    []string{config.Conf.Common.CommonEtcd.Host},
-		BasePath:       config.Conf.Common.CommonEtcd.BasePath,
-		Metrics:        metrics.NewRegistry(),
-		UpdateInterval: time.Minute,
+
+	if config.Conf.Common.Registy == "etcd" {
+		r := &serverplugin.EtcdV3RegisterPlugin{
+			ServiceAddress: network + "@" + addr,
+			EtcdServers:    []string{config.Conf.Common.CommonEtcd.Host},
+			BasePath:       config.Conf.Common.CommonEtcd.BasePath,
+			Metrics:        metrics.NewRegistry(),
+			UpdateInterval: time.Minute,
+		}
+		err := r.Start()
+		if err != nil {
+			logrus.Fatal(err)
+		}
+		s.Plugins.Add(r)
 	}
-	err := r.Start()
-	if err != nil {
-		logrus.Fatal(err)
+	if config.Conf.Common.Registy == "zookeeper" {
+		r := &serverplugin.ZooKeeperRegisterPlugin{
+			ServiceAddress:   network + "@" + addr,
+			ZooKeeperServers: []string{config.Conf.Common.CommonZookeeper.Host},
+			BasePath:         config.Conf.Common.CommonZookeeper.BasePath,
+			Metrics:          metrics.NewRegistry(),
+			UpdateInterval:   time.Minute,
+		}
+		err := r.Start()
+		if err != nil {
+			logrus.Fatal(err)
+		}
+		s.Plugins.Add(r)
 	}
-	s.Plugins.Add(r)
+
 }

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/bwmarrin/snowflake v0.3.0
 	github.com/gin-gonic/gin v1.4.0
 	github.com/go-redis/redis v6.15.2+incompatible
+	github.com/google/uuid v1.1.1 // indirect
 	github.com/gorilla/websocket v1.4.0
 	github.com/jinzhu/gorm v1.9.10
 	github.com/pkg/errors v0.8.1

logic/publish.go

@@ -69,18 +69,35 @@ func (logic *Logic) createRpcServer(network string, addr string) {
 }
 
 func (logic *Logic) addRegistryPlugin(s *server.Server, network string, addr string) {
-	r := &serverplugin.EtcdV3RegisterPlugin{
-		ServiceAddress: network + "@" + addr,
-		EtcdServers:    []string{config.Conf.Common.CommonEtcd.Host},
-		BasePath:       config.Conf.Common.CommonEtcd.BasePath,
-		Metrics:        metrics.NewRegistry(),
-		UpdateInterval: time.Minute,
-	}
-	err := r.Start()
-	if err != nil {
-		logrus.Fatal(err)
+	if config.Conf.Common.Registy == "etcd" {
+		r := &serverplugin.EtcdV3RegisterPlugin{
+			ServiceAddress: network + "@" + addr,
+			EtcdServers:    []string{config.Conf.Common.CommonEtcd.Host},
+			BasePath:       config.Conf.Common.CommonEtcd.BasePath,
+			Metrics:        metrics.NewRegistry(),
+			UpdateInterval: time.Minute,
+		}
+		err := r.Start()
+		if err != nil {
+			logrus.Fatal(err)
+		}
+		s.Plugins.Add(r)
+	}
+	if config.Conf.Common.Registy == "zookeeper" {
+		r := &serverplugin.ZooKeeperRegisterPlugin{
+			ServiceAddress:   network + "@" + addr,
+			ZooKeeperServers: []string{config.Conf.Common.CommonZookeeper.Host},
+			BasePath:         config.Conf.Common.CommonZookeeper.BasePath,
+			Metrics:          metrics.NewRegistry(),
+			UpdateInterval:   time.Minute,
+		}
+		err := r.Start()
+		if err != nil {
+			logrus.Fatal(err)
+		}
+		s.Plugins.Add(r)
 	}
-	s.Plugins.Add(r)
+
 }
 
 func (logic *Logic) RedisPublishChannel(serverId string, toUserId int, msg []byte) (err error) {

main.go

@@ -13,6 +13,8 @@ import (
 	"gochat/logic"
 	"gochat/site"
 	"gochat/task"
+
+	//"gochat/task"
 	"os"
 	"os/signal"
 	"syscall"

task/rpc.go

@@ -19,8 +19,31 @@ import (
 var RpcConnectClientList map[string]client.XClient
 
 func (task *Task) InitConnectRpcClient() (err error) {
-	etcdConfig := config.Conf.Common.CommonEtcd
-	d := client.NewEtcdV3Discovery(etcdConfig.BasePath, etcdConfig.ServerPathConnect, []string{etcdConfig.Host}, nil)
+	//etcdConfig := config.Conf.Common.CommonEtcd
+	//zookkperConfig := config.Conf.Common.CommonZookeeper
+	////d := client.NewEtcdV3Discovery(etcdConfig.BasePath, etcdConfig.ServerPathConnect, []string{etcdConfig.Host}, nil)
+	//d := client.NewZookeeperDiscovery(zookkperConfig.BasePath, zookkperConfig.ServerPathConnect, []string{zookkperConfig.Host}, nil)
+
+
+	var d client.ServiceDiscovery
+	var ServerPathConnect string
+	if config.Conf.Common.Registy == "etcd" {
+		ServerPathConnect=config.Conf.Common.CommonEtcd.ServerPathConnect
+		d = client.NewEtcdV3Discovery(
+			config.Conf.Common.CommonEtcd.BasePath,
+			config.Conf.Common.CommonEtcd.ServerPathConnect,
+			[]string{config.Conf.Common.CommonEtcd.Host},
+			nil,
+		)
+	}
+	if config.Conf.Common.Registy == "zookeeper" {
+		ServerPathConnect=config.Conf.Common.CommonZookeeper.ServerPathConnect
+		d = client.NewZookeeperDiscovery(config.Conf.Common.CommonZookeeper.BasePath,
+			config.Conf.Common.CommonZookeeper.ServerPathConnect,
+			[]string{config.Conf.Common.CommonZookeeper.Host},
+			nil)
+	}
+
 	if len(d.GetServices()) <= 0 {
 		logrus.Panicf("no etcd server find!")
 	}
@@ -35,7 +58,7 @@ func (task *Task) InitConnectRpcClient() (err error) {
 		}
 		d := client.NewPeer2PeerDiscovery(connectConf.Key, "")
 		//under serverId
-		RpcConnectClientList[serverId] = client.NewXClient(etcdConfig.ServerPathConnect, client.Failtry, client.RandomSelect, d, client.DefaultOption)
+		RpcConnectClientList[serverId] = client.NewXClient(ServerPathConnect, client.Failtry, client.RandomSelect, d, client.DefaultOption)
 		logrus.Infof("InitConnectRpcClient addr %s, v %+v", connectConf.Key, RpcConnectClientList[serverId])
 	}
 	return