|
|
d79fe65bf1
|
Merge branch 'dev/dev_xp' into dev/dev
|
2024-03-26 17:24:36 +08:00 |
|
|
|
4bf4dc2588
|
向TaskList插入数据时开启事务
|
2024-03-26 17:23:40 +08:00 |
|
|
|
edaa4344be
|
删除SR mapper
|
2024-03-26 15:35:49 +08:00 |
|
|
|
54df4a0ae2
|
paypal 环境转换sandbox->live
|
2024-03-26 15:31:57 +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
|
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
|
6e191413b9
|
TASK:数据库地址修改:;
|
2024-02-22 13:38:07 +08:00 |
|
|
|
e28502a00c
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-02-22 10:25:25 +08:00 |
|
|
|
7f8c84bd35
|
支付宝 回调地址免验证
|
2024-02-22 10:25:07 +08:00 |
|
|
|
f8996999d4
|
支付宝 回调地址修改
|
2024-02-22 10:23:46 +08:00 |
|
shahaibo
|
10b3637c80
|
Merge branch 'dev/dev_shb' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/python/PythonService.java
|
2024-02-21 15:27:57 +08:00 |
|
shahaibo
|
22330b674a
|
BUGFIX:代码优化;
|
2024-02-21 15:16:51 +08:00 |
|
shahaibo
|
6bb99194bd
|
Merge branch 'dev/dev_shb' into dev/dev
|
2024-02-21 13:54:54 +08:00 |
|
shahaibo
|
43ec55dfb6
|
BUGFIX:Single design;
|
2024-02-21 13:53:46 +08:00 |
|
shahaibo
|
8fe468fda2
|
BUGFIX:Single design;
|
2024-02-20 11:20:30 +08:00 |
|
shahaibo
|
4e4ed0f66c
|
Merge branch 'dev/dev_shb' into dev/dev
|
2024-02-20 11:19:37 +08:00 |
|
shahaibo
|
002a47c169
|
TASK:dev分支端口;
|
2024-02-20 11:05:01 +08:00 |
|
shahaibo
|
258ddbab31
|
TASK:个人分支端口;
|
2024-02-20 11:04:27 +08:00 |
|
shahaibo
|
703201dae6
|
TASK:dev端口;
|
2024-02-20 11:02:41 +08:00 |
|
shahaibo
|
66e10a5a80
|
TASK:代码合并;
|
2024-02-20 10:40:36 +08:00 |
|
shahaibo
|
f8d468d55b
|
TASK:代码合并;
|
2024-02-20 10:35:50 +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
|
7803decb29
|
TASK:增加邮件通知人;
|
2024-02-20 09:31:31 +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 |
|
shahaibo
|
a4f36a2fd5
|
TASK:试用时间增加;
|
2024-02-15 15:23:32 +08:00 |
|
|
|
87580cfece
|
接入支付宝 联调修改
|
2024-02-15 14:03:44 +08:00 |
|
|
|
318d0a1441
|
充值功能--接入支付宝
|
2024-02-14 12:37:57 +08:00 |
|
|
|
874a59ea04
|
Merge remote-tracking branch 'origin/dev/dev_xp' into dev/dev
|
2024-02-14 12:22:16 +08:00 |
|
|
|
a7c60a932a
|
合并stable
|
2024-02-14 12:21:01 +08:00 |
|
|
|
7f33597c02
|
充值功能--接入支付宝
|
2024-02-14 12:10:15 +08:00 |
|
|
|
9b55083768
|
generate 日志打印
|
2024-01-31 19:35:17 +08:00 |
|
|
|
c646a8adb0
|
Merge branch 'release/3.0' into dev/dev
# Conflicts:
# docker-compose.yml
# src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java
|
2024-01-31 16:30:52 +08:00 |
|
|
|
69fe927576
|
新增generate-queue-dev消息队列
|
2024-01-31 16:01:06 +08:00 |
|
|
|
f4a80a4486
|
Merge remote-tracking branch 'origin/test/stable' into dev/dev
# Conflicts:
# docker-compose.yml
|
2024-01-31 15:51:35 +08:00 |
|
|
|
83058acfea
|
Merge remote-tracking branch 'origin/test/stable' into release/3.0
# Conflicts:
# src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
# src/main/resources/application.properties
|
2024-01-31 15:13:02 +08:00 |
|
|
|
8f832ec441
|
机器人试用到期提示
|
2024-01-31 14:59:19 +08:00 |
|
shahaibo
|
5e1573ae09
|
TASK:试用用户机器人余额;
|
2024-01-30 15:07:34 +08:00 |
|
shahaibo
|
f1176dfefb
|
TASK:试用用户机器人余额;
|
2024-01-30 15:03:38 +08:00 |
|
zchengrong
|
12cd9e8f1f
|
Delete docker-compose.yml
|
2024-01-30 14:52:40 +08:00 |
|
shahaibo
|
81c5d7ee65
|
TASK:试用用户机器人余额;
|
2024-01-30 14:20:57 +08:00 |
|
