fonchain-fiee

fiee/fonchain-fiee

Fork 0

Commit Graph

Select branches

Hide Pull Requests

chat

dev

dev-lzh

feat-antom-pay-zjy

feat-zjy-copy-employee

feat-zjy-fix-paymentcent-proto

feat-zjy-fixbug-003

feat-zjy-issue-008

feature-multicast-daiyb

jng

main

main-out

sc

sxy

sxy-fix

sxy-sec

1.0.3

1.0.4

1.0.5

1.0.6

1.0.7

1.0.8

1.0.9

1.01

1.1.0

10.2

7fbf4864f1 Merge branch 'chat' into dev jjxu 2025-06-16 15:04:32 +0800
c1dc0821e9 fix: 完成关键字回复 jjxu 2025-06-16 15:02:35 +0800
6d3ec1ac10 Merge branch 'sxy-sec' into dev sxy 2025-06-16 14:32:29 +0800
80fd028885 修改page-1 sxy 2025-06-16 14:32:18 +0800
4e44c0ca06 Merge branch 'sxy-sec' into dev sxy 2025-06-16 14:26:18 +0800
d0a51000d0 修改page sxy 2025-06-16 14:26:00 +0800
cfaaf818c8 Merge branch 'dev-lzh' into dev lzh 2025-06-16 14:11:17 +0800
8a13754309 素材库路径修改 lzh 2025-06-16 14:11:11 +0800
48a85b000c Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev jjxu 2025-06-16 14:04:00 +0800
4c758f2045 fix: 解决冲突 jjxu 2025-06-16 14:03:38 +0800
eb99e251bf fix: 修复部分聊天机器人相关问题 jjxu 2025-06-16 14:02:16 +0800
cebf285f8e Merge branch 'feat-zjy-issue-008' into dev zhoujunyao 2025-06-16 13:57:49 +0800
7bc66c7107 fix: 处理支付更新对账单id错误问题 zhoujunyao 2025-06-16 13:57:30 +0800
16661dfe33 Merge branch 'dev-lzh' into dev lzh 2025-06-16 13:55:55 +0800
b29c2fcad3 匹配路径修改 lzh 2025-06-16 13:54:42 +0800
24c3d1c894 Merge branch 'dev-lzh' into dev lzh 2025-06-16 13:47:32 +0800
c07d4a3abb 修改预览接口路径 lzh 2025-06-16 13:47:14 +0800
653fe27066 冲突解决 lzh 2025-06-16 13:42:46 +0800
bef76dc3f0 添加套餐金额类型 lzh 2025-06-16 13:35:46 +0800
d0a93eb229 Merge branch 'sxy' into dev sxy 2025-06-16 13:22:53 +0800
de1ad8e06e 增加修改 sxy 2025-06-16 13:22:20 +0800
2d793324f1 解决突出 lzh 2025-06-16 13:15:11 +0800
909a44682b Merge branch 'dev-lzh' into dev lzh 2025-06-16 13:09:37 +0800
87fed2c831 文件上传修改为表单格式 lzh 2025-06-16 13:09:06 +0800
98b0893b0c Merge branch 'feat-zjy-issue-008' into dev zhoujunyao 2025-06-16 13:06:01 +0800
af9a59227f fix: 新增app端的根据orderNo查询子套餐 zhoujunyao 2025-06-16 13:05:29 +0800
467b126590 Merge branch 'dev' of http://172.16.100.91:3000/fiee/fonchain-fiee into dev daiyb 2025-06-16 11:53:08 +0800
505216a1b3 Merge branch 'feature-multicast-daiyb' into dev daiyb 2025-06-16 11:52:48 +0800
ac14cabe1b Update work.go daiyb 2025-06-16 11:52:30 +0800
8247a52343 Merge branch 'sxy-sec' into dev sxy 2025-06-16 11:48:25 +0800
4d8b89c68c 增加 page sxy 2025-06-16 11:48:11 +0800
7dcf40675f Merge branch 'feature-multicast-daiyb' into dev daiyb 2025-06-16 11:38:06 +0800
1e6e026aae 添加日志修改提示 daiyb 2025-06-16 11:37:05 +0800
0fb393e9ed 文件上传修改为表单格式 lzh 2025-06-16 11:25:17 +0800
a5d6e45cd1 Merge branch 'jng' into dev 桀尼龟 2025-06-16 11:19:50 +0800
21f6837fec 修改桀尼龟 2025-06-16 11:19:42 +0800
40c0a9d65f Merge branch 'feature-multicast-daiyb' into dev daiyb 2025-06-16 11:06:32 +0800
e9120402af 添加套餐金额类型 lzh 2025-06-16 11:06:17 +0800
92364e194f merge jng daiyb 2025-06-16 10:53:22 +0800
abe68c7f6e 1 daiyb 2025-06-16 10:37:18 +0800
033d9ba023 Merge branch 'dev-lzh' into dev lzh 2025-06-16 10:20:24 +0800
6c194a0646 作品类型判断 lzh 2025-06-16 10:20:18 +0800
fe8f3498cd fix: 调整代码，创建支付的时候加入创建对账单。支付成功通知时更新对账单 zhoujunyao 2025-06-16 10:04:27 +0800
35712fdbe2 Merge branch 'feat-zjy-issue-008' into dev zhoujunyao 2025-06-16 10:03:06 +0800
248d707026 Merge branch 'chat' into dev jjxu 2025-06-16 09:58:57 +0800
cde4488548 Update wsMessageHandle.go jjxu 2025-06-16 09:58:43 +0800
638f2a9554 fix: 调整代码，创建支付的时候加入创建对账单。支付成功通知时更新对账单 zhoujunyao 2025-06-16 09:56:09 +0800
eea71f6e5a Merge branch 'chat' into dev jjxu 2025-06-16 09:55:25 +0800
aac5d05d13 Update wsMessageHandle.go jjxu 2025-06-16 09:55:13 +0800
d543628d86 Merge branch 'chat' into dev jjxu 2025-06-16 09:52:18 +0800
d415621631 Update wsMessageHandle.go jjxu 2025-06-16 09:52:07 +0800
d93c911334 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev jjxu 2025-06-16 09:44:33 +0800
5954f86213 Merge branch 'chat' into dev jjxu 2025-06-16 09:44:06 +0800
f9921d2ba0 Update upload.go jjxu 2025-06-16 09:43:45 +0800
7747672842 Merge branch 'dev-lzh' into dev lzh 2025-06-16 09:35:03 +0800
1648689c02 Merge branch 'sxy-sec' into dev sxy 2025-06-16 09:31:40 +0800
549b5f05c6 增加 form list sxy 2025-06-16 09:31:23 +0800
c1ad440e83 提交时间类型修改 lzh 2025-06-16 09:04:45 +0800
43d3e83593 Merge branch 'chat' into dev jjxu 2025-06-16 00:17:17 +0800
7b2b64e8f6 Update wsMessageHandle.go jjxu 2025-06-16 00:16:48 +0800
808f7cce3e Update wsMessageHandle.go jjxu 2025-06-16 00:16:48 +0800
ff25d74c61 Update wsMessageHandle.go jjxu 2025-06-16 00:09:44 +0800
f9807d039a Update wsMessageHandle.go jjxu 2025-06-16 00:09:44 +0800
33ce4c7123 Merge branch 'chat' into dev jjxu 2025-06-16 00:04:40 +0800
16a7f5ed78 Update wsMessageHandle.go jjxu 2025-06-16 00:04:28 +0800
6bbe1319b8 解决冲突 jjxu 2025-06-15 23:57:57 +0800
f65fe9d5aa fix: 修改token查询逻辑 jjxu 2025-06-15 23:57:13 +0800
f3eba25a43 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev jjxu 2025-06-15 23:23:57 +0800
b3c8008b29 解决冲突 jjxu 2025-06-15 23:23:11 +0800
156e127776 Update chatRoom.go jjxu 2025-06-15 23:21:43 +0800
49137828da Merge branch 'feat-zjy-issue-008' into dev zhoujunyao 2025-06-15 20:57:25 +0800
e370308b10 fix: 调整校验状态 zhoujunyao 2025-06-15 20:57:02 +0800
cf18598b96 Merge branch 'jng' into feat-zjy-issue-008 zhoujunyao 2025-06-15 20:54:42 +0800
1988c49b82 Merge branch 'feature-multicast-daiyb' into dev daiyb 2025-06-15 20:46:23 +0800
c5ee0d1ae7 获取用户余量 daiyb 2025-06-15 20:46:05 +0800
f3e0ae8672 fix: update jjxu 2025-06-15 20:38:08 +0800
3b6e0e6310 Merge branch 'chat' into dev jjxu 2025-06-15 20:22:08 +0800
9839f3b358 Update common.go jjxu 2025-06-15 20:21:56 +0800
e0644769f5 Merge branch 'chat' into dev jjxu 2025-06-15 20:16:45 +0800
0fbc4a4f87 Update common.go jjxu 2025-06-15 20:16:34 +0800
5fd70717d4 Update common.go jjxu 2025-06-15 20:11:53 +0800
98168623b1 Update common.go jjxu 2025-06-15 20:10:51 +0800
5131c182a5 Merge branch 'chat' into dev jjxu 2025-06-15 20:05:42 +0800
6f16137b43 Update common.go jjxu 2025-06-15 20:05:26 +0800
c094790cd3 Update wsMessageHandle.go jjxu 2025-06-15 19:59:53 +0800
905d2077d3 fix: 完成用户进入聊天室直接回复 jjxu 2025-06-15 19:56:18 +0800
01bd9736e0 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev jjxu 2025-06-15 19:56:48 +0800
98c6a72f96 fix: 完成用户进入聊天室直接回复 jjxu 2025-06-15 19:56:18 +0800
aa6dca6f1f fix: 处理冲突 zhoujunyao 2025-06-15 19:22:55 +0800
ce95cface5 Merge branch 'feat-zjy-issue-008' into dev zhoujunyao 2025-06-15 19:22:14 +0800
057565b0aa fix: 新增接口，根据orderNo,仅查询它单独购买的增值服务，调整支付创建时候仅增值的情况 zhoujunyao 2025-06-15 19:19:10 +0800
bf21a5b906 Update conf.ini jjxu 2025-06-15 18:36:14 +0800
13b51cadf8 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev jjxu 2025-06-15 18:35:25 +0800
63620fdda4 fix: 修复domain配置错误的问题 jjxu 2025-06-15 18:35:08 +0800
f10b996656 fix: update jjxu 2025-06-15 18:34:17 +0800
e23f39c6ac fix: detail接口增加addBundle的字段 zhoujunyao 2025-06-15 18:32:36 +0800
2276144fc4 Merge branch 'feat-zjy-issue-008' into dev zhoujunyao 2025-06-15 18:31:52 +0800
32cf742fa8 fix: detail接口增加addBundle的字段 zhoujunyao 2025-06-15 18:29:10 +0800
c347c7d81d fix: debug jjxu 2025-06-15 18:28:21 +0800
8817680689 Update handler.go jjxu 2025-06-15 18:20:48 +0800