Commit Graph

111 Commits

Author SHA1 Message Date
zhaoyuhang
b6d9cad31c 敏感词工具类封装 2023-07-10 20:42:57 +08:00
zhaoyuhang
1c9079bffc Merge branch 'sensitive'
# Conflicts:
#	mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/TextMsgHandler.java
2023-07-10 20:38:48 +08:00
zhaoyuhang
6546b9fe16 敏感词工具类封装 2023-07-10 20:38:01 +08:00
zhongzb
2c21310982 fix:1.优化表情包功能
2.优化oss存储路径
3.删除兼容历史代码
2023-07-09 19:46:50 +08:00
zongzibinbin
250fdb006f Merge pull request #102 from ShijieWU520/main
新增表情包功能
2023-07-09 18:41:39 +08:00
zongzibinbin
3a4192aa68 Merge pull request #90 from BigDataQiChao/main
Url解析组件重构;server端UrlMap映射调整;优先级调整;新增Url解析组件模式(不影响旧版本使用)
2023-07-09 18:12:37 +08:00
WSJ
e64659b491 新增表情包功能 2023-07-08 19:07:12 +08:00
WSJ
630e6da05c 新增表情包功能 2023-07-08 18:35:32 +08:00
WSJ
5bdad1351c 新增表情包功能 2023-07-08 18:28:20 +08:00
WSJ
7d62a59da5 表情包上传增加上传类型 2023-07-08 17:49:21 +08:00
zhongzb
c80a48e85c fix:模板频控功能 2023-07-07 00:04:55 +08:00
zhongzb
65f8735d28 fix:微信推送接入频控 2023-07-06 23:08:06 +08:00
zongzibinbin
4ffb15d48f Merge pull request #92 from just-jing/main
支持向被艾特用户微信推送消息
2023-07-06 22:44:31 +08:00
lm
aa697c84eb Merge branch 'main' into main 2023-07-06 22:15:22 +08:00
linzhihan
58daaef47c 编程式限流 2023-07-06 21:54:04 +08:00
limeng
0e23f887bd 解决默认不传token出现NPE 2023-07-06 21:51:16 +08:00
limeng
f63a6974d7 恢复从channel中存放token 2023-07-06 21:04:59 +08:00
zongzibinbin
6a02bc1832 Merge branch 'main' into main 2023-07-06 21:02:20 +08:00
limeng
cc3a764aaf 将废弃的ServerHandshakeStateEvent.HANDSHAKE_COMPLETE升级为HandshakeComplete 2023-07-06 16:28:09 +08:00
zongzibinbin
c0cce238bb Merge pull request #82 from zbzbzzz/main
优化ws握手认证
2023-07-05 23:59:45 +08:00
wj
9e4808f466 微信推送功能: 主流程实现 2023-07-05 22:44:24 +08:00
zhaoqichao
b516e51bc9 Url解析组件优化,server端映射调整 2023-07-05 18:12:17 +08:00
zhaoqichao
3c77ed3c5f Url解析组件重构及优化 2023-07-05 09:29:21 +08:00
zbzbzzz
919bdc7c99 fix:握手认证方式改为参数认证 2023-07-04 17:04:52 +08:00
LiuZhiFeng
a3b52118de feat:内存泄露 2023-07-04 10:09:36 +08:00
zbzbzzz
5d8e32abf8 fix:优化ws握手同时认证 加上token为空判断 去掉异步认证 2023-07-04 09:56:35 +08:00
WSJ
ae1c1ed098 新增表情包功能 2023-07-04 09:22:35 +08:00
wangchao
f25e535c04 fix:CODE 使用自增方式 2023-07-03 23:08:23 +08:00
wangchao
41660e189b feat:使用caffine进行存储,设置时间与lru淘汰策略 2023-07-03 21:44:35 +08:00
zongzibinbin
cf88e1e8db Merge pull request #78 from 1045078399/chat
fix:ChatAI优化
2023-07-03 21:12:57 +08:00
zongzibinbin
84198fbfa8 Merge pull request #56 from GestapoSS/main
fix: 去除无用代码(sout),烦请作者通过pr哈,证明我也是一名contributor  哈哈
2023-07-03 21:11:09 +08:00
zbzbzzz
e671c66a26 fix:优化ws握手同时认证 2023-07-03 18:34:14 +08:00
WSJ
5347d4f56b 新增表情包功能 2023-07-03 18:17:08 +08:00
zbzbzzz
f7a80fa8d9 fix:优化ws握手同时认证 2023-07-03 18:09:27 +08:00
zbzbzzz
6cf7379ac4 fix:优化ws握手同时认证 2023-07-03 18:06:04 +08:00
zhaoyuhang
ec76c2e337 fix:ChatAI优化 2023-07-03 11:31:11 +08:00
zongzibinbin
c47b48760d Merge pull request #68 from FRookie/main
内存泄漏问题
2023-07-02 23:38:38 +08:00
zhongzb
c10e03727c fix:握手认证优化 2023-07-02 23:04:10 +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
zbzbzzz
f35eca9a14 feat:ws握手同时认证 以Sec-Websocket-Protocol的形式传递token 2023-07-02 15:26:00 +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
46c0d4b771 feat:ws握手同时认证 2023-07-01 20:37:43 +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
wangshunjie
d38380b36d 内存泄漏问题 2023-07-01 15:35:14 +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