Commit Graph

554 Commits

Author SHA1 Message Date
9e252b16ef BUGFIX: 2026-01-06 17:36:12 +08:00
bf95b85841 to dev 2025-12-23 16:28:07 +08:00
9e58bd9e7d Merge branch 'release/3.1' into dev/3.1_release_merge
# Conflicts:
#	src/main/java/com/ai/da/common/utils/SendRequestUtil.java
2025-12-23 16:16:30 +08:00
d0ec5c5c26 BUGFIX:邮件发送失败 2025-12-23 16:03:48 +08:00
ab8aa5ea5c Merge branch 'dev/dev_xp' into dev/3.1_release_merge 2025-12-23 14:07:53 +08:00
aefcd2fdb0 BUGFIX:邮件发送失败 2025-12-23 14:07:26 +08:00
e74eab1070 BUGFIX:邮件发送失败 2025-12-23 14:05:20 +08:00
litianxiang
34da437a26 Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge 2025-12-22 11:36:23 +08:00
litianxiang
f84935d0bd 登录token存入redis 2025-12-22 11:35:38 +08:00
8079877734 CONFIG: TO DEV 2025-12-19 17:40:37 +08:00
ef686e38ac CONFIG: TO PROD 2025-12-19 17:33:51 +08:00
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
litianxiang
17645d17e5 关闭batch MQ监听 2025-12-17 16:02:49 +08:00
ca7121dcda BUGFIX:订阅计划 2025-12-16 16:24:52 +08:00
95a9c81a1b Merge branch 'dev/dev_xp' into dev/3.1_release_merge
# Conflicts:
#	src/main/java/com/ai/da/model/dto/SubscriptionPlanDTO.java
#	src/main/java/com/ai/da/model/vo/SubscriptionPlanVO.java
2025-12-15 18:34:30 +08:00
81c0d7eeac TASK:订阅计划相关 2025-12-15 18:30:28 +08:00
litianxiang
9f48a2ce09 fix:升级swagger注解 2025-12-15 13:38:44 +08:00
94cafbd10c TASK:flux积分不足,邮件通知 2025-12-11 16:07:14 +08:00
22bc8750c8 Merge branch 'dev-ltx' into dev/dev_xp 2025-12-03 16:53:17 +08:00
bd69793a72 TASK:订阅到期通知或续订通知(暂时关闭邮件发送) 2025-12-03 13:55:52 +08:00
litianxiang
9344a946ad fix:接口文档打不开问题 2025-12-02 15:42:51 +08:00
litianxiang
aa0a787e3f dev跨域问题初步验证 2025-12-02 14:27:31 +08:00
fe3fbbe135 DEV 切换数据库 2025-12-02 10:21:07 +08:00
litianxiang
e085275aee Merge branch 'dev-ltx' into dev/3.1_release_merge
# Conflicts:
#	src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
2025-12-01 17:10:35 +08:00
litianxiang
fa7271567e 解决循环依赖问题 2025-12-01 17:05:57 +08:00
fcbe4762b3 TO prod 2025-11-27 17:38:24 +08:00
e750adcc94 TO prod 2025-11-27 17:35:47 +08:00
litianxiang
a2ff345da5 升级JDK到21 2025-11-25 16:46:05 +08:00
9ae1626309 Merge branch 'refs/heads/dev/3.1_release_merge' into dev/dev_xp 2025-11-25 14:25:59 +08:00
70a41bdfbc TASK:用户账号到期邮件通知 2025-11-25 14:24:30 +08:00
c1a5799da7 to dev 2025-11-25 10:15:32 +08:00
c4da4ea111 CONFIG:to Prod 2025-11-21 17:09:53 +08:00
bbc8b025a9 CONFIG:to Prod 2025-11-20 16:57:48 +08:00
d14fdfee79 Merge branch 'dev/dev_xp' into dev/3.1_release_merge 2025-11-20 11:11:21 +08:00
c14db62c0a BUGFIX:1.添加系统sketch到个人library 2.video生成结束后总是发送失败站内信 2025-11-20 11:09:20 +08:00
e2009617db Merge branch 'dev/dev_xp' into dev/3.1_release_merge 2025-11-19 17:00:29 +08:00
65b17fe109 TASK:调用第三方api,视频生成结束发送站内信 2025-11-19 16:59:54 +08:00
0917154283 Merge branch 'dev/dev_xp' into dev/3.1_release_merge 2025-11-19 15:58:11 +08:00
0f525c6c00 BUGFIX: 1.系统消息已读需判断接收人员 2.本地模型视频生成失败时,发送站内信 2025-11-19 15:57:47 +08:00
a466f269c2 Merge branch 'dev/dev_xp' into dev/3.1_release_merge 2025-11-18 16:04:37 +08:00
97f0c8f65f BUGFIX: 获取系统通知未读数 2025-11-18 16:02:26 +08:00
bc612481dc Merge branch 'dev/dev_xp' into dev/3.1_release_merge 2025-11-18 10:28:44 +08:00
2f3fa695b2 BUGFIX: 解决部分循环注入问题 2025-11-18 10:27:29 +08:00
313fc19dac Merge branch 'dev/dev_xp' into dev/3.1_release_merge 2025-11-17 16:56:50 +08:00
f36e0488ea TASK: video生成成功后添加站内信通知 2025-11-17 16:55:45 +08:00
f239c8c02b TASK: 订阅或试用用户账号到期邮件通知 2025-11-14 18:08:40 +08:00
litianxiang
1d4017bafd minio上传base64 log补充信息 2025-11-14 15:57:49 +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
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