rpc restore

internal/rpc/auth/rpcAuth.go

@@ -5,12 +5,11 @@ import (
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	pbAuth "Open_IM/pkg/proto/auth"
+	"Open_IM/pkg/utils"
+	"google.golang.org/grpc"
 	"net"
 	"strconv"
 	"strings"
-
-	"github.com/spf13/viper"
-	"google.golang.org/grpc"
 )
 
 type rpcAuth struct {
@@ -33,7 +32,7 @@ func NewRpcAuthServer(port int) *rpcAuth {
 func (rpc *rpcAuth) Run() {
 	log.Info("", "", "rpc get_token init...")
 
-	address := ":" + strconv.Itoa(rpc.rpcPort)
+	address := utils.ServerIP + ":" + strconv.Itoa(rpc.rpcPort)
 	listener, err := net.Listen("tcp", address)
 	if err != nil {
 		log.Error("", "", "listen network failed, err = %s, address = %s", err.Error(), address)
@@ -48,8 +47,7 @@ func (rpc *rpcAuth) Run() {
 	//service registers with etcd
 
 	pbAuth.RegisterAuthServer(srv, rpc)
-	host := viper.GetString("endpoints.rpc_auth")
-	err = getcdv3.RegisterEtcd(rpc.etcdSchema, strings.Join(rpc.etcdAddr, ","), host, rpc.rpcPort, rpc.rpcRegisterName, 10)
+	err = getcdv3.RegisterEtcd(rpc.etcdSchema, strings.Join(rpc.etcdAddr, ","), utils.ServerIP, rpc.rpcPort, rpc.rpcRegisterName, 10)
 	if err != nil {
 		log.Error("", "", "register rpc get_token to etcd failed, err = %s", err.Error())
 		return

internal/rpc/chat/rpcChat.go

@@ -6,12 +6,11 @@ import (
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	pbChat "Open_IM/pkg/proto/chat"
+	"Open_IM/pkg/utils"
+	"google.golang.org/grpc"
 	"net"
 	"strconv"
 	"strings"
-
-	"github.com/spf13/viper"
-	"google.golang.org/grpc"
 )
 
 type rpcChat struct {
@@ -37,7 +36,7 @@ func NewRpcChatServer(port int) *rpcChat {
 func (rpc *rpcChat) Run() {
 	log.Info("", "", "rpc get_token init...")
 
-	address := ":" + strconv.Itoa(rpc.rpcPort)
+	address := utils.ServerIP + ":" + strconv.Itoa(rpc.rpcPort)
 	listener, err := net.Listen("tcp", address)
 	if err != nil {
 		log.Error("", "", "listen network failed, err = %s, address = %s", err.Error(), address)
@@ -52,8 +51,7 @@ func (rpc *rpcChat) Run() {
 	//service registers with etcd
 
 	pbChat.RegisterChatServer(srv, rpc)
-	host := viper.GetString("endpoints.rpc_msg")
-	err = getcdv3.RegisterEtcd(rpc.etcdSchema, strings.Join(rpc.etcdAddr, ","), host, rpc.rpcPort, rpc.rpcRegisterName, 10)
+	err = getcdv3.RegisterEtcd(rpc.etcdSchema, strings.Join(rpc.etcdAddr, ","), utils.ServerIP, rpc.rpcPort, rpc.rpcRegisterName, 10)
 	if err != nil {
 		log.Error("", "", "register rpc get_token to etcd failed, err = %s", err.Error())
 		return

internal/rpc/friend/get_firends_info.go

@@ -8,14 +8,13 @@ import (
 	"Open_IM/pkg/common/token_verify"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	pbFriend "Open_IM/pkg/proto/friend"
+	"Open_IM/pkg/utils"
 	"context"
 	"fmt"
+	"google.golang.org/grpc"
 	"net"
 	"strconv"
 	"strings"
-
-	"github.com/spf13/viper"
-	"google.golang.org/grpc"
 )
 
 type friendServer struct {
@@ -38,7 +37,8 @@ func NewFriendServer(port int) *friendServer {
 func (s *friendServer) Run() {
 	log.Info("", "", fmt.Sprintf("rpc friend init...."))
 
-	registerAddress := ":" + strconv.Itoa(s.rpcPort)
+	ip := utils.ServerIP
+	registerAddress := ip + ":" + strconv.Itoa(s.rpcPort)
 	//listener network
 	listener, err := net.Listen("tcp", registerAddress)
 	if err != nil {
@@ -52,8 +52,7 @@ func (s *friendServer) Run() {
 	defer srv.GracefulStop()
 	//User friend related services register to etcd
 	pbFriend.RegisterFriendServer(srv, s)
-	host := viper.GetString("endpoints.rpc_friend")
-	err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), host, s.rpcPort, s.rpcRegisterName, 10)
+	err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), ip, s.rpcPort, s.rpcRegisterName, 10)
 	if err != nil {
 		log.ErrorByArgs("register rpc fiend service to etcd failed,err=%s", err.Error())
 		return

internal/rpc/group/create_group.go

@@ -14,13 +14,11 @@ import (
 	pbGroup "Open_IM/pkg/proto/group"
 	"Open_IM/pkg/utils"
 	"context"
+	"google.golang.org/grpc"
 	"net"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/spf13/viper"
-	"google.golang.org/grpc"
 )
 
 type groupServer struct {
@@ -42,7 +40,8 @@ func NewGroupServer(port int) *groupServer {
 func (s *groupServer) Run() {
 	log.Info("", "", "rpc group init....")
 
-	registerAddress := ":" + strconv.Itoa(s.rpcPort)
+	ip := utils.ServerIP
+	registerAddress := ip + ":" + strconv.Itoa(s.rpcPort)
 	//listener network
 	listener, err := net.Listen("tcp", registerAddress)
 	if err != nil {
@@ -56,8 +55,7 @@ func (s *groupServer) Run() {
 	defer srv.GracefulStop()
 	//Service registers with etcd
 	pbGroup.RegisterGroupServer(srv, s)
-	host := viper.GetString("endpoints.rpc_group")
-	err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), host, s.rpcPort, s.rpcRegisterName, 10)
+	err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), ip, s.rpcPort, s.rpcRegisterName, 10)
 	if err != nil {
 		log.ErrorByArgs("get etcd failed,err=%s", err.Error())
 		return

internal/rpc/user/get_user_info.go

@@ -6,13 +6,12 @@ import (
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	pbUser "Open_IM/pkg/proto/user"
+	"Open_IM/pkg/utils"
 	"context"
+	"google.golang.org/grpc"
 	"net"
 	"strconv"
 	"strings"
-
-	"github.com/spf13/viper"
-	"google.golang.org/grpc"
 )
 
 type userServer struct {
@@ -35,7 +34,8 @@ func NewUserServer(port int) *userServer {
 func (s *userServer) Run() {
 	log.Info("", "", "rpc user init....")
 
-	registerAddress := ":" + strconv.Itoa(s.rpcPort)
+	ip := utils.ServerIP
+	registerAddress := ip + ":" + strconv.Itoa(s.rpcPort)
 	//listener network
 	listener, err := net.Listen("tcp", registerAddress)
 	if err != nil {
@@ -49,8 +49,7 @@ func (s *userServer) Run() {
 	defer srv.GracefulStop()
 	//Service registers with etcd
 	pbUser.RegisterUserServer(srv, s)
-	host := viper.GetString("endpoints.rpc_user")
-	err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), host, s.rpcPort, s.rpcRegisterName, 10)
+	err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), ip, s.rpcPort, s.rpcRegisterName, 10)
 	if err != nil {
 		log.ErrorByArgs("register rpc token to etcd failed,err=%s", err.Error())
 		return