Commit Graph

458 Commits

Author SHA1 Message Date
4664da0d1c Merge branch 'chat' into dev 2025-06-18 16:43:34 +08:00
d42b82381e Update handler.go 2025-06-18 16:43:20 +08:00
492fdfeee2 Merge branch 'feat-zjy-issue-008' into dev 2025-06-18 16:28:30 +08:00
62a0a2c0af fix: 打日志 2025-06-18 16:27:17 +08:00
e47651247f Merge branch 'chat' into dev 2025-06-18 16:19:53 +08:00
65f12cc019 fix: 修复未读数量统计无法清零的问题 2025-06-18 16:19:42 +08:00
79ec11f0de Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-18 16:12:30 +08:00
97753f0578 fix: 解决冲突 2025-06-18 16:12:10 +08:00
5c84210272 perf: 调试重置未读消息数 2025-06-18 16:10:30 +08:00
ac79481ec5 perf: 未实名用户显示手机号 2025-06-18 15:59:01 +08:00
sxy
2b013f5269 Merge branch 'sxy' into dev 2025-06-18 15:51:52 +08:00
sxy
039cd019e9 修改套餐中间表 2025-06-18 15:51:31 +08:00
244901bf6a Merge branch 'chat' into dev 2025-06-18 15:33:20 +08:00
b39f315ac2 Update chatAutoReplyRulerHandler.go 2025-06-18 15:33:07 +08:00
9b13f753e6 Merge branch 'chat' into dev 2025-06-18 15:27:38 +08:00
be6d4dbb63 perf: 优化缓存key的读取 2025-06-18 15:27:26 +08:00
50851aa303 Merge branch 'chat' into dev 2025-06-18 15:17:35 +08:00
1424e76f54 Update cache.go 2025-06-18 15:17:11 +08:00
b89b86be5d Merge branch 'chat' into dev 2025-06-18 14:22:47 +08:00
613057182e fix: 修复自动回复的问题,修复回复规则筛选问题 2025-06-18 14:22:33 +08:00
59ba69477b Merge branch 'chat' into dev 2025-06-18 12:04:36 +08:00
ac5fe7a266 Update chat.go 2025-06-18 11:41:20 +08:00
sxy
e4554dd0ad Merge branch 'sxy-sec' into dev 2025-06-17 18:30:56 +08:00
sxy
8f8e28ca3d 修改 2025-06-17 18:30:36 +08:00
4e9091bd4b Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-17 16:14:55 +08:00
b4960fb7c2 Merge branch 'chat' into dev 2025-06-17 16:14:35 +08:00
7b76dd5142 feat: 回复列表支持类型搜索 2025-06-17 16:14:24 +08:00
b2e9b0c2d1 Merge branch 'jng' into dev 2025-06-17 15:40:00 +08:00
28cd572cbd 修改 2025-06-17 15:39:47 +08:00
lzh
cb707c96e1 Merge branch 'dev-lzh' into dev 2025-06-17 14:28:29 +08:00
lzh
5ad6d318e0 添加确认变更的接口 2025-06-17 14:27:43 +08:00
90504c8c0c Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-17 14:26:41 +08:00
13e19d8650 Merge branch 'chat' into dev 2025-06-17 14:26:26 +08:00
1fc1ea9285 Update replyAndRuler.go 2025-06-17 14:26:15 +08:00
e1df94bb5e fix: 解决冲突 2025-06-17 14:25:46 +08:00
sxy
d4eebacbda Merge branch 'sxy-sec' into dev 2025-06-17 14:07:50 +08:00
sxy
d14dbaaf99 修改官网数据 2025-06-17 14:07:30 +08:00
57b2e587e7 Merge branch 'chat' into dev 2025-06-17 11:28:09 +08:00
3fa1bfcb2a Update chat.go 2025-06-17 11:28:00 +08:00
fad92b5991 Merge branch 'chat' into dev 2025-06-17 11:22:05 +08:00
4643de4f6e fix: 修复role没有值的问题 2025-06-17 11:21:53 +08:00
086fe399e4 fix: 解决冲突 2025-06-17 10:55:54 +08:00
ef5362e1c4 fix: 修复上传后文件url无法访问的问题;修复中间件打印二进制文件的问题 2025-06-17 10:52:08 +08:00
sxy
b59f4e9395 Merge branch 'sxy-sec' into dev 2025-06-17 10:07:53 +08:00
sxy
73537c1a21 修改数据返回 2025-06-17 10:07:39 +08:00
96ed290f62 Merge branch 'chat' into dev 2025-06-17 09:31:58 +08:00
6f52c9ff98 fix: debug 聊天室 2025-06-17 09:31:47 +08:00
6d975266a6 Merge branch 'chat' into dev 2025-06-17 09:13:40 +08:00
3e5d70a8a3 feat: 机器人重载回复规则 2025-06-17 09:13:20 +08:00
dded072bad Update chatAutoReplyRulerHandler.go 2025-06-16 19:32:08 +08:00
55a2197ad4 Merge branch 'chat' into dev 2025-06-16 18:29:21 +08:00
1d62e95910 fix: 聊天消息增加角色 2025-06-16 18:28:16 +08:00
47da1435ae Merge branch 'chat' into dev 2025-06-16 17:58:27 +08:00
980880533c fix: 重构规则 2025-06-16 17:58:15 +08:00
7c75f0722a Merge branch 'chat' into dev 2025-06-16 16:18:17 +08:00
58eb0d0b52 Update dto.go 2025-06-16 16:18:06 +08:00
aecacb623b 解决冲突 2025-06-16 16:11:55 +08:00
cee0d67de1 fix: 更新配置 2025-06-16 16:10:48 +08:00
a38cc36e51 Merge branch 'chat' into dev 2025-06-16 15:52:06 +08:00
55c74ea17c fix: 修复卡片类型内容不展示 2025-06-16 15:51:52 +08:00
de557a8ac0 Merge branch 'chat' into dev 2025-06-16 15:22:57 +08:00
31d401e213 fix: 优化机器人监听事件的逻辑 2025-06-16 15:22:42 +08:00
5a6c8591d2 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-16 15:04:57 +08:00
7fbf4864f1 Merge branch 'chat' into dev 2025-06-16 15:04:32 +08:00
c1dc0821e9 fix: 完成关键字回复 2025-06-16 15:04:11 +08:00
sxy
6d3ec1ac10 Merge branch 'sxy-sec' into dev 2025-06-16 14:32:29 +08:00
sxy
80fd028885 修改page-1 2025-06-16 14:32:18 +08:00
sxy
4e44c0ca06 Merge branch 'sxy-sec' into dev 2025-06-16 14:26:18 +08:00
sxy
d0a51000d0 修改page 2025-06-16 14:26:00 +08:00
lzh
cfaaf818c8 Merge branch 'dev-lzh' into dev 2025-06-16 14:11:17 +08:00
lzh
8a13754309 素材库路径修改 2025-06-16 14:11:11 +08:00
48a85b000c Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-16 14:04:00 +08:00
4c758f2045 fix: 解决冲突 2025-06-16 14:03:38 +08:00
eb99e251bf fix: 修复部分聊天机器人相关问题 2025-06-16 14:02:55 +08:00
cebf285f8e Merge branch 'feat-zjy-issue-008' into dev 2025-06-16 13:57:49 +08:00
7bc66c7107 fix: 处理支付更新对账单id错误问题 2025-06-16 13:57:30 +08:00
lzh
16661dfe33 Merge branch 'dev-lzh' into dev 2025-06-16 13:55:55 +08:00
lzh
b29c2fcad3 匹配路径修改 2025-06-16 13:54:42 +08:00
lzh
24c3d1c894 Merge branch 'dev-lzh' into dev 2025-06-16 13:47:32 +08:00
lzh
c07d4a3abb 修改预览接口路径 2025-06-16 13:47:14 +08:00
lzh
909a44682b Merge branch 'dev-lzh' into dev 2025-06-16 13:09:37 +08:00
lzh
87fed2c831 文件上传修改为表单格式 2025-06-16 13:09:06 +08:00
467b126590 Merge branch 'dev' of http://172.16.100.91:3000/fiee/fonchain-fiee into dev 2025-06-16 11:53:08 +08:00
505216a1b3 Merge branch 'feature-multicast-daiyb' into dev 2025-06-16 11:52:48 +08:00
ac14cabe1b Update work.go 2025-06-16 11:52:30 +08:00
sxy
8247a52343 Merge branch 'sxy-sec' into dev 2025-06-16 11:48:25 +08:00
sxy
4d8b89c68c 增加 page 2025-06-16 11:48:11 +08:00
7dcf40675f Merge branch 'feature-multicast-daiyb' into dev 2025-06-16 11:38:06 +08:00
1e6e026aae 添加日志修改提示 2025-06-16 11:37:05 +08:00
lzh
0fb393e9ed 文件上传修改为表单格式 2025-06-16 11:25:17 +08:00
a5d6e45cd1 Merge branch 'jng' into dev 2025-06-16 11:19:50 +08:00
21f6837fec 修改 2025-06-16 11:19:42 +08:00
40c0a9d65f Merge branch 'feature-multicast-daiyb' into dev 2025-06-16 11:06:32 +08:00
92364e194f merge jng 2025-06-16 10:53:22 +08:00
abe68c7f6e 1 2025-06-16 10:37:18 +08:00
lzh
033d9ba023 Merge branch 'dev-lzh' into dev 2025-06-16 10:20:24 +08:00
lzh
6c194a0646 作品类型判断 2025-06-16 10:20:18 +08:00
35712fdbe2 Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
#	api/bundle/bundle.pb.go
#	api/bundle/bundle_triple.pb.go
2025-06-16 10:03:06 +08:00
638f2a9554 fix: 调整代码,创建支付的时候加入创建对账单。支付成功通知时更新对账单 2025-06-16 09:56:09 +08:00
d93c911334 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-16 09:44:33 +08:00