|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
821a3420ae
|
配置环境修改
|
2024-01-30 13:39:59 +08:00 |
|
|
|
02d65b4fb2
|
Merge remote-tracking branch 'origin/release/3.0' into test/stable
# Conflicts:
# src/main/resources/application-prod.properties
|
2024-01-30 10:50:18 +08:00 |
|
shahaibo
|
5c2c9f22ce
|
TASK:配置文件;
|
2024-01-29 11:33:28 +08:00 |
|
shahaibo
|
98d98b1131
|
TASK:配置文件;
|
2024-01-29 11:32:41 +08:00 |
|
shahaibo
|
7386f4427d
|
TASK:配置文件;
|
2024-01-29 11:30:39 +08:00 |
|
shahaibo
|
9a5ee2b264
|
TASK:配置文件;
|
2024-01-29 11:20:26 +08:00 |
|
shahaibo
|
a5cbca8d74
|
TASK:配置文件;
|
2024-01-29 11:18:32 +08:00 |
|
shahaibo
|
2b2fb4319a
|
TASK:配置文件;
|
2024-01-29 11:10:00 +08:00 |
|
shahaibo
|
3a2253f1ce
|
TASK:数据库连接
|
2024-01-28 11:08:53 +08:00 |
|
shahaibo
|
18d0d55d4f
|
BUGFIX:设置上传文件大小，正式用户转试用用户
|
2024-01-27 16:32:18 +08:00 |
|
|
|
c35a188abb
|
TASK:generate 修复逻辑Bug
|
2024-01-25 13:37:17 +08:00 |
|
|
|
d4568ad740
|
redis 配置修改
|
2024-01-24 11:47:19 +08:00 |
|
|
|
96858c2cc3
|
TASK:异步调用generate及取消generate
|
2024-01-24 11:43:56 +08:00 |
|
|
|
a9ce35200c
|
BUGFIX：测试环境配置修改
|
2024-01-22 16:27:46 +08:00 |
|
|
|
ec39bf9a97
|
修改redis配置
|
2024-01-22 12:03:36 +08:00 |
|
|
|
16f590dea5
|
修改redis配置
|
2024-01-22 11:17:53 +08:00 |
|
|
|
577dc94850
|
1、generate 异步生成及获取排队情况
2、generate 取消生成
|
2024-01-21 14:14:55 +08:00 |
|
shahaibo
|
471426e931
|
TASK:多数据源;
|
2024-01-19 16:36:34 +08:00 |
|
shahaibo
|
ed3dcf9ee8
|
Merge branch 'develop' into dev_shb
|
2024-01-18 13:34:20 +08:00 |
|
shahaibo
|
365c04375a
|
TASK:免登录;
|
2024-01-18 09:56:50 +08:00 |
|
shahaibo
|
a75cdffe59
|
TASK:design NEW;
|
2024-01-15 15:57:40 +08:00 |
|
|
|
1b836175b1
|
修改测试稳定版 python服务端口配置
|
2024-01-12 11:14:43 +08:00 |
|
