Commit Graph

130 Commits (41bdbfaa817c57b2f9a6656f64979be0b15ed06d)

Author SHA1 Message Date
yang ecc03229bd refactor(resource): 接口放行 2025-02-20 15:35:18 +08:00
yang 477d1c0dea refactor(resource): 调整用户身份获取方法 2025-02-20 14:47:33 +08:00
Diyu0904 91b2ade9f8 Merge branch 'feature/admin' into preview
# Conflicts:
#	mcwl-admin/src/main/resources/application-druid.yml
#	mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageLikeServiceImpl.java
2025-02-20 14:20:37 +08:00
Diyu0904 97a9ebdf56 新增obs文件对接
封装获取userId
新增白名单
2025-02-20 14:14:06 +08:00
yang e26568d0df feat(resource): 用户作品数量统计、配置文件调整 2025-02-20 09:33:11 +08:00
yang deabcf1b37 refactor(mcwl-pay): 重构支付宝支付功能,由秘钥改为证书 2025-02-18 16:09:42 +08:00
Diyu0904 aacf29a3db Merge remote-tracking branch 'origin/preview' into preview 2025-02-18 13:17:54 +08:00
Diyu0904 cb5dbc7919 联调工作流
新增上传文件接口
新增举报api文档
2025-02-18 13:16:31 +08:00
yang af0638438c feat(resource): 已读和一键已读 2025-02-18 09:12:55 +08:00
yang 2efdbfe773 refactor(resource): 调整消息通知 2025-02-17 10:06:09 +08:00
yang afc35ca586 feat(resource): 关注消息 2025-02-16 10:53:36 +08:00
yang 5a5ab268dd feat(resource): 点赞消息 2025-02-15 23:21:57 +08:00
yang 7e40833bb7 feat(resource): 评论通知功能 2025-02-15 18:01:24 +08:00
Diyu0904 461b75cce2 Merge branch 'feature/admin' into preview 2025-02-15 14:57:33 +08:00
Diyu0904 05f8858b6c 新增模型广场,工作流,作品灵感 2025-02-15 14:56:34 +08:00
yang da5366bc6f Merge branch 'feature/community-center' into preview 2025-02-15 14:37:10 +08:00
yang c363c0c6d9 feat(payment): 更新支付宝支付功能并添加证书 2025-02-15 14:36:29 +08:00
Diyu0904 57fffd4e27 修改文件查询bug 2025-02-14 17:56:35 +08:00
Diyu0904 69d3b7cdc4 修改文件查询bug 2025-02-14 17:37:53 +08:00
Diyu0904 2b8c8abd5a 联调工作流+模型
新增文件查询接口
2025-02-14 17:27:53 +08:00
Diyu0904 3859feb21d 删除工作流版本审核相关属性 2025-02-14 15:38:09 +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