 yang
|
c363c0c6d9
|
feat(payment): 更新支付宝支付功能并添加证书
|
2025-02-15 14:36:29 +08:00 |
Diyu0904
|
57bdbdca3b
|
Merge branch 'feature/admin' into preview
# Conflicts:
# mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java
# mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelVersionController.java
|
2025-02-14 13:41:14 +08:00 |
|
Diyu0904
|
7891130482
|
联调工作流+模型
|
2025-02-14 13:36:17 +08:00 |
|
yang
|
f9f7361a16
|
refactor(mcwl): 重构项目中的返回结果封装
|
2025-02-13 14:48:54 +08:00 |
|
yang
|
5b359ed6a3
|
refactor(resource): 调整评论排序逻辑和查询条件
|
2025-02-13 11:21:34 +08:00 |
|
Diyu0904
|
b4ae47cf28
|
Merge branch 'feature/admin' into preview
|
2025-02-13 10:38:49 +08:00 |
|
yang
|
89ff879055
|
refactor(resource): 调整评论和点赞功能
|
2025-02-13 10:37:15 +08:00 |
|
Diyu0904
|
f8034850cb
|
修改工作流回显
|
2025-02-13 10:36:58 +08:00 |
yang
|
dd16eb0106
|
feat(resource): 添加获取评论数量，增加排序
|
2025-02-12 22:21:05 +08:00 |
|
yang
|
570c7bb656
|
feat(resource): 调整评论和回复
|
2025-02-12 18:15:09 +08:00 |
|
yang
|
e679fd847e
|
feat(resource): 调整评论和回复
|
2025-02-12 16:59:30 +08:00 |
|
Diyu0904
|
7c3621ac2d
|
Merge branch 'feature/admin' into preview
# Conflicts:
# mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java
# mcwl-system/src/main/java/com/mcwl/system/mapper/SysUserMapper.java
# mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml
|
2025-02-12 13:20:19 +08:00 |
|
Diyu0904
|
bd23402389
|
联调工作流
修改文件上传
|
2025-02-12 13:16:35 +08:00 |
|
yang
|
c78b731816
|
feat(pay): 金币充值
|
2025-02-12 10:49:37 +08:00 |
|
yang
|
103a6e7db7
|
refactor(payment): 调整支付宝支付和订单状态
|
2025-02-11 13:56:17 +08:00 |
|
Diyu0904
|
74c13643a8
|
Merge branch 'preview' into feature/admin
# Conflicts:
# mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ToActivityServiceImpl.java
|
2025-02-07 15:28:16 +08:00 |
|
Diyu0904
|
25efe0d49a
|
修改bug
|
2025-02-07 15:27:29 +08:00 |
|
Diyu0904
|
415e25cdd7
|
Merge branch 'feature/admin' into preview
|
2025-02-07 13:59:02 +08:00 |
|
Diyu0904
|
7b99089c67
|
工作流新增校验
文件加密/解密
文件加密上传oss
|
2025-02-07 13:55:53 +08:00 |
|
yang
|
8d04847cd2
|
refactor: 新增AliPayController,重构AliPayIntegration类，改为实现 AliPayService 接口
|
2025-02-06 11:41:44 +08:00 |
|
yang
|
ee27b542cd
|
feat(resource): 更新 ModelLike
|
2025-02-06 09:47:32 +08:00 |
|
yang
|
e559b6d04d
|
feat(resource): 更新 ModelLike
|
2025-02-05 16:47:14 +08:00 |
|
yang
|
0d9a485c19
|
feat(resource): 增加模型类型字段
|
2025-02-05 15:20:45 +08:00 |
|
yang
|
c7a59a0d99
|
fix(resource): 修复用户信息为空时的异常处理
|
2025-02-05 11:28:33 +08:00 |
|
Diyu0904
|
6dedc5a170
|
Merge branch 'feature/admin' into preview
# Conflicts:
# mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowLikeServiceImpl.java
|
2025-02-05 11:20:05 +08:00 |
|
Diyu0904
|
32dd0de4cb
|
联调修复bug
编写dockerfile
测试文件加密
|
2025-02-05 11:17:27 +08:00 |
|
yang
|
821d852b5b
|
fix(mcwl-admin): 余额查询功能并优化工作流点赞列表
|
2025-02-05 11:16:53 +08:00 |
|
yang
|
f5309a6759
|
feat: 修改
|
2025-01-22 18:36:25 +08:00 |
|
yang
|
09dfd88a12
|
feat: 排序
|
2025-01-22 16:17:46 +08:00 |
|
yang
|
1594bc4a74
|
feat: 个人中心
|
2025-01-22 15:52:30 +08:00 |
|
yang
|
93efb588e2
|
feat: 图片审核
|
2025-01-21 18:09:29 +08:00 |
|
yang
|
3cd55dbbb9
|
Merge branch 'feature/community-center' into preview
# Conflicts:
# mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java
|
2025-01-21 17:37:58 +08:00 |
|
yang
|
cf6dcdee4c
|
feat: 提问和提问评论
|
2025-01-21 17:36:44 +08:00 |
|
Diyu0904
|
7a742d7338
|
修复图片审核
|
2025-01-21 17:30:38 +08:00 |
 ChenYan
|
382f32de5f
|
Merge remote-tracking branch 'origin/preview' into preview
# Conflicts:
# mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
|
2025-01-21 17:27:10 +08:00 |
|
ChenYan
|
02c090a971
|
feat 是否置顶
|
2025-01-21 17:25:46 +08:00 |
|
Diyu0904
|
2b791a875a
|
合并分支 图片审核+模型审核待合并
|
2025-01-21 17:15:45 +08:00 |
|
Diyu0904
|
cb5af5202f
|
Merge branch 'feature/admin' into preview
# Conflicts:
# mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelImage.java
# mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java
|
2025-01-21 17:05:14 +08:00 |
|
Diyu0904
|
71f1c01674
|
修复工作流审核bug
新增图片审核
|
2025-01-21 17:01:59 +08:00 |
|
ChenYan
|
7b0c1f6fbf
|
Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai into preview
# Conflicts:
# mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
|
2025-01-21 16:55:15 +08:00 |
|
ChenYan
|
d8c964f98b
|
feat 是否置顶
|
2025-01-21 16:45:00 +08:00 |
|
Diyu0904
|
b2dd5112c4
|
Merge branch 'feature/admin' into preview
# Conflicts:
# mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java
|
2025-01-20 15:49:03 +08:00 |
|
Diyu0904
|
4bb2498fc8
|
新增举报功能
新增审核举报功能
新增工作流添加审核
新增工作流修改审核
新增模型添加审核
新增模型修改审核
|
2025-01-20 15:42:46 +08:00 |
|
yang
|
f5f2693e8e
|
Merge branch 'feature/community-center' into preview
|
2025-01-20 14:30:59 +08:00 |
|
yang
|
5f4404ae1d
|
feat: 图片模块调整
|
2025-01-20 14:30:26 +08:00 |
|
ChenYan
|
746742ed14
|
feat
|
2025-01-20 11:48:15 +08:00 |
|
ChenYan
|
c7b780d2ef
|
feat
|
2025-01-20 11:46:42 +08:00 |
|
ChenYan
|
b164460829
|
feat
|
2025-01-19 18:12:01 +08:00 |
|
Diyu0904
|
f2c3d73071
|
Merge branch 'feature/admin' into preview
# Conflicts:
# mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlow.java
# mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java
|
2025-01-18 15:00:05 +08:00 |
|
Diyu0904
|
b5ca5718f6
|
新增线程池异步审核工作流
新增工作流的名称审核
新增工作流版本得名称+内容+图片审核
修复工作流修改时间丢失bug
|
2025-01-18 14:55:28 +08:00 |