Commit Graph

2150 Commits

Author SHA1 Message Date
jiaji.H
76a08f9ad8 Updata:解决冲突 2026-01-15 11:17:26 +08:00
cjy
e9cd6876c2 feat: 增加分布式锁,防止重复提交 2026-01-14 18:56:59 +08:00
cjy
9bd8e67116 Merge branch 'feat-cjy-report' into dev
# Conflicts:
#	pkg/model/cast/work.go
2026-01-14 17:43:51 +08:00
cjy
d811235da5 fix:移除注释 2026-01-14 17:09:13 +08:00
cjy
bdf3fa6144 feat:pdf上传完之后就删除 2026-01-14 17:08:55 +08:00
cjy
dfb2e5e037 fix: 修复逻辑错误 2026-01-14 17:04:41 +08:00
cjy
6b52775913 feat:增加自动生成pdf功能 2026-01-14 16:47:52 +08:00
9d1adef700 修改任务列表 2026-01-14 13:52:01 +08:00
81325137a9 修改任务列表 2026-01-14 13:51:12 +08:00
jiaji.H
8d36aeb751 Updata:解决冲突 2026-01-14 13:42:58 +08:00
cjy
0226b0af12 feat: 增加艺人确认竞品报告路由 2026-01-14 11:59:40 +08:00
cjy
ae76287088 feat: 把单个艺人竞品报告的接口的分开 2026-01-14 11:58:20 +08:00
2425920d34 导出Excel 2026-01-14 10:09:10 +08:00
2ba217c315 导出任务Excel 2026-01-14 10:07:49 +08:00
JNG
6b90728831 1 2026-01-14 09:45:42 +08:00
cjy
13fa87ec2b feat:source固定为1 2026-01-14 09:42:46 +08:00
JNG
a62549e503 Merge branch 'jng-supplier-0105' 2026-01-14 09:39:29 +08:00
jiaji.H
5d3c21624c Updata:更新视频上传数据导出 2026-01-13 16:43:17 +08:00
jiaji.H
68f2de32ca Merge branch 'main' into feat-hjj-ExportManager 2026-01-13 16:42:40 +08:00
cjy
fbf24995b8 feat:减少前端需要传的字段 2026-01-13 16:40:25 +08:00
jiaji.H
efe79ec250 Updata:解决冲突 2026-01-13 16:40:05 +08:00
cjy
145935ba04 fix: 打开批量导入的接口 2026-01-13 16:22:10 +08:00
cjy
a3e617a87f feat:批量导入增加校验竞品报告的余额 2026-01-13 16:20:00 +08:00
jiaji.H
a9dd32e450 Updata:更新导出 2026-01-13 16:17:06 +08:00
cjy
8fa9f89db9 feat:批量导入竞品报告 2026-01-13 16:15:06 +08:00
jiaji.H
b474856f35 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-01-13 16:12:37 +08:00
jiaji.H
0fd6319e34 Updata:更新导出 2026-01-13 16:12:32 +08:00
beac4f775d Update test.go 2026-01-13 16:07:55 +08:00
jiaji.H
1886935f4d Updata:更新导出 2026-01-13 16:00:32 +08:00
edebd161a1 Merge branch 'feature-h5-daiyb' into dev 2026-01-13 15:57:45 +08:00
d4bf96fef5 修改查询列表 2026-01-13 15:57:38 +08:00
cjy
e6ca737fb1 feat:增加一个作品列表接口 2026-01-13 15:19:13 +08:00
jiaji.H
dca004ecc6 Updata:解决冲突 2026-01-13 14:17:54 +08:00
jiaji.H
b121c12f7c Updata:增加支持多月份导出 2026-01-13 14:09:55 +08:00
JNG
ff3c5c0312 Merge branch 'jng-supplier-0105' into dev 2026-01-13 11:27:35 +08:00
JNG
0562f21c3b Update supplier.go 2026-01-13 11:27:28 +08:00
cjy
b079b597c3 feat: 增加检验竞品报告余额 2026-01-13 11:24:50 +08:00
bx1834938347-prog
6ab28792ec Merge branch 'wwq' into dev 2026-01-13 11:15:59 +08:00
bx1834938347-prog
fcc838ff43 Update cron.go 2026-01-13 11:15:30 +08:00
JNG
b7f8524861 Merge branch 'jng-supplier-0105' into dev 2026-01-13 10:49:34 +08:00
JNG
f4a3d39df6 Update supplier.go 2026-01-13 10:49:26 +08:00
0881472841 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-01-13 10:04:54 +08:00
4a3be6bdd4 修改账号添加逻辑 2026-01-13 10:04:51 +08:00
50f2c59c0b 修改逻辑判断 2026-01-13 10:03:47 +08:00
jiaji.H
3d67be4e09 Updata:解决冲突 2026-01-13 09:39:13 +08:00
jiaji.H
e75e6b7ce9 Updata:增加竞品数pb 2026-01-13 09:36:01 +08:00
cjy
789af8f0db Merge branch 'main' into feat-cjy-report 2026-01-13 09:33:35 +08:00
cjy
09f598a1f4 feat: 增加自动审批 2026-01-12 18:34:56 +08:00
JNG
44dd68fd84 Merge branch 'jng-code-0112' 2026-01-12 18:08:55 +08:00
cjy
cf6a932dbb Merge branch 'feat-cjy-tag' into dev 2026-01-12 16:49:23 +08:00
cjy
3286f12505 fix: 随机选key 2026-01-12 16:49:10 +08:00
cjy
a6e5d38a43 feat: 增加导出excel接口 2026-01-12 14:45:52 +08:00
cf99647d57 Update test.go 2026-01-12 14:41:04 +08:00
JNG
e5362cb262 解决冲突 2026-01-12 14:39:24 +08:00
JNG
7798f19d2b 添加邀请人 2026-01-12 14:38:49 +08:00
e2e4df84fc Merge branch 'feature-userinfo-daiyb' into dev 2026-01-12 14:35:39 +08:00
84e8a6dfda 修改状态刷新 2026-01-12 14:35:35 +08:00
cjy
26c59ee54c feat: 增加竞品报告相关路由 2026-01-12 14:34:15 +08:00
jiaji.H
f23e68f948 Updata:解决冲突 2026-01-12 13:43:40 +08:00
jiaji.H
4c8db9bec8 Updata:移动余量更新定时任务至客户端 2026-01-12 13:37:30 +08:00
cjy
71aecaf454 Merge branch 'feat-cjy-tag' into dev 2026-01-12 13:34:57 +08:00
cjy
7e1bf3ca60 fix: 增加一个判断,避免多调用一次接口 2026-01-12 13:34:47 +08:00
cjy
d2b7064dc0 Merge branch 'feat-cjy-tag' into dev
# Conflicts:
#	pkg/service/cast/work.go
2026-01-12 13:28:52 +08:00
cjy
fac24b72ac fix: 增加检查,避免空指针 2026-01-12 13:27:48 +08:00
c3eabff227 草稿不判断额度 2026-01-12 13:26:47 +08:00
48e55a7d32 Update work.go 2026-01-12 13:24:13 +08:00
b220a4ea96 草稿不判断余额,删除调试日志 2026-01-12 13:22:34 +08:00
627b08f0cd Update work.go 2026-01-12 13:16:11 +08:00
fa069d0d7d Merge branch 'feature-userinfo-daiyb' into dev 2026-01-12 13:10:24 +08:00
bcee7cdaf3 Update work.go 2026-01-12 13:10:19 +08:00
c019547992 Update work.go 2026-01-12 13:04:52 +08:00
312ecca943 Update work.go 2026-01-12 13:04:35 +08:00
d189ce2eae Update work.go 2026-01-12 13:04:11 +08:00
f8e8f4806b 调试 2026-01-12 13:03:41 +08:00
a92526a399 Merge branch 'main' into feature-userinfo-daiyb 2026-01-12 11:55:42 +08:00
bx1834938347-prog
ba402065dd Merge branch 'wwq' into dev 2026-01-12 11:18:10 +08:00
bx1834938347-prog
cfdd16ca47 feat:新增导出excel平台的执行结果 2026-01-12 11:18:05 +08:00
68de32f89d 关闭不然额外每月300美元 2026-01-09 14:52:57 +08:00
JNG
ec2de470c4 Merge branch 'jng-supplier-0105' into dev 2026-01-09 14:39:49 +08:00
JNG
1bdd0eabb2 添加导出接口 2026-01-09 14:39:42 +08:00
751e5c4900 Merge branch 'main' into feature-userinfo-daiyb 2026-01-09 14:04:01 +08:00
bx1834938347-prog
d095fdedf4 Merge branch 'wwq' 2026-01-09 14:03:16 +08:00
6ea7c95804 修改文件链接 2026-01-09 14:01:16 +08:00
71c3e61b65 自动调整ins图片大小 2026-01-09 13:59:56 +08:00
b378f85bbd Update work.go 2026-01-09 13:57:49 +08:00
ae88e366ee Merge branch 'main' into feature-userinfo-daiyb 2026-01-09 13:56:18 +08:00
jiaji.H
a3d942135d Updata:解决冲突 2026-01-09 13:17:12 +08:00
jiaji.H
13b66debf3 Updata:解决冲突 2026-01-09 11:37:17 +08:00
b2050626b7 Merge branch 'main' into feature-userinfo-daiyb 2026-01-09 11:35:03 +08:00
jiaji.H
300a3eaebc Updata:增加youtube和bluesky账号导出 2026-01-09 11:32:54 +08:00
cjy
869817f43c Merge branch 'feat-cjy-tag' into dev 2026-01-09 11:05:05 +08:00
cjy
dfc8ddb9b1 fix: 改成一分钟更新10个 2026-01-09 11:04:56 +08:00
cjy
e54af0d278 Merge branch 'feat-cjy-tag' into dev 2026-01-09 11:02:43 +08:00
cjy
a5fa884ebc Revert "fix: 如果RecommendHashtags接口调用失败,就不更新为已调用"
This reverts commit df21fe78fa.
2026-01-09 11:02:29 +08:00
cjy
266e4a6b94 Merge branch 'feat-cjy-tag' into dev 2026-01-09 10:56:24 +08:00
cjy
317d50bad6 feat: 暂时打开定时任务获取tiktok观看数 2026-01-09 10:56:12 +08:00
cjy
df21fe78fa fix: 如果RecommendHashtags接口调用失败,就不更新为已调用 2026-01-09 10:55:16 +08:00
cjy
628d2b64fc Merge branch 'feat-cjy-tag' into dev 2026-01-09 10:39:29 +08:00
cjy
3ded74991c 增加日志记录 2026-01-09 10:39:17 +08:00
jiaji.H
1d136ceb8f Updata:修正精度丢失问题 2026-01-09 10:16:02 +08:00
93c085fb94 fix: 账号数量从3刷成5 2026-01-09 09:55:31 +08:00
cjy
411c1ccbb3 暂时打开识别标签,并保存到数据库 2026-01-09 09:46:10 +08:00
cjy
9c6808ec53 Merge branch 'feat-cjy-tag' into dev 2026-01-09 09:44:08 +08:00
cjy
390d3ea35b feat: 增加是否标签是否有重复的 2026-01-09 09:43:50 +08:00
cjy
7833d399fc Merge branch 'feat-cjy-tag' into dev 2026-01-08 16:44:38 +08:00
cjy
ab8bdde9d9 feat: 增加定时任务更新观看次数 2026-01-08 16:44:20 +08:00
jiaji.H
6dde482bb4 Updata:补充代码 2026-01-08 16:00:09 +08:00
jiaji.H
4f74232571 Updata:补充代码 2026-01-08 15:59:43 +08:00
jiaji.H
150452f067 Updata:作品确认时增加判断套餐是否过期 2026-01-08 15:57:29 +08:00
bx1834938347-prog
62c0bfcf3e Merge branch 'wwq' into dev 2026-01-08 15:21:10 +08:00
bx1834938347-prog
13caea6d29 Update imageContentImport.go 2026-01-08 15:21:05 +08:00
bx1834938347-prog
e2d8114144 Merge branch 'wwq' into dev 2026-01-08 15:20:23 +08:00
bx1834938347-prog
420d706035 feat:修改导入excel的模板 2026-01-08 15:20:13 +08:00
a3485401f5 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-01-08 15:08:16 +08:00
f6be7d7c82 Merge branch 'feature-userinfo-daiyb' into dev 2026-01-08 15:08:15 +08:00
aed787f8ca 修改文件链接 2026-01-08 15:08:10 +08:00
cjy
156459cf32 Merge branch 'feat-cjy-tag' into dev 2026-01-08 14:57:30 +08:00
cjy
d5a81f5c74 fix: 优化获取热门标签错误提示语 2026-01-08 14:57:19 +08:00
cjy
66287ee0d0 Merge branch 'feat-cjy-tag' into dev
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2026-01-08 14:49:11 +08:00
cjy
5bee5bf5aa 暂时关闭上传视频和图文调用自动标签接口 2026-01-08 14:48:09 +08:00
cjy
d8b972be26 feat: 获取推荐标签和热门标签自动获取有效配置 2026-01-08 14:17:57 +08:00
cjy
c17028fbcf feat: 把获取有效配置的方法提取出来 2026-01-08 14:14:52 +08:00
cjy
3318bd45fc fix: 将自动生成标签后的内容更新到请求中 2026-01-08 14:07:36 +08:00
JNG
1714702304 Update upload.go 2026-01-08 13:58:01 +08:00
JNG
70452455b9 Update upload.go 2026-01-08 13:54:56 +08:00
cjy
8ba457d1b8 feat:保存视频和图文自动生成标签到5个。 2026-01-08 13:46:52 +08:00
JNG
c69f7ddba8 Update upload.go 2026-01-08 13:37:49 +08:00
JNG
74bfc30e82 Update upload.go 2026-01-08 13:33:49 +08:00
JNG
df06768936 Merge branch 'dev' of https://gitea-net.fontree.cn/fiee/fonchain-fiee into dev 2026-01-08 13:33:26 +08:00
JNG
771ec86506 Update upload.go 2026-01-08 13:33:21 +08:00
bx1834938347-prog
29d6a2e022 Merge branch 'wwq' into dev 2026-01-08 13:31:08 +08:00
bx1834938347-prog
646b4c7f3f Update imageContentImport.go 2026-01-08 13:31:03 +08:00
JNG
b6ed2e4eac Update upload.go 2026-01-08 13:28:30 +08:00
bx1834938347-prog
34aea49f68 Merge branch 'wwq' into dev 2026-01-08 13:24:26 +08:00
bx1834938347-prog
e7aae9247c Update imageContentImport.go 2026-01-08 13:24:20 +08:00
JNG
5f3a8b6906 Merge branch 'jng-supplier-0105' into dev 2026-01-08 13:17:20 +08:00
JNG
dea92bc15c Update supplier.go 2026-01-08 13:17:12 +08:00
JNG
1f7b864434 Update upload.go 2026-01-08 13:12:44 +08:00
JNG
30591a3014 Update upload.go 2026-01-08 12:00:16 +08:00
JNG
8b63419bd5 Update upload.go 2026-01-08 11:57:52 +08:00
JNG
73661824e7 解决冲突 2026-01-08 11:42:58 +08:00
JNG
cb395d19c2 修改 2026-01-08 11:39:11 +08:00
bx1834938347-prog
28e7e3beba feat:新增图文导入的其他平台 2026-01-08 11:26:11 +08:00
bx1834938347-prog
5e25b846cb feat:新增图文导入平台 2026-01-08 11:19:52 +08:00
cjy
7f583f1a21 feat:自动标签添加获取配置文件的接口 2026-01-08 11:01:40 +08:00
cjy
e8289367bb fix:修复合并代码后的报错 2026-01-07 16:14:22 +08:00
cjy
d074c80af4 Merge branch 'main' into feat-cjy-tag
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
#	pkg/service/cast/work.go
2026-01-07 16:13:07 +08:00
cjy
ceb8a372ff Merge branch 'fix-main-upload' into dev 2026-01-07 15:26:40 +08:00
cjy
b04fe6fd62 fix:将任务管理台与发布管理里面的上传视频图文接口同步 2026-01-07 15:20:25 +08:00
cjy
a3817266a8 Merge branch 'feat-cjy-newTwoPlatform'
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
#	pkg/service/cast/media.go
2026-01-07 14:51:21 +08:00