|
|
0017568cc7
|
slogan
|
2024-06-17 10:21:49 +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 |
|
|
|
891f6fb15f
|
Printboard level2Type 语言适配
|
2024-06-04 15:19:30 +08:00 |
|
|
|
49b086ad10
|
generate 添加Logo与Slogan
|
2024-06-03 17:13:48 +08:00 |
|
|
|
86e7119cfb
|
AlipayHK 回调及相关数据处理
|
2024-05-31 16:28:23 +08:00 |
|
|
|
1aea8e93f2
|
AlipayHK 新增指定订单查询接口
|
2024-05-30 09:54:49 +08:00 |
|
shahaibo
|
ffd371e5b4
|
BUGFIX:渐变色回退;
|
2024-05-28 11:48:35 +08:00 |
|
shahaibo
|
40aad9d1a3
|
BUGFIX:渐变色回退;
|
2024-05-28 11:32:49 +08:00 |
|
|
|
f4e9a3474a
|
Merge branch 'test/stable' into release/3.0
# Conflicts:
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
|
2024-05-28 10:59:34 +08:00 |
|
shahaibo
|
890389843f
|
BUGFIX:试用时间link14天;
|
2024-05-28 10:43:50 +08:00 |
|
|
|
76618de386
|
不等比缩放
|
2024-05-27 18:07:33 +08:00 |
|
|
|
eda92b3f0b
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
|
2024-05-27 15:13:20 +08:00 |
|
shahaibo
|
4ba5f63a62
|
TASK:workspace;
|
2024-05-27 15:05:46 +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 |
|
|
|
54cbaf4b80
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
# src/main/resources/application-dev.properties
|
2024-05-27 13:24:51 +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
|
37de7d9276
|
BUGFIX:design;
|
2024-05-24 15:18:01 +08:00 |
|
shahaibo
|
02b3a407a9
|
BUGFIX:色块重复
|
2024-05-23 16:38:40 +08:00 |
|
|
|
5ebf0669f5
|
alipay-hk 切换到live环境
|
2024-05-23 15:48:55 +08:00 |
|
shahaibo
|
205f0d54c5
|
BUGFIX:workspace;
|
2024-05-22 14:09:16 +08:00 |
|
shahaibo
|
1303b1805a
|
TASK:style;
|
2024-05-22 11:40:01 +08:00 |
|
shahaibo
|
cd817dbf57
|
TASK:style;
|
2024-05-22 09:50:34 +08:00 |
|
shahaibo
|
6e64eb741a
|
TASK:邮箱;
|
2024-05-20 22:32:45 +08:00 |
|
shahaibo
|
b3591f879d
|
TASK:试用时间;
|
2024-05-17 15:23:26 +08:00 |
|
shahaibo
|
8e1766eed0
|
Merge remote-tracking branch 'origin/temp0516' into test/stable
# Conflicts:
# pom.xml
# src/main/java/com/ai/da/common/config/MyTaskScheduler.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
|
2024-05-17 10:31:29 +08:00 |
|
shahaibo
|
f1d67f2f7d
|
Merge branch 'release/3.0' into test/stable
|
2024-05-17 10:22:42 +08:00 |
|
shahaibo
|
ebb6577e98
|
TASK:portfolio;
|
2024-05-17 10:19:34 +08:00 |
|
|
|
5318e5d32a
|
generate text存db内容简化
|
2024-05-16 15:32:39 +08:00 |
|
|
|
2aabb2347b
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# pom.xml
|
2024-05-15 15:39:28 +08:00 |
|
|
|
3790b8ee72
|
Alipay-HK 创建订单和异步回调
|
2024-05-15 15:38:11 +08:00 |
|
|
|
f4766d4ab4
|
designSingle 入参记录
|
2024-05-13 17:22:21 +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 |
|
shahaibo
|
8da24f4933
|
BUGFIX:aida;
|
2024-05-06 16:02:02 +08:00 |
|
|
|
ffeaac8c46
|
generate 代码优化
|
2024-05-02 10:33:11 +08:00 |
|
|
|
988fe89576
|
generate 将还未处理的请求置为Waiting状态
|
2024-04-30 11:39:04 +08:00 |
|
|
|
5f0546c6cf
|
design single 在用户submit时将上传的图片保存到library
|
2024-04-30 10:59:41 +08:00 |
|
shahaibo
|
e70580c388
|
BUGFIX:邮件;
|
2024-04-30 10:19:40 +08:00 |
|
