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

107 Commits (5eb778c21cea69caba05ffd847bc2ce68e77e0fd)

Author SHA1 Message Date
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
yang 6ea08e3b1c feat: 新增邀请功能和消费记录 
- 新增 Consume 和 Commission 表及相关服务
- 实现消费记录保存和提成计算
- 添加邀请码生成和收益展示功能
-重构 Invitation 相关代码，支持获取邀请列表和收益信息
 2025-01-04 18:50:05 +08:00
Diyu0904 715174403b Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-admin/src/test/java/com/mcwl/memberCenter/MemberCenterTest.java
 2025-01-04 17:32:26 +08:00
Diyu0904 734cb109fb 新增查看个人资料 
新增修改个人资料
 2025-01-04 17:24:34 +08:00
ChenYan 3b4ff9f774 Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-04 17:12:37 +08:00
ChenYan 11b42f5fe2 Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-04 17:11:04 +08:00
ChenYan 6f45a85b95 feat:商品 订单 支付模块 2025-01-04 17:09:07 +08:00
yang 7ce0a4fbcb modify：类名修改，方便后续扩展 2025-01-03 12:53:44 +08:00
ChenYan dcce7b4b29 Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai into feature/resource 2025-01-03 11:04:49 +08:00
ChenYan 58a0b376bc Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-03 11:03:46 +08:00
ChenYan 3559242524 build:依赖 工具 2025-01-03 11:02:11 +08:00
yang 7215fcb48e Merge branch 'refs/heads/feature/my-invitation' into preview 
# Conflicts:
#	mcwl-common/src/main/java/com/mcwl/common/domain/response/ResponseEnum.java
#	mcwl-common/src/main/java/com/mcwl/common/domain/response/ServerResponseEntity.java
#	mcwl-common/src/main/java/com/mcwl/common/exception/YamiBizException.java
#	mcwl-common/src/main/java/com/mcwl/common/exception/YamiShopBindException.java
#	mcwl-common/src/main/java/com/mcwl/common/i18n/I18nMessage.java
#	mcwl-common/src/main/java/com/mcwl/common/utils/ImageUtil.java
 2025-01-02 15:49:11 +08:00
yang 5cc7874b77 refactor：调整 2025-01-02 15:47:03 +08:00
ChenYan 51055443c5 build:依赖 工具 2025-01-02 14:56:54 +08:00
ChenYan 1a1803b991 build:依赖 工具 2025-01-02 14:52:02 +08:00
ChenYan 1f05411e72 Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 
# Conflicts:
#	mcwl-admin/src/main/resources/application.yml
 2025-01-02 14:21:26 +08:00
ChenYan 76a23fa933 build:依赖 工具 2025-01-02 14:18:31 +08:00
yang 8df1daac3e Merge branch 'refs/heads/feature/my-invitation' into preview 
# Conflicts:
#	mcwl-common/src/main/java/com/mcwl/common/utils/ShareCodeUtils.java
 2025-01-02 14:13:18 +08:00
yang 1fce665900 feat：会员中心 2025-01-02 14:10:59 +08:00
ChenYan 5f5cc9aa7e build:依赖 工具 2025-01-02 11:44:13 +08:00
ChenYan e35045b1c8 Merge branch 'master' of https://gitea.qinmian.online/CY/mcwl-ai into feature/resource 
# Conflicts:
#	mcwl-admin/pom.xml
 2024-12-31 16:15:51 +08:00
ChenYan 9d5cf6040d Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 
# Conflicts:
#	mcwl-admin/pom.xml
 2024-12-31 16:09:18 +08:00
ChenYan 2b5c7e1f20 build:依赖 工具 2024-12-31 15:59:15 +08:00
Diyu0904 4fe40b47fb 新增mybatis-plus 
新增微信扫码登录
优化发送验证码逻辑
 2024-12-31 14:56:32 +08:00
Diyu0904 a0c6c39c03 Merge branch 'feature/admin' into preview 2024-12-30 16:55:05 +08:00
Diyu0904 200d7b8106 新增短信工具类 
新增自定义异常类
新增手机号登录
 2024-12-30 16:52:24 +08:00
yang 8f80a6ea4f Merge branch 'feature/my-invitation' of https://gitea.qinmian.online/CY/mcwl-ai into preview 
# Conflicts:
#	pom.xml
 2024-12-30 15:03:19 +08:00
yang c846cbcf50 feat:我的邀请 2024-12-30 15:00:42 +08:00
ChenYan dee5eb0518 build: 工具 2024-12-30 14:47:34 +08:00
ChenYan db0cee24e1 chore: 工具 2024-12-30 11:28:25 +08:00
ChenYan cf6a7b2047 feat: 工具类 2024-12-28 16:43:59 +08:00
ChenYan 1c93d5b555 feat:项目1.11 2024-12-28 13:12:46 +08:00
ChenYan 006c7004ba feat:项目 2024-12-27 19:19:47 +08:00