diff --git a/README.md b/README.md index 925cfdc0e..f66da4fed 100644 --- a/README.md +++ b/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-server:Tuoyun's open source sdk service + open-im-sdk:open-im source sdk + open-im-server:open-im source sdk service ``` - **Authentication Clow Chart** diff --git a/docs/open-im-logo.png b/docs/open-im-logo.png new file mode 100644 index 000000000..4fb6a6700 Binary files /dev/null and b/docs/open-im-logo.png differ diff --git a/script/start_all.sh b/script/start_all.sh index 15cbfb56e..b504efb09 100644 --- a/script/start_all.sh +++ b/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 diff --git a/src/common/multi_terminal_login/multi_terminal_login.go b/src/common/multi_terminal_login/multi_terminal_login.go index 02245cf7e..8da527274 100644 --- a/src/common/multi_terminal_login/multi_terminal_login.go +++ b/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, diff --git a/src/push/content_struct/content.go b/src/push/content_struct/content.go new file mode 100644 index 000000000..b97e3217f --- /dev/null +++ b/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 +} diff --git a/src/rpc/friend/friend/add_friend.go b/src/rpc/friend/friend/add_friend.go index 28deae6ed..f0b3a2bce 100644 --- a/src/rpc/friend/friend/add_friend.go +++ b/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, diff --git a/src/rpc/friend/friend/add_friend_response.go b/src/rpc/friend/friend/add_friend_response.go index 31963e0b4..b7c1638e7 100644 --- a/src/rpc/friend/friend/add_friend_response.go +++ b/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 diff --git a/src/utils/map.go b/src/utils/map.go index bec647464..c52cebf67 100644 --- a/src/utils/map.go +++ b/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{} { - var tempMap map[string]interface{} +func JsonStringToMap(str string) (tempMap map[string]interface{}) { _ = json.Unmarshal([]byte(str), &tempMap) return tempMap }