|
|
0692b29065
|
Merge branch 'dev/dev_xp' into dev/3.1_release_merge
# Conflicts:
# src/main/java/com/ai/da/controller/AccountController.java
|
2025-12-11 16:12:41 +08:00 |
|
|
|
5c2008ec4a
|
TASK:订阅计划,测试修改
|
2025-12-11 15:26:20 +08:00 |
|
|
|
7f094265da
|
TASK:新增订阅计划概念
|
2025-12-11 09:44:25 +08:00 |
|
|
|
a940105fa4
|
DEV 数据库切换
|
2025-12-03 14:18:58 +08:00 |
|
|
|
c36ba6211a
|
DEV 数据库切换
|
2025-12-02 14:34:12 +08:00 |
|
litianxiang
|
964ee1c5cc
|
dev数据库切换
|
2025-12-02 14:18:18 +08:00 |
|
|
|
ac98cd01db
|
DEV JDK版本升级，redis配置修改
|
2025-12-02 13:53:43 +08:00 |
|
|
|
fe3fbbe135
|
DEV 切换数据库
|
2025-12-02 10:21:07 +08:00 |
|
|
|
cbca666e7b
|
BUGFIX: 账号重置为游客后，提示混乱
|
2025-11-28 16:36:34 +08:00 |
|
|
|
c1a5799da7
|
to dev
|
2025-11-25 10:15:32 +08:00 |
|
|
|
059d6edc12
|
BUGFIX: 查询affiliate时，不显示已删除的记录，删除affiliate时，状态也修改
|
2025-11-22 00:41:35 +08:00 |
|
|
|
97c5be7b22
|
CONFIG:修改第二数据源的库
|
2025-11-22 00:15:13 +08:00 |
|
|
|
bbc8b025a9
|
CONFIG:to Prod
|
2025-11-20 16:57:48 +08:00 |
|
litianxiang
|
b86f3c9f7e
|
1.fix：高级工具转产品图不需要也没有ageGroup，会导致报错
2.上传sketch模板代码
|
2025-11-20 10:48:36 +08:00 |
|
|
|
3886aeaa46
|
Merge branch 'dev/dev_xp' into dev/3.1_release_merge
# Conflicts:
# src/main/java/com/ai/da/python/PythonService.java
# src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
|
2025-11-13 13:41:31 +08:00 |
|
|
|
8750ea355a
|
TASK:1.修改affiliate状态 2.添加系统sketch到个人library 3.视频生成新增生成模型 4.获取所有pose，从过去gif改为获取video
|
2025-11-13 11:40:37 +08:00 |
|
litianxiang
|
b107fa82df
|
修改第二数据源位置
|
2025-11-13 11:24:14 +08:00 |
|
litianxiang
|
52094d58e7
|
Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge
|
2025-11-12 13:50:14 +08:00 |
|
litianxiang
|
e4e6cfbff7
|
sketch暂时修改为java端推荐，根据style进行推荐
|
2025-11-12 13:49:01 +08:00 |
|
litianxiang
|
1fd1f7dd47
|
配饰更换为其他
|
2025-11-06 17:20:05 +08:00 |
|
|
|
e8766b9af3
|
Merge branch 'dev/dev_xp' into dev/3.1_release_merge
# Conflicts:
# src/main/java/com/ai/da/common/config/MyTaskScheduler.java
# src/main/java/com/ai/da/common/task/PaymentTask.java
|
2025-11-05 16:51:41 +08:00 |
|
|
|
4fed5f7439
|
BUGFIX: design single - sketch modify
|
2025-11-05 16:40:31 +08:00 |
|
litianxiang
|
58212e92ec
|
增加配饰类别
|
2025-11-04 16:37:57 +08:00 |
|
litianxiang
|
3b6a9882d2
|
回滚
|
2025-10-14 18:10:59 +08:00 |
|
litianxiang
|
854847a6f4
|
去掉打印谷歌base64log
|
2025-10-14 17:46:06 +08:00 |
|
|
|
42aed5804b
|
BUGFIX:1.生成的图案在design时未加入到library
2.获取组织名时出现空字符串
TASK:1. 允许超级管理员按组织名查询用户design频次
|
2025-10-08 21:04:19 +08:00 |
|
litianxiang
|
95f6f02290
|
豆包api key
|
2025-10-02 09:37:21 +08:00 |
|
litianxiang
|
d837f0dc78
|
Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge
# Conflicts:
# src/main/java/com/ai/da/service/WorkspaceService.java
# src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
# src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
|
2025-10-02 00:41:04 +08:00 |
|
litianxiang
|
ab6cc04483
|
为模特和线稿设置性别
修改设置模特会增多问题
模型更换
设置可以切换男女兼容
TODO：扣除积分价格
转产品图模型未完成
|
2025-09-30 17:22:23 +08:00 |
|
|
|
dab253c313
|
BUGFIX:检查所有异常提示的语言是否都做了多语言
|
2025-09-24 14:21:07 +08:00 |
|
|
|
d59a69e6f4
|
切换dev环境的谷歌登录相关配置
|
2025-09-19 14:08:52 +08:00 |
|
litianxiang
|
950707ab44
|
Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge
|
2025-09-17 16:45:56 +08:00 |
|
litianxiang
|
b0e5f39765
|
perf:减少/api/project/getModuleContent数据库交互次数以优化速度
|
2025-09-17 16:14:08 +08:00 |
|
|
|
106528ce08
|
TASK: 教育管理员账号到期后降为游客并移除所有子账号
|
2025-09-16 17:01:18 +08:00 |
|
|
|
e3b0d3bc0a
|
BUGFIX:1. 新建的教育管理员无法登录、无法分配积分
2. 填写个人信息时会覆盖其他人的信息
TASK:教育用户不能通过个人版登录入口登录
|
2025-09-10 22:05:45 +08:00 |
|
|
|
d5a74c1ff3
|
新建子账号 默认密码修改
|
2025-09-09 12:04:37 +08:00 |
|
|
|
f20a85a0e2
|
Google 回调地址修改
|
2025-09-07 20:52:49 +08:00 |
|
|
|
c67d197da0
|
BUGFIX:无法通过谷歌登录/教育管理员无法查看design使用频次
|
2025-09-03 18:15:23 +08:00 |
|
|
|
136bcdf82b
|
切换正式支付环境
|
2025-09-02 20:13:37 +08:00 |
|
|
|
a59acb0903
|
BUGFIX:
|
2025-09-02 20:09:37 +08:00 |
|
|
|
179b79812a
|
release 3.1 dev与prod代码合并冲突处理
|
2025-08-31 22:02:28 +08:00 |
|
|
|
94cf82340a
|
Merge branch 'release/3.1' into dev/3.1_release_merge
# Conflicts:
# src/main/java/com/ai/da/common/config/MyTaskScheduler.java
# src/main/java/com/ai/da/common/enums/ProductEnum.java
# src/main/java/com/ai/da/common/task/PaymentTask.java
# src/main/java/com/ai/da/common/utils/LocalCacheUtils.java
# src/main/java/com/ai/da/common/utils/RedisUtil.java
# src/main/java/com/ai/da/controller/AffiliateController.java
# src/main/java/com/ai/da/controller/ConvenientInquiryController.java
# src/main/java/com/ai/da/controller/StripeController.java
# src/main/java/com/ai/da/mapper/primary/entity/Library.java
# src/main/java/com/ai/da/mapper/primary/entity/ProductCoupons.java
# src/main/java/com/ai/da/model/dto/CreateCouponDTO.java
# src/main/java/com/ai/da/model/vo/CheckCouponsVO.java
# src/main/java/com/ai/da/service/AffiliateService.java
# src/main/java/com/ai/da/service/PaymentInfoService.java
# src/main/java/com/ai/da/service/StripeService.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
# src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java
# src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
# src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
# src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
# src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
# src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java
# src/main/java/com/ai/da/service/impl/StripeServiceImpl.java
# src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
# src/main/resources/messages_en.properties
# src/main/resources/messages_zh.properties
|
2025-08-31 17:54:44 +08:00 |
|
|
|
18c38b020e
|
TASK:默认积分分配改为平均分配；超级管理员可新增教育、企业管理员账户；组织成员使用积分时需要记录creditsUsage；试用用户初始50积分
|
2025-08-26 23:53:40 +08:00 |
|
|
|
83ba69c950
|
BUGFIX:子账号批量导入、brand dna返回计算时间、按权限范围查询design频次
|
2025-08-26 15:49:02 +08:00 |
|
|
|
9a650afc7d
|
TASK:优化查询子账号design试用频次，根据管理员身份限定查询范围
|
2025-08-26 14:10:28 +08:00 |
|
|
|
e4ce7e9e63
|
TASK:获取affiliate的用户名和id;BUGFIX:模特无法保存
|
2025-08-21 13:22:22 +08:00 |
|
|
|
81c417ed76
|
BUGFIX:1、子账号查询，无法批量根据用户名或邮箱查
2、教育版子账号创建及修改涉及的积分问题
|
2025-08-20 16:40:44 +08:00 |
|
|
|
caa9985d11
|
TASK: 1.affiliate 新增referral新增、查询、修改以及其他相关的自动结算佣金的功能；2.删除affiliate_income表及相关mapper
|
2025-08-19 17:44:34 +08:00 |
|
|
|
45d6af92e8
|
BUGFIX:1、教育通过上传文件批量创建子账号没有任何校验
2、下载子账号所有信息接口缺失（原下载模板接口保留）
3、保存个人模特到collection时类型设置为System
4、创建子账号时设置积分无效
|
2025-08-15 17:44:45 +08:00 |
|
|
|
132f48eb60
|
CONFIG:dev添加死信队列信息
|
2025-08-01 11:29:47 +08:00 |
|
