Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wecloud_im_server
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hewei
wecloud_im_server
Commits
55a5d561
Commit
55a5d561
authored
May 07, 2022
by
罗长华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复NPE
parent
9a79ae97
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
11 deletions
+16
-11
core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
+16
-11
No files found.
core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
View file @
55a5d561
...
@@ -697,19 +697,24 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
...
@@ -697,19 +697,24 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
// 发送消息
// 发送消息
for
(
ImConversationMembers
members
:
membersList
)
{
for
(
ImConversationMembers
members
:
membersList
)
{
try
{
if
(
members
.
getClientId
().
equals
(
senderClientId
)
&&
!
param
.
getIncludeSender
())
{
if
(
members
.
getClientId
().
equals
(
senderClientId
)
&&
!
param
.
getIncludeSender
())
{
// 是否是发送者 且includeSender不为true
// 是否是发送者 且includeSender不为true
continue
;
continue
;
}
}
// 入库 保存收件箱
}
catch
(
Exception
e
)
{
saveImInbox
(
application
,
conversation
.
getId
(),
imMessageOnlineSend
.
getMsgId
(),
log
.
info
(
""
);
members
,
SnowflakeUtil
.
getId
());
}
// 在线用户直接发消息
sendMsgForOnline
(
members
.
getFkClientId
(),
imMessageOnlineSend
);
// 离线消息推送
// // 入库 保存收件箱
pushMsgToOfflineMembers
(
application
,
members
,
param
.
getPushContent
(),
param
.
getPushExt
());
// saveImInbox(application, conversation.getId(), imMessageOnlineSend.getMsgId(),
// members, SnowflakeUtil.getId());
//
// // 在线用户直接发消息
// sendMsgForOnline(members.getFkClientId(), imMessageOnlineSend);
//
// // 离线消息推送
// pushMsgToOfflineMembers(application, members, param.getPushContent(), param.getPushExt());
}
}
});
});
...
@@ -832,9 +837,9 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
...
@@ -832,9 +837,9 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
receiverMember
.
setFkConversationId
(
conversation
.
getId
());
receiverMember
.
setFkConversationId
(
conversation
.
getId
());
ImConversationMembers
creatorMember
=
new
ImConversationMembers
();
ImConversationMembers
creatorMember
=
new
ImConversationMembers
();
receive
rMember
.
setClientId
(
sender
.
getClientId
());
creato
rMember
.
setClientId
(
sender
.
getClientId
());
receive
rMember
.
setFkClientId
(
sender
.
getId
());
creato
rMember
.
setFkClientId
(
sender
.
getId
());
receive
rMember
.
setFkConversationId
(
conversation
.
getId
());
creato
rMember
.
setFkConversationId
(
conversation
.
getId
());
List
<
ImConversationMembers
>
conversationMembers
=
new
ArrayList
<>();
List
<
ImConversationMembers
>
conversationMembers
=
new
ArrayList
<>();
conversationMembers
.
add
(
receiverMember
);
conversationMembers
.
add
(
receiverMember
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment