|
|
d4eb7c846b
|
to dev
|
2024-08-06 11:35:11 +08:00 |
|
|
|
94927ae0a4
|
modify
|
2024-08-05 15:48:50 +08:00 |
|
|
|
71e6abd816
|
to prod
|
2024-07-29 17:52:06 +08:00 |
|
|
|
00c948116e
|
to prod
|
2024-07-29 17:50:40 +08:00 |
|
|
|
b6efd598bd
|
to prod
|
2024-07-29 17:50:09 +08:00 |
|
|
|
bfe7ad4aa6
|
to prod
|
2024-07-29 17:49:16 +08:00 |
|
|
|
018ccef46a
|
to prod
|
2024-07-29 17:47:09 +08:00 |
|
|
|
0106f21b86
|
Merge branch 'dev/dev_xp' into dev/dev
|
2024-07-29 17:31:21 +08:00 |
|
|
|
1b5f64785d
|
调查问卷查看
|
2024-07-29 17:24:14 +08:00 |
|
shahaibo
|
ce1e2f3eab
|
TASK:取消定时任务
|
2024-07-22 11:18:43 +08:00 |
|
shahaibo
|
75fbd2844b
|
TASK:mq配置
|
2024-07-22 11:15:25 +08:00 |
|
徐佩
|
34c4cd47ef
|
Merge remote-tracking branch 'origin/release/3.0' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/common/task/AccountTask.java
|
2024-07-21 09:54:42 +08:00 |
|
|
|
c46f65600f
|
添加 开展活动接口
|
2024-07-19 15:40:54 +08:00 |
|
|
|
440dfdcceb
|
push to prod 开启定时任务
|
2024-07-17 15:32:58 +08:00 |
|
|
|
36e41ecd89
|
push to prod 配置修改
|
2024-07-17 15:28:55 +08:00 |
|
|
|
e1b08a9979
|
modify:Stripe
|
2024-07-17 15:26:11 +08:00 |
|
|
|
b9041d9c09
|
添加新的支付方式：Stripe
|
2024-07-16 16:59:58 +08:00 |
|
|
|
037a0d12ff
|
Merge branch 'release/3.0' into dev/dev_xp
|
2024-07-15 13:57:20 +08:00 |
|
shahaibo
|
f77de3a1f4
|
BUGFIX:token filter
|
2024-07-15 13:43:44 +08:00 |
|
|
|
f03d32030d
|
1、stripe
2、游客到试用用户身份转换
|
2024-07-15 13:42:18 +08:00 |
|
shahaibo
|
6a098ffa13
|
BUGFIX:发送每日申请试用用户邮件
|
2024-07-13 12:40:13 +08:00 |
|
|
|
925da9fa03
|
prod->local 合代码配置修改
|
2024-07-10 14:28:50 +08:00 |
|
|
|
8f0d45adf9
|
design 将未分割的图层添加到design_item_detail表中
|
2024-07-10 13:53:52 +08:00 |
|
|
|
44e045ece3
|
开启account-task
|
2024-07-10 11:00:17 +08:00 |
|
|
|
429fdad2b7
|
Merge branch 'test/stable' into release/3.0
|
2024-07-10 10:56:07 +08:00 |
|
|
|
46fbbd747e
|
alipay-hk 配置文件位置修改
|
2024-07-10 10:47:36 +08:00 |
|
shahaibo
|
54f8d4b5e0
|
TASK:消费开启
|
2024-07-10 09:30:40 +08:00 |
|
shahaibo
|
314ad7a4f8
|
TASK:定时任务开启
|
2024-07-09 23:46:54 +08:00 |
|
shahaibo
|
a56510c35a
|
TASK:变回develop环境
|
2024-07-09 23:44:40 +08:00 |
|
shahaibo
|
c2e2140ce6
|
Merge branch 'test/stable' into release/3.0
# Conflicts:
# src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
|
2024-07-09 23:40:58 +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
|
5297880c3b
|
BUGFIX:aida;
|
2024-07-09 17:10:49 +08:00 |
|
shahaibo
|
2ed63cafd0
|
TASK:生产消费暂时关闭;
|
2024-07-09 11:44:18 +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
|
1cab7332f9
|
BUGFIX:aida;
|
2024-07-05 16:52:56 +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 |
|
|
|
a64d4e30de
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-06-26 14:02:45 +08:00 |
|
|
|
0759452381
|
积分相关修改
1、BUGFIX: 用户表中的积分与积分详细中不统一;
2、To_Product_Image 添加扣除积分
3、每周刷新付费用户积分
|
2024-06-26 13:55:20 +08:00 |
|
