Commit Graph

149 Commits

Author SHA1 Message Date
zhaoyuhang
553a5be9e2 上下文 2023-07-08 21:47:48 +08:00
zhaoyuhang
ec76c2e337 fix:ChatAI优化 2023-07-03 11:31:11 +08:00
Quintin Bergreen
3c1262d7ae Merge branch 'zongzibinbin:main' into main 2023-07-02 23:45:35 +08:00
zhaoyuhang
dedf13f727 处理冲突 2023-07-02 23:45:17 +08:00
zhaoyuhang
d8e2168b40 处理冲突 2023-07-02 23:43:03 +08:00
zongzibinbin
c47b48760d Merge pull request #68 from FRookie/main
内存泄漏问题
2023-07-02 23:38:38 +08:00
zhaoyuhang
3f2ac6a06b Merge remote-tracking branch 'origin/chat' 2023-07-02 23:37:38 +08:00
zhaoyuhang
6dd7b21b39 合并 2023-07-02 23:34:03 +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
4400868f06 Merge pull request #74 from LIjiAngChen8/fix/docs
docs: 更新readme文档
2023-07-02 21:06:26 +08:00
zongzibinbin
c1257f5f40 Merge pull request #73 from zbzbzzz/main
ws握手认证
2023-07-02 20:50:34 +08:00
李江辰
08150a2e3c docs: 更新readme文档 2023-07-02 20:49:28 +08:00
Babelyj
b12be7c6df Merge pull request #4 from zongzibinbin/main
1
2023-07-02 17:09:25 +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
zongzibinbin
597e5a0361 Merge pull request #70 from 1045078399/chat
feat: ChatGPT & ChatGLM
2023-07-01 21:18:33 +08:00
zhaoyuhang
824d3b78c7 改为使用id获取机器人 2023-07-01 21:13:49 +08:00
zbzbzzz
89a4eb0b0a Merge branch 'zongzibinbin:main' into main 2023-07-01 20:39:50 +08:00
zbzbzzz
46c0d4b771 feat:ws握手同时认证 2023-07-01 20:37:43 +08:00
zhongzb
9a29546225 feat:更新readme 2023-07-01 18:15:21 +08:00
zhaoyuhang
e4051cb970 优化chatAI 2023-07-01 17:43:42 +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
zhaoyuhang
440159e8a0 chatAI-handler 2023-07-01 13:42:10 +08:00
zhongzb
0b86ee9d21 fix:消息校验优化 2023-07-01 13:15:35 +08:00
zongzibinbin
b40287a622 Merge pull request #62 from HandsomeNo2/main
增加参数注解校验
2023-07-01 13:04:04 +08:00
zhongzb
502a53ec01 fix:语音bug修复 2023-06-30 23:13:30 +08:00
HandsomeNo2
c602c6abc6 增加参数校验 2023-06-30 14:56:46 +08:00
Babelyj
f208296bcb Merge pull request #3 from zongzibinbin/main
1
2023-06-30 13:49:10 +08:00
zhaoyuhang
c06934bc89 openAI 2023-06-30 00:03:21 +08:00
zhaoyuhang
fb90e98a4e openAI 2023-06-29 23:52:48 +08:00
zhongzb
eec9e4b48e fix:@消息校验问题 2023-06-29 21:27:19 +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
Babelyj
c7c9b81e39 Merge pull request #2 from zongzibinbin/main
11
2023-06-28 21:11: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