diff --git a/config/config.yaml b/config/config.yaml index 9c14726ae..6e10a65b2 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -150,6 +150,7 @@ rpcport: #rpc服务端口 默认即可 openImOrganizationPort: [ 10220 ] openImConversationPort: [ 10230 ] openImCachePort: [ 10240 ] + openImRealTimeCommPort: [ 11300 ] c2c: callbackBeforeSendMsg: switch: false diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 53082d375..d5450aa11 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -128,6 +128,7 @@ type config struct { OpenImOrganizationPort []int `yaml:"openImOrganizationPort"` OpenImConversationPort []int `yaml:"openImConversationPort"` OpenImCachePort []int `yaml:"openImCachePort"` + OpenImRealTimeCommPort []int `yaml:"openImRealTimeCommPort"` } RpcRegisterName struct { OpenImStatisticsName string `yaml:"openImStatisticsName"` diff --git a/pkg/grpc-etcdv3/getcdv3/resolver.go b/pkg/grpc-etcdv3/getcdv3/resolver.go index 92a3b5a64..d8b544e9c 100644 --- a/pkg/grpc-etcdv3/getcdv3/resolver.go +++ b/pkg/grpc-etcdv3/getcdv3/resolver.go @@ -103,7 +103,7 @@ func GetConfigConn(serviceName string, operationID string) *grpc.ClientConn { if config.Config.RpcRegisterIP == "" { rpcRegisterIP, err = utils.GetLocalIP() if err != nil { - log.Error("", "GetLocalIP failed ", err.Error()) + log.Error(operationID, "GetLocalIP failed ", err.Error()) return nil } } @@ -111,27 +111,27 @@ func GetConfigConn(serviceName string, operationID string) *grpc.ClientConn { var configPortList []int //1 if config.Config.RpcRegisterName.OpenImUserName == serviceName { - configPortList = config.Config.RpcPort.OpenImAuthPort + configPortList = config.Config.RpcPort.OpenImUserPort } //2 if config.Config.RpcRegisterName.OpenImFriendName == serviceName { - configPortList = config.Config.RpcPort.OpenImAuthPort + configPortList = config.Config.RpcPort.OpenImFriendPort } //3 if config.Config.RpcRegisterName.OpenImMsgName == serviceName { - configPortList = config.Config.RpcPort.OpenImAuthPort + configPortList = config.Config.RpcPort.OpenImMessagePort } //4 if config.Config.RpcRegisterName.OpenImPushName == serviceName { - configPortList = config.Config.RpcPort.OpenImAuthPort + configPortList = config.Config.RpcPort.OpenImPushPort } //5 if config.Config.RpcRegisterName.OpenImRelayName == serviceName { - configPortList = config.Config.RpcPort.OpenImAuthPort + configPortList = config.Config.RpcPort.OpenIm } //6 if config.Config.RpcRegisterName.OpenImGroupName == serviceName { - configPortList = config.Config.RpcPort.OpenImAuthPort + configPortList = config.Config.RpcPort.OpenImGroupPort } //7 if config.Config.RpcRegisterName.OpenImAuthName == serviceName { @@ -139,41 +139,41 @@ func GetConfigConn(serviceName string, operationID string) *grpc.ClientConn { } //8 if config.Config.RpcRegisterName.OpenImMessageCMSName == serviceName { - configPortList = config.Config.RpcPort.OpenImAuthPort + configPortList = config.Config.RpcPort.OpenImMessageCmsPort } //9 if config.Config.RpcRegisterName.OpenImAdminCMSName == serviceName { - configPortList = config.Config.RpcPort.OpenImAuthPort + configPortList = config.Config.RpcPort.OpenImAdminCmsPort } //10 if config.Config.RpcRegisterName.OpenImOfficeName == serviceName { - configPortList = config.Config.RpcPort.OpenImAuthPort + configPortList = config.Config.RpcPort.OpenImOfficePort } //11 if config.Config.RpcRegisterName.OpenImOrganizationName == serviceName { - configPortList = config.Config.RpcPort.OpenImAuthPort + configPortList = config.Config.RpcPort.OpenImOrganizationPort } //12 if config.Config.RpcRegisterName.OpenImConversationName == serviceName { - configPortList = config.Config.RpcPort.OpenImAuthPort + configPortList = config.Config.RpcPort.OpenImConversationPort } //13 if config.Config.RpcRegisterName.OpenImCacheName == serviceName { - configPortList = config.Config.RpcPort.OpenImAuthPort + configPortList = config.Config.RpcPort.OpenImCachePort } //14 if config.Config.RpcRegisterName.OpenImRealTimeCommName == serviceName { - configPortList = config.Config.RpcPort.OpenImAuthPort + configPortList = config.Config.RpcPort.OpenImRealTimeCommPort } if len(configPortList) == 0 { - log.Error("", "len(configPortList) == 0 ") + log.Error(operationID, "len(configPortList) == 0 ") return nil } target := rpcRegisterIP + ":" + utils.Int32ToString(int32(configPortList[0])) - log.Info("", "rpcRegisterIP ", rpcRegisterIP, "port ", configPortList, "grpc target: ", target, "serviceName: ", serviceName) + log.Info(operationID, "rpcRegisterIP ", rpcRegisterIP, " port ", configPortList, " grpc target: ", target, " serviceName: ", serviceName) conn, err := grpc.Dial(target, grpc.WithInsecure()) if err != nil { - log.Error("", "grpc.Dail failed ", err.Error()) + log.Error(operationID, "grpc.Dail failed ", err.Error()) return nil } return conn