Commit Graph

1910 Commits

Author SHA1 Message Date
JNG
b9406c7f8a 解决冲突 2026-01-04 15:14:51 +08:00
JNG
4e9720e14d 添加邮箱和境外手机号 2026-01-04 15:13:45 +08:00
jiaji.H
2a38ed44b0 Updata:增加竞品数类型数据 2026-01-04 15:04:09 +08:00
d1269f9ec1 修改DM授权账号分配 2026-01-04 14:10:38 +08:00
817c38dffa 修改DM授权账号分配 2026-01-04 14:09:26 +08:00
cjy
81d99cbc91 Merge branch 'main' into feat-cjy-tag 2026-01-04 11:44:37 +08:00
5b6e72ee96 Merge branch 'feat-zjy-fixbug-022' into dev 2026-01-04 11:08:32 +08:00
fb77d2560f fix: 增值服务允许刷0 2026-01-04 11:06:33 +08:00
127f030415 修改获取平台判断 2026-01-04 10:44:55 +08:00
cjy
09dc29b966 Merge branch 'feat-cjy-data' 2026-01-04 09:43:30 +08:00
cjy
3d2a70966e fix: 减少调用次数,每天只执行一次,不重试 2026-01-04 09:43:17 +08:00
cjy
2cb1301cfa feat:实现对应话题标签相关接口 2025-12-31 14:07:01 +08:00
cjy
5a59be18db Merge branch 'feat-cjy-data' 2025-12-30 13:59:22 +08:00
cjy
4bc97b1a7c fix: 让手动触发数据采集需要鉴权 2025-12-30 13:58:45 +08:00
236f3c0203 Revert "fix: 尝试修复带代码"
This reverts commit decf8ded5e.
2025-12-30 09:43:57 +08:00
79caa97771 Merge branch 'feat-xjj-aschatFunction#A116' 2025-12-30 09:39:58 +08:00
d36f923418 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-29 16:20:28 +08:00
b33c2af027 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-29 16:20:27 +08:00
ad73d0daa2 优化导出 2025-12-29 16:20:20 +08:00
cjy
73c164ca63 Merge branch 'feat-cjy-newTwoPlatform' into dev 2025-12-29 15:23:55 +08:00
cjy
68ef35a746 fix:发布增加两个平台 2025-12-29 15:23:33 +08:00
cf3e9e10c5 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-29 15:05:37 +08:00
367ba4ec79 修改判断 2025-12-29 15:01:05 +08:00
51fe54a99d Merge branch 'feature-userinfo-daiyb' into dev 2025-12-29 14:34:18 +08:00
67dfa1adcc 修改图片限制 2025-12-29 14:34:13 +08:00
79ed00a421 Update work.go 2025-12-29 14:21:35 +08:00
cjy
7a016ea15a feat: 批量导入账号增加两个平台 2025-12-29 14:09:53 +08:00
cjy
55828e2577 feat: 作品列表导出增加两个字段 2025-12-29 14:07:36 +08:00
bfbaed3895 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-29 13:56:48 +08:00
5cafeeaf3a Merge branch 'feature-userinfo-daiyb' into dev 2025-12-29 13:56:44 +08:00
19fe2ecb49 转换图片 2025-12-29 13:56:38 +08:00
cjy
346c76f307 Merge branch 'feat-cjy-newTwoPlatform' into dev
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
#	pkg/service/cast/work.go
2025-12-29 13:55:39 +08:00
cjy
bd7e0e4169 fix: 重新增加批量发布图文 2025-12-29 13:53:02 +08:00
cjy
1233cd04cf feat: 重新添加上两个平台的发布 2025-12-29 13:04:47 +08:00
ad3794a1dd Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-29 11:45:21 +08:00
9924e74633 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-29 11:45:19 +08:00
32413251a8 添加图片格式判断 2025-12-29 11:45:09 +08:00
cjy
f02fbb8cbe Merge branch 'main' into feat-cjy-newTwoPlatform
# Conflicts:
#	api/aryshare/ayrshare.pb.go
#	api/aryshare/ayrshare.validator.pb.go
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
#	pkg/service/cast/work.go
2025-12-29 11:38:03 +08:00
decf8ded5e fix: 尝试修复带代码 2025-12-29 10:57:17 +08:00
3ca58286b1 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-28 18:41:26 +08:00
2aecb54f20 关闭黄反 2025-12-28 18:41:22 +08:00
6b575dac0d Merge branch 'feature-userinfo-daiyb' into dev 2025-12-28 18:16:53 +08:00
ea2c17bf92 修改黄凡的提示 2025-12-28 18:16:40 +08:00
2465eaf56f 打开黄反修改批量发布 2025-12-28 17:46:08 +08:00
8319451cb4 Update security.go 2025-12-28 17:45:03 +08:00
a956eaffda 打开黄反 2025-12-28 17:44:43 +08:00
7bdc1f3dd6 Update task.go 2025-12-28 17:32:38 +08:00
869c1de9ca Update task.go 2025-12-28 17:28:54 +08:00
849c11e87c Update work.go 2025-12-28 16:50:48 +08:00
18e1cda6cc Update task.go 2025-12-28 16:19:33 +08:00
1cb188664f Merge branch 'feature-userinfo-daiyb' 2025-12-28 16:01:02 +08:00
5b489327e0 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-28 16:00:52 +08:00
71b26f0839 修改数据查询逻辑 2025-12-28 16:00:47 +08:00
039852b9a7 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-28 15:22:15 +08:00
2735ca3058 Merge branch 'main' into feature-userinfo-daiyb 2025-12-28 15:22:10 +08:00
f296f0e464 Update work.go 2025-12-28 15:22:06 +08:00
cjy
57f451de4f Merge branch 'feat-cjy-taskLog' 2025-12-28 15:00:39 +08:00
8af4ee47eb 自动确认 2025-12-28 13:26:35 +08:00
cjy
445a81e198 feat: 完成任务时,记录日志
# Conflicts:
#	api/bundle/bundle.pb.go
#	api/bundle/bundle_triple.pb.go
2025-12-28 13:12:42 +08:00
cjy
879b975ae5 feat: 完成任务时,记录日志 2025-12-28 13:09:54 +08:00
7bd66bb589 Update work.go 2025-12-28 11:38:39 +08:00
2c7f66d87f Update work.go 2025-12-28 11:38:02 +08:00
7dfc65639b Merge branch 'main' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee 2025-12-28 11:07:54 +08:00
804b26c686 自动确认失败的忽略 2025-12-28 11:07:45 +08:00
cjy
7022ed69a9 Merge branch 'feat-cjy-data' 2025-12-28 10:49:59 +08:00
cjy
1de1540b15 Merge branch 'feat-cjy-data' into dev 2025-12-28 10:41:19 +08:00
cjy
b0e7f0bb59 feat: 并发获取数据指标,提高效率 2025-12-28 10:40:25 +08:00
51b981b10c 合并代码 2025-12-28 09:51:34 +08:00
cjy
d4144b8824 Merge branch 'feat-cjy-data' 2025-12-26 19:52:56 +08:00
cjy
06bc301d80 Merge branch 'feat-cjy-data' into dev 2025-12-26 19:52:36 +08:00
cjy
5dc3679c3e fix: 不暂停,直接请求,提高速度 2025-12-26 19:52:24 +08:00
cjy
3faeddec26 Merge branch 'feat-cjy-data' 2025-12-26 18:49:50 +08:00
bx1834938347-prog
7d8f65fe07 feat:cron 2025-12-26 18:42:52 +08:00
cjy
9574f77eb7 Merge branch 'feat-cjy-data' into dev
# Conflicts:
#	pkg/model/cast/work.go
2025-12-26 18:15:48 +08:00
cjy
df569bfd4b fix: 提高获取指标效率 2025-12-26 18:14:45 +08:00
cjy
4e9d043bd1 发布的时候不检查余额 2025-12-26 17:41:21 +08:00
cjy
a11b5b2af5 发布的时候不检查余额 2025-12-26 17:34:41 +08:00
b76c69d235 Update security.go 2025-12-26 17:12:27 +08:00
c601d36078 Merge branch 'main' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee 2025-12-26 16:56:26 +08:00
780e1761e1 修改黄反等级 2025-12-26 16:56:21 +08:00
bx1834938347-prog
057a8a4c93 Update cron.go 2025-12-26 15:29:35 +08:00
bx1834938347-prog
33d006bbdc Update init.go 2025-12-26 15:11:52 +08:00
bx1834938347-prog
8f6ab0ae8a Update init.go 2025-12-26 15:03:52 +08:00
bx1834938347-prog
123f70d4e2 feat:解决冲突 2025-12-26 15:02:11 +08:00
bx1834938347-prog
03d53a3a0c feat:合并代码 2025-12-26 14:53:05 +08:00
bx1834938347-prog
16929ac88d Merge branch 'wwq' into dev 2025-12-26 14:51:34 +08:00
bx1834938347-prog
b89e4b1660 feat:合并代码 2025-12-26 14:51:22 +08:00
bx1834938347-prog
8fd0965714 Update cron.go 2025-12-26 14:49:08 +08:00
e5aaa6fc18 Update work.go 2025-12-26 14:41:54 +08:00
f5dc00b76f Update media.go 2025-12-26 14:37:51 +08:00
cjy
7f082d4889 fix: 修复合并冲突 2025-12-26 13:50:06 +08:00
cjy
77bdd47159 fix: 移除重复代码 2025-12-26 13:45:50 +08:00
cjy
f88e745ab7 Merge branch 'feat-cjy-data'
# Conflicts:
#	api/aryshare/ayrshare.pb.go
#	api/aryshare/ayrshare.validator.pb.go
#	api/bundle/bundle.pb.go
#	api/bundle/bundle.validator.pb.go
#	api/bundle/bundle_triple.pb.go
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
#	api/cast/cast_triple.pb.go
#	pkg/cron/task.go
#	pkg/model/cast/work.go
2025-12-26 13:28:55 +08:00
jiaji.H
0578f53f2f Updata:解决冲突 2025-12-26 12:31:44 +08:00
4b48da5d08 Update init.go 2025-12-26 11:55:20 +08:00
e8fb81bfe9 fiee三期 2025-12-26 11:53:38 +08:00
020de78e1b Merge branch 'feature-userinfo-daiyb' into dev 2025-12-26 11:49:49 +08:00
4acef959cb Update work.go 2025-12-26 11:49:43 +08:00
4f317ddaef Update work.go 2025-12-26 11:49:14 +08:00
JNG
6644880fc8 解决冲突 2025-12-26 11:47:07 +08:00
JNG
9219289db1 解决冲突 2025-12-26 11:44:06 +08:00
6032b977b1 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-26 10:47:03 +08:00
e81b30ac6c Merge branch 'feature-userinfo-daiyb' into dev 2025-12-26 10:47:02 +08:00
a2967ed09b Update work.go 2025-12-26 10:46:55 +08:00
JNG
792a07057c Merge branch 'jng-contract-1225' into dev 2025-12-26 10:45:07 +08:00
JNG
c58fdff8e2 Update bundleOrder.go 2025-12-26 10:45:01 +08:00
d5746221fb Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-26 10:44:10 +08:00
ae0639a0de Merge branch 'feature-userinfo-daiyb' into dev 2025-12-26 10:44:09 +08:00
094de973d2 添加调试日志 2025-12-26 10:44:03 +08:00
JNG
f017aaa32e Merge branch 'jng-contract-1225' into dev 2025-12-26 10:40:51 +08:00
JNG
3aff9c3f87 Update bundleOrder.go 2025-12-26 10:40:42 +08:00
JNG
77c71b135d Merge branch 'jng-contract-1225' into dev 2025-12-26 10:25:20 +08:00
JNG
3bedf23d15 Update bundleOrder.go 2025-12-26 10:25:15 +08:00
JNG
2c0cc0a075 Merge branch 'jng-contract-1225' into dev 2025-12-26 10:21:09 +08:00
JNG
fda10744f1 Update bundleOrder.go 2025-12-26 10:21:04 +08:00
JNG
37e05c5e70 Merge branch 'jng-contract-1225' into dev 2025-12-26 09:53:18 +08:00
JNG
0c1a9374b4 修改 2025-12-26 09:53:04 +08:00
a8ccc3ba74 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-26 09:17:21 +08:00
f490c4e42e Merge branch 'feature-userinfo-daiyb' into dev 2025-12-26 09:17:20 +08:00
80ed35bf51 Update work.go 2025-12-26 09:17:14 +08:00
JNG
4494e80665 Merge branch 'jng-contract-1225' into dev 2025-12-25 20:22:31 +08:00
JNG
2e39896064 Update bundleOrder.go 2025-12-25 20:22:24 +08:00
JNG
4587bcb73c Merge branch 'jng-contract-1225' into dev 2025-12-25 20:17:53 +08:00
JNG
21322d0345 Update bundleOrder.go 2025-12-25 20:17:46 +08:00
JNG
b8258c611f Merge branch 'jng-contract-1225' into dev 2025-12-25 20:14:35 +08:00
JNG
07eb527d99 Update bundleOrder.go 2025-12-25 20:14:28 +08:00
JNG
384d67f56d Merge branch 'jng-contract-1225' into dev 2025-12-25 20:11:06 +08:00
JNG
ef8604530d Update signContractV2.go 2025-12-25 20:11:01 +08:00
JNG
1a4d3224a1 Merge branch 'jng-contract-1225' into dev 2025-12-25 19:51:26 +08:00
JNG
804fe0fd33 Update bundleOrder.go 2025-12-25 19:51:20 +08:00
JNG
5e17ed3890 Merge branch 'jng-contract-1225' into dev 2025-12-25 19:38:00 +08:00
JNG
71bf24ae63 Update signContractV2.go 2025-12-25 19:37:52 +08:00
JNG
943a3f58b7 解决冲突 2025-12-25 18:46:16 +08:00
JNG
f1372dfe5a 修改合同签署 2025-12-25 18:45:37 +08:00
dce69e150b Merge branch 'feature-userinfo-daiyb' into dev 2025-12-25 16:58:51 +08:00
30f2e200be 修改发布提示 2025-12-25 16:58:42 +08:00
fa68bf9ed4 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-25 16:41:29 +08:00
d3e91575f0 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-25 16:41:28 +08:00
faed07145d 添加重试机制 2025-12-25 16:41:21 +08:00
cjy
6aac31847b Merge branch 'feat-cjy-data' into dev 2025-12-25 16:09:26 +08:00
cjy
33f4530d66 feat: 更新账号访问量计算方式 2025-12-25 16:09:03 +08:00
jiaji.H
885dac4abc Merge branch 'feat-hjj-ExportManager' 2025-12-25 15:58:14 +08:00
jiaji.H
6e64748577 Updata:解决冲突 2025-12-25 15:53:37 +08:00
jiaji.H
bd827102e0 Updata:增加导出表对应账号状态 2025-12-25 15:51:18 +08:00
2b493c1647 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-25 15:37:51 +08:00
a5d87ba1fd 添加验证逻辑,TikTok校验很严格 2025-12-25 15:37:46 +08:00
058ed862e0 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-25 14:33:28 +08:00
eac3bf47f1 Update ayrshare.go 2025-12-25 14:33:22 +08:00
JNG
13cdbebace Merge branch 'jng-1127' 2025-12-25 11:47:26 +08:00
bf48f09be0 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-25 11:25:27 +08:00