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
a4bd3996
Commit
a4bd3996
authored
Jun 06, 2022
by
Shadow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
群聊天时,增加对群封禁的判断
parent
1c565855
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
50 additions
and
2 deletions
+50
-2
config/src/main/resources/static/i18n/messages_zh_CN.properties
+3
-2
core/src/main/java/com/wecloud/im/action/NormalChatAction.java
+42
-0
framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiCode.java
+5
-0
No files found.
config/src/main/resources/static/i18n/messages_zh_CN.properties
View file @
a4bd3996
...
@@ -79,5 +79,6 @@ api.response.code.REPETITION_CONVERSATION=已有会话,不能重复创建会话
...
@@ -79,5 +79,6 @@ api.response.code.REPETITION_CONVERSATION=已有会话,不能重复创建会话
api.response.code.CLIENT_NOT_FOUNT
=
成员不存在,不能创建会话
api.response.code.CLIENT_NOT_FOUNT
=
成员不存在,不能创建会话
api.response.code.IS_BE_BLACK
=
被对方拉黑
api.response.code.IS_BE_BLACK
=
被对方拉黑
api.response.code.IS_TO_BLACK
=
你把对方拉黑
api.response.code.IS_TO_BLACK
=
你把对方拉黑
api.response.code.IS_BE_FORBID_SEND_LINK
=
????????
api.response.code.IS_BE_FORBID_SEND_LINK
=
禁止发送链接
api.response.code.IS_BE_FORBID_SEND_PIC
=
????????
api.response.code.IS_BE_FORBID_SEND_PIC
=
禁止发送图片
api.response.code.IS_BE_BANED
=
该群已被封禁
core/src/main/java/com/wecloud/im/action/NormalChatAction.java
View file @
a4bd3996
...
@@ -140,6 +140,8 @@ public class NormalChatAction {
...
@@ -140,6 +140,8 @@ public class NormalChatAction {
channelSender
.
sendMsgLocal
((
NioSocketChannel
)
request
.
getSenderChannel
(),
responseModel
);
channelSender
.
sendMsgLocal
((
NioSocketChannel
)
request
.
getSenderChannel
(),
responseModel
);
return
;
return
;
}
}
// 判断为单聊
// 判断为单聊
if
(
membersList
.
size
()
==
2
)
{
if
(
membersList
.
size
()
==
2
)
{
// 判断是否被拉黑逻辑
// 判断是否被拉黑逻辑
...
@@ -151,12 +153,18 @@ public class NormalChatAction {
...
@@ -151,12 +153,18 @@ public class NormalChatAction {
return
;
return
;
}
}
}
}
if
(
beKickOut
(
reqId
,
imClientSender
,
membersList
,
request
.
getSenderChannel
()))
{
if
(
beKickOut
(
reqId
,
imClientSender
,
membersList
,
request
.
getSenderChannel
()))
{
return
;
return
;
}
}
if
(
muted
(
conversation
,
reqId
,
imClientSender
,
membersList
,
request
.
getSenderChannel
()))
{
if
(
muted
(
conversation
,
reqId
,
imClientSender
,
membersList
,
request
.
getSenderChannel
()))
{
return
;
return
;
}
}
if
(
baned
(
conversation
,
reqId
,
imClientSender
,
membersList
,
request
.
getSenderChannel
()))
{
return
;
}
// 消息内容校验
// 消息内容校验
if
(!
checkMsg
(
imClientSender
,
conversation
,
reqId
,
data
,
request
.
getSenderChannel
()))
{
if
(!
checkMsg
(
imClientSender
,
conversation
,
reqId
,
data
,
request
.
getSenderChannel
()))
{
return
;
return
;
...
@@ -493,6 +501,40 @@ public class NormalChatAction {
...
@@ -493,6 +501,40 @@ public class NormalChatAction {
}
}
/**
/**
* 是否封禁
* @Author Shadow
* @Date 2022年06月06日 01:42:33
* @param
* @Return
*/
private
boolean
baned
(
ImConversationQueryVo
conversation
,
String
reqId
,
ImClient
imClientSender
,
List
<
ImConversationMembers
>
membersList
,
Channel
channel
)
{
// 会话是否被封禁
String
attributes
=
imClientSender
.
getAttributes
();
if
(
StringUtils
.
isNotBlank
(
attributes
))
{
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
attributes
);
if
(
jsonObject
==
null
||
jsonObject
.
isEmpty
()
||
!
jsonObject
.
containsKey
(
"baned"
))
{
return
false
;
}
boolean
baned
=
jsonObject
.
getBoolean
(
"baned"
);
if
(
baned
)
{
// 响应发送方
WsResponse
<
HashMap
<
String
,
Long
>>
responseModel
=
new
WsResponse
<>();
ApiResult
<
Boolean
>
apiResult
=
ApiResult
.
result
(
ApiCode
.
IS_BE_MUTED
);
responseModel
.
setCmd
(
WsResponseCmdEnum
.
RES
.
getCmdCode
());
responseModel
.
setCode
(
apiResult
.
getCode
());
responseModel
.
setMsg
(
apiResult
.
getMessage
());
responseModel
.
setReqId
(
reqId
);
channelSender
.
sendMsgLocal
((
NioSocketChannel
)
channel
,
responseModel
);
return
true
;
}
return
false
;
}
else
{
return
false
;
}
}
/**
* 是否禁止发送链接
* 是否禁止发送链接
* @Author luozh
* @Author luozh
* @Date 2022年04月27日 04:39:04
* @Date 2022年04月27日 04:39:04
...
...
framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiCode.java
View file @
a4bd3996
...
@@ -162,6 +162,11 @@ public enum ApiCode {
...
@@ -162,6 +162,11 @@ public enum ApiCode {
*/
*/
EXCEED_VIP_QUANTITY_LIMIT
(
6020
,
"api.response.code.IS_BE_FORBID_SEND_PIC"
),
EXCEED_VIP_QUANTITY_LIMIT
(
6020
,
"api.response.code.IS_BE_FORBID_SEND_PIC"
),
/**
* 已被禁言
*/
IS_BE_BANED
(
6021
,
"api.response.code.IS_BE_BANED"
),
;
;
private
final
int
code
;
private
final
int
code
;
...
...
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