Error code standardization

internal/common/check/access.go

@@ -11,4 +11,5 @@ func Access(ctx context.Context, ownerUserID string) (err error) {
 		return err
 	}
 	return tokenverify.CheckAccessV3(ctx, ownerUserID)
+
 }

internal/common/check/msg.go

@@ -0,0 +1,26 @@
+package check
+
+import (
+	"Open_IM/pkg/common/config"
+	discoveryRegistry "Open_IM/pkg/discoveryregistry"
+	"Open_IM/pkg/proto/msg"
+	"context"
+	"google.golang.org/grpc"
+)
+
+type MsgCheck struct {
+	zk discoveryRegistry.SvcDiscoveryRegistry
+}
+
+func (m *MsgCheck) getConn() (*grpc.ClientConn, error) {
+	return m.zk.GetConn(config.Config.RpcRegisterName.OpenImMsgName)
+}
+
+func (m *MsgCheck) SendMsg(ctx context.Context, req *msg.SendMsgReq) (*msg.SendMsgResp, error) {
+	cc, err := m.getConn()
+	if err != nil {
+		return nil, err
+	}
+	resp, err := msg.NewMsgClient(cc).SendMsg(ctx, req)
+	return resp, err
+}

internal/common/notification/c.go

@@ -4,8 +4,10 @@ import (
 	"Open_IM/internal/common/check"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
+	"Open_IM/pkg/common/tracelog"
 	"Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/proto/sdkws"
+	utils2 "Open_IM/pkg/utils"
 	"context"
 	utils "github.com/OpenIMSDK/open_utils"
 )
@@ -13,6 +15,7 @@ import (
 type Check struct {
 	user  *check.UserCheck
 	group *check.GroupChecker
+	msg   *check.MsgCheck
 }
 
 type NotificationMsg struct {
@@ -26,28 +29,33 @@ type NotificationMsg struct {
 	SenderFaceURL  string
 }
 
-func (c *Check) Notification(ctx context.Context, n *NotificationMsg) {
+func (c *Check) Notification(ctx context.Context, notificationMsg *NotificationMsg) {
+	var err error
+	defer func() {
+		tracelog.SetCtxDebug(ctx, utils2.GetFuncName(1), err, "notificationMsg", notificationMsg)
+	}()
+
 	var req msg.SendMsgReq
 	var msg sdkws.MsgData
 	var offlineInfo sdkws.OfflinePushInfo
 	var title, desc, ex string
 	var pushSwitch, unReadCount bool
 	var reliabilityLevel int
-	msg.SendID = n.SendID
-	msg.RecvID = n.RecvID
-	msg.Content = n.Content
-	msg.MsgFrom = n.MsgFrom
-	msg.ContentType = n.ContentType
-	msg.SessionType = n.SessionType
+	msg.SendID = notificationMsg.SendID
+	msg.RecvID = notificationMsg.RecvID
+	msg.Content = notificationMsg.Content
+	msg.MsgFrom = notificationMsg.MsgFrom
+	msg.ContentType = notificationMsg.ContentType
+	msg.SessionType = notificationMsg.SessionType
 	msg.CreateTime = utils.GetCurrentTimestampByMill()
-	msg.ClientMsgID = utils.GetMsgID(n.SendID)
+	msg.ClientMsgID = utils.GetMsgID(notificationMsg.SendID)
 	msg.Options = make(map[string]bool, 7)
-	msg.SenderNickname = n.SenderNickname
-	msg.SenderFaceURL = n.SenderFaceURL
-	switch n.SessionType {
+	msg.SenderNickname = notificationMsg.SenderNickname
+	msg.SenderFaceURL = notificationMsg.SenderFaceURL
+	switch notificationMsg.SessionType {
 	case constant.GroupChatType, constant.SuperGroupChatType:
 		msg.RecvID = ""
-		msg.GroupID = n.RecvID
+		msg.GroupID = notificationMsg.RecvID
 	}
 	offlineInfo.IOSBadgeCount = config.Config.IOSPush.BadgeCount
 	offlineInfo.IOSPushSound = config.Config.IOSPush.PushSound
@@ -280,9 +288,5 @@ func (c *Check) Notification(ctx context.Context, n *NotificationMsg) {
 	msg.OfflinePushInfo = &offlineInfo
 	req.MsgData = &msg
 
-	_, err := sendMsg(context.Background(), &req)
-}
-
-func sendMsg(ctx context.Context, req *msg.SendMsgReq) (*msg.SendMsgResp, error) {
-
+	_, err = c.msg.SendMsg(ctx, &req)
 }

internal/common/notification/friend.go

@@ -148,12 +148,6 @@ func (c *Check) BlackDeletedNotification(ctx context.Context, req *pbFriend.Remo
 	c.friendNotification(ctx, req.OwnerUserID, req.BlackUserID, constant.BlackDeletedNotification, &blackDeletedTips)
 }
 
-// send to myself
-func (c *Check) UserInfoUpdatedNotification(ctx context.Context, opUserID string, changedUserID string) {
-	selfInfoUpdatedTips := sdkws.UserInfoUpdatedTips{UserID: changedUserID}
-	c.friendNotification(ctx, opUserID, changedUserID, constant.UserInfoUpdatedNotification, &selfInfoUpdatedTips)
-}
-
 func (c *Check) FriendInfoUpdatedNotification(ctx context.Context, changedUserID string, needNotifiedUserID string, opUserID string) {
 	selfInfoUpdatedTips := sdkws.UserInfoUpdatedTips{UserID: changedUserID}
 	c.friendNotification(ctx, opUserID, needNotifiedUserID, constant.FriendInfoUpdatedNotification, &selfInfoUpdatedTips)

internal/common/notification/user.go

@@ -0,0 +1,13 @@
+package notification
+
+import (
+	"Open_IM/pkg/common/constant"
+	"Open_IM/pkg/proto/sdkws"
+	"context"
+)
+
+// send to myself
+func (c *Check) UserInfoUpdatedNotification(ctx context.Context, opUserID string, changedUserID string) {
+	selfInfoUpdatedTips := sdkws.UserInfoUpdatedTips{UserID: changedUserID}
+	c.friendNotification(ctx, opUserID, changedUserID, constant.UserInfoUpdatedNotification, &selfInfoUpdatedTips)
+}