From b2c2c1247b0ee36fa98402a3ffef9db6a6222609 Mon Sep 17 00:00:00 2001
From: wenxu12345 <44203734@qq.com>
Date: Sat, 15 Jan 2022 11:14:29 +0800
Subject: [PATCH] Refactor code

---
 internal/rpc/msg/friend_notification.go | 12 +++++++++++-
 internal/rpc/msg/send_msg.go            |  2 +-
 pkg/common/constant/constant.go         |  1 +
 pkg/proto/sdk_ws/ws.proto               |  5 +++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/internal/rpc/msg/friend_notification.go b/internal/rpc/msg/friend_notification.go
index 1d13088..8b472e8 100644
--- a/internal/rpc/msg/friend_notification.go
+++ b/internal/rpc/msg/friend_notification.go
@@ -9,6 +9,7 @@ import (
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"encoding/json"
+	"github.com/golang/protobuf/proto"
 )
 
 //message MemberInfoChangedTips{
@@ -75,7 +76,11 @@ func FriendApplicationProcessedNotification(req *pbFriend.AddFriendResponseReq)
 	}
 
 	var tips open_im_sdk.TipsComm
-	tips.Detail, _ = json.Marshal(FriendApplicationProcessedTips)
+	tips.Detail, err = proto.Marshal(&FriendApplicationProcessedTips)
+	if err != nil {
+		log.Error(req.CommID.OperationID, "Marshal failed ", err.Error(), FriendApplicationProcessedTips)
+		return
+	}
 	tips.DefaultTips = fromUserNickname + " FriendApplicationProcessedNotification " + toUserNickname
 
 	var n NotificationMsg
@@ -86,6 +91,11 @@ func FriendApplicationProcessedNotification(req *pbFriend.AddFriendResponseReq)
 	n.MsgFrom = constant.SysMsgType
 	n.OperationID = req.CommID.OperationID
 	n.Content, _ = json.Marshal(tips)
+	n.Content, err = proto.Marshal(&tips)
+	if err != nil {
+		log.Error(req.CommID.OperationID, "Marshal failed ", err.Error(), tips)
+		return
+	}
 	Notification(&n)
 }
 
diff --git a/internal/rpc/msg/send_msg.go b/internal/rpc/msg/send_msg.go
index 481dee2..83f4391 100644
--- a/internal/rpc/msg/send_msg.go
+++ b/internal/rpc/msg/send_msg.go
@@ -232,7 +232,7 @@ func modifyMessageByUserMessageReceiveOpt(userID, sourceID string, sessionType i
 type NotificationMsg struct {
 	SendID      string
 	RecvID      string
-	Content     []byte
+	Content     []byte //  open_im_sdk.TipsComm
 	MsgFrom     int32
 	ContentType int32
 	SessionType int32
diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go
index d0bfec2..cd35036 100644
--- a/pkg/common/constant/constant.go
+++ b/pkg/common/constant/constant.go
@@ -45,6 +45,7 @@ const (
 	GroupMsg       = 201
 
 	//SysRelated
+
 	FriendApplicationProcessedNotification = 1201 //AcceptFriendApplicationTip = 201
 	FriendApplicationAddedNotification     = 1202 //AddFriendTip               = 202
 	FriendAddedNotification                = 1203
diff --git a/pkg/proto/sdk_ws/ws.proto b/pkg/proto/sdk_ws/ws.proto
index 919596d..5b235f5 100644
--- a/pkg/proto/sdk_ws/ws.proto
+++ b/pkg/proto/sdk_ws/ws.proto
@@ -75,8 +75,8 @@ message BlackInfo{
 }
 
 message GroupRequest{
-  string userID = 1;
-  string groupID = 2;
+  PublicUserInfo userInfo = 1;
+  GroupInfo groupInfo = 2;
   string handleResult = 3;
   string reqMsg = 4;
   string  handleMsg = 5;
@@ -312,6 +312,7 @@ message FriendApplicationAddedTips{
 //FromUserID accept or reject ToUserID
 message FriendApplicationProcessedTips{
   FromToUserID fromToUserID = 1;
+  int32 handleResult = 2;
 }
 
 // FromUserID  Added a friend ToUserID
-- 
GitLab