Commit Graph

1278 Commits

Author SHA1 Message Date
5ee42b7137 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-18 20:03:00 +08:00
8e68bbe543 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-18 20:02:59 +08:00
c85c877f51 1 2025-12-18 20:02:52 +08:00
jiaji.H
1e19761356 Updata:增加失败类型 2025-12-18 19:25:21 +08:00
jiaji.H
33d7bde337 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-18 17:36:53 +08:00
jiaji.H
2ebfe14652 Merge branch 'feat-hjj-BundleStratusInfo' into dev 2025-12-18 17:36:30 +08:00
jiaji.H
6cd2077886 Updata:增加套餐过期判断 2025-12-18 17:36:09 +08:00
92b8e6be12 Merge branch 'fix-balanceCost-daiyb' into feature-userinfo-daiyb 2025-12-18 17:35:47 +08:00
10ba57a049 修改判断余量 是否足够 2025-12-18 17:35:40 +08:00
d2c0460827 Update work.go 2025-12-18 17:31:27 +08:00
bx1834938347-prog
682007dc8f Merge branch 'wwq' into dev 2025-12-18 16:41:20 +08:00
bx1834938347-prog
82a893f863 feat:新增定时任务发布 2025-12-18 16:40:59 +08:00
cjy
e8daefc672 Merge branch 'feat-cjy-data' into dev 2025-12-18 16:38:32 +08:00
cjy
b4ae16107e fix: 修复计算是否还有额度的问题 2025-12-18 16:36:10 +08:00
be1af84920 互动管理接口 2025-12-18 16:00:56 +08:00
baf12aff14 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-18 15:59:59 +08:00
73464a6b6d 添加互动接口 2025-12-18 15:59:52 +08:00
bx1834938347-prog
ec394c57f1 Merge branch 'wwq' into dev 2025-12-18 14:14:56 +08:00
bx1834938347-prog
8fa9cd79a4 feat:修改成post请求 2025-12-18 14:14:42 +08:00
bx1834938347-prog
11b278045d Update init.go 2025-12-18 11:46:52 +08:00
bx1834938347-prog
9ea6cbdbd7 Merge branch 'wwq' into dev 2025-12-18 11:46:21 +08:00
bx1834938347-prog
0f9ac2b1f9 Update init.go 2025-12-18 11:46:06 +08:00
bx1834938347-prog
b38331b8c7 Update init.go 2025-12-18 11:44:54 +08:00
bx1834938347-prog
ae5f9aea6f Update init.go 2025-12-18 11:44:10 +08:00
bx1834938347-prog
0556ab0109 Merge branch 'wwq' into dev 2025-12-18 11:43:56 +08:00
bx1834938347-prog
af546831b3 Update init.go 2025-12-18 11:43:45 +08:00
bx1834938347-prog
60d141d892 feat:解决冲突 2025-12-18 11:32:24 +08:00
bx1834938347-prog
505412e777 feat:新增定时任务调度发布 2025-12-18 11:25:00 +08:00
cjy
766f1eddd1 Merge branch 'feat-cjy-data' into dev
# Conflicts:
#	api/cast/cast.pb.go
2025-12-18 10:42:03 +08:00
cjy
2651af4f88 fix: 修复没有插入自媒体信息的问题 2025-12-18 10:41:12 +08:00
cjy
5463e7f44c Merge branch 'feat-cjy-data' into dev
# Conflicts:
#	api/aryshare/ayrshare.pb.go
#	api/aryshare/ayrshare.validator.pb.go
#	api/aryshare/ayrshare_triple.pb.go
#	pkg/cron/task.go
2025-12-17 19:33:21 +08:00
cjy
0c4d0f221b feat: 增加定时任务获取数据指标 2025-12-17 19:31:49 +08:00
fc0484370a Merge branch 'feature-userinfo-daiyb' into dev 2025-12-17 17:05:09 +08:00
6137604749 Merge branch 'main' into feature-userinfo-daiyb 2025-12-17 17:02:14 +08:00
7d14505bf4 合并冲突 2025-12-17 17:01:53 +08:00
a7ac8beb3a Merge branch 'main' into feature-userinfo-daiyb 2025-12-17 17:00:18 +08:00
jiaji.H
c2b4114bd5 Updata:解决冲突 2025-12-17 16:24:53 +08:00
jiaji.H
9477939a5a Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' 2025-12-17 16:21:16 +08:00
jiaji.H
ccf51138e3 Updata:更新逻辑 2025-12-17 16:21:03 +08:00
3c5132777c Update work.go 2025-12-17 16:14:49 +08:00
9731c02a63 Merge branch 'main' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee 2025-12-17 15:12:55 +08:00
e2abc91367 Merge branch 'feature-upload-daiyb' into dev 2025-12-17 14:45:26 +08:00
188d5c27b2 修改文件上传as 2025-12-17 14:45:15 +08:00
ea4e66a2a3 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-17 14:08:13 +08:00
4e48fb3742 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-17 14:08:12 +08:00
2e15c23aeb 防止没有数据 2025-12-17 14:08:07 +08:00
jiaji.H
ac85e5abf0 Updata:解决冲突 2025-12-17 13:25:45 +08:00
jiaji.H
50ec661b16 Updata:解决冲突 2025-12-17 13:22:31 +08:00
cjy
62572aa23e Merge branch 'feat-cjy-data' into dev 2025-12-17 13:17:00 +08:00
cjy
e424cef29f fix: 获取详情失败后自动更新为确认失败 2025-12-17 13:16:47 +08:00