|
|
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 |
|
shahaibo
|
7194049127
|
TASK:prompt修改;
|
2024-12-13 11:32:42 +08:00 |
|
shahaibo
|
e34cec812f
|
Merge remote-tracking branch 'origin/release/3.0' into release/3.0
|
2024-12-13 10:35:17 +08:00 |
|
shahaibo
|
11a5b53d2a
|
BUGFIX:prompt重复拼接;
|
2024-12-13 10:34:14 +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 |
|
|
|
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 |
|
|
|
3c0fa205d1
|
BUGFIX:code-create注册的新用户自动添加为aida的游客,去重bug修改
|
2024-12-09 18:17:09 +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
|
1a568621ca
|
BUGFIX:重复申请试用;
|
2024-12-03 11:51:01 +08:00 |
|
|
|
eecefee674
|
Merge branch 'dev/dev' into release/3.0
|
2024-12-02 14:54:00 +08:00 |
|
|
|
ea0332851d
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-12-02 14:35:20 +08:00 |
|
|
|
a25a7dc023
|
high || fast 生成次数修改
|
2024-12-02 14:34:10 +08:00 |
|
shahaibo
|
b4fe1ca199
|
TASK:toproductimage prompt;
|
2024-12-02 13:51:46 +08:00 |
|
shahaibo
|
b315ae5644
|
TASK:toproductimage prompt;
|
2024-12-02 12:02:19 +08:00 |
|
徐佩
|
f7113601f3
|
Merge branch 'dev/dev' into release/3.0
|
2024-12-01 20:27:58 +08:00 |
|
徐佩
|
8d6e3e9644
|
sketchboard-prompt 修改
|
2024-12-01 19:48:12 +08:00 |
|
徐佩
|
23b864d378
|
to prod
|
2024-12-01 17:37:52 +08:00 |
|
徐佩
|
be1119be6f
|
bugfix : fast || high
|
2024-12-01 16:51:38 +08:00 |
|
徐佩
|
b836e7fd67
|
bugfix : fast || high
|
2024-12-01 16:32:51 +08:00 |
|
|
|
a237b4041d
|
模型选择 添加high || fast
|
2024-11-29 15:09:34 +08:00 |
|
|
|
ea4cd29723
|
to dev
|
2024-11-28 17:26:53 +08:00 |
|
|
|
13397fa1f7
|
to dev
|
2024-11-28 17:22:57 +08:00 |
|
|
|
2fab472150
|
to dev
|
2024-11-28 17:21:58 +08:00 |
|
|
|
8c71b4845a
|
Merge branch 'release/3.0' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
|
2024-11-28 17:19:40 +08:00 |
|
|
|
b70f909a32
|
优化-自动将Code-Create注册的新用户添加到AiDA
|
2024-11-28 17:14:11 +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 |
|
|
|
f6f759110f
|
支付优化--修改积分购买相应功能
|
2024-11-19 16:00:30 +08:00 |
|
|
|
8d27b5b51e
|
新增功能 -- 产品订阅 年度/月度
|
2024-11-18 16:20:25 +08:00 |
|
shahaibo
|
9f064609e7
|
TASK:谷歌登录
|
2024-11-13 15:45:40 +08:00 |
|
shahaibo
|
fd10d4dbc4
|
TASK:谷歌登录
|
2024-11-13 15:44:48 +08:00 |
|
shahaibo
|
fadb5faf0d
|
TASK:谷歌登录
|
2024-11-12 15:34:43 +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
|
8da51a0a82
|
TASK:谷歌登录
|
2024-11-11 16:08:49 +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 |
|
|
|
4535fb7dfb
|
ws
|
2024-11-11 15:07:02 +08:00 |
|
