 yang
|
2d8ee1bb8e
|
feat(memberCenter): 调整
|
2025-03-06 13:54:28 +08:00 |
|
yang
|
13f5f5f52a
|
Merge remote-tracking branch 'origin/preview' into preview
|
2025-03-06 13:34:11 +08:00 |
|
yang
|
a044b8c367
|
feat(memberCenter): 积分消费和充值记录的分页
|
2025-03-06 13:33:52 +08:00 |
Diyu0904
|
87cc661a7f
|
Merge branch 'feature/admin' into preview
|
2025-03-06 11:31:40 +08:00 |
|
Diyu0904
|
54c6eb463b
|
修改对接审核
测试加密/解密文件
|
2025-03-06 11:30:00 +08:00 |
|
yang
|
c69d7e032f
|
feat(myInvitation): 金币消费记录查询
|
2025-03-06 10:55:07 +08:00 |
|
yang
|
c13fcadc1f
|
Merge branch 'feature/community-center' into preview
|
2025-03-05 18:34:38 +08:00 |
|
yang
|
212dd4f1da
|
feat(memberCenter): 调整
|
2025-03-05 18:34:13 +08:00 |
|
Diyu0904
|
8500650f8e
|
Merge branch 'feature/admin' into preview
|
2025-03-05 18:31:53 +08:00 |
|
yang
|
8ee438d3c3
|
Merge branch 'feature/community-center' into preview
|
2025-03-05 18:31:31 +08:00 |
|
yang
|
63fcfc941d
|
feat(memberCenter): 调整积分
|
2025-03-05 18:31:05 +08:00 |
|
Diyu0904
|
083b94232d
|
新增收藏
删除加密测试
|
2025-03-05 18:30:56 +08:00 |
|
yang
|
1350eb52f5
|
feat(memberCenter): 积分调整
|
2025-03-05 17:03:26 +08:00 |
|
Diyu0904
|
214d933b70
|
Merge branch 'feature/admin' into preview
|
2025-03-05 13:10:56 +08:00 |
|
Diyu0904
|
adf6cc178d
|
新增工作流下载文件
新增模型下载文件
新增修改邀请码
新增模型名字唯一校验
|
2025-03-05 13:09:36 +08:00 |
|
Diyu0904
|
078fa26c7f
|
新增模型校验名字
|
2025-03-04 18:43:58 +08:00 |
|
yang
|
1b7b096f50
|
refactor(myInvitation): 调整邀请功能模块
|
2025-03-04 18:04:51 +08:00 |
 ChenYan
|
e813ee9dff
|
feat： 平台官方联系方式
|
2025-03-04 17:01:06 +08:00 |
|
ChenYan
|
103cac2670
|
Merge remote-tracking branch 'origin/preview' into preview
|
2025-03-04 16:59:11 +08:00 |
|
ChenYan
|
0a5801a116
|
feat： 平台官方联系方式
|
2025-03-04 16:58:47 +08:00 |
|
yang
|
1f10b247b9
|
Merge branch 'feature/community-center' into preview
|
2025-03-04 16:02:46 +08:00 |
|
yang
|
52bac53e6c
|
refactor(mcwl-admin): 个人中心
|
2025-03-04 16:02:05 +08:00 |
|
Diyu0904
|
59e1e87b2a
|
Merge branch 'feature/admin' into preview
|
2025-03-04 15:51:05 +08:00 |
|
Diyu0904
|
0ea4df338e
|
调用加密接口
调用ui拉取文件接口
新增远程调用工具类
新增华为云obs接口
与前端联调工作流和模型
|
2025-03-04 15:50:09 +08:00 |
|
yang
|
33d27fdedc
|
feat: ai调整
|
2025-03-04 15:48:45 +08:00 |
|
yang
|
38d47a0bca
|
feat(payment): 证书调整
|
2025-03-03 17:54:23 +08:00 |
|
yang
|
a9a2fb5d68
|
feat(communityCenter): ai窗口
|
2025-03-03 17:21:50 +08:00 |
|
Diyu0904
|
1f584d5e9d
|
新增白名单
|
2025-02-22 15:06:42 +08:00 |
|
yang
|
ba510ac671
|
config:调整 token
|
2025-02-22 13:25:48 +08:00 |
|
yang
|
b30a70cbae
|
联调粉丝，关注列表
|
2025-02-21 18:01:43 +08:00 |
|
yang
|
1bf1ab1619
|
feat(mcwl): 接口放行
|
2025-02-21 16:28:32 +08:00 |
|
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
|
cb2f059fff
|
新增obs配置文件
|
2025-02-20 14:32:17 +08:00 |
|
Diyu0904
|
097ecfa023
|
修改token过期时间
|
2025-02-20 14:21:45 +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
|
cecfc17172
|
build(mcwl-admin): 更新数据库配置和证书
|
2025-02-18 17:46:23 +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
|
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 |
|
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 |