Browse Source

!40 同步代码到2.0

Merge pull request !40 from blue/master
master
blue 2 years ago
committed by Gitee
parent
commit
64f9ef9825
No known key found for this signature in database GPG Key ID: 173E9B9CA92EEF8F
  1. 1
      im-commom/src/main/java/com/bx/imcommon/util/ThreadPoolExecutorFactory.java
  2. 20
      im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
  3. 12
      im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java
  4. 8
      im-platform/src/main/java/com/bx/implatform/service/thirdparty/FileService.java
  5. 204
      im-platform/src/main/java/com/bx/implatform/util/SensitiveFilterUtil.java
  6. 1
      im-platform/src/main/resources/application.yml
  7. 3
      im-platform/src/main/resources/sensitive-words.txt

1
im-commom/src/main/java/com/bx/imcommon/util/ThreadPoolExecutorFactory.java

@ -11,6 +11,7 @@ import java.util.concurrent.TimeUnit;
* @author Andrews
* @date 2023/11/30 11:12
*/
@Slf4j
public final class ThreadPoolExecutorFactory {
/**
* 机器的CPU核数:Runtime.getRuntime().availableProcessors()

20
im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java

@ -1,6 +1,5 @@
package com.bx.implatform.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -27,12 +26,13 @@ import com.bx.implatform.service.IGroupService;
import com.bx.implatform.session.SessionContext;
import com.bx.implatform.session.UserSession;
import com.bx.implatform.util.BeanUtils;
import com.bx.implatform.util.DateTimeUtils;
import com.bx.implatform.util.SensitiveFilterUtil;
import com.bx.implatform.vo.GroupMessageVO;
import com.google.common.base.Splitter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@ -47,6 +47,7 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
private final IGroupMemberService groupMemberService;
private final RedisTemplate<String, Object> redisTemplate;
private final IMClient imClient;
private final SensitiveFilterUtil sensitiveFilterUtil;
@Override
public Long sendMessage(GroupMessageDTO dto) {
@ -55,12 +56,12 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
if (Objects.isNull(group)) {
throw new GlobalException(ResultCode.PROGRAM_ERROR, "群聊不存在");
}
if (group.getDeleted()) {
if (Boolean.TRUE.equals(group.getDeleted())) {
throw new GlobalException(ResultCode.PROGRAM_ERROR, "群聊已解散");
}
// 是否在群聊里面
GroupMember member = groupMemberService.findByGroupAndUserId(dto.getGroupId(), session.getUserId());
if (Objects.isNull(member) || member.getQuit()) {
if (Objects.isNull(member) || Boolean.TRUE.equals(member.getQuit())) {
throw new GlobalException(ResultCode.PROGRAM_ERROR, "您已不在群聊里面,无法发送消息");
}
// 群聊成员列表
@ -72,10 +73,13 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
msg.setSendId(session.getUserId());
msg.setSendTime(new Date());
msg.setSendNickName(member.getAliasName());
if (CollUtil.isNotEmpty(dto.getAtUserIds())) {
if (CollectionUtil.isNotEmpty(dto.getAtUserIds())) {
msg.setAtUserIds(StrUtil.join(",", dto.getAtUserIds()));
}
this.save(msg);
// 过滤消息内容
String content = sensitiveFilterUtil.filter(dto.getContent());
msg.setContent(content);
// 群发
GroupMessageVO msgInfo = BeanUtils.copyProperties(msg, GroupMessageVO.class);
msgInfo.setAtUserIds(dto.getAtUserIds());
@ -103,7 +107,7 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
}
// 判断是否在群里
GroupMember member = groupMemberService.findByGroupAndUserId(msg.getGroupId(), session.getUserId());
if (Objects.isNull(member) || member.getQuit()) {
if (Objects.isNull(member) || Boolean.TRUE.equals(member.getQuit())) {
throw new GlobalException(ResultCode.PROGRAM_ERROR, "您已不在群聊里面,无法撤回消息");
}
// 修改数据库
@ -146,7 +150,7 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
return new ArrayList<>();
}
// 只能拉取最近1个月的
Date minDate = DateTimeUtils.addMonths(new Date(), -1);
Date minDate = DateUtils.addMonths(new Date(), -1);
LambdaQueryWrapper<GroupMessage> wrapper = Wrappers.lambdaQuery();
wrapper.gt(GroupMessage::getId, minId).gt(GroupMessage::getSendTime, minDate).in(GroupMessage::getGroupId, ids)
.ne(GroupMessage::getStatus, MessageStatus.RECALL.code()).orderByAsc(GroupMessage::getId).last("limit 100");
@ -220,7 +224,7 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
long stIdx = (page - 1) * size;
// 群聊成员信息
GroupMember member = groupMemberService.findByGroupAndUserId(groupId, userId);
if (member == null || member.getQuit()) {
if (Objects.isNull(member) || member.getQuit()) {
throw new GlobalException(ResultCode.PROGRAM_ERROR, "您已不在群聊中");
}
// 查询聊天记录,只查询加入群聊时间之后的消息

12
im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java

@ -22,11 +22,11 @@ import com.bx.implatform.service.IPrivateMessageService;
import com.bx.implatform.session.SessionContext;
import com.bx.implatform.session.UserSession;
import com.bx.implatform.util.BeanUtils;
import com.bx.implatform.util.DateTimeUtils;
import com.bx.implatform.util.SensitiveFilterUtil;
import com.bx.implatform.vo.PrivateMessageVO;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -40,6 +40,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
private final IFriendService friendService;
private final IMClient imClient;
private final SensitiveFilterUtil sensitiveFilterUtil;
@Override
public Long sendMessage(PrivateMessageDTO dto) {
@ -54,6 +55,9 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
msg.setStatus(MessageStatus.UNSEND.code());
msg.setSendTime(new Date());
this.save(msg);
// 过滤消息内容
String content = sensitiveFilterUtil.filter(dto.getContent());
msg.setContent(content);
// 推送消息
PrivateMessageVO msgInfo = BeanUtils.copyProperties(msg, PrivateMessageVO.class);
IMPrivateMessage<PrivateMessageVO> sendMessage = new IMPrivateMessage<>();
@ -70,7 +74,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
public void recallMessage(Long id) {
UserSession session = SessionContext.getSession();
PrivateMessage msg = this.getById(id);
if (msg == null) {
if (Objects.isNull(msg)) {
throw new GlobalException(ResultCode.PROGRAM_ERROR, "消息不存在");
}
if (!msg.getSendId().equals(session.getUserId())) {
@ -139,7 +143,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
// 获取当前用户的消息
LambdaQueryWrapper<PrivateMessage> queryWrapper = Wrappers.lambdaQuery();
// 只能拉取最近1个月的
Date minDate = DateTimeUtils.addMonths(new Date(), -1);
Date minDate = DateUtils.addMonths(new Date(), -1);
queryWrapper.gt(PrivateMessage::getId, minId)
.ge(PrivateMessage::getSendTime, minDate)
.ne(PrivateMessage::getStatus, MessageStatus.RECALL.code())

8
im-platform/src/main/java/com/bx/implatform/service/thirdparty/FileService.java

@ -40,6 +40,8 @@ public class FileService {
private String imagePath;
@Value("${minio.filePath}")
private String filePath;
@Value("${minio.videoPath}")
private String videoPath;
@PostConstruct
@ -109,13 +111,13 @@ public class FileService {
String url = minIoServer + "/" + bucketName;
switch (fileTypeEnum) {
case FILE:
url += "/file/";
url += "/" + filePath + "/";
break;
case IMAGE:
url += "/image/";
url += "/" + imagePath + "/";
break;
case VIDEO:
url += "/video/";
url += "/" + videoPath + "/";
break;
default:
break;

204
im-platform/src/main/java/com/bx/implatform/util/SensitiveFilterUtil.java

@ -0,0 +1,204 @@
package com.bx.implatform.util;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.CharUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.Map;
/**
* 敏感词过滤器SensitiveFilter
*
* @author Andrews
* @date 2023/12/4 11:12
* @return null
*/
@Slf4j
@Component
@NoArgsConstructor
public final class SensitiveFilterUtil {
/**
* 替换符
*/
private static final String REPLACE_MENT = "***";
/**
* 根节点
*/
private static final TrieNode ROOT_NODE = new TrieNode();
/**
* 1 前缀树 前缀树某一个节点
*
* @author NXY
* @date 2023/12/4 11:17
* @return null
*/
private static class TrieNode {
// 关键词结束标识
private boolean isKeywordEnd = false;
// 子节点(key是下级字符,value是下级节点)
// 当前节点的子节点
private final Map<Character, TrieNode> subNodes = new HashMap<>();
public boolean isKeywordEnd() {
return isKeywordEnd;
}
public void setKeywordEnd(boolean keywordEnd) {
isKeywordEnd = keywordEnd;
}
// 添加子节点
public void addSubNode(Character c, TrieNode node) {
subNodes.put(c, node);
}
// 获取子节点
public TrieNode getSubNode(Character c) {
return subNodes.get(c);
}
}
/**
* 2初始化方法服务器启动时初始化
*
* @author NXY
* @date 2023/12/4 11:18
*/
@PostConstruct
public void init() {
try (
// 类加载器
InputStream is = this.getClass().getClassLoader().getResourceAsStream("sensitive-words.txt");
BufferedReader reader = new BufferedReader(new InputStreamReader(is));
) {
String keyword;
while ((keyword = reader.readLine()) != null) {
// 添加到前缀树
this.addKeyword(keyword);
}
} catch (IOException e) {
log.error("加载敏感词文件失败: " + e.getMessage());
}
}
/**
* 3将一个敏感词添加到前缀树中
*
* @param keyword
* @author NXY
* @date 2023/12/4 11:15
*/
private void addKeyword(String keyword) {
TrieNode tempNode = ROOT_NODE;
for (int i = 0; i < keyword.length(); i++) {
char c = keyword.charAt(i);
TrieNode subNode = tempNode.getSubNode(c);
if (subNode == null) {
// 初始化子节点
subNode = new TrieNode();
tempNode.addSubNode(c, subNode);
}
// 指向子节点,进入下一轮循环
tempNode = subNode;
// 设置结束标识
if (i == keyword.length() - 1) {
tempNode.setKeywordEnd(true);
}
}
}
/**
* 过滤敏感词
*
* @param text 待过滤的文本
* @return 过滤后的文本
*/
public String filter(String text) {
if (StringUtils.isBlank(text)) {
return null;
}
// 结果
StringBuilder sb = new StringBuilder();
try {
// 指针1
TrieNode tempNode = ROOT_NODE;
// 指针2
int begin = 0;
// 指针3
int position = 0;
while (begin < text.length()) {
if (position < text.length()) {
char c = text.charAt(position);
// 跳过符号
if (isSymbol(c)) {
// 若指针1处于根节点,将此符号计入结果,让指针2向下走一步
if (tempNode == ROOT_NODE) {
sb.append(c);
begin++;
}
// 无论符号在开头或中间,指针3都向下走一步
position++;
continue;
}
// 检查下级节点
tempNode = tempNode.getSubNode(c);
if (tempNode == null) {
// 以begin开头的字符串不是敏感词
sb.append(text.charAt(begin));
// 进入下一个位置
position = ++begin;
// 重新指向根节点
tempNode = ROOT_NODE;
} else if (tempNode.isKeywordEnd()) {
// 发现敏感词,将begin~position字符串替换掉
sb.append(REPLACE_MENT);
// 进入下一个位置
begin = ++position;
// 重新指向根节点
tempNode = ROOT_NODE;
} else {
// 检查下一个字符
position++;
}
}
// position遍历越界仍未匹配到敏感词
else {
sb.append(text.charAt(begin));
position = ++begin;
tempNode = ROOT_NODE;
}
}
} catch (Exception e) {
sb = new StringBuilder(text);
}
return sb.toString();
}
/**
* 判断是否为符号 特殊符号
*
* @param c
* @return boolean
* @author NXY
* @date 2023/12/4 11:17
*/
private boolean isSymbol(Character c) {
// 0x2E80~0x9FFF 是东亚文字范围
return !CharUtils.isAsciiAlphanumeric(c) && (c < 0x2E80 || c > 0x9FFF);
}
}

1
im-platform/src/main/resources/application.yml

@ -39,6 +39,7 @@ minio:
bucketName: box-im
imagePath: image
filePath: file
videoPath: video
webrtc:
iceServers:

3
im-platform/src/main/resources/sensitive-words.txt

@ -0,0 +1,3 @@
杀了你
傻逼
去死
Loading…
Cancel
Save