Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zhaominxu
Open-IM-Server
提交
4ff8a75b
O
Open-IM-Server
项目概览
zhaominxu
/
Open-IM-Server
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Open-IM-Server
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4ff8a75b
编写于
5月 27, 2021
作者:
programor_guo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
system text format changes
上级
32d5e151
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
32 addition
and
5 deletion
+32
-5
src/common/multi_terminal_login/multi_terminal_login.go
src/common/multi_terminal_login/multi_terminal_login.go
+2
-1
src/push/content_struct/content.go
src/push/content_struct/content.go
+25
-0
src/rpc/friend/friend/add_friend.go
src/rpc/friend/friend/add_friend.go
+2
-1
src/rpc/friend/friend/add_friend_response.go
src/rpc/friend/friend/add_friend_response.go
+2
-1
src/utils/map.go
src/utils/map.go
+1
-2
未找到文件。
src/common/multi_terminal_login/multi_terminal_login.go
浏览文件 @
4ff8a75b
...
...
@@ -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 → 100644
浏览文件 @
4ff8a75b
/*
** 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
浏览文件 @
4ff8a75b
...
...
@@ -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
浏览文件 @
4ff8a75b
...
...
@@ -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
浏览文件 @
4ff8a75b
...
...
@@ -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
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录