Commit Graph

689 Commits

Author SHA1 Message Date
b089aca290 打印容器时间 2026-02-09 16:27:03 +08:00
c692e034a6 Merge branch 'feature-special-daiyb' 2026-02-09 15:38:43 +08:00
fa028e8ad2 Merge branch 'fearture-newScript-daiyb' into dev 2026-02-09 15:15:12 +08:00
2663a3562f 内容鉴定 2026-02-09 15:15:05 +08:00
f903c56467 Merge branch 'fearture-newScript-daiyb' into dev 2026-02-09 15:10:25 +08:00
ae5c3de6c4 黄反检测 2026-02-09 15:10:19 +08:00
cjy
05774fcb3b fix:修改时间戳格式化 2026-02-09 12:50:13 +08:00
cjy
c399689be0 fix: 避免空指针 2026-02-09 12:37:44 +08:00
cjy
cea0b741f8 fix:修改判断查询失败的逻辑 2026-02-09 12:37:26 +08:00
cjy
c941a46cee fix:续费的话,查询续费开始到现在套餐的时间所有数据
# Conflicts:
#	api/bundle/bundle.pb.go
#	api/cast/cast.pb.go
#	pkg/service/cast/analysis.go
#	pkg/service/cast/report.go
2026-02-09 12:36:51 +08:00
cjy
31a08879b6 fix:如果套餐为续费套餐直接失败
# Conflicts:
#	api/cast/cast.pb.go
2026-02-09 11:58:14 +08:00
cjy
8ec97fdcff fix:创建竞品报告时,传入订单uuid 2026-02-09 11:55:17 +08:00
cjy
063a7991ba Merge branch 'fix-cjy-baseOnjng'
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2026-02-09 11:53:30 +08:00
cjy
59ece0cb7f Merge branch 'feat-cjy-changeOperator'
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
#	pkg/cron/task.go
2026-02-09 11:52:07 +08:00
195ac2a769 fiee5️⃣期需求
账号过期解绑
2026-02-09 11:30:22 +08:00
4fd1f7c08a Merge branch 'fix-import-script-daiyb' into dev 2026-02-06 19:42:46 +08:00
5e10fe8bb0 优化脚本导入自己不能同时导入2个 2026-02-06 19:42:39 +08:00
cjy
b58e02a5ae fix: 避免空指针 2026-02-06 19:24:20 +08:00
cjy
9c6029c20b fix:修改时间戳格式化 2026-02-06 18:36:12 +08:00
ee64ecd246 Merge branch 'feature-special-daiyb' into dev 2026-02-06 18:21:38 +08:00
23cf5af6dc 修改上下文解析 2026-02-06 18:21:33 +08:00
cjy
ce0fb99ed6 fix:修改判断查询失败的逻辑 2026-02-06 17:12:05 +08:00
cjy
0142be0dc6 fix:续费的话,查询续费开始到现在套餐的时间所有数据 2026-02-06 17:00:38 +08:00
e671b6817c Merge branch 'feature-special-daiyb' into dev 2026-02-06 16:41:19 +08:00
4df6706dac 兼容无token调用 2026-02-06 16:41:13 +08:00
179b3c2838 Merge branch 'feature-four-daiyb' into dev 2026-02-06 14:34:58 +08:00
a805c9c382 Update test.go 2026-02-06 14:34:53 +08:00
b1bb087316 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-06 14:33:27 +08:00
76d64508bb Merge branch 'feature-four-daiyb' into dev 2026-02-06 14:33:21 +08:00
ccb469edda Update test.go 2026-02-06 14:33:14 +08:00
cjy
f9f02e7b10 增加一点日志 2026-02-06 14:31:22 +08:00
1d36eea47c 修改订单刷新 2026-02-06 14:11:14 +08:00
0cef4a573e Update test.go 2026-02-06 13:39:18 +08:00
4773caf295 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-06 12:03:22 +08:00
54f4b5d62e Merge branch 'feature-four-daiyb' into dev 2026-02-06 12:03:21 +08:00
62e25d3079 修改同步逻辑 2026-02-06 12:03:14 +08:00
cjy
60beab01be fix:如果套餐为续费套餐直接失败 2026-02-05 20:24:55 +08:00
cjy
46b7762471 fix:创建竞品报告时,传入订单uuid 2026-02-05 20:24:37 +08:00
cjy
bb326bfe0d fix:更新也增加订单uuid 2026-02-05 20:24:00 +08:00
cjy
0bdf0f9648 feat:存入订单uuid
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2026-02-05 20:22:11 +08:00
cjy
4c4d139b05 fix:更新也增加订单uuid 2026-02-05 19:32:00 +08:00
cjy
d27b85a155 feat:存入订单uuid 2026-02-05 17:52:24 +08:00
cf2e4067b9 脚本更新 2026-02-05 17:07:51 +08:00
cf709742b2 脚本更新 2026-02-05 17:06:24 +08:00
fee7728da9 Merge branch 'feature-four-daiyb' into dev 2026-02-05 15:50:00 +08:00
e0a5346302 完善代码 2026-02-05 15:49:55 +08:00
fbe32fb485 套餐已过期 2026-02-05 15:44:55 +08:00
433ec99628 套餐已过期 2026-02-05 15:44:19 +08:00
cjy
2aa0a73041 fix:暂时注释 2026-02-05 13:15:02 +08:00
cjy
084df09c9b Merge branch 'feat-cjy-changeOperator' into dev
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2026-02-05 13:10:00 +08:00
cjy
748ceb5d63 feat: 增加审批通过时间 2026-02-05 11:28:01 +08:00
cjy
c82f137ac1 fix:调用列表不再刷新审批更新状态 2026-02-05 09:56:20 +08:00
cjy
15338ca7c8 fix:更新通过审批的操作人为业务部门 2026-02-05 09:52:32 +08:00
5d27d502c8 取消授权写入excel 2026-02-04 19:15:36 +08:00
f4c826936b 解绑取消授权记录 2026-02-04 19:02:42 +08:00
f59b434dc7 同步bundle的proto 2026-02-04 17:39:00 +08:00
3940e5f9eb Merge branch 'feature-four-daiyb' into dev 2026-02-04 16:09:14 +08:00
39dc62b032 套餐续费和新购 2026-02-04 16:09:08 +08:00
7cca30c2a5 Merge branch 'fix-operator-daiyb' into dev 2026-02-04 13:48:53 +08:00
d3ae7e0b85 修改默认值 2026-02-04 13:48:46 +08:00
5a814ab12f DM取消授权 2026-02-04 09:41:39 +08:00
103fe91e8f Merge branch 'feature-four-daiyb' into dev 2026-02-03 16:21:25 +08:00
7e77b6d585 发布来源 2026-02-03 15:29:36 +08:00
f39ca2179d Merge branch 'feature-four-daiyb' into dev 2026-02-03 09:45:50 +08:00
544a8be9dc 解绑账号 2026-02-03 09:45:44 +08:00
f4f75a06ca Merge branch 'feature-four-daiyb' 2026-02-02 16:50:59 +08:00
579fcb3667 Merge branch 'feature-four-daiyb' into dev 2026-02-02 16:50:51 +08:00
076d4d3f80 Update test.go 2026-02-02 16:50:46 +08:00
7373026f48 Merge branch 'feature-four-daiyb' 2026-02-02 16:13:01 +08:00
cjy
5e762104d9 fix:移除测试环境不必要的导入 2026-02-02 10:26:24 +08:00
cjy
28ea5ec412 fix:套餐过期后,只显示套餐过期的上一个套餐期间的竞品报告和数据分析 2026-02-02 09:35:22 +08:00
c87c1be186 Update work.go 2026-01-30 20:23:37 +08:00
8c18af01a8 Update work.go 2026-01-30 20:19:31 +08:00
e57dd03269 Update work.go 2026-01-30 19:53:05 +08:00
6f1277ec9b Update work.go 2026-01-30 19:49:44 +08:00
dee2b9d50c Update work.go 2026-01-30 19:40:52 +08:00
cjy
248d8f50ef fix:修改状态映射 2026-01-30 18:31:28 +08:00
cjy
def4c797f2 fix:修改状态映射 2026-01-30 18:31:05 +08:00
cjy
ba19e65e7f Merge branch 'feat-cjy-report' into dev 2026-01-30 18:21:19 +08:00
cjy
8e7a3643d2 Merge branch 'feat-cjy-report' 2026-01-30 18:20:52 +08:00
cjy
61aa8af162 Revert "fix:如果新买一个套餐,原有套餐的直接通过,不需要消耗额度"
This reverts commit 7564af8220.
2026-01-30 18:20:32 +08:00
cjy
df8fbfbc43 fix:修复批量导入的时候,始终固定报告名 2026-01-30 17:31:00 +08:00
cjy
a2703f907e fix:修复批量导入的时候,始终固定报告名 2026-01-30 17:29:10 +08:00
cjy
6619c99be7 fix:修复批量导入的时候,始终固定报告名 2026-01-30 17:28:24 +08:00
cjy
254d85ced3 Merge branch 'feat-cjy-report'
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
#	api/cast/cast_triple.pb.go
#	pkg/service/cast/work.go
2026-01-30 12:01:23 +08:00
7c45999a40 Merge branch 'feature-four-daiyb' into dev 2026-01-29 11:42:23 +08:00
26658aaa5e 修改名称 2026-01-29 11:42:14 +08:00
4e69ab9731 Merge branch 'feature-four-daiyb' into dev 2026-01-29 11:16:38 +08:00
a67adf0013 更新账号返回状态 2026-01-29 11:16:27 +08:00
c6cf13465c Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-01-27 14:36:26 +08:00
e4c88feaef Merge branch 'feature-four-daiyb' into dev 2026-01-27 14:36:25 +08:00
c8e5ab9873 Update test.go 2026-01-27 13:37:10 +08:00
cjy
12870fbf94 Merge branch 'feat-cjy-report' into dev 2026-01-27 13:24:43 +08:00
cjy
7564af8220 fix:如果新买一个套餐,原有套餐的直接通过,不需要消耗额度 2026-01-27 13:24:35 +08:00
cjy
451fe4b2e2 Merge branch 'feat-cjy-report' into dev 2026-01-26 15:59:06 +08:00
cjy
4ce735d4de fix: 买套餐之后,旧套餐期间的数据分析和竞品报告不让看 2026-01-26 15:58:58 +08:00
cjy
889acc4e78 Merge branch 'feat-cjy-report' into dev 2026-01-26 15:27:42 +08:00
cjy
c6f4385991 fix: 修改报告名 2026-01-26 15:27:32 +08:00
cjy
82fd06139a Merge branch 'feat-cjy-report' into dev 2026-01-26 15:01:09 +08:00
cjy
c0ea800511 fix: 修复套餐过期导致的错误 2026-01-26 15:01:01 +08:00