Commit Graph

413 Commits

Author SHA1 Message Date
9f42e153a4 Merge branch 'release/3.1' into dev/3.1_release_merge
# Conflicts:
#	.gitea/workflows/develop_build_manual.yaml
2025-12-19 15:01:32 +08:00
4fa70a1c90 BUGFIX:订阅计划创建不允许指定子账号为管理员 2025-12-18 18:03:03 +08:00
bce368248c Merge branch 'dev/dev_xp' into dev/3.1_release_merge 2025-12-16 16:26:27 +08:00
ca7121dcda BUGFIX:订阅计划 2025-12-16 16:24:52 +08:00
litianxiang
9a206f9979 生产环境配置callbackUrl 2025-12-16 14:10:22 +08:00
litianxiang
eb7a46c7e8 fix:callbackUrl 2025-12-16 13:45:21 +08:00
litianxiang
95ef68a784 Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge 2025-12-16 13:20:31 +08:00
litianxiang
6429288fd9 dev环境加入design回调配置 2025-12-16 13:16:36 +08:00
81c0d7eeac TASK:订阅计划相关 2025-12-15 18:30:28 +08:00
459c743ce4 CONFIG: 2025-12-11 16:58:24 +08:00
ce3516916d CONFIG: 2025-12-11 16:18:37 +08:00
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
d598f53d3c Merge branch 'dev/3.1_release_merge' into release/3.1
# Conflicts:
#	.gitea/workflows/prod_build_schedule.yaml
2025-11-28 17:16:55 +08:00
cbca666e7b BUGFIX: 账号重置为游客后,提示混乱 2025-11-28 16:36:34 +08:00
e750adcc94 TO prod 2025-11-27 17:35:47 +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