blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-05-26 06:59:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

system text format changes

Browse Source
This commit is contained in:
Gordon 2021-05-27 11:40:39 +08:00
parent 32d5e1515c
commit 4ff8a75b3f
5 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/multi_terminal_login/multi_terminal_login.go
View File

@ -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,

25
src/push/content_struct/content.go Normal file
View File

@ -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
}

3
src/rpc/friend/friend/add_friend.go
View File

@ -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,

3
src/rpc/friend/friend/add_friend_response.go
View File

@ -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

3
src/utils/map.go
View File

@ -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
}