Commit Graph

139 Commits

Author SHA1 Message Date
b5b6f737aa slogan 暂停监听 2024-06-17 10:41:36 +08:00
0017568cc7 slogan 2024-06-17 10:21:49 +08:00
fc48d8931f 2024-06-12 11:27:21 +08:00
619d33b412 Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
#	src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
#	src/main/resources/application-dev.properties
#	src/main/resources/messages_en.properties
#	src/main/resources/messages_zh.properties
2024-06-12 10:50:05 +08:00
1a48527c70 1、design single 添加 design elements
2、design single -- print添加level2Type
3、替换部分flask接口 为 fastAPI接口
2024-06-12 10:41:59 +08:00
shahaibo
ee68a5d782 Merge remote-tracking branch 'origin/dev/dev' into dev/dev 2024-06-12 09:48:11 +08:00
shahaibo
3a29d25060 TASK:aida; 2024-06-12 09:47:55 +08:00
77f514a03b Merge branch 'release/3.0' into dev/dev_xp
# Conflicts:
#	src/main/java/com/ai/da/python/PythonService.java
#	src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
2024-06-11 15:23:24 +08:00
954f6207ec design Single 允许画笔修改sketch后进行design 2024-06-05 11:43:35 +08:00
49b086ad10 generate 添加Logo与Slogan 2024-06-03 17:13:48 +08:00
shahaibo
3dc7866fba BUGFIX:渐变色回退; 2024-05-28 11:52:33 +08:00
shahaibo
ffd371e5b4 BUGFIX:渐变色回退; 2024-05-28 11:48:35 +08:00
shahaibo
40aad9d1a3 BUGFIX:渐变色回退; 2024-05-28 11:32:49 +08:00
76618de386 不等比缩放 2024-05-27 18:07:33 +08:00
shahaibo
8b274b2822 Merge remote-tracking branch 'origin/release/3.0' into dev/dev
# Conflicts:
#	pom.xml
#	src/main/java/com/ai/da/common/utils/SendEmailUtil.java
#	src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
2024-05-27 15:03:02 +08:00
c688af01f2 Merge branch 'release/3.0' into dev/dev_xp
# Conflicts:
#	pom.xml
#	src/main/java/com/ai/da/common/utils/SendEmailUtil.java
2024-05-27 13:20:31 +08:00
shahaibo
02b3a407a9 BUGFIX:色块重复 2024-05-23 16:38:40 +08:00
shahaibo
031d71bf99 BUGFIX:design; 2024-05-22 15:12:37 +08:00
shahaibo
2845c2c8b9 BUGFIX:male_top; 2024-05-22 10:26:29 +08:00
d1fab003d2 designSingle 加入渐变色 2024-05-13 16:23:37 +08:00
718198bcfe Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
#	src/main/java/com/ai/da/python/vo/DesignPythonItem.java
2024-05-13 14:30:15 +08:00
shahaibo
7b83f42ed8 TASK:design 渐变色; 2024-05-13 14:23:08 +08:00
f23f4133d0 Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
#	src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java
#	src/main/java/com/ai/da/python/vo/DesignPythonItem.java
2024-05-10 17:25:06 +08:00
shahaibo
b86f168fe8 TASK:design 渐变色; 2024-05-10 17:17:28 +08:00
6fa0ab30db Merge branch 'dev/dev' into dev/dev_xp 2024-05-10 17:12:52 +08:00
d41bc284d4 Alipay-HK 接入 暂存 2024-05-10 17:11:49 +08:00
e2697aa407 Merge branch 'dev/dev_xp' into dev/dev 2024-05-08 09:46:15 +08:00
ae937dbf65 将generate输入的文本进行翻译或微处理 2024-05-07 18:27:32 +08:00
18f9e9130c Merge branch 'dev/dev_xp' into dev/dev 2024-04-30 11:00:57 +08:00
5f0546c6cf design single 在用户submit时将上传的图片保存到library 2024-04-30 10:59:41 +08:00
shahaibo
e7d4e98ad0 BUGFIX:sketchNum bugfix; 2024-04-23 16:18:25 +08:00
shahaibo
c8f4d82bf5 BUGFIX:sketchNum bugfix; 2024-04-23 16:14:03 +08:00
shahaibo
c661f4a871 BUGFIX:sketchNum bugfix; 2024-04-23 15:55:20 +08:00
896120fea4 generate模型更换后的接口更改及异步获取结果 2024-04-18 14:07:20 +08:00
754de78b57 single design添加渐变颜色 2024-04-10 11:21:48 +08:00
shahaibo
b2d615f31a BUGFIX; 2024-03-28 10:33:13 +08:00
3662ed3f96 Merge branch 'dev/dev_xp' into dev/dev 2024-03-26 15:02:12 +08:00
d411b428f8 1、完善超分功能
2、完善积分系统
3、新增任务列表
2024-03-26 14:58:43 +08:00
305324fe1a 1、接入超分功能
2、添加积分系统
3、新增订单查询,积分详细查询
2024-03-15 15:38:56 +08:00
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
shahaibo
87d8a92cdd BUGFIX:design new male_outwear; 2024-02-23 11:38:09 +08:00
shahaibo
471cdd866b BUGFIX:design new single; 2024-02-23 11:09:25 +08:00
shahaibo
22330b674a BUGFIX:代码优化; 2024-02-21 15:16:51 +08:00
shahaibo
43ec55dfb6 BUGFIX:Single design; 2024-02-21 13:53:46 +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
9b55083768 generate 日志打印 2024-01-31 19:35:17 +08:00
c35a188abb TASK:generate 修复逻辑Bug 2024-01-25 13:37:17 +08:00
65bed9dada TASK:generate 取消generate 2024-01-24 16:57:53 +08:00
1d2cb17d54 TASK:generate 添加队列消费者,增加并发量 2024-01-24 14:44:31 +08:00