|
|
46fbbd747e
|
alipay-hk 配置文件位置修改
|
2024-07-10 10:47:36 +08:00 |
|
|
|
83915d332f
|
Merge branch 'dev/dev' into test/stable
|
2024-07-09 17:30:54 +08:00 |
|
|
|
751aeb785d
|
Merge branch 'dev/dev_xp' into dev/dev
|
2024-07-09 17:29:42 +08:00 |
|
|
|
7cadab9345
|
付费用户邮件通知
|
2024-07-09 17:28:38 +08:00 |
|
shahaibo
|
4c598200e5
|
TASK:邮件通知
|
2024-07-09 17:10:50 +08:00 |
|
shahaibo
|
11eb6595dd
|
BUGFIX:游客注册主题;
|
2024-07-09 17:10:50 +08:00 |
|
shahaibo
|
0b8d0a1843
|
BUGFIX:aida;
|
2024-07-09 09:46:41 +08:00 |
|
shahaibo
|
9ca0cd7c43
|
BUGFIX:aida;
|
2024-07-08 15:24:50 +08:00 |
|
|
|
5ecebd5117
|
修改印花 允许同时single和overall
|
2024-07-05 18:47:12 +08:00 |
|
|
|
c6626b230a
|
Merge branch 'dev/dev' into dev/dev_xp
|
2024-07-05 18:42:03 +08:00 |
|
shahaibo
|
c1d88943a9
|
BUGFIX:aida;
|
2024-07-05 11:26:46 +08:00 |
|
|
|
569c2e719f
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
# src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
|
2024-07-04 14:42:51 +08:00 |
|
|
|
d2129459fe
|
S3Util 工具类修改
|
2024-07-03 16:43:22 +08:00 |
|
shahaibo
|
f869f8eb10
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-06-27 15:33:38 +08:00 |
|
shahaibo
|
9b438c78a3
|
TASK:aida;
|
2024-06-27 15:33:26 +08:00 |
|
|
|
a5b435b80f
|
S3 Util 新增工具类
|
2024-06-26 18:00:47 +08:00 |
|
|
|
e7f9b77fe5
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
|
2024-06-20 10:39:36 +08:00 |
|
shahaibo
|
ad1fa0e4c2
|
TASK:aida;
|
2024-06-20 10:27:28 +08:00 |
|
|
|
227c742f0d
|
新增接口：调查问卷
|
2024-06-20 10:27:04 +08:00 |
|
shahaibo
|
18914bea7e
|
TASK:aida;
|
2024-06-17 09:34:48 +08:00 |
|
|
|
77f514a03b
|
Merge branch 'release/3.0' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/python/PythonService.java
# src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
|
2024-06-11 15:23:24 +08:00 |
|
|
|
954f6207ec
|
design Single 允许画笔修改sketch后进行design
|
2024-06-05 11:43:35 +08:00 |
|
|
|
86e7119cfb
|
AlipayHK 回调及相关数据处理
|
2024-05-31 16:28:23 +08:00 |
|
|
|
1aea8e93f2
|
AlipayHK 新增指定订单查询接口
|
2024-05-30 09:54:49 +08:00 |
|
|
|
804dc9b1b4
|
添加aws S3访问工具类
|
2024-05-29 16:30:27 +08:00 |
|
|
|
f4e9a3474a
|
Merge branch 'test/stable' into release/3.0
# Conflicts:
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
|
2024-05-28 10:59:34 +08:00 |
|
shahaibo
|
890389843f
|
BUGFIX:试用时间link14天;
|
2024-05-28 10:43:50 +08:00 |
|
|
|
54cbaf4b80
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
# src/main/resources/application-dev.properties
|
2024-05-27 13:24:51 +08:00 |
|
|
|
c688af01f2
|
Merge branch 'release/3.0' into dev/dev_xp
# Conflicts:
# pom.xml
# src/main/java/com/ai/da/common/utils/SendEmailUtil.java
|
2024-05-27 13:20:31 +08:00 |
|
|
|
5ebf0669f5
|
alipay-hk 切换到live环境
|
2024-05-23 15:48:55 +08:00 |
|
shahaibo
|
4b1a58c036
|
TASK:检查令牌日志注释;
|
2024-05-17 20:58:54 +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 |
|
|
|
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 |
|
