From 9ea3e4c758cad51884c912ea82b608d54991ad2e Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Tue, 9 May 2023 18:34:20 +0800
Subject: [PATCH] test group

---
 internal/api/group.go       |  4 ----
 internal/rpc/group/group.go | 20 ++++++++++----------
 pkg/common/cmd/rpc.go       |  5 +++++
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/internal/api/group.go b/internal/api/group.go
index 81e3fcddf..bd517d050 100644
--- a/internal/api/group.go
+++ b/internal/api/group.go
@@ -2,11 +2,9 @@ package api
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/group"
 
@@ -28,8 +26,6 @@ func (o *Group) client(ctx context.Context) (group.GroupClient, error) {
 	if err != nil {
 		return nil, err
 	}
-	log.ZDebug(ctx, "get conn success", "conn", conn, "config", config.Config.RpcRegisterName.OpenImGroupName)
-	fmt.Println("conn", conn)
 	return group.NewGroupClient(conn), nil
 }
 
diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index b5fdceee6..7d3918792 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -48,19 +48,19 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	if err != nil {
 		return err
 	}
-	user := rpcclient.NewUserClient(client)
+	// user := rpcclient.NewUserClient(client)
 	database := controller.InitGroupDatabase(db, rdb, mongo.GetDatabase())
 	pbGroup.RegisterGroupServer(server, &groupServer{
 		GroupDatabase: database,
-		User:          user,
-		Notification: notification.NewGroupNotificationSender(database, client, func(ctx context.Context, userIDs []string) ([]rpcclient.CommonUser, error) {
-			users, err := user.GetUsersInfo(ctx, userIDs)
-			if err != nil {
-				return nil, err
-			}
-			return utils.Slice(users, func(e *sdkws.UserInfo) rpcclient.CommonUser { return e }), nil
-		}),
-		conversationRpcClient: rpcclient.NewConversationClient(client),
+		// User:          user,
+		// Notification: notification.NewGroupNotificationSender(database, client, func(ctx context.Context, userIDs []string) ([]rpcclient.CommonUser, error) {
+		// 	users, err := user.GetUsersInfo(ctx, userIDs)
+		// 	if err != nil {
+		// 		return nil, err
+		// 	}
+		// 	return utils.Slice(users, func(e *sdkws.UserInfo) rpcclient.CommonUser { return e }), nil
+		// }),
+		// conversationRpcClient: rpcclient.NewConversationClient(client),
 	})
 	return nil
 }
diff --git a/pkg/common/cmd/rpc.go b/pkg/common/cmd/rpc.go
index 6c6e9b485..d24073940 100644
--- a/pkg/common/cmd/rpc.go
+++ b/pkg/common/cmd/rpc.go
@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"errors"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/startrpc"
 	"github.com/spf13/cobra"
@@ -25,5 +27,8 @@ func (a *RpcCmd) Exec() error {
 }
 
 func (a *RpcCmd) StartSvr(name string, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error {
+	if a.GetPortFlag() == 0 {
+		return errors.New("port is required")
+	}
 	return startrpc.Start(a.GetPortFlag(), name, a.GetPrometheusPortFlag(), rpcFn)
 }