Commit 54743aa0 by 罗长华

添加禁止发送图片判断

parent 729f7a1c
...@@ -45,6 +45,7 @@ import com.wecloud.im.service.ImConversationMembersService; ...@@ -45,6 +45,7 @@ import com.wecloud.im.service.ImConversationMembersService;
import com.wecloud.im.service.ImConversationService; import com.wecloud.im.service.ImConversationService;
import com.wecloud.im.service.ImInboxService; import com.wecloud.im.service.ImInboxService;
import com.wecloud.im.service.ImMessageService; import com.wecloud.im.service.ImMessageService;
import com.wecloud.im.ws.enums.MsgTypeEnum;
import com.wecloud.im.ws.enums.WsResponseCmdEnum; import com.wecloud.im.ws.enums.WsResponseCmdEnum;
import com.wecloud.im.ws.model.WsResponse; import com.wecloud.im.ws.model.WsResponse;
import com.wecloud.im.ws.sender.ChannelSender; import com.wecloud.im.ws.sender.ChannelSender;
...@@ -143,7 +144,7 @@ public class NormalChatAction { ...@@ -143,7 +144,7 @@ public class NormalChatAction {
return; return;
} }
// 消息内容校验 // 消息内容校验
if (checkMsg(conversation, reqId, data.getText(), request.getSenderChannel())) { if (checkMsg(conversation, reqId, data, request.getSenderChannel())) {
return; return;
} }
...@@ -397,8 +398,23 @@ public class NormalChatAction { ...@@ -397,8 +398,23 @@ public class NormalChatAction {
* @Return * @Return
*/ */
private boolean checkMsg(ImConversationQueryVo conversation, String reqId, private boolean checkMsg(ImConversationQueryVo conversation, String reqId,
String msgContent, Channel channel) { ChatContentVo data, Channel channel) {
boolean result = false; boolean result = false;
String msgContent = data.getText();
// 是否图片
if (MsgTypeEnum.MEDIA_TYPE_IMAGE.getUriCode() == data.getType()) {
if (conversation.getForbidSendPic()) {
// 响应发送方
WsResponse<HashMap<String, Long>> responseModel = new WsResponse<>();
ApiResult<Boolean> apiResult = ApiResult.result(ApiCode.IS_BE_FORBID_SEND_PIC);
responseModel.setCmd(WsResponseCmdEnum.RES.getCmdCode());
responseModel.setCode(apiResult.getCode());
responseModel.setMsg("本群已被群主禁止发送图片");
responseModel.setReqId(reqId);
channelSender.sendMsgLocal((NioSocketChannel) channel, responseModel);
return false;
}
}
// 判断是否开启禁止发送链接 // 判断是否开启禁止发送链接
if (conversation.getForbidSendLink()) { if (conversation.getForbidSendLink()) {
String regex = "((ht|f)tp(s?)\\:\\/\\/)?[0-9a-zA-Z]([-.\\w]*[0-9a-zA-Z])*." + String regex = "((ht|f)tp(s?)\\:\\/\\/)?[0-9a-zA-Z]([-.\\w]*[0-9a-zA-Z])*." +
......
...@@ -147,6 +147,11 @@ public enum ApiCode { ...@@ -147,6 +147,11 @@ public enum ApiCode {
*/ */
IS_BE_FORBID_SEND_LINK(6017, "api.response.code.IS_BE_FORBID_SEND_LINK"), IS_BE_FORBID_SEND_LINK(6017, "api.response.code.IS_BE_FORBID_SEND_LINK"),
/**
* 群已禁止发图片
*/
IS_BE_FORBID_SEND_PIC(6018, "api.response.code.IS_BE_FORBID_SEND_LINK"),
; ;
private final int code; private final int code;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment