Merge remote-tracking branch 'origin/main'

README.md

@@ -1,5 +1,5 @@
 # Open-IM-Server
-![avatar](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/Open-IM.png)
+![avatar](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/open-im-logo.png)
 
 [![LICENSE](https://img.shields.io/badge/license-Apache--2.0-green)](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/LICENSE)
 [![Language](https://img.shields.io/badge/Language-Go-blue.svg)](https://golang.org/)
@@ -327,8 +327,8 @@ All images are available at https://hub.docker.com/r/lyt1123/open_im_server
    ```
    app：app client
    app-server：app server
-   open-im-sdk：Tuoyun's open source sdk
+   open-im-sdk：open-im source sdk
-   open-im-server：Tuoyun's open source sdk service 
+   open-im-server：open-im source sdk service 
    ```
 
 - **Authentication Clow Chart**

script/start_all.sh

@@ -4,7 +4,7 @@
 
 #fixme Put the shell script name here
 need_to_start_server_shell=(
-  auto_start_service.sh
+  start_rpc_service.sh
   msg_gateway_start.sh
   push_start.sh
   msg_transfer_start.sh

src/common/multi_terminal_login/multi_terminal_login.go

@@ -5,6 +5,7 @@ import (
 	"Open_IM/src/common/constant"
 	"Open_IM/src/common/db"
 	pbChat "Open_IM/src/proto/chat"
+	"Open_IM/src/push/content_struct"
 	"Open_IM/src/push/logic"
 	"Open_IM/src/utils"
 )
@@ -63,7 +64,7 @@ func PushMessageToTheTerminal(uid string, platform int32) {
 	logic.SendMsgByWS(&pbChat.WSToMsgSvrChatMsg{
 		SendID:      uid,
 		RecvID:      uid,
-		Content:     "Your account is already logged on other terminal,please confirm",
+		Content:     content_struct.NewContentStructString(1, "", "Your account is already logged on other terminal,please confirm"),
 		SendTime:    utils.GetCurrentTimestampBySecond(),
 		MsgFrom:     constant.SysMsgType,
 		ContentType: constant.KickOnlineTip,

src/push/content_struct/content.go

@@ -0,0 +1,25 @@
+/*
+** description("").
+** copyright('open-im,www.open-im.io').
+** author("fg,Gordon@tuoyun.net").
+** time(2021/5/27 11:24).
+ */
+package content_struct
+
+import "encoding/json"
+
+type Content struct {
+	IsDisplay int32  `json:"isDisplay"`
+	ID        string `json:"id"`
+	Text      string `json:"text"`
+}
+
+func NewContentStructString(isDisplay int32, ID string, text string) string {
+	c := Content{IsDisplay: isDisplay, ID: ID, Text: text}
+	return c.contentToString()
+}
+func (c *Content) contentToString() string {
+	data, _ := json.Marshal(c)
+	dataString := string(data)
+	return dataString
+}

src/rpc/friend/friend/add_friend.go

@@ -7,6 +7,7 @@ import (
 	"Open_IM/src/common/log"
 	pbChat "Open_IM/src/proto/chat"
 	pbFriend "Open_IM/src/proto/friend"
+	"Open_IM/src/push/content_struct"
 	"Open_IM/src/push/logic"
 	"Open_IM/src/utils"
 	"context"
@@ -35,7 +36,7 @@ func (s *friendServer) AddFriend(ctx context.Context, req *pbFriend.AddFriendReq
 		logic.SendMsgByWS(&pbChat.WSToMsgSvrChatMsg{
 			SendID:      senderInfo.UID,
 			RecvID:      receiverInfo.UID,
-			Content:     senderInfo.Name + " asked to add you as a friend",
+			Content:     content_struct.NewContentStructString(0, "", senderInfo.Name+" asked to add you as a friend"),
 			SendTime:    utils.GetCurrentTimestampBySecond(),
 			MsgFrom:     constant.SysMsgType,
 			ContentType: constant.AddFriendTip,

src/rpc/friend/friend/add_friend_response.go

@@ -7,6 +7,7 @@ import (
 	"Open_IM/src/common/log"
 	pbChat "Open_IM/src/proto/chat"
 	pbFriend "Open_IM/src/proto/friend"
+	"Open_IM/src/push/content_struct"
 	"Open_IM/src/push/logic"
 	"Open_IM/src/utils"
 	"context"
@@ -45,7 +46,7 @@ func (s *friendServer) AddedFriend(ctx context.Context, req *pbFriend.AddedFrien
 			logic.SendMsgByWS(&pbChat.WSToMsgSvrChatMsg{
 				SendID:      claims.UID,
 				RecvID:      req.Uid,
-				Content:     senderInfo.Name + " agreed to add you as a friend.",
+				Content:     content_struct.NewContentStructString(0, "", senderInfo.Name+" agreed to add you as a friend."),
 				SendTime:    utils.GetCurrentTimestampBySecond(),
 				MsgFrom:     constant.SysMsgType,        //Notification message identification
 				ContentType: constant.AgreeAddFriendTip, //Add friend flag

src/utils/map.go

@@ -106,8 +106,7 @@ func MapToJsonString(param map[string]interface{}) string {
 	dataString := string(dataType)
 	return dataString
 }
-func JsonStringToMap(str string) map[string]interface{} {
+func JsonStringToMap(str string) (tempMap map[string]interface{}) {
-	var tempMap map[string]interface{}
 	_ = json.Unmarshal([]byte(str), &tempMap)
 	return tempMap
 }