Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

 Conflicts:

	internal/api/group/group.go

	internal/api/group/super_group.go

	pkg/common/db/controller/user.go

internal/common/network/ip.go

@@ -2,7 +2,7 @@ package network
 
 import utils "github.com/OpenIMSDK/open_utils"
 
-func GetRpcIP(configIP string) (string, error) {
+func GetRpcRegisterIP(configIP string) (string, error) {
 	registerIP := configIP
 	if registerIP == "" {
 		ip, err := utils.GetLocalIP()
@@ -13,3 +13,11 @@ func GetRpcIP(configIP string) (string, error) {
 	}
 	return registerIP, nil
 }
+
+func GetListenIP(configIP string) string {
+	if configIP == "" {
+		return "0.0.0.0"
+	} else {
+		return configIP
+	}
+}

internal/common/rpc_server/a.go

@@ -0,0 +1,46 @@
+package rpc_server
+
+import (
+	"Open_IM/internal/common/network"
+	"Open_IM/pkg/common/constant"
+	"Open_IM/pkg/common/log"
+	discoveryRegistry "Open_IM/pkg/discovery_registry"
+	"github.com/OpenIMSDK/openKeeper"
+	"net"
+	"strconv"
+)
+
+type RpcServer struct {
+	Port           int
+	RegisterName   string
+	RegisterCenter discoveryRegistry.SvcDiscoveryRegistry
+}
+
+func NewRpcServer(registerIPInConfig string, port int, registerName string, zkServers []string, zkRoot string) (*RpcServer, error) {
+	log.NewPrivateLog(constant.LogFileName)
+	s := &RpcServer{
+		Port:         port,
+		RegisterName: registerName,
+	}
+
+	zkClient, err := openKeeper.NewClient(zkServers, zkRoot, 10, "", "")
+	if err != nil {
+		return nil, err
+	}
+	registerIP, err := network.GetRpcRegisterIP(registerIPInConfig)
+	if err != nil {
+		return nil, err
+	}
+	err = zkClient.Register(s.RegisterName, registerIP, s.Port)
+	if err != nil {
+		return nil, err
+	}
+	s.RegisterCenter = zkClient
+	return s, nil
+}
+
+func GetTcpListen(listenIPInConfig string, port int) (net.Listener, string, error) {
+	address := network.GetListenIP(listenIPInConfig) + ":" + strconv.Itoa(port)
+	listener, err := net.Listen("tcp", address)
+	return listener, address, err
+}