完善服务器

Server/common/net/grpc/grpc_conn/conn.go

@@ -8,15 +8,15 @@ import (
 )
 
 type GrpcConnection struct {
-	sid  string
+	sid  int64
 	conn *grpc.ClientConn
 }
 
-func NewGrpcConnection(sid, address string) (*GrpcConnection, error) {
+func NewGrpcConnection(sid int64, address string) (*GrpcConnection, error) {
 	p := &GrpcConnection{
 		sid: sid,
 	}
-	conn, err := grpc.Dial(
+	conn, err := grpc.NewClient(
 		address,
 		grpc.WithInsecure(),
 		grpc.WithKeepaliveParams(

Server/common/net/grpc/grpc_conn/conn_mgr.go

@@ -8,18 +8,18 @@ import (
 )
 
 type GrpcConnectionMgr struct {
-	poolM map[string]*GrpcConnection
+	poolM map[int64]*GrpcConnection
 	poolS []*GrpcConnection
 }
 
 func NewGrpcConnectionMgr() *GrpcConnectionMgr {
 	return &GrpcConnectionMgr{
-		poolM: make(map[string]*GrpcConnection),
+		poolM: make(map[int64]*GrpcConnection),
 		poolS: make([]*GrpcConnection, 0),
 	}
 }
 
-func (p *GrpcConnectionMgr) Store(sid, addr string) {
+func (p *GrpcConnectionMgr) Store(sid int64, addr string) {
 	pool, err := NewGrpcConnection(sid, addr)
 	if err != nil {
 		log.Errorf("create grpc err: %v, sid: %v, addr: %v", err, sid, addr)
@@ -29,7 +29,7 @@ func (p *GrpcConnectionMgr) Store(sid, addr string) {
 	p.poolS = append(p.poolS, pool)
 }
 
-func (p *GrpcConnectionMgr) Delete(sid string) int {
+func (p *GrpcConnectionMgr) Delete(sid int64) int {
 	delete(p.poolM, sid)
 	for i, pool := range p.poolS {
 		if pool.sid == sid {
@@ -40,9 +40,9 @@ func (p *GrpcConnectionMgr) Delete(sid string) int {
 	return len(p.poolS)
 }
 
-func (p *GrpcConnectionMgr) Load(sid ...string) (*grpc.ClientConn, error) {
+func (p *GrpcConnectionMgr) Load(sid ...int64) (*grpc.ClientConn, error) {
 	var pool *GrpcConnection
-	if len(sid) > 0 && len(sid[0]) > 0 {
+	if len(sid) > 0 && sid[0] > 0 {
 		pool = p.poolM[sid[0]]
 	} else {
 		pool = p.poolS[rand.Intn(len(p.poolS))]
@@ -53,8 +53,8 @@ func (p *GrpcConnectionMgr) Load(sid ...string) (*grpc.ClientConn, error) {
 	return pool.GetConnection(), nil
 }
 
-func (p *GrpcConnectionMgr) LoadAll() map[string]*grpc.ClientConn {
-	sidM := make(map[string]*grpc.ClientConn)
+func (p *GrpcConnectionMgr) LoadAll() map[int64]*grpc.ClientConn {
+	sidM := make(map[int64]*grpc.ClientConn)
 	for sid, pool := range p.poolM {
 		sidM[sid] = pool.GetConnection()
 	}

Server/common/net/grpc/service/client_gateway.go

@@ -6,7 +6,7 @@ import (
 	"common/proto/gen/grpc_pb"
 )
 
-func GatewayNewClient(sid ...string) (grpc_pb.GatewayClient, error) {
+func GatewayNewClient(sid ...int64) (grpc_pb.GatewayClient, error) {
 	c, err := discover.FindServer(common.KeyDiscoverGateway, sid...)
 	if err != nil {
 		return nil, err
@@ -14,8 +14,8 @@ func GatewayNewClient(sid ...string) (grpc_pb.GatewayClient, error) {
 	return grpc_pb.NewGatewayClient(c), nil
 }
 
-func GatewayNewBroadcastClient() map[string]grpc_pb.GatewayClient {
-	clientM := make(map[string]grpc_pb.GatewayClient)
+func GatewayNewBroadcastClient() map[int64]grpc_pb.GatewayClient {
+	clientM := make(map[int64]grpc_pb.GatewayClient)
 	connM := discover.FindServerAll(common.KeyDiscoverGateway)
 	for sid, conn := range connM {
 		clientM[sid] = grpc_pb.NewGatewayClient(conn)

Server/common/net/grpc/service/client_scene.go

@@ -0,0 +1,24 @@
+package service
+
+import (
+	"common/discover"
+	"common/discover/common"
+	"common/proto/gen/grpc_pb"
+)
+
+func SceneNewClient(sid ...int64) (grpc_pb.SceneClient, error) {
+	c, err := discover.FindServer(common.KeyDiscoverScene, sid...)
+	if err != nil {
+		return nil, err
+	}
+	return grpc_pb.NewSceneClient(c), nil
+}
+
+func SceneNewBroadcastClient() map[int64]grpc_pb.SceneClient {
+	clientM := make(map[int64]grpc_pb.SceneClient)
+	connM := discover.FindServerAll(common.KeyDiscoverScene)
+	for sid, conn := range connM {
+		clientM[sid] = grpc_pb.NewSceneClient(conn)
+	}
+	return clientM
+}