shahaibo
|
c73876e8b0
|
TASK:配置文件;
|
2024-05-17 12:13:35 +08:00 |
|
shahaibo
|
9f4dbda152
|
TASK:无新增用户邮件;
|
2024-05-17 10:39:00 +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 |
|
|
|
e2697aa407
|
Merge branch 'dev/dev_xp' into dev/dev
|
2024-05-08 09:46:15 +08:00 |
|
|
|
ae937dbf65
|
将generate输入的文本进行翻译或微处理
|
2024-05-07 18:27:32 +08:00 |
|
shahaibo
|
8da24f4933
|
BUGFIX:aida;
|
2024-05-06 16:02:02 +08:00 |
|
|
|
ffeaac8c46
|
generate 代码优化
|
2024-05-02 10:33:11 +08:00 |
|
|
|
6d9efc1509
|
generate 接口参数变更
|
2024-04-25 12:41:07 +08:00 |
|
|
|
2882b06128
|
sr MQ异常捕捉 手动ack
generate 全部失败 抛异常
|
2024-04-23 16:44:55 +08:00 |
|
|
|
c31a4bcd8f
|
generate mode修改
|
2024-04-23 14:21:18 +08:00 |
|
|
|
ff842c5443
|
BUGFIX:SR异常 手动ACK
|
2024-04-23 12:18:15 +08:00 |
|
|
|
540d2a4e28
|
generate bug修复
|
2024-04-18 18:34:44 +08:00 |
|
|
|
e832d5e4d4
|
generate
|
2024-04-18 18:04:02 +08:00 |
|
|
|
d2076a81d5
|
generate 联调修改
|
2024-04-18 16:48:19 +08:00 |
|
|
|
896120fea4
|
generate模型更换后的接口更改及异步获取结果
|
2024-04-18 14:07:20 +08:00 |
|
|
|
8d330e8ad9
|
积分充值与扣除数量变更
|
2024-04-11 13:48:14 +08:00 |
|
|
|
c73414a1f4
|
Merge branch 'test/stable' into dev/dev_xp
|
2024-04-11 13:30:44 +08:00 |
|
|
|
050b93d47a
|
积分充值与扣除数量变更
|
2024-04-11 11:51:52 +08:00 |
|
|
|
75a63c7a6f
|
Merge branch 'dev/dev_xp' into dev/dev
# Conflicts:
# src/main/resources/paypal-sandbox.properties
|
2024-04-11 11:45:03 +08:00 |
|
|
|
1d443b140b
|
为PayPal添加定时任务
|
2024-04-10 16:07:52 +08:00 |
|
|
|
5cd3121546
|
local -> dev 队列名修改
|
2024-03-28 16:49:33 +08:00 |
|
|
|
7d967ed41e
|
1、完善积分充值
2、升级积分扣除机制
3、优化部分代码
|
2024-03-28 14:43:36 +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 |
|
|
|
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 |
|
|
|
ee96759832
|
1、接入paypal
2、修改支付宝支付
|
2024-03-01 17:31:26 +08:00 |
|
|
|
7f8c84bd35
|
支付宝 回调地址免验证
|
2024-02-22 10:25:07 +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 |
|
|
|
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 |
|
|
|
92dafd74c9
|
在过滤器中添加未携带token的请求ip日志打印
|
2024-02-01 13:28:48 +08:00 |
|
|
|
9b55083768
|
generate 日志打印
|
2024-01-31 19:35:17 +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 |
|
|
|
bee78cc9a2
|
generate 添加试用用户判断
|
2024-01-30 13:34:30 +08:00 |
|
|
|
533b54a768
|
MQ 消息队列名修改
|
2024-01-29 17:03:10 +08:00 |
|
shahaibo
|
d4a7fa441c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-01-26 13:18:37 +08:00 |
|
shahaibo
|
62e6f8b77d
|
TASK:数据迁移;
|
2024-01-26 13:17:59 +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 |
|
