Commit Graph

644 Commits

Author SHA1 Message Date
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
ee749bac65 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-18 17:45:02 +08:00
d122130196 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-18 17:44:57 +08:00
2e4bd18833 失败类型 2025-12-18 17:44:52 +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
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
4fee0f485c 更新pb 2025-12-18 16:38:19 +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
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
0191ed1219 Update cast_triple.pb.go 2025-12-17 17:05:11 +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
d7639d46a6 Updata:更新pb文件 2025-12-17 16:18:11 +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
13fa310b57 Merge branch 'feat-cjy-data' into dev 2025-12-17 11:45:41 +08:00
cjy
c87f27f432 fix 2025-12-17 11:45:09 +08:00
jiaji.H
41ff630b60 Updata:解决冲突 2025-12-17 11:02:58 +08:00
jiaji.H
8c7bf3696f Updata:修正判断 2025-12-17 11:02:00 +08:00
cjy
4357edb29f Merge branch 'feat-cjy-data' into dev
# Conflicts:
#	api/cast/cast.pb.go
2025-12-16 19:40:04 +08:00
cjy
e1fa4468f2 fix: 更新pb 2025-12-16 19:39:21 +08:00
cjy
e481f61a53 Merge branch 'feat-cjy-data' into dev
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2025-12-16 19:33:48 +08:00
43404ae283 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-16 17:59:38 +08:00
e1b0c62f28 添加接口 2025-12-16 17:59:32 +08:00
jiaji.H
7687495842 Updata:更新pb文件 2025-12-16 16:15:08 +08:00
jiaji.H
5a41de85dd Updata:增加手动确认定时任务 2025-12-16 16:14:06 +08:00
fb851cc393 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-16 15:22:13 +08:00
a4c48a1dba Merge branch 'feature-userinfo-daiyb' into dev 2025-12-16 15:22:12 +08:00
1fd4feefc9 黄反 2025-12-16 15:22:06 +08:00
c93ae3f602 黄反 2025-12-16 14:58:57 +08:00
jiaji.H
6e5a914152 Updata:解决冲突 2025-12-16 14:44:58 +08:00
jiaji.H
8e890a35c5 Updata:解决冲突 2025-12-16 14:44:22 +08:00
bd9df0a02b Merge branch 'feature-userinfo-daiyb' into dev 2025-12-16 13:49:50 +08:00