Commit Graph

437 Commits (ef826ce25ff45c3fee19f4ea3ba0468935a7d70c)

Author SHA1 Message Date
yang f4e4ef40c1 feat(payment): 调整订单信息 2025-02-08 18:01:07 +08:00
yang e97b6492b2 refactor(payment): 调整支付宝支付 2025-02-08 17:35:16 +08:00
yang 79bf09e235 refactor: 调整支付宝支付相关代码并修改会员权益相关功能 2025-02-08 09:46:31 +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
yang 7e0540104f feat(payment): 支付宝余额查询 2025-02-07 15:27:03 +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 e44f6b8a0f feat(payment): 支付宝转账集成邮件通知 2025-02-07 12:29:45 +08:00
yang e09584800a refactor(mcwl-pay): 支付宝转账 2025-02-06 17:57:37 +08:00
yang 47717bae9c feat: 支付宝提现 2025-02-06 17:34:43 +08:00
yang 2672fc9e33 feat: 支付宝提现 2025-02-06 17:27:00 +08:00
yang 61ac03de38 feat(payment): 支付宝账号绑定 2025-02-06 16:34:14 +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 bb64605dc4 refactor(mcwl): 重构删除接口并添加参数校验 2025-02-05 13:28:58 +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 7c527151b0 feat: 提问评论多租户 2025-01-24 13:37:15 +08:00
yang 200e5c1d32 Merge branch 'feature/community-center' into preview 2025-01-23 13:37:39 +08:00
yang 999616a0cd feat: 采纳评论修复 2025-01-23 13:36:47 +08:00
Diyu0904 dfeabe5897 Merge branch 'feature/admin' into preview
# Conflicts:
#	mcwl-resource/src/main/resources/mapper/resource/ModelLikeMapper.xml
2025-01-22 18:40:14 +08:00
Diyu0904 bd4998b73d Merge remote-tracking branch 'origin/feature/admin' into feature/admin 2025-01-22 18:37:47 +08:00
yang 789cf9f3d9 修复模型点赞bug 2025-01-22 18:37:08 +08:00
yang f5309a6759 feat: 修改 2025-01-22 18:36:25 +08:00
yang 70aa6a6b27 feat: 接受评论 2025-01-22 17:34:20 +08:00
yang 09dfd88a12 feat: 排序 2025-01-22 16:17:46 +08:00
Diyu0904 c6a92b1e62 Merge branch 'feature/admin' into preview
# Conflicts:
#	mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
2025-01-22 16:05:30 +08:00
Diyu0904 628c9e57bb 修复查看个人发布模型bug 2025-01-22 16:01:17 +08:00
yang bcf7cb7e3d Merge branch 'feature/community-center' into preview 2025-01-22 15:53:11 +08:00
yang 1594bc4a74 feat: 个人中心 2025-01-22 15:52:30 +08:00
ChenYan 019ff6943f Merge remote-tracking branch 'origin/preview' into preview 2025-01-21 19:34:50 +08:00
ChenYan 8316bd1e76 feat 2025-01-21 19:34:12 +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
yang b2a3596f20 feat: 会员和邀请添加swagger注解 2025-01-21 13:07:58 +08:00
yang f77029ead8 Merge branch 'feature/community-center' into preview 2025-01-20 16:43:29 +08:00