Commit Graph

60 Commits

Author SHA1 Message Date
5ebf0669f5 alipay-hk 切换到live环境 2024-05-23 15:48:55 +08:00
3790b8ee72 Alipay-HK 创建订单和异步回调 2024-05-15 15:38:11 +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
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
shahaibo
8da24f4933 BUGFIX:aida; 2024-05-06 16:02:02 +08:00
896120fea4 generate模型更换后的接口更改及异步获取结果 2024-04-18 14:07:20 +08:00
7d967ed41e 1、完善积分充值
2、升级积分扣除机制
3、优化部分代码
2024-03-28 14:43:36 +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
ee96759832 1、接入paypal
2、修改支付宝支付
2024-03-01 17:31:26 +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
7f33597c02 充值功能--接入支付宝 2024-02-14 12:10:15 +08:00
9b55083768 generate 日志打印 2024-01-31 19:35:17 +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
1d2cb17d54 TASK:generate 添加队列消费者,增加并发量 2024-01-24 14:44:31 +08:00
96858c2cc3 TASK:异步调用generate及取消generate 2024-01-24 11:43:56 +08:00
a9ce35200c BUGFIX:测试环境配置修改 2024-01-22 16:27:46 +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
5bed3c180b TASK:续订通知; 2024-01-08 13:02:50 +08:00
shahaibo
11f94ebcb4 BUGFIX:element上传; 2024-01-04 11:04:15 +08:00
shahaibo
8dd658f1e9 BUGFIX: 使用订单通过后的邮件标题,多语言内容更新; 2023-12-18 17:18:19 +08:00
shahaibo
f80e5ce455 TASK: 试用用户添加测试; 2023-12-11 15:11:40 +08:00
shahaibo
7fdacaeb7c TASK: 试用用户添加测试; 2023-12-11 14:35:05 +08:00
shahaibo
91993feee8 TASK: 试用用户添加测试; 2023-12-11 10:02:05 +08:00
xupei
35e6bb8cd9 BUGFIX:取消like后不能再like同一张图片
其他:generate--sketchboard 添加gender
修改generate like的图片命名--当下的十位时间戳
2023-11-15 13:22:15 +08:00
xupei
0313149ea5 修改异常处理+代码清理 2023-11-02 15:35:07 +08:00
shahaibo
44a30bf9b5 TASK: 全局异常优化; 2023-10-31 14:07:43 +08:00
shahaibo
bedc640e13 TASK: 全局异常处理,代码优化,测试数据库连接信息变更; 2023-10-27 10:09:19 +08:00
shahaibo
9fa605f83e BUGFIX: format; 2023-10-20 14:47:18 +08:00
shahaibo
e5beab268c TASK:预签名缓存; 2023-10-11 14:53:38 +08:00
shahaibo
0931923d0b Merge remote-tracking branch 'origin/develop' into dev_shb
# Conflicts:
#	src/main/java/com/ai/da/mapper/entity/SysFile.java
2023-09-30 13:23:08 +08:00
shahaibo
0a3487a3db TASK:机器人、首页、history模块代码; 2023-09-29 21:44:43 +08:00
xupei
f026a9b929 Merge remote-tracking branch 'origin/dev_shb' into develop
# Conflicts:
#	src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
2023-09-28 10:29:54 +08:00
shahaibo
02d658dd0d TASK:workspace、design模块代码; 2023-09-22 16:28:33 +08:00
xupei
20f5a3eda2 design single接口疏通 2023-09-20 16:16:02 +08:00
shahaibo
49b62d3733 TASK:workspace、design模块代码; 2023-09-20 16:02:57 +08:00
shahaibo
d3530f0af9 Merge remote-tracking branch 'origin/dev-xp' into dev_shb
# Conflicts:
#	src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
#	src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
2023-09-20 13:35:35 +08:00
shahaibo
0115759563 TASK:workspace、design模块代码; 2023-09-20 13:03:07 +08:00