|
|
bf05f88c00
|
Merge branch 'release/3.0' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/mapper/primary/DesignMapper.java
# src/main/resources/mapper/primary/DesignMapper.xml
|
2024-03-06 21:00:07 +08:00 |
|
|
|
e84d800ba0
|
加入积分系统，将充值与积分关联
|
2024-03-06 20:56:22 +08:00 |
|
|
|
a016f16052
|
便利查询--指定用户有权限直接获取当前数据库部分数据
|
2024-03-04 16:33:23 +08:00 |
|
|
|
ee96759832
|
1、接入paypal
2、修改支付宝支付
|
2024-03-01 17:31:26 +08:00 |
|
shahaibo
|
66e10a5a80
|
TASK:代码合并;
|
2024-02-20 10:40:36 +08:00 |
|
shahaibo
|
f8d468d55b
|
TASK:代码合并;
|
2024-02-20 10:35:50 +08:00 |
|
shahaibo
|
ca70371585
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java
# src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java
# src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java
# src/main/java/com/ai/da/mapper/primary/entity/Product.java
# src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java
# src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
|
2024-02-20 10:26:13 +08:00 |
|
shahaibo
|
68f6ae2a8d
|
TASK:design new;
|
2024-02-20 10:12:44 +08:00 |
|
shahaibo
|
4e2e1affa8
|
Merge branch 'dev/dev' into dev/dev_shb
# Conflicts:
# src/main/java/com/ai/da/controller/AccountController.java
# src/main/java/com/ai/da/mapper/primary/entity/GenerateCancel.java
# src/main/java/com/ai/da/mapper/primary/entity/LibraryCopy.java
# src/main/java/com/ai/da/mapper/primary/entity/LibraryModelPointCopy.java
# src/main/java/com/ai/da/service/AccountService.java
# src/main/java/com/ai/da/service/LibraryService.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
# src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
# src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
# src/main/resources/application-prod.properties
# src/main/resources/application-test.properties
|
2024-02-19 13:02:58 +08:00 |
|
|
|
7f33597c02
|
充值功能--接入支付宝
|
2024-02-14 12:10:15 +08:00 |
|
shahaibo
|
d4a7fa441c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-01-26 13:18:37 +08:00 |
|
shahaibo
|
62e6f8b77d
|
TASK:数据迁移;
|
2024-01-26 13:17:59 +08:00 |
|
|
|
4c0dd27332
|
generate 记录取消操作
|
2024-01-26 13:12:04 +08:00 |
|
|
|
96858c2cc3
|
TASK:异步调用generate及取消generate
|
2024-01-24 11:43:56 +08:00 |
|
|
|
577dc94850
|
1、generate 异步生成及获取排队情况
2、generate 取消生成
|
2024-01-21 14:14:55 +08:00 |
|
shahaibo
|
471426e931
|
TASK:多数据源;
|
2024-01-19 16:36:34 +08:00 |
|
shahaibo
|
62f9bb3795
|
TASK:机房免登录测试;
|
2024-01-15 15:06:48 +08:00 |
|
|
|
51548b52ba
|
TASK:designSingle 添加多件衣服并允许添加相同类型的服装
|
2023-12-13 10:45:52 +08:00 |
|
shahaibo
|
f80e5ce455
|
TASK: 试用用户添加测试;
|
2023-12-11 15:11:40 +08:00 |
|
shahaibo
|
91993feee8
|
TASK: 试用用户添加测试;
|
2023-12-11 10:02:05 +08:00 |
|
shahaibo
|
6d99a5fa16
|
TASK: 是否完成引导字段添加;
|
2023-11-29 14:37:32 +08:00 |
|
shahaibo
|
9e3c29bd47
|
TASK: sketchBoard上传；工作空间列表;
|
2023-11-22 15:18:58 +08:00 |
|
shahaibo
|
4971f2b96a
|
TASK: 用户试用添加，印花逻辑调整;
|
2023-11-20 15:06:15 +08:00 |
|
shahaibo
|
269b6fa5fb
|
TASK: library分类;
|
2023-11-07 15:12:55 +08:00 |
|
shahaibo
|
c8fe8c27f8
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/resources/messages_en.properties
|
2023-11-07 11:42:37 +08:00 |
|
shahaibo
|
bb1c56182e
|
BUGFIX: sketchBoard upload checkMd5校验;
TASK: 分类;
|
2023-11-03 14:59:19 +08:00 |
|
xupei
|
ffcbabf62e
|
Generate
1、将生成图片的md5存储到数据库
2、记录sketchboard下，生成图片时的性别（添加到generateType之后）
|
2023-11-03 11:29:54 +08:00 |
|
shahaibo
|
85a815dddc
|
BUGFIX: design generate处理;
|
2023-11-02 14:00:02 +08:00 |
|
xupei
|
2524077768
|
generate
1、sketchboard的生成条件添加gender
2、添加存储生成图片MD5值到数据库
|
2023-11-02 10:55:25 +08:00 |
|
shahaibo
|
dbc8c7dcf5
|
BUGFIX: 系统模特高宽;
|
2023-11-01 17:30:52 +08:00 |
|
shahaibo
|
bedc640e13
|
TASK: 全局异常处理，代码优化，测试数据库连接信息变更;
|
2023-10-27 10:09:19 +08:00 |
|
shahaibo
|
9fa605f83e
|
BUGFIX: format;
|
2023-10-20 14:47:18 +08:00 |
|
shahaibo
|
89d3349b49
|
BUGFIX: retrive回参参数名统一;
|
2023-10-17 13:42:41 +08:00 |
|
xupei
|
2d8672e0a8
|
接口修改：存储offset并返回给前端
|
2023-10-11 10:37:11 +08:00 |
|
shahaibo
|
4a803d90f2
|
TASK:代码提交;
|
2023-10-10 14:19:10 +08:00 |
|
shahaibo
|
26f4566fac
|
BUGFIX:系统模特高宽默认1050 500;
|
2023-10-09 10:26:10 +08:00 |
|
shahaibo
|
907184d2eb
|
BUGFIX:模特;
|
2023-10-05 13:37:42 +08:00 |
|
shahaibo
|
ee32111599
|
TASK:模特相关接口;
|
2023-10-04 06:47:48 +08:00 |
|
shahaibo
|
0931923d0b
|
Merge remote-tracking branch 'origin/develop' into dev_shb
# Conflicts:
# src/main/java/com/ai/da/mapper/entity/SysFile.java
|
2023-09-30 13:23:08 +08:00 |
|
shahaibo
|
0a3487a3db
|
TASK:机器人、首页、history模块代码;
|
2023-09-29 21:44:43 +08:00 |
|
xupei
|
b0095e26a7
|
design detail 新增接口--编辑图层的位置、大小
|
2023-09-29 13:59:38 +08:00 |
|
xupei
|
f026a9b929
|
Merge remote-tracking branch 'origin/dev_shb' into develop
# Conflicts:
# src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
|
2023-09-28 10:29:54 +08:00 |
|
xupei
|
8a3c42ac0e
|
designSingle 、getDetail 添加返回印花详细
|
2023-09-26 15:47:01 +08:00 |
|
shahaibo
|
02d658dd0d
|
TASK:workspace、design模块代码;
|
2023-09-22 16:28:33 +08:00 |
|
xupei
|
20f5a3eda2
|
design single接口疏通
|
2023-09-20 16:16:02 +08:00 |
|
shahaibo
|
49b62d3733
|
TASK:workspace、design模块代码;
|
2023-09-20 16:02:57 +08:00 |
|
shahaibo
|
d3530f0af9
|
Merge remote-tracking branch 'origin/dev-xp' into dev_shb
# Conflicts:
# src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
# src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
|
2023-09-20 13:35:35 +08:00 |
|
shahaibo
|
cbb5145123
|
TASK:workspace、design模块代码;
|
2023-09-20 12:05:08 +08:00 |
|
xupei
|
eb2ef0f39d
|
generate 添加dislike功能
获取library地址修改（兼容minio地址）
|
2023-09-19 15:21:53 +08:00 |
|
xupei
|
305b932cbd
|
design Single接口第一版
|
2023-09-18 11:31:26 +08:00 |
|
