Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zhaominxu
Open-IM-Server
提交
205229ee
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,发现更多精彩内容 >>
提交
205229ee
编写于
7月 06, 2021
作者:
programor_guo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
persistent message modify
上级
e74e963b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
23 addition
and
12 deletion
+23
-12
src/api/open_im_api.go
src/api/open_im_api.go
+2
-1
src/common/log/logrus.go
src/common/log/logrus.go
+0
-1
src/msg_transfer/logic/persistent_msg_handler.go
src/msg_transfer/logic/persistent_msg_handler.go
+17
-6
src/push/logic/push_to_client.go
src/push/logic/push_to_client.go
+2
-2
src/rpc/chat/chat/send_msg.go
src/rpc/chat/chat/send_msg.go
+2
-2
未找到文件。
src/api/open_im_api.go
浏览文件 @
205229ee
...
...
@@ -24,7 +24,8 @@ func main() {
return
}
syscall
.
Dup2
(
int
(
logFile
.
Fd
()),
int
(
os
.
Stderr
.
Fd
()))
//gin.SetMode(gin.ReleaseMode)
//gin.DefaultWriter = ioutil.Discard
log
.
Info
(
""
,
""
,
"api server running..."
)
r
:=
gin
.
Default
()
r
.
Use
(
utils
.
CorsHandler
())
...
...
src/common/log/logrus.go
浏览文件 @
205229ee
...
...
@@ -62,7 +62,6 @@ func NewLfsHook(rotationTime time.Duration, maxRemainNum uint, moduleName string
HideKeys
:
false
,
FieldsOrder
:
[]
string
{
"PID"
},
})
return
lfsHook
}
func
initRotateLogs
(
rotationTime
time
.
Duration
,
maxRemainNum
uint
,
level
string
,
moduleName
string
)
*
rotatelogs
.
RotateLogs
{
...
...
src/msg_transfer/logic/persistent_msg_handler.go
浏览文件 @
205229ee
...
...
@@ -8,6 +8,7 @@ package logic
import
(
"Open_IM/src/common/config"
"Open_IM/src/common/constant"
"Open_IM/src/common/db/mysql_model/im_mysql_msg_model"
kfk
"Open_IM/src/common/kafka"
"Open_IM/src/common/log"
...
...
@@ -15,6 +16,7 @@ import (
"Open_IM/src/utils"
"github.com/Shopify/sarama"
"github.com/golang/protobuf/proto"
"strings"
)
type
PersistentConsumerHandler
struct
{
...
...
@@ -42,14 +44,23 @@ func (pc *PersistentConsumerHandler) handleChatWs2Mysql(msg []byte, msgKey strin
//Control whether to store history messages (mysql)
isPersist
:=
utils
.
GetSwitchFromOptions
(
Options
,
"persistent"
)
//Only process receiver data
if
isPersist
&&
msgKey
==
pbData
.
RecvID
{
log
.
InfoByKv
(
"msg_transfer chat persisting"
,
pbData
.
OperationID
)
if
err
=
im_mysql_msg_model
.
InsertMessageToChatLog
(
pbData
);
err
!=
nil
{
log
.
ErrorByKv
(
"Message insert failed"
,
pbData
.
OperationID
,
"err"
,
err
.
Error
(),
"chat"
,
pbData
.
String
())
return
if
isPersist
{
if
msgKey
==
pbData
.
RecvID
&&
pbData
.
SessionType
==
constant
.
SingleChatType
{
log
.
InfoByKv
(
"msg_transfer chat persisting"
,
pbData
.
OperationID
)
if
err
=
im_mysql_msg_model
.
InsertMessageToChatLog
(
pbData
);
err
!=
nil
{
log
.
ErrorByKv
(
"Message insert failed"
,
pbData
.
OperationID
,
"err"
,
err
.
Error
(),
"chat"
,
pbData
.
String
())
return
}
}
else
if
pbData
.
SessionType
==
constant
.
GroupChatType
&&
msgKey
==
"0"
{
pbData
.
RecvID
=
strings
.
Split
(
pbData
.
RecvID
,
" "
)[
1
]
log
.
InfoByKv
(
"msg_transfer chat persisting"
,
pbData
.
OperationID
)
if
err
=
im_mysql_msg_model
.
InsertMessageToChatLog
(
pbData
);
err
!=
nil
{
log
.
ErrorByKv
(
"Message insert failed"
,
pbData
.
OperationID
,
"err"
,
err
.
Error
(),
"chat"
,
pbData
.
String
())
return
}
}
}
}
}
func
(
PersistentConsumerHandler
)
Setup
(
_
sarama
.
ConsumerGroupSession
)
error
{
return
nil
}
func
(
PersistentConsumerHandler
)
Cleanup
(
_
sarama
.
ConsumerGroupSession
)
error
{
return
nil
}
...
...
src/push/logic/push_to_client.go
浏览文件 @
205229ee
...
...
@@ -131,9 +131,9 @@ func SendMsgByWS(m *pbChat.WSToMsgSvrChatMsg) {
return
}
groupID
:=
m
.
RecvID
for
_
,
v
:=
range
reply
.
MemberList
{
for
i
,
v
:=
range
reply
.
MemberList
{
m
.
RecvID
=
v
.
UserId
+
" "
+
groupID
sendMsgToKafka
(
m
,
m
.
RecvID
,
"msgKey--recvID+
\"
\"
+groupID"
)
sendMsgToKafka
(
m
,
utils
.
IntToString
(
i
)
,
"msgKey--recvID+
\"
\"
+groupID"
)
}
default
:
...
...
src/rpc/chat/chat/send_msg.go
浏览文件 @
205229ee
...
...
@@ -111,9 +111,9 @@ func (rpc *rpcChat) UserSendMsg(_ context.Context, pb *pbChat.UserSendMsgReq) (*
return
returnMsg
(
&
replay
,
pb
,
reply
.
ErrorCode
,
reply
.
ErrorMsg
,
""
,
0
)
}
groupID
:=
pbData
.
RecvID
for
_
,
v
:=
range
reply
.
MemberList
{
for
i
,
v
:=
range
reply
.
MemberList
{
pbData
.
RecvID
=
v
.
UserId
+
" "
+
groupID
rpc
.
sendMsgToKafka
(
&
pbData
,
pbData
.
RecvID
)
rpc
.
sendMsgToKafka
(
&
pbData
,
utils
.
IntToString
(
i
)
)
}
return
returnMsg
(
&
replay
,
pb
,
0
,
""
,
serverMsgID
,
pbData
.
SendTime
)
default
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录