|
|
fb8de15eca
|
不等比缩放
|
2024-05-28 11:17:46 +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 |
|
|
|
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
|
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 |
|
|
|
5ebf0669f5
|
alipay-hk 切换到live环境
|
2024-05-23 15:48:55 +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
|
bf072e35f5
|
TASK:监听;
|
2024-05-18 01:16:15 +08:00 |
|
shahaibo
|
b8048704ba
|
TASK:监听;
|
2024-05-18 01:00:42 +08:00 |
|
shahaibo
|
6b07c84c80
|
TASK:检查令牌日志注释;
|
2024-05-17 21:14:39 +08:00 |
|
shahaibo
|
f1eb48ae74
|
TASK:配置文件;
|
2024-05-17 19:25:50 +08:00 |
|
shahaibo
|
e634481113
|
TASK:配置文件;
|
2024-05-17 17:59:04 +08:00 |
|
shahaibo
|
c73876e8b0
|
TASK:配置文件;
|
2024-05-17 12:13:35 +08:00 |
|
shahaibo
|
a726ceca59
|
TASK:配置文件;
|
2024-05-17 11:40:38 +08:00 |
|
|
|
bc85e33074
|
paypal 收款账号切换到live
|
2024-05-16 18:19:01 +08:00 |
|
|
|
3790b8ee72
|
Alipay-HK 创建订单和异步回调
|
2024-05-15 15:38:11 +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 |
|
shahaibo
|
8da24f4933
|
BUGFIX:aida;
|
2024-05-06 16:02:02 +08:00 |
|
|
|
a749c5dd2e
|
BUGFIX:便利查询
|
2024-04-22 13:09:44 +08:00 |
|
|
|
9f23df04db
|
Merge branch 'dev/dev_xp' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java
|
2024-04-18 14:09:16 +08:00 |
|
|
|
896120fea4
|
generate模型更换后的接口更改及异步获取结果
|
2024-04-18 14:07:20 +08:00 |
|
|
|
074e4154ac
|
配置修改
|
2024-04-11 15:20:49 +08:00 |
|
|
|
8d330e8ad9
|
积分充值与扣除数量变更
|
2024-04-11 13:48:14 +08:00 |
|
|
|
8d77cd0be6
|
修改dev环境下paypal webhook_id
|
2024-03-28 15:53:04 +08:00 |
|
|
|
784f599e38
|
paypal live-> sandbox
|
2024-03-28 15:04:31 +08:00 |
|
shahaibo
|
3be72dbe49
|
BUGFIX;
|
2024-03-27 13:34:36 +08:00 |
|
shahaibo
|
1d71d276bb
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev_shb
|
2024-03-27 13:31:08 +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 |
|
|
|
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
|
db68ce7d1b
|
BUGFIX:design new male_outwear;
|
2024-02-23 15:40:04 +08:00 |
|
shahaibo
|
6e191413b9
|
TASK:数据库地址修改:;
|
2024-02-22 13:38:07 +08:00 |
|
|
|
f8996999d4
|
支付宝 回调地址修改
|
2024-02-22 10:23:46 +08:00 |
|
shahaibo
|
002a47c169
|
TASK:dev分支端口;
|
2024-02-20 11:05:01 +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 |
|
|
|
35fbd4d865
|
修改内网穿透地址
|
2024-02-19 15:26:42 +08:00 |
|
|
|
2a73986e64
|
修改内网穿透地址
|
2024-02-19 14:38:18 +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 |
|
|
|
318d0a1441
|
充值功能--接入支付宝
|
2024-02-14 12:37:57 +08:00 |
|
