Commit Graph

131 Commits

Author SHA1 Message Date
sxy
24fe5e3760 Merge branch 'sxy' 2025-06-26 17:46:33 +08:00
lzh
7735b710dd Merge branch 'dev-lzh' 2025-06-26 17:18:46 +08:00
bbf093e104 Merge branch 'feat-zjy-issue-008' into main
# Conflicts:
#	api/bundle/bundle.pb.go
#	api/bundle/bundle_triple.pb.go
#	docs/dev/dubbogo.yaml
#	pkg/router/bundle.go
#	pkg/service/init.go
2025-06-26 17:07:16 +08:00
2fc8ee5cb2 合并代码 2025-06-26 16:54:59 +08:00
lzh
fe9f4dcc95 调整资源原始文件鉴权 2025-06-26 16:12:50 +08:00
ce9deac980 1 2025-06-25 10:25:24 +08:00
e0d7b3775c 添加作品数量 2025-06-24 18:27:55 +08:00
490b0d7787 添加合同删除 2025-06-24 13:56:22 +08:00
383f8bef10 Merge branch 'jng' into feat-zjy-issue-008
# Conflicts:
#	api/bundle/bundle.pb.go
#	api/bundle/bundle_triple.pb.go
2025-06-20 11:21:22 +08:00
sxy
87e9701f72 修改h5 list接口 2025-06-20 11:15:01 +08:00
sxy
736e3b1bd0 修改H5套餐列表 2025-06-19 16:19:37 +08:00
8cfcbf345e 修改 2025-06-19 15:32:54 +08:00
2facb5c0fb Merge branch 'chat' 2025-06-19 15:07:05 +08:00
480551a738 添加重新发布 2025-06-19 11:04:37 +08:00
sxy
8ba1cd7101 Merge branch 'sxy-sec' 2025-06-17 20:28:37 +08:00
sxy
c98591b2bb Revert "修改"
This reverts commit 8f8e28ca3d.
2025-06-17 19:55:01 +08:00
lzh
d00a4d48ad Merge branch 'dev-lzh' 2025-06-17 19:34:51 +08:00
lzh
661eb9c72a 添加跨域处理 2025-06-17 19:34:42 +08:00
sxy
5aaf8d92bf Merge branch 'sxy-sec' 2025-06-17 18:33:52 +08:00
sxy
8f8e28ca3d 修改 2025-06-17 18:30:36 +08:00
sxy
8d28627e5f 修改接口认证 2025-06-17 14:46:09 +08:00
lzh
5ad6d318e0 添加确认变更的接口 2025-06-17 14:27:43 +08:00
sxy
0a5cb9f175 修改接口认证 2025-06-17 14:21:18 +08:00
sxy
d14dbaaf99 修改官网数据 2025-06-17 14:07:30 +08:00
lzh
8a13754309 素材库路径修改 2025-06-16 14:11:11 +08:00
lzh
b29c2fcad3 匹配路径修改 2025-06-16 13:54:42 +08:00
lzh
c07d4a3abb 修改预览接口路径 2025-06-16 13:47:14 +08:00
af9a59227f fix: 新增app端的根据orderNo查询子套餐 2025-06-16 13:05:29 +08:00
92364e194f merge jng 2025-06-16 10:53:22 +08:00
abe68c7f6e 1 2025-06-16 10:37:18 +08:00
sxy
549b5f05c6 增加 form list 2025-06-16 09:31:23 +08:00
cf18598b96 Merge branch 'jng' into feat-zjy-issue-008
# Conflicts:
#	api/bundle/bundle.pb.go
2025-06-15 20:54:42 +08:00
057565b0aa fix: 新增接口,根据orderNo,仅查询它单独购买的增值服务,调整支付创建时候仅增值的情况 2025-06-15 19:19:10 +08:00
d332b0e1d4 修改 2025-06-15 15:59:40 +08:00
lzh
cc591a2e04 磁盘使用率接口 2025-06-15 15:53:57 +08:00
8000f56c06 修改 2025-06-15 15:27:51 +08:00
lzh
d3b16ace79 作品确认、用户余量信息 2025-06-15 12:18:50 +08:00
f41e053e08 feat: debug 2025-06-15 10:20:36 +08:00
eb3e1f809b 修改 2025-06-15 10:06:57 +08:00
1617c6170d APP接口 2025-06-14 19:46:02 +08:00
025d64087f fix: update 2025-06-14 19:30:37 +08:00
f987f964b5 1 2025-06-14 19:00:37 +08:00
f86d6b5db6 Update router.go 2025-06-14 17:27:43 +08:00
lzh
f2277fa337 添加待确认作品详情查看 2025-06-14 17:13:30 +08:00
39fc87c859 fix: update 2025-06-14 17:10:52 +08:00
sxy
637fc47188 z增加详情接口 2025-06-14 17:10:28 +08:00
sxy
1bab9a17e6 修改proto 2025-06-14 17:09:14 +08:00
sxy
ba65fbe5b7 修改 2025-06-14 16:41:21 +08:00
lzh
ae7b87aa17 添加作品记录和详情接口 2025-06-14 13:52:51 +08:00
lzh
bef40ad0f1 Merge remote-tracking branch 'origin/feature-multicast-daiyb' into dev-lzh 2025-06-14 13:31:29 +08:00