shahaibo
|
aff870fba7
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2025-02-11 10:25:08 +08:00 |
|
shahaibo
|
a2390a6ab2
|
BUGFIX:试用订单邮件 订单更新时间判断;
|
2025-02-10 10:34:01 +08:00 |
|
shahaibo
|
8dc5dcb1bd
|
BUGFIX:试用订单邮件 订单更新时间判断;
|
2025-02-10 10:11:59 +08:00 |
|
shahaibo
|
5d010d2f77
|
BUGFIX:试用订单邮件 订单更新时间判断;
|
2025-02-10 10:08:48 +08:00 |
|
shahaibo
|
5f79c3276a
|
BUGFIX:试用订单邮件 订单更新时间判断;
|
2025-02-10 10:03:28 +08:00 |
|
|
|
aadb717c9f
|
to dev
|
2025-02-07 15:03:24 +08:00 |
|
|
|
c325927418
|
to prod
|
2025-02-06 14:46:50 +08:00 |
|
|
|
433d8a460e
|
to dev
|
2025-02-06 14:22:27 +08:00 |
|
shahaibo
|
a384aba4df
|
TASK:定时任务开启;
|
2025-02-06 10:04:30 +08:00 |
|
|
|
bdfa249c2e
|
token过期 日志打印优化
|
2025-01-23 14:15:12 +08:00 |
|
|
|
d8320ba83d
|
新增自定义异常
|
2025-01-23 13:56:48 +08:00 |
|
|
|
9f37cb3f8d
|
Merge branch 'release/3.0' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/controller/ConvenientInquiryController.java
# src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java
# src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
|
2025-01-08 10:33:49 +08:00 |
|
shahaibo
|
afeeef4af7
|
TASK:试用订单接收名单添加;
|
2025-01-04 21:35:21 +08:00 |
|
|
|
5dd1e10b61
|
to dev
|
2024-12-10 10:09:21 +08:00 |
|
徐佩
|
23b864d378
|
to prod
|
2024-12-01 17:37:52 +08:00 |
|
|
|
13397fa1f7
|
to dev
|
2024-11-28 17:22:57 +08:00 |
|
|
|
e5e514b522
|
ws优化
|
2024-11-11 17:31:55 +08:00 |
|
|
|
7c56d2bf4e
|
to dev
|
2024-10-29 10:33:48 +08:00 |
|
shahaibo
|
6c6162df74
|
BUGFIX:定时任务开启;
|
2024-10-23 08:54:00 +08:00 |
|
shahaibo
|
fd12b9e571
|
TASK:male sketch style逻辑添加;
|
2024-10-04 10:40:32 +08:00 |
|
shahaibo
|
9f5c901502
|
TASK:aida;
|
2024-09-27 14:42:30 +08:00 |
|
|
|
ea92e1f20d
|
to dev
|
2024-09-25 11:38:11 +08:00 |
|
|
|
93e9c61943
|
1、新增 imageToSketch
2、删除无用代码
|
2024-09-20 11:32:09 +08:00 |
|
|
|
56679808e9
|
mask更新 从sketch分割
|
2024-09-19 09:50:56 +08:00 |
|
|
|
a47e53b19e
|
mask 数据替换,代码暂存
|
2024-09-13 10:09:33 +08:00 |
|
|
|
00c948116e
|
to prod
|
2024-07-29 17:50:40 +08:00 |
|
|
|
b6efd598bd
|
to prod
|
2024-07-29 17:50:09 +08:00 |
|
shahaibo
|
ce1e2f3eab
|
TASK:取消定时任务
|
2024-07-22 11:18:43 +08:00 |
|
|
|
e1b08a9979
|
modify:Stripe
|
2024-07-17 15:26:11 +08:00 |
|
shahaibo
|
6a098ffa13
|
BUGFIX:发送每日申请试用用户邮件
|
2024-07-13 12:40:13 +08:00 |
|
shahaibo
|
314ad7a4f8
|
TASK:定时任务开启
|
2024-07-09 23:46:54 +08:00 |
|
shahaibo
|
9b438c78a3
|
TASK:aida;
|
2024-06-27 15:33:26 +08:00 |
|
shahaibo
|
9b589eece6
|
TASK:aida;
|
2024-06-25 10:59:58 +08:00 |
|
shahaibo
|
ad1fa0e4c2
|
TASK:aida;
|
2024-06-20 10:27:28 +08:00 |
|
shahaibo
|
18914bea7e
|
TASK:aida;
|
2024-06-17 09:34:48 +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 |
|
shahaibo
|
3a29d25060
|
TASK:aida;
|
2024-06-12 09:47:55 +08:00 |
|
shahaibo
|
775ae3266c
|
BUGFIX:定时任务开启;
|
2024-05-31 09:59:08 +08:00 |
|
shahaibo
|
cd817dbf57
|
TASK:style;
|
2024-05-22 09:50:34 +08:00 |
|
shahaibo
|
b86f168fe8
|
TASK:design 渐变色;
|
2024-05-10 17:17:28 +08:00 |
|
shahaibo
|
8da24f4933
|
BUGFIX:aida;
|
2024-05-06 16:02:02 +08:00 |
|
shahaibo
|
737ec594fd
|
BUGFIX;
|
2024-03-28 11:55:52 +08:00 |
|
shahaibo
|
1d71d276bb
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev_shb
|
2024-03-27 13:31:08 +08:00 |
|
shahaibo
|
54fe254ab0
|
BUGFIX;
|
2024-03-27 13:28:48 +08:00 |
|
|
|
ee96759832
|
1、接入paypal
2、修改支付宝支付
|
2024-03-01 17:31:26 +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 |
|
