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
bf8e10f9
Commit
bf8e10f9
authored
Sep 30, 2022
by
Future
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
日志打印
parent
f2805706
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
10 deletions
+7
-10
core/src/main/java/com/wecloud/im/action/NormalChatAction.java
+3
-5
core/src/main/java/com/wecloud/im/service/EhcacheService.java
+0
-1
core/src/main/java/com/wecloud/im/service/ImMessageService.java
+1
-1
core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
+2
-2
core/src/main/java/com/wecloud/im/thousandchat/action/ThousandChatAction.java
+1
-1
No files found.
core/src/main/java/com/wecloud/im/action/NormalChatAction.java
View file @
bf8e10f9
...
@@ -114,9 +114,7 @@ public class NormalChatAction {
...
@@ -114,9 +114,7 @@ public class NormalChatAction {
// 给所有人(在线+离线)遍历发送
// 给所有人(在线+离线)遍历发送
// 先查询该会话所有成员
// 先查询该会话所有成员
Long
time1
=
System
.
currentTimeMillis
();
List
<
ImConversationMembers
>
membersList
=
ehcacheService
.
getEhCacheMember
(
"member"
+
conversation
.
getId
(),
conversation
.
getId
());
List
<
ImConversationMembers
>
membersList
=
ehcacheService
.
getEhCacheMember
(
"member"
+
conversation
.
getId
(),
conversation
.
getId
());
log
.
info
(
"获取群成员列表耗时 {}"
,
System
.
currentTimeMillis
()
-
time1
);
if
(
membersList
.
isEmpty
())
{
if
(
membersList
.
isEmpty
())
{
log
.
info
(
"查询会话所有成员返回空,会话ID: {}"
,
data
.
getToConversation
());
log
.
info
(
"查询会话所有成员返回空,会话ID: {}"
,
data
.
getToConversation
());
WsResponse
<
HashMap
<
String
,
Long
>>
responseModel
=
new
WsResponse
<>();
WsResponse
<
HashMap
<
String
,
Long
>>
responseModel
=
new
WsResponse
<>();
...
@@ -156,7 +154,9 @@ public class NormalChatAction {
...
@@ -156,7 +154,9 @@ public class NormalChatAction {
if
(!
checkMsg
(
imClientSender
,
conversation
,
reqId
,
data
,
request
.
getSenderChannel
(),
memberMap
))
{
if
(!
checkMsg
(
imClientSender
,
conversation
,
reqId
,
data
,
request
.
getSenderChannel
(),
memberMap
))
{
return
;
return
;
}
}
Long
time
=
System
.
currentTimeMillis
();
ImMessageOnlineSend
imMessageOnlineSend
=
assembleImMessageOnlineSend
(
data
,
imClientSender
,
imApplication
.
getId
());
ImMessageOnlineSend
imMessageOnlineSend
=
assembleImMessageOnlineSend
(
data
,
imClientSender
,
imApplication
.
getId
());
log
.
info
(
"消息落库耗时 {}"
,
System
.
currentTimeMillis
()-
time
);
// 入库 保存收件箱
// 入库 保存收件箱
batchSaveInbox
(
imApplication
,
imClientSender
,
conversation
,
imMessageOnlineSend
.
getMsgId
(),
membersList
);
batchSaveInbox
(
imApplication
,
imClientSender
,
conversation
,
imMessageOnlineSend
.
getMsgId
(),
membersList
);
...
@@ -229,11 +229,9 @@ public class NormalChatAction {
...
@@ -229,11 +229,9 @@ public class NormalChatAction {
* @return
* @return
*/
*/
private
ImMessageOnlineSend
assembleImMessageOnlineSend
(
ChatContentVo
data
,
ImClient
imClientSender
,
Long
appId
)
{
private
ImMessageOnlineSend
assembleImMessageOnlineSend
(
ChatContentVo
data
,
ImClient
imClientSender
,
Long
appId
)
{
// 生成消息id
long
messageId
=
SnowflakeUtil
.
getId
();
// 入库 保存消息至消息表
// 入库 保存消息至消息表
ImClientSimpleDto
client
=
new
ImClientSimpleDto
().
setId
(
imClientSender
.
getId
()).
setFkAppid
(
appId
);
ImClientSimpleDto
client
=
new
ImClientSimpleDto
().
setId
(
imClientSender
.
getId
()).
setFkAppid
(
appId
);
ImMessage
imMessage
=
imMessageService
.
saveImMessage
(
client
,
messageId
,
data
);
ImMessage
imMessage
=
imMessageService
.
saveImMessage
(
client
,
data
);
// 封装响应的实体
// 封装响应的实体
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
...
...
core/src/main/java/com/wecloud/im/service/EhcacheService.java
View file @
bf8e10f9
...
@@ -75,7 +75,6 @@ public class EhcacheService {
...
@@ -75,7 +75,6 @@ public class EhcacheService {
@Cacheable
(
value
=
"business"
,
key
=
"#key"
)
@Cacheable
(
value
=
"business"
,
key
=
"#key"
)
public
List
<
ImConversationMembers
>
getEhCacheMember
(
String
key
,
Long
id
)
{
public
List
<
ImConversationMembers
>
getEhCacheMember
(
String
key
,
Long
id
)
{
log
.
info
(
"本地ehcache不存在 key {}"
,
key
);
return
imConversationMembersService
.
list
(
new
QueryWrapper
<
ImConversationMembers
>().
lambda
()
return
imConversationMembersService
.
list
(
new
QueryWrapper
<
ImConversationMembers
>().
lambda
()
.
eq
(
ImConversationMembers:
:
getFkConversationId
,
id
));
.
eq
(
ImConversationMembers:
:
getFkConversationId
,
id
));
}
}
...
...
core/src/main/java/com/wecloud/im/service/ImMessageService.java
View file @
bf8e10f9
...
@@ -52,7 +52,7 @@ public interface ImMessageService extends BaseService<ImMessage> {
...
@@ -52,7 +52,7 @@ public interface ImMessageService extends BaseService<ImMessage> {
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
ImMessage
saveImMessage
(
ImClientSimpleDto
client
,
long
messageId
,
ChatContentVo
data
);
ImMessage
saveImMessage
(
ImClientSimpleDto
client
,
ChatContentVo
data
);
/**
/**
* 消息撤回
* 消息撤回
...
...
core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
View file @
bf8e10f9
...
@@ -218,7 +218,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
...
@@ -218,7 +218,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
}
}
@Override
@Override
public
ImMessage
saveImMessage
(
ImClientSimpleDto
client
,
long
messageId
,
ChatContentVo
data
)
{
public
ImMessage
saveImMessage
(
ImClientSimpleDto
client
,
ChatContentVo
data
)
{
ImMessage
imMessage
=
new
ImMessage
();
ImMessage
imMessage
=
new
ImMessage
();
...
@@ -227,7 +227,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
...
@@ -227,7 +227,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
String
contentJsonString
=
JsonUtils
.
encodeJson
(
data
);
String
contentJsonString
=
JsonUtils
.
encodeJson
(
data
);
imMessage
.
setContent
(
contentJsonString
);
imMessage
.
setContent
(
contentJsonString
);
imMessage
.
setId
(
messageId
);
imMessage
.
setId
(
SnowflakeUtil
.
getId
()
);
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setFkAppid
(
client
.
getFkAppid
());
imMessage
.
setFkAppid
(
client
.
getFkAppid
());
imMessage
.
setSender
(
client
.
getId
());
imMessage
.
setSender
(
client
.
getId
());
...
...
core/src/main/java/com/wecloud/im/thousandchat/action/ThousandChatAction.java
View file @
bf8e10f9
...
@@ -195,7 +195,7 @@ public class ThousandChatAction {
...
@@ -195,7 +195,7 @@ public class ThousandChatAction {
long
messageId
=
SnowflakeUtil
.
getId
();
long
messageId
=
SnowflakeUtil
.
getId
();
// 入库 保存消息至消息表
// 入库 保存消息至消息表
ImClientSimpleDto
client
=
new
ImClientSimpleDto
().
setId
(
imClientSender
.
getId
()).
setFkAppid
(
appId
);
ImClientSimpleDto
client
=
new
ImClientSimpleDto
().
setId
(
imClientSender
.
getId
()).
setFkAppid
(
appId
);
ImMessage
imMessage
=
imMessageService
.
saveImMessage
(
client
,
messageId
,
data
);
ImMessage
imMessage
=
imMessageService
.
saveImMessage
(
client
,
data
);
// 封装响应的实体
// 封装响应的实体
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
...
...
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