Commit Graph

141 Commits

Author SHA1 Message Date
shahaibo
4ba5f63a62 TASK:workspace; 2024-05-27 15:05:46 +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
shahaibo
cd817dbf57 TASK:style; 2024-05-22 09:50:34 +08:00
shahaibo
8f5a86db0b TASK:监听; 2024-05-18 08:19:55 +08:00
shahaibo
14c99f6c6b TASK:监听; 2024-05-18 01:31:26 +08:00
shahaibo
b8048704ba TASK:监听; 2024-05-18 01:00:42 +08:00
shahaibo
b6704c3caf TASK:取消监听; 2024-05-18 00:34:18 +08:00
shahaibo
980e1547cd TASK:检查令牌日志注释; 2024-05-17 21:07:20 +08:00
shahaibo
ae2191f369 TASK:检查令牌日志注释; 2024-05-17 21:03:56 +08:00
shahaibo
4b1a58c036 TASK:检查令牌日志注释; 2024-05-17 20:58:54 +08:00
shahaibo
4dbd5a1fad TASK:检查令牌日志注释; 2024-05-17 20:27:58 +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
12c447d6b0 TASK:配置文件; 2024-05-17 12:14:20 +08:00
shahaibo
c73876e8b0 TASK:配置文件; 2024-05-17 12:13:35 +08:00
shahaibo
9f4dbda152 TASK:无新增用户邮件; 2024-05-17 10:39:00 +08:00
shahaibo
ebb6577e98 TASK:portfolio; 2024-05-17 10:19:34 +08:00
d1fab003d2 designSingle 加入渐变色 2024-05-13 16:23:37 +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
fb29310ba1 TASK:design 渐变色; 2024-05-10 17:18:25 +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
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