|
|
efe22de0a0
|
Merge branch 'refs/heads/dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/common/utils/SendEmailUtil.java
# src/main/java/com/ai/da/mapper/primary/entity/Account.java
|
2024-12-11 16:52:16 +08:00 |
|
|
|
5dd1e10b61
|
to dev
|
2024-12-10 10:09:21 +08:00 |
|
|
|
e9e8e87719
|
Merge branch 'release/3.0' into dev/dev
|
2024-12-10 10:04:27 +08:00 |
|
|
|
47ca7bde41
|
Affiliate-新增、查询、佣金计算等
|
2024-12-09 16:53:29 +08:00 |
|
shahaibo
|
9e28d579d1
|
Merge branch 'dev/dev' into dev/dev_shb
# Conflicts:
# src/main/java/com/ai/da/controller/AccountController.java
# src/main/java/com/ai/da/controller/SavedCollectionController.java
# src/main/java/com/ai/da/service/AccountService.java
# src/main/java/com/ai/da/service/UserLikeGroupService.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
|
2024-12-09 13:44:07 +08:00 |
|
shahaibo
|
1c96522447
|
TASK:AiDA
|
2024-12-09 13:31:30 +08:00 |
|
|
|
eecefee674
|
Merge branch 'dev/dev' into release/3.0
|
2024-12-02 14:54:00 +08:00 |
|
shahaibo
|
b315ae5644
|
TASK:toproductimage prompt;
|
2024-12-02 12:02:19 +08:00 |
|
徐佩
|
23b864d378
|
to prod
|
2024-12-01 17:37:52 +08:00 |
|
|
|
13397fa1f7
|
to dev
|
2024-11-28 17:22:57 +08:00 |
|
|
|
2fab472150
|
to dev
|
2024-11-28 17:21:58 +08:00 |
|
|
|
1b15aed6a2
|
支付优化-续订失败邮件通知
|
2024-11-28 10:43:06 +08:00 |
|
|
|
5019fbd3fc
|
支付优化
|
2024-11-25 10:53:09 +08:00 |
|
|
|
2ea19dcf03
|
Merge branch 'refs/heads/dev/dev' into dev/dev_xp
|
2024-11-19 17:09:36 +08:00 |
|
|
|
4d756d5624
|
支付优化
|
2024-11-19 17:08:16 +08:00 |
|
|
|
8d27b5b51e
|
新增功能 -- 产品订阅 年度/月度
|
2024-11-18 16:20:25 +08:00 |
|
shahaibo
|
9f064609e7
|
TASK:谷歌登录
|
2024-11-13 15:45:40 +08:00 |
|
|
|
e5e514b522
|
ws优化
|
2024-11-11 17:31:55 +08:00 |
|
|
|
74e6d5a1da
|
ws 联调修改
|
2024-11-11 17:24:49 +08:00 |
|
|
|
3cf0570912
|
ws 引入心跳
|
2024-11-11 16:34:55 +08:00 |
|
shahaibo
|
37ff7fbb91
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/service/AccountService.java
|
2024-11-11 16:06:21 +08:00 |
|
shahaibo
|
8c20b51e13
|
TASK:谷歌登录
|
2024-11-11 16:04:26 +08:00 |
|
|
|
391a28d659
|
ws
|
2024-11-11 15:21:35 +08:00 |
|
|
|
546d1b4c44
|
ws 设置session2分钟超时，以及心跳回复
|
2024-11-11 15:03:21 +08:00 |
|
|
|
5fe605c130
|
长连接 关闭日志打印
|
2024-11-11 10:45:57 +08:00 |
|
|
|
4408c0ecc6
|
to dev
|
2024-11-11 10:29:06 +08:00 |
|
|
|
59b02b3f28
|
to prod
|
2024-11-04 10:49:29 +08:00 |
|
|
|
4a23e33080
|
BUGFIX：作品删除后，获取点赞详细报错
|
2024-11-04 10:42:35 +08:00 |
|
|
|
7c56d2bf4e
|
to dev
|
2024-10-29 10:33:48 +08:00 |
|
|
|
c9bb7fe502
|
to prod
|
2024-10-29 10:03:21 +08:00 |
|
shahaibo
|
6c6162df74
|
BUGFIX:定时任务开启;
|
2024-10-23 08:54:00 +08:00 |
|
shahaibo
|
ebd596d0d2
|
TASK:aida;
|
2024-10-20 10:52:14 +08:00 |
|
|
|
e684c4e547
|
Merge branch 'release/3.0' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/common/constant/CommonConstant.java
# src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
# src/main/java/com/ai/da/controller/PortfolioController.java
# src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java
# src/main/java/com/ai/da/service/PortfolioService.java
# src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
# src/main/resources/messages_en.properties
# src/main/resources/messages_zh.properties
|
2024-10-10 23:26:20 +08:00 |
|
|
|
0cca24ee30
|
修改环境及打开监听
|
2024-10-09 15:44:47 +08:00 |
|
|
|
463ddf3cb2
|
1、为发布的作品添加标签
2、修改标签
3、不允许用户重复参与活动
4、查询所有参与活动的作品
|
2024-10-09 13:51:16 +08:00 |
|
|
|
a7c5723e10
|
保存修改
|
2024-10-08 13:34:10 +08:00 |
|
shahaibo
|
d9118aaf93
|
TASK:AiDA workshop活动;
|
2024-10-08 13:17:55 +08:00 |
|
shahaibo
|
fd12b9e571
|
TASK:male sketch style逻辑添加;
|
2024-10-04 10:40:32 +08:00 |
|
shahaibo
|
51a1c1d8e1
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-10-03 12:14:43 +08:00 |
|
shahaibo
|
8445c23984
|
TASK:十月优惠邮件发送接口;
|
2024-10-03 12:14:30 +08:00 |
|
|
|
283b6244b1
|
消息推送连接关闭时避免报错
|
2024-10-01 10:29:06 +08:00 |
|
|
|
791d44df02
|
消息推送 bug修改
|
2024-09-30 17:15:11 +08:00 |
|
shahaibo
|
373608d989
|
TASK:aida design统计;
|
2024-09-29 18:32:06 +08:00 |
|
shahaibo
|
45e3dde03f
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-09-29 17:59:00 +08:00 |
|
shahaibo
|
3625180a6e
|
Merge branch 'release/3.0' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
# src/main/java/com/ai/da/controller/ThirdPartyController.java
# src/main/java/com/ai/da/service/AccountService.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
|
2024-09-29 17:56:49 +08:00 |
|
|
|
08dcd03468
|
修改默认头像
|
2024-09-28 20:14:19 +08:00 |
|
shahaibo
|
deda511e32
|
TASK:aida;
|
2024-09-27 16:43:02 +08:00 |
|
shahaibo
|
70912c4c43
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-09-27 16:24:56 +08:00 |
|
shahaibo
|
fa013c1974
|
TASK:aida;
|
2024-09-27 16:24:45 +08:00 |
|
|
|
11fbeb1ed0
|
Merge branch 'dev/dev_xp' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/common/utils/RedisUtil.java
# src/main/java/com/ai/da/service/AccountService.java
|
2024-09-27 15:43:48 +08:00 |
|
