|
|
e84d800ba0
|
加入积分系统，将充值与积分关联
|
2024-03-06 20:56:22 +08:00 |
|
|
|
ee96759832
|
1、接入paypal
2、修改支付宝支付
|
2024-03-01 17:31:26 +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 |
|
shahaibo
|
22330b674a
|
BUGFIX:代码优化;
|
2024-02-21 15:16:51 +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
|
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
|
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 |
|
|
|
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 |
|
|
|
7f33597c02
|
充值功能--接入支付宝
|
2024-02-14 12:10:15 +08:00 |
|
|
|
69fe927576
|
新增generate-queue-dev消息队列
|
2024-01-31 16:01:06 +08:00 |
|
|
|
8f832ec441
|
机器人试用到期提示
|
2024-01-31 14:59:19 +08:00 |
|
shahaibo
|
5e1573ae09
|
TASK:试用用户机器人余额;
|
2024-01-30 15:07:34 +08:00 |
|
shahaibo
|
878b5a129c
|
TASK:试用用户机器人余额;
|
2024-01-30 14:20:01 +08:00 |
|
|
|
9e653595a9
|
generate 添加试用用户判断
|
2024-01-30 11:48:26 +08:00 |
|
|
|
533b54a768
|
MQ 消息队列名修改
|
2024-01-29 17:03:10 +08:00 |
|
shahaibo
|
0afcf92582
|
BUGFIX:试用用户;
|
2024-01-29 10:35:19 +08:00 |
|
shahaibo
|
4380f0bc5b
|
BUGFIX:异常级别设置
|
2024-01-28 10:40:29 +08:00 |
|
shahaibo
|
18d0d55d4f
|
BUGFIX:设置上传文件大小，正式用户转试用用户
|
2024-01-27 16:32:18 +08:00 |
|
shahaibo
|
f047ca0324
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-01-26 15:33:43 +08:00 |
|
shahaibo
|
f02988a0a7
|
TASK:分页去除限制;
|
2024-01-26 15:33:33 +08:00 |
|
|
|
fc4dcd41ae
|
generate 修改字段名str->content
|
2024-01-26 14:18:28 +08:00 |
|
shahaibo
|
d4a7fa441c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-01-26 13:18:37 +08:00 |
|
shahaibo
|
5af86c28f1
|
TASK:数据迁移;
|
2024-01-26 13:18:16 +08:00 |
|
shahaibo
|
62e6f8b77d
|
TASK:数据迁移;
|
2024-01-26 13:17:59 +08:00 |
|
|
|
4c0dd27332
|
generate 记录取消操作
|
2024-01-26 13:12:04 +08:00 |
|
|
|
aa270b5f7d
|
修改排队位置
|
2024-01-25 14:11:12 +08:00 |
|
|
|
c35a188abb
|
TASK:generate 修复逻辑Bug
|
2024-01-25 13:37:17 +08:00 |
|
|
|
65bed9dada
|
TASK:generate 取消generate
|
2024-01-24 16:57:53 +08:00 |
|
|
|
1d2cb17d54
|
TASK:generate 添加队列消费者，增加并发量
|
2024-01-24 14:44:31 +08:00 |
|
|
|
96858c2cc3
|
TASK:异步调用generate及取消generate
|
2024-01-24 11:43:56 +08:00 |
|
shahaibo
|
6b8e96ec74
|
TASK:design new;
|
2024-01-24 10:23:58 +08:00 |
|
|
|
a9ce35200c
|
BUGFIX：测试环境配置修改
|
2024-01-22 16:27:46 +08:00 |
|
|
|
164454b5b2
|
BUGFIX：数据传输过程中long精度发生丢失
|
2024-01-22 16:21:32 +08:00 |
|
|
|
404172e5f2
|
修改获取结果的请求方式
|
2024-01-22 14:00:05 +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
|
449c568907
|
TASK:免登录;
|
2024-01-18 12:05:06 +08:00 |
|
shahaibo
|
b828c8fcde
|
TASK:免登录;
|
2024-01-18 11:58:37 +08:00 |
|
shahaibo
|
557041335a
|
TASK:免登录;
|
2024-01-18 11:23:25 +08:00 |
|
shahaibo
|
bccb6d7bd2
|
TASK:免登录;
|
2024-01-18 10:03:48 +08:00 |
|
shahaibo
|
365c04375a
|
TASK:免登录;
|
2024-01-18 09:56:50 +08:00 |
|
shahaibo
|
90634f73c7
|
TASK:免密登录;
|
2024-01-17 17:49:40 +08:00 |
|
