|
c07d4a3abb
|
修改预览接口路径
|
2025-06-16 13:47:14 +08:00 |
|
|
909a44682b
|
Merge branch 'dev-lzh' into dev
|
2025-06-16 13:09:37 +08:00 |
|
|
87fed2c831
|
文件上传修改为表单格式
|
2025-06-16 13:09:06 +08:00 |
|
|
467b126590
|
Merge branch 'dev' of http://172.16.100.91:3000/fiee/fonchain-fiee into dev
|
2025-06-16 11:53:08 +08:00 |
|
|
505216a1b3
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-06-16 11:52:48 +08:00 |
|
|
ac14cabe1b
|
Update work.go
|
2025-06-16 11:52:30 +08:00 |
|
|
8247a52343
|
Merge branch 'sxy-sec' into dev
|
2025-06-16 11:48:25 +08:00 |
|
|
4d8b89c68c
|
增加 page
|
2025-06-16 11:48:11 +08:00 |
|
|
7dcf40675f
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-06-16 11:38:06 +08:00 |
|
|
1e6e026aae
|
添加日志修改提示
|
2025-06-16 11:37:05 +08:00 |
|
|
0fb393e9ed
|
文件上传修改为表单格式
|
2025-06-16 11:25:17 +08:00 |
|
|
a5d6e45cd1
|
Merge branch 'jng' into dev
|
2025-06-16 11:19:50 +08:00 |
|
|
21f6837fec
|
修改
|
2025-06-16 11:19:42 +08:00 |
|
|
40c0a9d65f
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-06-16 11:06:32 +08:00 |
|
|
92364e194f
|
merge jng
|
2025-06-16 10:53:22 +08:00 |
|
|
abe68c7f6e
|
1
|
2025-06-16 10:37:18 +08:00 |
|
|
033d9ba023
|
Merge branch 'dev-lzh' into dev
|
2025-06-16 10:20:24 +08:00 |
|
|
6c194a0646
|
作品类型判断
|
2025-06-16 10:20:18 +08:00 |
|
|
35712fdbe2
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# api/bundle/bundle.pb.go
# api/bundle/bundle_triple.pb.go
|
2025-06-16 10:03:06 +08:00 |
|
|
638f2a9554
|
fix: 调整代码,创建支付的时候加入创建对账单。支付成功通知时更新对账单
|
2025-06-16 09:56:09 +08:00 |
|
|
d93c911334
|
Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev
|
2025-06-16 09:44:33 +08:00 |
|
|
5954f86213
|
Merge branch 'chat' into dev
|
2025-06-16 09:44:06 +08:00 |
|
|
f9921d2ba0
|
Update upload.go
|
2025-06-16 09:43:45 +08:00 |
|
|
1648689c02
|
Merge branch 'sxy-sec' into dev
|
2025-06-16 09:31:40 +08:00 |
|
|
549b5f05c6
|
增加 form list
|
2025-06-16 09:31:23 +08:00 |
|
|
49137828da
|
Merge branch 'feat-zjy-issue-008' into dev
|
2025-06-15 20:57:25 +08:00 |
|
|
e370308b10
|
fix: 调整校验状态
|
2025-06-15 20:57:02 +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 |
|
|
1988c49b82
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-06-15 20:46:23 +08:00 |
|
|
c5ee0d1ae7
|
获取用户余量
|
2025-06-15 20:46:05 +08:00 |
|
|
905d2077d3
|
fix: 完成用户进入聊天室直接回复
|
2025-06-15 19:58:02 +08:00 |
|
|
01bd9736e0
|
Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev
|
2025-06-15 19:56:48 +08:00 |
|
|
98c6a72f96
|
fix: 完成用户进入聊天室直接回复
|
2025-06-15 19:56:32 +08:00 |
|
|
ce95cface5
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# api/bundle/bundle.pb.go
# pkg/router/bundle.go
# pkg/service/bundle/bundleProfile.go
|
2025-06-15 19:22:14 +08:00 |
|
|
057565b0aa
|
fix: 新增接口,根据orderNo,仅查询它单独购买的增值服务,调整支付创建时候仅增值的情况
|
2025-06-15 19:19:10 +08:00 |
|
|
2276144fc4
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# api/bundle/bundle.pb.go
|
2025-06-15 18:31:52 +08:00 |
|
|
32cf742fa8
|
fix: detail接口增加addBundle的字段
|
2025-06-15 18:29:10 +08:00 |
|
|
c347c7d81d
|
fix: debug
|
2025-06-15 18:28:21 +08:00 |
|
|
8817680689
|
Update handler.go
|
2025-06-15 18:20:48 +08:00 |
|
|
9ecc24cbbe
|
Update handler.go
|
2025-06-15 18:20:04 +08:00 |
|
|
e6920fe595
|
Update handler.go
|
2025-06-15 17:18:44 +08:00 |
|
|
1979ac7530
|
Merge branch 'chat' into dev
|
2025-06-15 16:23:58 +08:00 |
|
|
f90be904e4
|
fix: update
|
2025-06-15 16:23:01 +08:00 |
|
|
2827c3a921
|
fix: update
|
2025-06-15 16:09:25 +08:00 |
|
|
a295762f37
|
Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev
|
2025-06-15 16:03:08 +08:00 |
|
|
2151a8e42b
|
Merge branch 'chat' into dev
|
2025-06-15 16:02:45 +08:00 |
|
|
4269f34670
|
fix: 聊天机器人
|
2025-06-15 16:02:31 +08:00 |
|
|
7e9f25fffe
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 15:54:04 +08:00 |
|
|
cc591a2e04
|
磁盘使用率接口
|
2025-06-15 15:53:57 +08:00 |
|
|
729c9e661c
|
解决冲突
|
2025-06-15 15:32:25 +08:00 |
|
|
8000f56c06
|
修改
|
2025-06-15 15:27:51 +08:00 |
|
|
aa08c15e2a
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 15:12:49 +08:00 |
|
|
d47c033d7b
|
作品状态确认
|
2025-06-15 15:12:42 +08:00 |
|
|
3e16c413e5
|
作品状态判断
|
2025-06-15 15:00:45 +08:00 |
|
|
c84fb621a9
|
作品状态判断
|
2025-06-15 15:00:14 +08:00 |
|
|
325d14d913
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 14:58:36 +08:00 |
|
|
cb84e6195d
|
1
|
2025-06-15 14:58:29 +08:00 |
|
|
45a3751914
|
删除调试日志
|
2025-06-15 14:56:01 +08:00 |
|
|
1dd8ccf3b7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-15 14:55:25 +08:00 |
|
|
15ddf58f55
|
Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
# api/bundle/bundle.pb.go
# api/bundle/bundle_triple.pb.go
# docs/dev/dubbogo.yaml
# pkg/service/init.go
|
2025-06-15 14:53:47 +08:00 |
|
|
4b9e6eb7bd
|
调试日志打印
|
2025-06-15 14:51:51 +08:00 |
|
|
59ed859aae
|
fix: 调整支付配置文件
|
2025-06-15 14:50:26 +08:00 |
|
|
966790326e
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 13:58:15 +08:00 |
|
|
bfef9134b7
|
余量查询修改
|
2025-06-15 13:58:07 +08:00 |
|
|
e26c9f0c51
|
fix: 调整创建支付的代码逻辑
|
2025-06-15 13:23:11 +08:00 |
|
|
26c0056b12
|
Merge branch 'dev-lzh' into dev
|
2025-06-15 12:22:38 +08:00 |
|
|
d3b16ace79
|
作品确认、用户余量信息
|
2025-06-15 12:18:50 +08:00 |
|
|
e8645e6515
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-06-15 12:13:04 +08:00 |
|
|
71ef73bec6
|
fix: 调试token
|
2025-06-15 11:24:49 +08:00 |
|
|
3f43441c4f
|
Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev
|
2025-06-15 10:21:29 +08:00 |
|
|
c665b2190c
|
Merge branch 'chat' into dev
|
2025-06-15 10:21:11 +08:00 |
|
|
f41e053e08
|
feat: debug
|
2025-06-15 10:20:36 +08:00 |
|
|
abc498f656
|
解决冲突
|
2025-06-15 10:09:39 +08:00 |
|
|
eb3e1f809b
|
修改
|
2025-06-15 10:06:57 +08:00 |
|
|
f8c6a2ff96
|
完成套餐查询
|
2025-06-15 00:33:25 +08:00 |
|
|
ec631334d6
|
APP接口
|
2025-06-14 19:47:36 +08:00 |
|
|
1617c6170d
|
APP接口
|
2025-06-14 19:46:02 +08:00 |
|
|
f987f964b5
|
1
|
2025-06-14 19:00:37 +08:00 |
|
|
c1ba3f348a
|
Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev
|
2025-06-14 17:41:29 +08:00 |
|
|
8bacafbdfe
|
Merge branch 'chat' into dev
|
2025-06-14 17:40:41 +08:00 |
|
|
0f59144fa8
|
Merge branch 'sxy' into dev
|
2025-06-14 17:40:19 +08:00 |
|
|
9402bad9fd
|
修改语言传输
|
2025-06-14 17:40:06 +08:00 |
|
|
19e1ce9182
|
feat: 增加调试记录
|
2025-06-14 17:39:58 +08:00 |
|
|
f4ae80f326
|
Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev
|
2025-06-14 17:20:11 +08:00 |
|
|
bc8d915944
|
Merge branch 'chat' into dev
|
2025-06-14 17:18:25 +08:00 |
|
|
f2277fa337
|
添加待确认作品详情查看
|
2025-06-14 17:13:30 +08:00 |
|
|
39fc87c859
|
fix: update
|
2025-06-14 17:10:52 +08:00 |
|
|
b06f24d06e
|
Merge branch 'sxy' into dev
|
2025-06-14 17:10:40 +08:00 |
|
|
637fc47188
|
z增加详情接口
|
2025-06-14 17:10:28 +08:00 |
|
|
1bab9a17e6
|
修改proto
|
2025-06-14 17:09:14 +08:00 |
|
|
623584225d
|
Revert "Merge branch 'sxy' into dev"
This reverts commit 9301c78060 , reversing
changes made to fe3f693925 .
|
2025-06-14 16:43:59 +08:00 |
|
|
9301c78060
|
Merge branch 'sxy' into dev
|
2025-06-14 16:41:35 +08:00 |
|
|
ba65fbe5b7
|
修改
|
2025-06-14 16:41:21 +08:00 |
|
|
b523c46cde
|
解决冲突
|
2025-06-14 15:25:09 +08:00 |
|
|
c4e72efcb5
|
11
|
2025-06-14 15:23:14 +08:00 |
|
|
13fc02b8ba
|
Merge branch 'chat' into dev
|
2025-06-14 15:05:00 +08:00 |
|
|
e01ea1d9c2
|
Update handler.go
|
2025-06-14 15:04:51 +08:00 |
|
|
8f137abf30
|
Merge branch 'chat' into dev
|
2025-06-14 14:59:25 +08:00 |
|
|
94f01d2ee1
|
Update handler.go
|
2025-06-14 14:59:01 +08:00 |
|
|
5706c238a4
|
Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev
|
2025-06-14 14:49:31 +08:00 |
|
|
75231bab91
|
fix: 解决冲突
|
2025-06-14 14:48:34 +08:00 |
|
|
c81b87d824
|
feat: 客服聊天
|
2025-06-14 14:46:01 +08:00 |
|
|
d1468434b6
|
Merge branch 'dev-lzh' into dev
|
2025-06-14 13:54:16 +08:00 |
|
|
ae7b87aa17
|
添加作品记录和详情接口
|
2025-06-14 13:52:51 +08:00 |
|
|
bef40ad0f1
|
Merge remote-tracking branch 'origin/feature-multicast-daiyb' into dev-lzh
|
2025-06-14 13:31:29 +08:00 |
|
|
a41962ba8d
|
添加使用记录接口
|
2025-06-14 13:29:05 +08:00 |
|
|
bb36d88c98
|
补齐依赖
|
2025-06-14 13:21:02 +08:00 |
|
|
0d28141f65
|
Merge remote-tracking branch 'origin/jng' into dev-lzh
|
2025-06-14 13:20:21 +08:00 |
|
|
58b0ca77e1
|
Merge branch 'jng' into dev
|
2025-06-14 11:29:27 +08:00 |
|
|
99cfbbf6f7
|
添加订单详情接口
|
2025-06-14 11:29:21 +08:00 |
|
|
4f9f8e66db
|
解决冲突
|
2025-06-14 10:33:53 +08:00 |
|
|
8196e14159
|
Merge branch 'jng' into dev
|
2025-06-14 10:23:16 +08:00 |
|
|
d4b50302fa
|
添加轮播接口
|
2025-06-14 10:22:02 +08:00 |
|
|
d4e00229fa
|
Merge branch 'dev-lzh' into dev
|
2025-06-14 09:50:35 +08:00 |
|
|
e447ff1d42
|
素材库添加鉴权
|
2025-06-14 09:50:12 +08:00 |
|
|
36dc2dd194
|
解决冲突
|
2025-06-13 22:39:14 +08:00 |
|
|
8449969682
|
修改
|
2025-06-13 22:38:03 +08:00 |
|
|
ec0ad25aec
|
解决冲突
|
2025-06-13 19:29:19 +08:00 |
|
|
a439342ba2
|
修改订单创建
|
2025-06-13 19:25:39 +08:00 |
|
|
829928da9b
|
添加审批
|
2025-06-13 19:02:00 +08:00 |
|
|
129d3fafa1
|
更新审批
|
2025-06-13 19:00:38 +08:00 |
|
|
2e46cfaacd
|
Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev
|
2025-06-13 15:29:37 +08:00 |
|
|
8570541f76
|
Merge branch 'chat' into dev
|
2025-06-13 15:29:12 +08:00 |
|
|
b979be1484
|
fix: 修复聊天中的token校验问题
|
2025-06-13 15:28:23 +08:00 |
|
|
1b1db8e0aa
|
Merge branch 'sxy-sec' into dev
|
2025-06-13 14:44:43 +08:00 |
|
|
8d9260aca5
|
修改返回数据
|
2025-06-13 14:44:24 +08:00 |
|
|
fd6d763431
|
添加扩展、余量接口
|
2025-06-13 14:23:06 +08:00 |
|
|
c22977816b
|
解决冲突
|
2025-06-13 14:16:35 +08:00 |
|
|
4a30ddad23
|
修改
|
2025-06-13 14:02:34 +08:00 |
|
|
11b0192a23
|
添加扩展和余量接口
|
2025-06-13 14:00:29 +08:00 |
|
|
126360113d
|
Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev
|
2025-06-13 11:05:18 +08:00 |
|
|
3e80d15355
|
Merge branch 'chat' into dev
|
2025-06-13 11:04:47 +08:00 |
|
|
fb076dd4db
|
feat: update
|
2025-06-13 11:04:33 +08:00 |
|
|
7ea561bb01
|
Merge branch 'sxy-sec' into dev
|
2025-06-13 10:54:13 +08:00 |
|
|
a63b001e5b
|
修改
|
2025-06-13 10:53:59 +08:00 |
|
|
efdebf8949
|
Merge branch 'sxy-sec' into dev
|
2025-06-13 10:49:32 +08:00 |
|
|
76e30e9211
|
修改冲突
|
2025-06-13 10:47:42 +08:00 |
|
|
49a935d6c6
|
修改
|
2025-06-13 10:34:36 +08:00 |
|
|
637cad4298
|
fix: 解决go.mod 冲突
|
2025-06-12 19:38:03 +08:00 |
|
|
72c1ad35b7
|
feat: 回复规则
|
2025-06-12 19:31:40 +08:00 |
|
|
9718cd7c67
|
临时注释
|
2025-06-12 18:50:28 +08:00 |
|
|
3fb1c12bef
|
解决冲突
|
2025-06-12 18:16:31 +08:00 |
|
|
449ff68d3a
|
修改
|
2025-06-12 18:15:28 +08:00 |
|
|
cc328eee8d
|
备份
|
2025-06-12 18:10:07 +08:00 |
|
|
47c77fcdbb
|
feat: 客服聊天
|
2025-06-12 17:07:49 +08:00 |
|
|
a1679a8a24
|
解决冲突
|
2025-06-12 16:40:38 +08:00 |
|
|
03574bd25f
|
修改
|
2025-06-12 16:38:55 +08:00 |
|
|
7c54d3ce30
|
更新审批信息
|
2025-06-12 15:20:11 +08:00 |
|
|
7edf18a252
|
Merge branch 'dev-lzh' into dev
|
2025-06-12 14:36:37 +08:00 |
|
|
3a47be645f
|
添加摘要字段
|
2025-06-12 14:36:29 +08:00 |
|
|
b65f78dc12
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-06-12 11:38:43 +08:00 |
|
|
347b97f9d9
|
添加详情
|
2025-06-12 11:38:19 +08:00 |
|
|
da7b5edb6e
|
Merge branch 'dev-lzh' into dev
|
2025-06-11 17:51:52 +08:00 |
|
|
83c218564f
|
修改文档接口method
|
2025-06-11 17:51:45 +08:00 |
|
|
b8355c0e27
|
删除调试信息
|
2025-06-11 16:55:46 +08:00 |
|
|
949be8efaa
|
添加调试信息
|
2025-06-11 16:48:38 +08:00 |
|
|
5aa145bf1a
|
添加调试信息
|
2025-06-11 16:44:37 +08:00 |
|
|
329098d07b
|
添加调试信息
|
2025-06-11 16:41:13 +08:00 |
|
|
7dbef64c91
|
Merge branch 'dev' of http://172.16.100.91:3000/fiee/fonchain-fiee into dev
|
2025-06-11 16:11:38 +08:00 |
|
|
53127451c9
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-06-11 16:11:31 +08:00 |
|
|
a6078341ab
|
更新列表接口
|
2025-06-11 16:11:16 +08:00 |
|
|
99f4ca986a
|
修改路由接口
|
2025-06-11 15:41:04 +08:00 |
|
|
feefda874a
|
删除无用依赖
|
2025-06-11 14:54:08 +08:00 |
|
|
a725fb7d98
|
解决冲突
|
2025-06-11 14:34:40 +08:00 |
|
|
db54a355e8
|
修改
|
2025-06-11 14:33:48 +08:00 |
|
|
9289953613
|
Merge branch 'dev-lzh' into dev
|
2025-06-11 14:14:04 +08:00 |
|
|
dc54b70b59
|
完善文档相关接口
|
2025-06-11 14:13:11 +08:00 |
|
|
8e8cc16853
|
添加官网新闻接口
|
2025-06-11 13:59:35 +08:00 |
|
|
5d19fb261d
|
修改字段
|
2025-06-11 09:55:07 +08:00 |
|
|
fc482ff71e
|
更新cast
|
2025-06-11 09:54:04 +08:00 |
|
|
69212549c5
|
合并
|
2025-06-11 09:22:49 +08:00 |
|
|
fb60eba3e9
|
合并
|
2025-06-11 09:19:55 +08:00 |
|
|
7008b4aa2a
|
完成部分接口
|
2025-06-11 09:16:11 +08:00 |
|
|
1fa862b85d
|
解决冲突
|
2025-06-10 16:17:09 +08:00 |
|
|
8f4dd8aee0
|
修改
|
2025-06-10 16:15:57 +08:00 |
|
|
8629decdc0
|
Merge branch 'sxy' into dev
|
2025-06-10 15:03:04 +08:00 |
|
|
289c5937c5
|
"套餐修改"
|
2025-06-10 14:05:57 +08:00 |
|
|
272d59af4c
|
添加套餐扩展、扩展记录接口
|
2025-06-09 14:22:39 +08:00 |
|
|
d067c785fb
|
Merge branch 'dev-resource-library' into dev-lzh
|
2025-06-09 13:40:19 +08:00 |
|
|
99520e87d4
|
完成账号更新
|
2025-06-06 14:15:37 +08:00 |
|
|
9711496a8b
|
合并代码
|
2025-06-06 11:53:54 +08:00 |
|
|
5d7f617c4d
|
Update init.go
|
2025-06-06 11:46:25 +08:00 |
|
|
4f6101be68
|
merge
|
2025-06-06 11:45:47 +08:00 |
|
|
78f4a98993
|
merge main
|
2025-06-06 11:44:06 +08:00 |
|
|
5a8bb4216c
|
添加素材库接口
|
2025-06-03 15:58:52 +08:00 |
|
|
d9275166e7
|
Merge branch 'main' into feature-multicast-daiyb
|
2025-05-29 14:28:16 +08:00 |
|
|
f7a0e319b5
|
删除忽略文件
|
2025-05-29 14:28:00 +08:00 |
|
|
c250930722
|
Merge branch 'jng' into dev
|
2025-05-28 15:32:06 +08:00 |
|
|
0b7c37c18b
|
修改
|
2025-05-28 15:31:58 +08:00 |
|
|
ed7b95d707
|
Merge branch 'jng' into dev
|
2025-05-28 15:04:59 +08:00 |
|
|
34aa4f1b03
|
修改
|
2025-05-28 15:04:52 +08:00 |
|
|
5bbf97eaf2
|
修改引用问题
|
2025-05-27 10:56:19 +08:00 |
|
|
c1978c9ee7
|
修改冲突
|
2025-05-27 10:49:22 +08:00 |
|
|
73f269f847
|
导出文件 上传 oss
|
2025-05-27 10:46:36 +08:00 |
|
|
01724622b9
|
修改
|
2025-05-26 17:03:07 +08:00 |
|
|
3df1e05aef
|
修改
|
2025-05-26 16:31:38 +08:00 |
|
|
d0453c222d
|
添加cast微服务
|
2025-05-23 13:25:47 +08:00 |
|
|
48f6eca314
|
修改
|
2025-05-23 10:53:16 +08:00 |
|
|
7b5fd0182a
|
111
|
2025-05-22 20:19:42 +08:00 |
|
|
c9635a647c
|
fix: 调整payment的proto的service
|
2025-05-16 14:39:34 +08:00 |
|