|
|
018ccef46a
|
to prod
|
2024-07-29 17:47:09 +08:00 |
|
|
|
feb836f849
|
调查问卷
|
2024-07-29 17:36:32 +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 |
|
|
|
77a4aee88e
|
取消英文字母的正则匹配
|
2024-07-24 09:44:32 +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 |
|
shahaibo
|
832f331603
|
TASK:配置文件dev分支改为dev
|
2024-07-22 11:14:19 +08:00 |
|
|
|
9a2d58d922
|
正则匹配输入的英文文本
|
2024-07-22 09:46:11 +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 |
|
|
|
56ebcfbce2
|
stripe 设置支付链接语言
|
2024-07-17 17:17:04 +08:00 |
|
|
|
aa1eb7411e
|
stripe 设置支付链接语言
|
2024-07-17 17:12:25 +08:00 |
|
|
|
4626ea3c55
|
prod stripe->live
|
2024-07-17 16:21:05 +08:00 |
|
|
|
5858f7dcf1
|
添加stripe接口路由到过滤器
|
2024-07-17 16:05:33 +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 |
|
|
|
956b72729f
|
Merge remote-tracking branch 'origin/release/3.0' into release/3.0
|
2024-07-15 13:48:00 +08:00 |
|
|
|
9b185e6919
|
游客到试用用户身份转换
|
2024-07-15 13:47:43 +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 |
|
shahaibo
|
12c10167f1
|
Merge remote-tracking branch 'origin/release/3.0' into release/3.0
|
2024-07-11 15:54:49 +08:00 |
|
shahaibo
|
679b213b6f
|
BUGFIX:aida
|
2024-07-11 15:54:08 +08:00 |
|
shahaibo
|
6fa6c38398
|
BUGFIX:试用用户
|
2024-07-11 10:50:24 +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 |
|
|
|
505288fdb7
|
代码合并修改
|
2024-07-10 11:01:25 +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 |
|
|
|
803bdfd291
|
alipay-hk 配置文件路径修改
|
2024-07-10 10:08:20 +08:00 |
|
shahaibo
|
6cbc4882fa
|
BUGFIX:问卷调查
|
2024-07-10 09:49:41 +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
|
8a7b64dd65
|
Merge remote-tracking branch 'origin/test/stable' into test/stable
|
2024-07-09 17:11:05 +08:00 |
|
shahaibo
|
4c598200e5
|
TASK:邮件通知
|
2024-07-09 17:10:50 +08:00 |
|
shahaibo
|
d052918725
|
BUGFIX:t_design_item_detail_print level2type;
|
2024-07-09 17:10:50 +08:00 |
|
shahaibo
|
8fd6a3462e
|
BUGFIX:颜色没返回;
|
2024-07-09 17:10:50 +08:00 |
|
shahaibo
|
11eb6595dd
|
BUGFIX:游客注册主题;
|
2024-07-09 17:10:50 +08:00 |
|
shahaibo
|
0adfcb745d
|
BUGFIX:喜欢的作品;
|
2024-07-09 17:10:50 +08:00 |
|
shahaibo
|
779e1e8be3
|
BUGFIX:like;
|
2024-07-09 17:10:49 +08:00 |
|