Commit Graph

110 Commits

Author SHA1 Message Date
zhongzb
eec9e4b48e fix:@消息校验问题 2023-06-29 21:27:19 +08:00
zhongzb
3218b37ffc fix:移除阿里云依赖 2023-06-28 23:28:41 +08:00
zhongzb
c889a9fdc6 feat:增加图片上传功能,增加多种消息类型 2023-06-28 23:25:53 +08:00
zongzibinbin
892b658d38 Merge pull request #55 from xiaoahuaya/main
依赖升级 aliyun-oss 高危漏洞
2023-06-27 16:21:39 +08:00
mateng
22635d3791 依赖升级 aliyun-oss 高危漏洞
Apache Commons Beanutils 存在不可信数据的反序列化漏洞
Apache Struts 远程代码执行漏洞
2023-06-27 11:37:11 +08:00
zongzibinbin
95392191b0 Merge pull request #46 from Yancyji/main
style:代码风格规范
2023-06-22 21:35:29 +08:00
zongzibinbin
db1ffc40ff Merge pull request #47 from 1045078399/main
fix: 修改敏感词bug
2023-06-22 21:34:36 +08:00
zhaoyuhang
744e1243a2 修改敏感词bug 2023-06-19 18:00:19 +08:00
Yancyji
5c252b1d04 style:TextMsgHandler中自动装配规范问题修改。static 成员不应该使用Autowired注解装配;且会找不到PrioritizedUrlTitleDiscover类型的bean对象。修复方式为:去除@Autowired注解,使用new方式创建对象 2023-06-19 08:51:51 +00:00
Yancyji
a4351b2c3d Merge branch 'zongzibinbin:main' into main 2023-06-19 16:25:49 +08:00
zhongzb
99f06004f8 Merge remote-tracking branch 'origin/main' 2023-06-18 23:53:07 +08:00
zhongzb
536ee9dec7 fix:前后端交互优化 2023-06-18 23:52:50 +08:00
zongzibinbin
a1980eb6ec Merge pull request #42 from xiaocairush/main
feat;添加ac自动机算法进行敏感词过滤
2023-06-18 21:29:50 +08:00
xiaocairush
28116878d1 feat;resolve conflicts 2023-06-18 21:28:02 +08:00
xiaocairush
3943f44d19 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/SensitiveWordUtils.java
2023-06-18 21:09:46 +08:00
zhongzb
b22f905014 fix:前后端交互优化 2023-06-18 20:02:44 +08:00
zongzibinbin
f3b9c180fb Merge pull request #44 from 1045078399/dev
敏感词优化
2023-06-18 20:00:07 +08:00
xiaocairush
6b5e9cd023 feat;优化替代敏感词的逻辑 2023-06-18 16:37:35 +08:00
zhaoyuhang
77cafd1d5a 1.异步构建前缀数,不要占用spring的启动流程
2.前缀树需要有结束节点,否则判断会出问题
3.前缀数用map构建,提高匹配速度,不要用arraylist。
2023-06-18 11:42:11 +08:00
xiaocairush
8bcdce311d feat;添加测试用例 2023-06-18 11:10:16 +08:00
xiaocairush
aa36134dbc fix;typo 2023-06-18 11:01:53 +08:00
xiaocairush
da024f08e9 feat;添加ac自动机算法进行敏感词过滤 2023-06-18 10:40:25 +08:00
zongzibinbin
b4b6c1ea36 Merge pull request #31 from 1045078399/main
feat:敏感词过滤
2023-06-17 19:56:32 +08:00
zongzibinbin
c8c20aa6ce Merge pull request #39 from TH1nker2/main
netty服务的worker的EventLoopGroup大小根据当前cpu核心数动态获取
2023-06-16 10:45:25 +08:00
thinker
a3eeb4ee9f Update NettyWebSocketServer.java
feat(main):netty服务,worker的EventLoopGroup大小根据当前cpu核心数动态获取
2023-06-14 14:37:18 +08:00
yancy
bc7b6e3650 fix:解决冲突 2023-06-13 14:39:56 +08:00
zongzibinbin
ab7d06d333 Merge pull request #33 from ziiigzag/optimize_2
fix: 代码规范化修改
2023-06-12 23:29:58 +08:00
zongzibinbin
b59ec42e0b Merge pull request #34 from ziiigzag/optimize_3
perf: 全局异常处理细化
2023-06-12 23:25:15 +08:00
zigzag
49e1fb18fb perf: 全局异常处理细化 2023-06-11 23:22:07 +08:00
zigzag
7e78a63bb4 fix: 代码规范化修改 2023-06-11 23:03:54 +08:00
zhaoyuhang
09ca3698c4 发送消息,用户改名 敏感词过滤 2023-06-11 21:31:08 +08:00
zhongzb
13dc04d4af feat:
1.前后端交互改版
2.艾特成员功能
3.用户名片卡功能
2023-06-10 23:34:51 +08:00
zhongzb
cc6c69527b Merge branch 'self' 2023-06-10 23:23:34 +08:00
zongzibinbin
84f516e709 Merge pull request #25 from josek43326/main
fix:RedisUtils相关修改
2023-06-10 13:53:12 +08:00
zhongzb
635144670c websocket频控 2023-06-07 21:19:37 +08:00
zhongzb
e7740a4358 Merge remote-tracking branch 'origin/main' 2023-06-07 20:25:14 +08:00
zhongzb
8faed2abc9 私下调整频控 2023-06-07 20:22:43 +08:00
JoseK
81b380c60a Merge branch 'zongzibinbin:main' into main 2023-06-07 11:18:05 +08:00
Yancyji
5ac184366d Merge branch 'zongzibinbin:main' into main 2023-06-07 10:04:24 +08:00
zongzibinbin
dec68a5940 Merge pull request #28 from hakusai22/fix_mallchat_sql
fix: AUTO_INCREMENT 使用默认值
2023-06-07 09:50:27 +08:00
JoseK
4d5aae97b7 Merge remote-tracking branch 'origin/main' 2023-06-07 00:16:06 +08:00
JoseK
5fc368b0e0 Merge branch 'zongzibinbin:main' into main 2023-06-07 00:09:30 +08:00
JoseK
14637a9031 fix:RedisUtils相关修改 2023-06-07 00:07:22 +08:00
yinpeng
818ce90f32 fix: AUTO_INCREMENT 使用默认值 2023-06-06 23:49:28 +08:00
zongzibinbin
92a0561aec Merge pull request #27 from RealBeBetter/main
fix: 读取客户端发送的请求报文错误 日志输出异常
2023-06-06 22:44:48 +08:00
Real
78c89b6182 fix: 读取客户端发送的请求报文错误 日志输出异常 2023-06-06 21:52:24 +08:00
zhongzb
6eec704b49 频控调整 2023-06-06 20:25:45 +08:00
yancy
5a34172343 fix:不应该通过对象访问静态成员 2023-06-06 16:30:38 +08:00
JoseK
dcaf90d3c1 fix:RedisUtils相关修改 2023-06-06 01:30:20 +08:00
zhongzb
faaa6c5591 fix:用户收到徽章不立马更新的情况 2023-06-05 23:08:45 +08:00