rpc mw

internal/api/auth.go

@@ -20,7 +20,7 @@ type Auth struct {
 }
 
 func (o *Auth) client() (auth.AuthClient, error) {
-	conn, err := o.zk.GetConn(config.Config.RpcRegisterName.OpenImGroupName, nil)
+	conn, err := o.zk.GetDefaultConn(config.Config.RpcRegisterName.OpenImAuthName)
 	if err != nil {
 		return nil, err
 	}

internal/api/conversation.go

@@ -20,7 +20,7 @@ type Conversation struct {
 }
 
 func (o *Conversation) client() (conversation.ConversationClient, error) {
-	conn, err := o.zk.GetConn(config.Config.RpcRegisterName.OpenImGroupName)
+	conn, err := o.zk.GetDefaultConn(config.Config.RpcRegisterName.OpenImConversationName)
 	if err != nil {
 		return nil, err
 	}

internal/api/friend.go

@@ -20,7 +20,7 @@ type Friend struct {
 }
 
 func (o *Friend) client() (friend.FriendClient, error) {
-	conn, err := o.zk.GetConn(config.Config.RpcRegisterName.OpenImGroupName)
+	conn, err := o.zk.GetDefaultConn(config.Config.RpcRegisterName.OpenImFriendName)
 	if err != nil {
 		return nil, err
 	}

internal/api/group.go

@@ -20,7 +20,7 @@ type Group struct {
 }
 
 func (o *Group) client() (group.GroupClient, error) {
-	conn, err := o.zk.GetConn(config.Config.RpcRegisterName.OpenImGroupName)
+	conn, err := o.zk.GetDefaultConn(config.Config.RpcRegisterName.OpenImGroupName)
 	if err != nil {
 		return nil, err
 	}

internal/api/msg.go

@@ -107,7 +107,7 @@ func newUserSendMsgReq(params *apistruct.ManagementSendMsgReq) *msg.SendMsgReq {
 }
 
 func (o *Msg) client() (msg.MsgClient, error) {
-	conn, err := o.zk.GetConn(config.Config.RpcRegisterName.OpenImMsgName)
+	conn, err := o.zk.GetDefaultConn(config.Config.RpcRegisterName.OpenImMsgName)
 	if err != nil {
 		return nil, err
 	}

internal/api/route.go

@@ -3,23 +3,24 @@ package api
 import (
 	"OpenIM/pkg/common/config"
 	"OpenIM/pkg/common/log"
-	"OpenIM/pkg/common/middleware"
+	"OpenIM/pkg/common/mw"
 	"OpenIM/pkg/common/prome"
 	"github.com/OpenIMSDK/openKeeper"
 	"github.com/gin-gonic/gin"
+	"google.golang.org/grpc"
 	"io"
 	"os"
 )
 
 func NewGinRouter() *gin.Engine {
+	openKeeper.DefaultOptions = []grpc.DialOption{mw.GrpcClient()} // 默认RPC中间件
 	gin.SetMode(gin.ReleaseMode)
 	f, _ := os.Create("../logs/api.log")
 	gin.DefaultWriter = io.MultiWriter(f)
 	//	gin.SetMode(gin.DebugMode)
 	r := gin.New()
-	r.Use(gin.Recovery())
-	r.Use(middleware.GinParseOperationID)
 	log.Info("load config: ", config.Config)
+	r.Use(gin.Recovery(), mw.CorsHandler(), mw.GinParseOperationID())
 	if config.Config.Prometheus.Enable {
 		prome.NewApiRequestCounter()
 		prome.NewApiRequestFailedCounter()
@@ -148,25 +149,3 @@ func NewGinRouter() *gin.Engine {
 	}
 	return r
 }
-
-/*
-
-	{
-		GetSeq
-		SendMsg
-		PullMsgBySeqList
-		DelMsg
-		DelSuperGroupMsg
-		ClearMsg
-		SetMsgMinSeq
-		SetMessageReactionExtensions
-		GetMessageListReactionExtensions
-		AddMessageReactionExtensions
-		DeleteMessageReactionExtensions
-		ManagementSendMsg
-		ManagementBatchSendMsg
-		CheckMsgIsSendSuccess
-	}
-
-
-*/

internal/api/third.go

@@ -20,7 +20,7 @@ type Third struct {
 }
 
 func (o *Third) client() (third.ThirdClient, error) {
-	conn, err := o.zk.GetConn(config.Config.RpcRegisterName.OpenImThirdName)
+	conn, err := o.zk.GetDefaultConn(config.Config.RpcRegisterName.OpenImThirdName)
 	if err != nil {
 		return nil, err
 	}

internal/api/user.go

@@ -20,7 +20,7 @@ type User struct {
 }
 
 func (o *User) client() (user.UserClient, error) {
-	conn, err := o.zk.GetConn(config.Config.RpcRegisterName.OpenImGroupName)
+	conn, err := o.zk.GetDefaultConn(config.Config.RpcRegisterName.OpenImUserName)
 	if err != nil {
 		return nil, err
 	}
@@ -47,7 +47,6 @@ func (o *User) GetAllUsersID(c *gin.Context) {
 	a2r.Call(user.UserClient.GetDesignateUsers, o.client, c)
 }
 
-//
 func (u *User) AccountCheck(c *gin.Context) {
 	a2r.Call(user.UserClient.AccountCheck, u.client, c)
 }