CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
328 Commits
8 Branches
0 Tags
10 MiB
Commit Graph

244 Commits (54c6eb463bdecca91f985ee0fa776c579d511b64)

Author SHA1 Message Date
ChenYan 27fac6cf9c Merge remote-tracking branch 'origin/preview' into preview 2025-02-14 10:34:24 +08:00
ChenYan 367c359b5e feat：用户协议/隐私政策 2025-02-14 10:33:56 +08:00
yang f9f7361a16 refactor(mcwl): 重构项目中的返回结果封装 2025-02-13 14:48:54 +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 1c014c13d1 feat(pay): 金币充值 2025-02-12 11:19:45 +08:00
yang c78b731816 feat(pay): 金币充值 2025-02-12 10:49:37 +08:00
yang be124c92fa feat(system): 新增用户批量查询 2025-02-12 10:18:26 +08:00
yang 103a6e7db7 refactor(payment): 调整支付宝支付和订单状态 2025-02-11 13:56:17 +08:00
yang 63f14ce3d1 refactor(payment): 调整支付宝支付和订单状态 2025-02-11 10:42:17 +08:00
yang 00385906c3 refactor(pay): 调整支付宝支付流程 2025-02-10 22:49:00 +08:00
yang da69a15cb9 feat(payment): 支付功能调整和订单状态查询 2025-02-10 18:44:44 +08:00
yang 13d4e21691 refactor: 调整支付宝支付流程和会员相关功能 2025-02-10 13:54:14 +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 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 bb64605dc4 refactor(mcwl): 重构删除接口并添加参数校验 2025-02-05 13:28:58 +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 999616a0cd feat: 采纳评论修复 2025-01-23 13:36:47 +08:00
yang f5309a6759 feat: 修改 2025-01-22 18:36:25 +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 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
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 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
yang e34ce61003 feat: 图片、文件筛选 2025-01-20 16:43: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 5f4404ae1d feat: 图片模块调整 2025-01-20 14:30:26 +08:00
yang dc2b5c9daa Merge branch 'feature/community-center' into preview 2025-01-19 20:01:04 +08:00
yang b30dbfbe2e feat: 提问 2025-01-19 20:00:40 +08:00
ChenYan dbc9381724 Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-19 18:18:17 +08:00
ChenYan b164460829 feat 2025-01-19 18:12:01 +08:00
yang d5acfb00ae feat: 提问 2025-01-19 17:12:48 +08:00
yang 84f3caf7af feat: 社区、邀请、发布调整 2025-01-19 15:20:52 +08:00
yang 8fda8397f2 feat: 提问 2025-01-18 20:03:04 +08:00
yang d5157ce481 Merge branch 'feature/community-center' into preview 2025-01-18 19:04:15 +08:00
yang c59ab0d20a feat: 社区、社区发布 2025-01-18 19:03:46 +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
yang 3fed564e38 feat: 社区调整 2025-01-17 20:07:24 +08:00
yang d97050a4ef feat: 社区 2025-01-17 19:10:20 +08:00
yang 484c99504a Merge branch 'feature/community-center' into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/QuestionController.java
 2025-01-17 19:09:25 +08:00
yang 5ef3c1bcd3 feat: 社区 2025-01-17 19:07:56 +08:00
ChenYan ab147addea feat 2025-01-17 19:06:10 +08:00
ChenYan 88c9a15fed Merge remote-tracking branch 'origin/preview' into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/QuestionController.java
 2025-01-17 19:05:41 +08:00
ChenYan ba0cc48174 feat 2025-01-17 19:04:35 +08:00
yang 2ba9f440d3 Merge branch 'feature/community-center' into preview 2025-01-17 16:31:38 +08:00
yang 7d05307a4c fix: 添加提问 2025-01-17 16:31:12 +08:00
ChenYan b265f24f81 feat(communityCenter): 添加评论区 点赞功能 2025-01-17 15:59:21 +08:00
yang b1b884a82e Merge branch 'feature/community-center' into preview 2025-01-16 19:32:06 +08:00
yang c1b6dac662 Merge remote-tracking branch 'origin/feature/community-center' into feature/community-center 2025-01-16 19:31:35 +08:00
yang 436ff6877c feat:社区邀请 2025-01-16 19:31:24 +08:00
ChenYan d09410bee7 Merge branch 'feature/community-center' of https://gitea.qinmian.online/CY/mcwl-ai into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishController.java
 2025-01-16 19:06:04 +08:00
ChenYan e31b12fd39 feat 2025-01-16 19:04:11 +08:00
ChenYan 537997deab Merge remote-tracking branch 'origin/preview' into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishController.java
 2025-01-16 19:02:56 +08:00
ChenYan 170ca3da7e feat：feat(resource): 添加模型版本高清修复功能 2025-01-16 19:01:56 +08:00
Diyu0904 6ae9eca9b6 Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayIntegration.java
#	mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelVersionController.java
 2025-01-16 18:58:49 +08:00
Diyu0904 f88c68ac0a 新增文本审核 
新增图片审核
规范配置文件
完善短信验证码发送
 2025-01-16 18:55:49 +08:00
ChenYan aecbdb60e1 Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai into feature/community-center 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishController.java
 2025-01-16 17:30:37 +08:00
ChenYan 6fee8248de feat：feat(resource): 添加模型版本高清修复功能 2025-01-16 17:27:55 +08:00
yang 9dcf061dcb Merge remote-tracking branch 'origin/feature/community-center' into feature/community-center 2025-01-16 17:26:23 +08:00
yang 02d8dc45dd feat:社区 2025-01-16 17:26:12 +08:00
ChenYan 83b07054a1 feat：feat(resource): 添加模型版本高清修复功能 2025-01-15 19:00:30 +08:00
yang 7efb7973ef feat:多租户 2025-01-15 18:49:40 +08:00
Diyu0904 5f6844dc29 Merge branch 'feature/admin' into preview 2025-01-15 15:23:03 +08:00
Diyu0904 f41ab7b899 新增点赞/取消工作流 
新增发布工作流评论
新增点赞/取消工作流评论
新增删除工作流评论
 2025-01-15 15:21:55 +08:00
yang 3ebcf6e07e Merge branch 'feature/my-invitation' into preview 2025-01-14 18:54:57 +08:00
yang ab5cc03786 refactor(mcwl): 重构获取模型图片详情接口 
- 新增 ModelImageService 接口的 getDetail 方法
- 实现 getDetail 方法，封装模型图片详情信息- 更新 ModelImageController 中的 detail 方法，使用新的 getDetail 接口
- 修改 ModelImageVo 中的 tags 字段类型，从 String 改为 List<String>
 2025-01-14 18:53:46 +08:00
ChenYan 6a5ad7403a Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-14 18:47:09 +08:00
ChenYan d49115ec61 feat(resource): 2025-01-14 18:45:52 +08:00
yang 40d37e42be refactor(resource): 重构图片相关接口 
- 新增 ModelImageCommentController 专门处理图片评论相关功能
- 从 ModelImageController 中移除图片评论相关的代码
- 删除了 ModelImageController 中未使用的上传功能
- 调整了 ModelImageController 的路由前缀
 2025-01-14 18:28:20 +08:00
yang bd42786571 feat(resource): 实现工作流分页查询功能 
- 新增 WorkFlowService 接口的 listByPage 方法
- 实现 WorkFlowServiceImpl 类的 listByPage 方法- 添加 ModelImagePageRes 类用于分页查询参数
- 新增 WorkFlowVo 类用于工作流列表展示
- 优化 ModelProductController 中的分页查询逻辑
 2025-01-14 18:09:36 +08:00