feat 结构调整

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

@@ -3,6 +3,7 @@ package service
 import (
 	"common/discover"
 	"common/discover/common"
+	"common/net/grpc/resolver"
 	"common/proto/ss/grpc_pb"
 )
 
@@ -14,6 +15,14 @@ func SceneNewClient(sid ...int64) (grpc_pb.SceneClient, error) {
 	return grpc_pb.NewSceneClient(c), nil
 }
 
+func SceneNewClientLB() (grpc_pb.SceneClient, error) {
+	c, err := resolver.GetGrpcClientConn("etcd:///" + common.KeyDiscoverServiceNameScene)
+	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)

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

@@ -0,0 +1,24 @@
+package service
+
+import (
+	"common/discover"
+	"common/discover/common"
+	"common/net/grpc/resolver"
+	"common/proto/ss/grpc_pb"
+)
+
+func UserNewClient(sid ...int64) (grpc_pb.UserClient, error) {
+	c, err := discover.FindServer(common.KeyDiscoverUser, sid...)
+	if err != nil {
+		return nil, err
+	}
+	return grpc_pb.NewUserClient(c), nil
+}
+
+func UserNewClientLB() (grpc_pb.UserClient, error) {
+	c, err := resolver.GetGrpcClientConn("etcd:///" + common.KeyDiscoverServiceNameUser)
+	if err != nil {
+		return nil, err
+	}
+	return grpc_pb.NewUserClient(c), nil
+}

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

@@ -7,7 +7,9 @@ import (
 	"context"
 	"fmt"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/keepalive"
+	"google.golang.org/grpc/status"
 	"net"
 	"sync"
 	"time"
@@ -51,6 +53,7 @@ func (s *Base) Init(addr string, port int32) {
 					defer func() {
 						if r := recover(); r != nil {
 							log.Errorf("server Panic: %v", r)
+							err = status.Error(codes.Internal, fmt.Sprintf("%v", r))
 						}
 					}()
 					resp, err = handler(ctx, req)