fonchain-fiee

fiee/fonchain-fiee

Fork 0

Commit Graph

Select branches

Hide Pull Requests

chat

dev

dev-lzh

feat-antom-pay-zjy

feat-cjy-taskBench

feat-hjj-pkManage#A116

feat-sxy-import

feat-zjy-copy-employee

feat-zjy-fix-paymentcent-proto

feat-zjy-fixbug-003

feat-zjy-fixbug-006

feat-zjy-issue-008

feat-zjy-issue-013

feature-tiktok-daiyb

gy

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

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
9ecc24cbbe Update handler.go jjxu 2025-06-15 18:20:04 +0800
e6920fe595 Update handler.go jjxu 2025-06-15 17:18:44 +0800
21b0c2cc49 Merge branch 'chat' into dev jjxu 2025-06-15 17:07:34 +0800
de4389b6f1 Update common.go jjxu 2025-06-15 17:07:19 +0800
1979ac7530 Merge branch 'chat' into dev jjxu 2025-06-15 16:23:58 +0800
f90be904e4 fix: update jjxu 2025-06-15 16:21:55 +0800
2827c3a921 fix: update jjxu 2025-06-15 16:09:25 +0800
a295762f37 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev jjxu 2025-06-15 16:03:08 +0800
2151a8e42b Merge branch 'chat' into dev jjxu 2025-06-15 16:02:45 +0800
4269f34670 fix: 聊天机器人 jjxu 2025-06-15 16:01:55 +0800
f60f7c4a6a Merge branch 'jng' into dev 桀尼龟 2025-06-15 15:59:46 +0800
d332b0e1d4 修改桀尼龟 2025-06-15 15:59:40 +0800
7e9f25fffe Merge branch 'dev-lzh' into dev lzh 2025-06-15 15:54:04 +0800
cc591a2e04 磁盘使用率接口 lzh 2025-06-15 15:53:57 +0800
729c9e661c 解决冲突桀尼龟 2025-06-15 15:32:25 +0800
8000f56c06 修改桀尼龟 2025-06-15 15:27:51 +0800
aa08c15e2a Merge branch 'dev-lzh' into dev lzh 2025-06-15 15:12:49 +0800
d47c033d7b 作品状态确认 lzh 2025-06-15 15:12:42 +0800
8ad73a8874 fix: 调整配置文件，只能dev改，master上没有 zhoujunyao 2025-06-15 15:03:53 +0800
3e16c413e5 作品状态判断 lzh 2025-06-15 15:00:45 +0800
c84fb621a9 作品状态判断 lzh 2025-06-15 15:00:14 +0800
325d14d913 Merge branch 'dev-lzh' into dev lzh 2025-06-15 14:58:36 +0800
cb84e6195d 1 lzh 2025-06-15 14:58:29 +0800
45a3751914 删除调试日志 lzh 2025-06-15 14:56:01 +0800
1dd8ccf3b7 Merge remote-tracking branch 'origin/dev' into dev zhoujunyao 2025-06-15 14:55:25 +0800
2734e4572f fix: 处理proto冲突 zhoujunyao 2025-06-15 14:55:09 +0800
15ddf58f55 Merge branch 'feat-zjy-issue-008' into dev zhoujunyao 2025-06-15 14:53:47 +0800
4b9e6eb7bd 调试日志打印 lzh 2025-06-15 14:51:51 +0800
59ed859aae fix: 调整支付配置文件 zhoujunyao 2025-06-15 14:50:26 +0800
549a557bf2 Merge branch 'dev-lzh' into dev lzh 2025-06-15 14:28:40 +0800
e5efa596d9 补齐json tag lzh 2025-06-15 14:28:33 +0800
966790326e Merge branch 'dev-lzh' into dev lzh 2025-06-15 13:58:15 +0800
bfef9134b7 余量查询修改 lzh 2025-06-15 13:58:07 +0800
ef18264bf8 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev jjxu 2025-06-15 13:33:15 +0800
426b65537f fix: update jjxu 2025-06-15 13:33:00 +0800
3c4375964e Update common.go jjxu 2025-06-15 13:28:52 +0800
e26c9f0c51 fix: 调整创建支付的代码逻辑 zhoujunyao 2025-06-15 13:23:11 +0800
0d46dd75d8 冲突解决 lzh 2025-06-15 12:56:05 +0800
3fbc1e6ef4 冲突解决 lzh 2025-06-15 12:54:02 +0800
3a00260038 Update common.go jjxu 2025-06-15 12:45:28 +0800
3533242855 Update common.go jjxu 2025-06-15 12:28:30 +0800
26c0056b12 Merge branch 'dev-lzh' into dev lzh 2025-06-15 12:22:38 +0800
d3b16ace79 作品确认、用户余量信息 lzh 2025-06-15 12:18:50 +0800
e8645e6515 Merge branch 'feature-multicast-daiyb' into dev daiyb 2025-06-15 12:13:04 +0800
701b27215f 详情添加分类 daiyb 2025-06-15 12:12:17 +0800
b991b6f7d8 fix: update jjxu 2025-06-15 11:37:15 +0800
a413806363 Update common.go jjxu 2025-06-15 11:45:41 +0800
f1d411c6bc Update wsMessageHandle.go jjxu 2025-06-15 11:37:15 +0800
71ef73bec6 fix: 调试token jjxu 2025-06-15 11:24:49 +0800
3f43441c4f Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev jjxu 2025-06-15 10:21:29 +0800
c665b2190c Merge branch 'chat' into dev jjxu 2025-06-15 10:21:11 +0800
f41e053e08 feat: debug jjxu 2025-06-15 10:19:39 +0800
b75a07c4dd Merge branch 'jng' into feat-zjy-issue-008 zhoujunyao 2025-06-15 10:12:06 +0800
abc498f656 解决冲突桀尼龟 2025-06-15 10:09:39 +0800
eb3e1f809b 修改桀尼龟 2025-06-15 10:06:57 +0800
f8c6a2ff96 完成套餐查询 daiyb 2025-06-15 00:33:25 +0800
5cfbfb687d Merge branch 'chat' into dev jjxu 2025-06-14 19:58:18 +0800
48c27ae476 Update common.go jjxu 2025-06-14 19:58:07 +0800
0839151de0 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev jjxu 2025-06-14 19:54:15 +0800
5f1b85bbb4 Merge branch 'chat' into dev jjxu 2025-06-14 19:53:58 +0800
cb7e875f2d Update common.go jjxu 2025-06-14 19:53:46 +0800