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

83 Commits (41bdbfaa817c57b2f9a6656f64979be0b15ed06d)

Author SHA1 Message Date
yang 477d1c0dea refactor(resource): 调整用户身份获取方法 2025-02-20 14:47:33 +08:00
Diyu0904 97a9ebdf56 新增obs文件对接 
封装获取userId
新增白名单
 2025-02-20 14:14:06 +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 c363c0c6d9 feat(payment): 更新支付宝支付功能并添加证书 2025-02-15 14:36:29 +08:00
yang f9f7361a16 refactor(mcwl): 重构项目中的返回结果封装 2025-02-13 14:48:54 +08:00
yang e679fd847e feat(resource): 调整评论和回复 2025-02-12 16:59:30 +08:00
Diyu0904 bd23402389 联调工作流 
修改文件上传
 2025-02-12 13:16:35 +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 61ac03de38 feat(payment): 支付宝账号绑定 2025-02-06 16:34:14 +08:00
yang bb64605dc4 refactor(mcwl): 重构删除接口并添加参数校验 2025-02-05 13:28:58 +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
ChenYan d8c964f98b feat 是否置顶 2025-01-21 16:45:00 +08:00
Diyu0904 a8bf9b7390 Merge remote-tracking branch 'origin/preview' into preview 2025-01-18 15:01:24 +08:00
ChenYan 925705caaa Merge remote-tracking branch 'origin/preview' into preview 2025-01-18 15:00:19 +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
ChenYan 0fc813f3a0 feat 2025-01-18 14:58:53 +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 1ef75e6bda fix: 修复接受邀请时的异常 2025-01-17 10:48:16 +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
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 c2f0ada4f1 fix(resource): 修复模型图片标签显示问题 
- 修正图片标签的字典常量名称
- 实现图片标签的字典值转换
- 初始化图片标签列表
 2025-01-14 19:06:07 +08:00
ChenYan 421ca7dc9d feat(resource): 新增模型产品和工作流相关功能 2025-01-14 18:11:39 +08:00
Diyu0904 3645f7894c 新增工作流添加，修改，回显，删除，详情 2025-01-14 16:07:30 +08:00
yang 7f22f046c8 feat(resource): 添加模特图片列表、详情、删除等功能 
- 新增图片列表、详情、删除、修改等接口
- 实现分页查询功能
- 添加用户信息展示
- 优化图片上传和评论相关功能
 2025-01-12 15:14:31 +08:00
ChenYan 64de27cc8c Merge remote-tracking branch 'origin/preview' into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java
 2025-01-11 15:09:21 +08:00
ChenYan 75cdc9ea16 Merge remote-tracking branch 'origin/feature/resource' into preview 2025-01-11 14:53:56 +08:00
ChenYan 9ecc8db800 feat: 模型模块 2025-01-09 18:17:28 +08:00
Diyu0904 9cd8da3803 Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java
#	mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java
 2025-01-09 14:50:53 +08:00
Diyu0904 a3241b83ff 新增工作流业务 2025-01-09 14:46:01 +08:00
yang dc3a45b274 refactor(payment): 重构支付宝支付流程并更新相关服务 
-暂时注释掉了 AliPayIntegration 中的 orderPay 方法
- 更新了 application.yml 中的支付宝通知 URL
- 重构了 OrderTradeServiceImpl 中的订单处理逻辑
- 移除了 mcwl-pay 中的 OrderTypeEnum 枚举
- 更新了 mcwl-resource 中的 OrderTypeEnum 枚举
- 升级了 alipay-sdk-java 版本
- 在 SysUser 模型中添加了邀请人 ID 和免费积分字段
- 更新了 SysUser
 2025-01-09 14:44:59 +08:00
Diyu0904 a938a05b72 Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/comment/CommentController.java
#	mcwl-comment/src/main/java/com/mcwl/comment/domain/Comment.java
#	mcwl-comment/src/main/java/com/mcwl/comment/domain/ProductCommentConditionEntity.java
#	mcwl-comment/src/main/java/com/mcwl/comment/domain/ProductCommentEntity.java
#	mcwl-comment/src/main/java/com/mcwl/comment/domain/RequestConditionEntity.java
#	mcwl-comment/src/main/java/com/mcwl/comment/domain/RequestPageEntity.java
#	mcwl-comment/src/main/java/com/mcwl/comment/mapper/CommentMapper.java
#	mcwl-comment/src/main/java/com/mcwl/comment/service/impl/CommentServiceImpl.java
#	mcwl-comment/src/main/resources/mapper/comment/CommentMapper.xml
#	mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java
#	mcwl-system/src/main/java/com/mcwl/system/mapper/SysUserMapper.java
#	mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java
 2025-01-09 11:27:44 +08:00
Diyu0904 aae00a4bb9 新增实名认证 2025-01-09 11:14:22 +08:00
ChenYan 50c89af2c2 Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 
# Conflicts:
#	mcwl-pay/src/main/java/com/mcwl/pay/service/OrderTradeService.java
#	mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java
#	mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml
 2025-01-08 20:15:33 +08:00
ChenYan 72a737eda7 feat: sp模块 2025-01-08 20:08:32 +08:00
yang f75eae71a4 Merge branch 'feature/my-invitation' into preview 2025-01-08 15:58:32 +08:00
yang d23497bdc5 feat(payment): 支持会员和积分充值的支付宝支付功能 
- 新增了 memberPay 和 pointsPay 方法来处理不同类型的支付请求- 实现了订单处理和支付回调逻辑
- 添加了充值记录相关功能和数据库表
- 更新了用户模型，增加了邀请人ID和免费积分字段
 2025-01-08 15:58:02 +08:00
ChenYan a045ab58b6 Merge branch 'feature/comment' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-06 16:05:11 +08:00
ChenYan 3de19c962d feat: 评论模块 2025-01-06 16:02:26 +08:00
Diyu0904 6cba0a69fe 新增支付宝扫码支付回调接口 
新增根据订单号查询支付订单状态
 2025-01-06 15:27:41 +08:00
yang 468d14a3e6 Merge branch 'feature/my-invitation' into preview 
# Conflicts:
#	mcwl-admin/src/test/java/com/mcwl/memberCenter/MemberCenterTest.java
 2025-01-04 18:51:07 +08:00