|
|
1d60a6a129
|
Merge branch 'dev/dev_xp' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java
|
2024-06-17 10:25:20 +08:00 |
|
|
|
0017568cc7
|
slogan
|
2024-06-17 10:21:49 +08:00 |
|
shahaibo
|
375f717721
|
TASK:aida;
|
2024-06-17 09:43:59 +08:00 |
|
shahaibo
|
18914bea7e
|
TASK:aida;
|
2024-06-17 09:34:48 +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 |
|
|
|
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 |
|
shahaibo
|
775ae3266c
|
BUGFIX:定时任务开启;
|
2024-05-31 09:59:08 +08:00 |
|
|
|
1aea8e93f2
|
AlipayHK 新增指定订单查询接口
|
2024-05-30 09:54:49 +08:00 |
|
|
|
804dc9b1b4
|
添加aws S3访问工具类
|
2024-05-29 16:30:27 +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 |
|
|
|
709393a9a6
|
paypal 切换为live环境
|
2024-05-28 11:20:58 +08:00 |
|
|
|
fb8de15eca
|
不等比缩放
|
2024-05-28 11:17:46 +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 |
|
|
|
db04267591
|
Merge branch 'dev/dev' into test/stable
# Conflicts:
# src/main/resources/paypal-sandbox.properties
|
2024-05-27 18:26:36 +08:00 |
|
|
|
5ff2bf11d7
|
alipay 密钥文件
|
2024-05-27 18:10:20 +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
|
b1b4b4147c
|
TASK:配置文件;
|
2024-05-27 15:06:24 +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
|
031d71bf99
|
BUGFIX:design;
|
2024-05-22 15:12:37 +08:00 |
|
shahaibo
|
205f0d54c5
|
BUGFIX:workspace;
|
2024-05-22 14:09:16 +08:00 |
|
shahaibo
|
50e46fed02
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
# Conflicts:
# src/main/resources/application-dev.properties
|
2024-05-22 14:05:01 +08:00 |
|
shahaibo
|
1303b1805a
|
TASK:style;
|
2024-05-22 11:40:01 +08:00 |
|
shahaibo
|
2845c2c8b9
|
BUGFIX:male_top;
|
2024-05-22 10:26:29 +08:00 |
|
shahaibo
|
cd817dbf57
|
TASK:style;
|
2024-05-22 09:50:34 +08:00 |
|
|
|
f9ce559915
|
paypal 切换回sandbox环境
|
2024-05-21 14:40:46 +08:00 |
|
|
|
e40401f61f
|
paypal webhook切换到prod
|
2024-05-21 14:27:17 +08:00 |
|
shahaibo
|
6e64eb741a
|
TASK:邮箱;
|
2024-05-20 22:32:45 +08:00 |
|
shahaibo
|
c4a37f5d73
|
TASK:邮件;
|
2024-05-20 09:34:20 +08:00 |
|
shahaibo
|
8f5a86db0b
|
TASK:监听;
|
2024-05-18 08:19:55 +08:00 |
|
shahaibo
|
14c99f6c6b
|
TASK:监听;
|
2024-05-18 01:31:26 +08:00 |
|
shahaibo
|
bf072e35f5
|
TASK:监听;
|
2024-05-18 01:16:15 +08:00 |
|
shahaibo
|
b8048704ba
|
TASK:监听;
|
2024-05-18 01:00:42 +08:00 |
|
