|
|
e9a15b950e
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-07 14:37:28 +08:00 |
|
|
|
ee676614f8
|
统一多种支付方式创建订单的入参
|
2025-01-07 14:31:43 +08:00 |
|
|
|
f08e36d100
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-07 11:12:30 +08:00 |
|
|
|
6a861305d6
|
解析所有发起购买的客户端ip地址
|
2025-01-07 11:07:49 +08:00 |
|
|
|
094718e67f
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-06 14:47:40 +08:00 |
|
|
|
e4a8bf80e9
|
1、用户详细信息添加国家、职业、用户名修改剩余次数
2、积分不够 返回异常提示类型更改
3、添加根据ip解析地理位置测试接口
4、更新积分刷新机制（每月1号0点刷新年费用户积分）
|
2025-01-06 14:42:08 +08:00 |
|
shahaibo
|
5ea8e851d7
|
TASK:AiDA design like sort
|
2025-01-06 10:46:51 +08:00 |
|
|
|
ee1e2f8556
|
获取所有标签
|
2025-01-02 17:32:49 +08:00 |
|
|
|
c997fbf1cb
|
Merge branch 'dev/dev_xp' into dev/dev
|
2024-12-23 14:35:29 +08:00 |
|
|
|
7283ace072
|
getAffiliateList 添加返回用户名
|
2024-12-23 14:31:48 +08:00 |
|
shahaibo
|
ec094d7471
|
TASK:AiDA
|
2024-12-19 13:31:01 +08:00 |
|
shahaibo
|
1a19604163
|
TASK:AiDA
|
2024-12-19 10:51:38 +08:00 |
|
|
|
fdebb2b215
|
Merge branch 'dev/dev_xp' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/model/vo/AccountLoginVO.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
|
2024-12-18 14:02:06 +08:00 |
|
|
|
7d8f047087
|
Affiliate功能-数据库表设计更新
|
2024-12-18 11:53:41 +08:00 |
|
|
|
bf8af41f3f
|
添加Affiliate功能
|
2024-12-16 10:26:02 +08:00 |
|
shahaibo
|
cdf29d2b0d
|
TASK:AiDA
|
2024-12-13 16:07:21 +08:00 |
|
|
|
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 |
|
shahaibo
|
82f7571612
|
TASK:AiDA
|
2024-12-11 16:21:18 +08:00 |
|
shahaibo
|
2ac54a50ec
|
TASK:AiDA
|
2024-12-11 14:21:29 +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 |
|
shahaibo
|
b315ae5644
|
TASK:toproductimage prompt;
|
2024-12-02 12:02:19 +08:00 |
|
|
|
ea4cd29723
|
to dev
|
2024-11-28 17:26:53 +08:00 |
|
|
|
1b15aed6a2
|
支付优化-续订失败邮件通知
|
2024-11-28 10:43:06 +08:00 |
|
|
|
2ea19dcf03
|
Merge branch 'refs/heads/dev/dev' into dev/dev_xp
|
2024-11-19 17:09:36 +08:00 |
|
|
|
8d27b5b51e
|
新增功能 -- 产品订阅 年度/月度
|
2024-11-18 16:20:25 +08:00 |
|
shahaibo
|
fd10d4dbc4
|
TASK:谷歌登录
|
2024-11-13 15:44:48 +08:00 |
|
|
|
e5e514b522
|
ws优化
|
2024-11-11 17:31: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 |
|
|
|
49f08d1191
|
管理员系统优化-1
|
2024-11-06 17:51:51 +08:00 |
|
|
|
903bafb245
|
管理员系统优化
|
2024-11-06 17:27:16 +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 |
|
|
|
463ddf3cb2
|
1、为发布的作品添加标签
2、修改标签
3、不允许用户重复参与活动
4、查询所有参与活动的作品
|
2024-10-09 13:51:16 +08:00 |
|
shahaibo
|
f0e0987f31
|
BUGFIX:发布作品返回作品ID;
|
2024-10-09 13:10:48 +08:00 |
|
|
|
a7c5723e10
|
保存修改
|
2024-10-08 13:34:10 +08:00 |
|
|
|
1bdc71998b
|
按标签查询作品
|
2024-10-08 13:13:13 +08:00 |
|
|
|
a597f7a67a
|
为作品添加标签
|
2024-10-07 21:27:37 +08:00 |
|
shahaibo
|
8445c23984
|
TASK:十月优惠邮件发送接口;
|
2024-10-03 12:14:30 +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 |
|
|
|
f432b8cce6
|
修改提取的sketch
|
2024-09-27 15:40:30 +08:00 |
|
shahaibo
|
9f5c901502
|
TASK:aida;
|
2024-09-27 14:42:30 +08:00 |
|
|
|
2bc5fef175
|
1、修改用户名
2、更改账号绑定邮箱地址
|
2024-09-25 16:15:18 +08:00 |
|
|
|
2f1b22d423
|
Merge branch 'refs/heads/release/3.0' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/common/utils/RedisUtil.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
# src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
|
2024-09-24 10:27:18 +08:00 |
|
|
|
5a86f2e649
|
修改 imageToSketch
|
2024-09-23 11:13:44 +08:00 |
|
|
|
93e9c61943
|
1、新增 imageToSketch
2、删除无用代码
|
2024-09-20 11:32:09 +08:00 |
|
|
|
56679808e9
|
mask更新 从sketch分割
|
2024-09-19 09:50:56 +08:00 |
|
shahaibo
|
472f5e65b4
|
TASK:凭证更新;
|
2024-09-13 11:13:23 +08:00 |
|
