Commit Graph

80 Commits

Author SHA1 Message Date
zbzbzzz
066634f1f0 Merge remote-tracking branch 'origin/main' 2023-07-03 18:08:13 +08:00
zbzbzzz
6cf7379ac4 fix:优化ws握手同时认证 2023-07-03 18:06:04 +08:00
yangzhengwu
d08a22d6b1 bugFix:NullPointerException的getMessage默认是null,所以没有必要打印出来,直接打印错误堆栈即可 2023-07-03 16:27:50 +08:00
zongzibinbin
f26a08b229 Merge pull request #75 from Babelyj/main
chatai相关线程池配置添加,以及替换AbstractChatAIHandler中线程池替换
2023-07-02 21:37:09 +08:00
Babelyj
c87b968735 chatai相关线程池配置添加 2023-07-02 21:30:38 +08:00
zongzibinbin
c1257f5f40 Merge pull request #73 from zbzbzzz/main
ws握手认证
2023-07-02 20:50:34 +08:00
zhongzb
e9dbeec854 fix:gpt优化 2023-07-01 22:13:39 +08:00
zhaoyuhang
824d3b78c7 改为使用id获取机器人 2023-07-01 21:13:49 +08:00
zbzbzzz
d1ad40cadf Merge branch 'zongzibinbin:main' into main 2023-07-01 17:00:56 +08:00
zbzbzzz
0cc840cadf feat:ws握手同时认证 2023-07-01 16:58:32 +08:00
zhaoyuhang
a944d1df14 优化chatAI 2023-07-01 15:24:52 +08:00
zhaoyuhang
dc4fe6215e Merge remote-tracking branch 'origin/main' into chat
# Conflicts:
#	mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/TextMsgHandler.java
2023-07-01 14:06:14 +08:00
zhaoyuhang
440159e8a0 chatAI-handler 2023-07-01 13:42:10 +08:00
zhongzb
0b86ee9d21 fix:消息校验优化 2023-07-01 13:15:35 +08:00
HandsomeNo2
c602c6abc6 增加参数校验 2023-06-30 14:56:46 +08:00
zhaoyuhang
fb90e98a4e openAI 2023-06-29 23:52:48 +08:00
HandsomeNo2
a0183d1265 增加参数注解校验 2023-06-28 23:53:18 +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
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
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
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
ab7d06d333 Merge pull request #33 from ziiigzag/optimize_2
fix: 代码规范化修改
2023-06-12 23:29:58 +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
JoseK
14637a9031 fix:RedisUtils相关修改 2023-06-07 00:07:22 +08:00
JoseK
dcaf90d3c1 fix:RedisUtils相关修改 2023-06-06 01:30:20 +08:00
zongzibinbin
6083edefaa Merge pull request #19 from li-junpeng/main
perf: 优化代码,提高系统性能。
2023-06-05 21:52:36 +08:00
zongzibinbin
4524148365 Merge branch 'main' into main 2023-06-05 21:51:03 +08:00
Junpeng
701f0a1f63 Merge branch 'zongzibinbin:main' into main 2023-06-05 17:26:28 +08:00
zhongzb
44244c0ba2 feat:
1.消息撤回功能
2.管理员拉黑功能
3.管理员撤回消息功能
4.消息类型可扩展
2023-06-05 13:02:09 +08:00
Junpeng.Li
883cbfac99 perf: 优化代码,提高系统性能。 2023-06-05 11:38:29 +08:00
maofuyu
eb4bde77de fix: 增加pageSize的Min校验,修复pageSize小于0不分页的问题 2023-06-04 22:57:08 +08:00
zhongzb
cf5eb9f455 Merge remote-tracking branch 'origin/main' 2023-06-04 17:20:29 +08:00
zhongzb
858e9a9e7f fix:
1.翻页条数限制失败bug
2.消息标记的事务方法重写失效问题
2023-06-04 17:20:21 +08:00
zongzibinbin
5e7a5fc837 Merge pull request #11 from hakusai22/main
[fix] 修改了一些CollectionUtil.isEmpty()/Objects.equals()判断
2023-06-03 01:23:45 +08:00
zhongzb
59a80110ef feat:消息标记重构 2023-06-01 21:57:48 +08:00