Commit Graph

107 Commits

Author SHA1 Message Date
497421e7fe TO DEV 2026-01-27 10:15:36 +08:00
49288c3a31 TO Prod 2026-01-23 16:10:55 +08:00
bf95b85841 to dev 2025-12-23 16:28:07 +08:00
ef686e38ac CONFIG: TO PROD 2025-12-19 17:33:51 +08:00
81c0d7eeac TASK:订阅计划相关 2025-12-15 18:30:28 +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
litianxiang
a2ff345da5 升级JDK到21 2025-11-25 16:46:05 +08:00
bbc8b025a9 CONFIG:to Prod 2025-11-20 16:57:48 +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
db5f435a4d BUGFIX:1.标签允许不同用户创建相同的标签2.删除指定人员试用名单通知邮箱 2025-10-15 10:46:27 +08:00
litianxiang
3b6a9882d2 回滚 2025-10-14 18:10:59 +08:00
litianxiang
854847a6f4 去掉打印谷歌base64log 2025-10-14 17:46:06 +08:00
c43a716104 BUGFIX: 所有通过邮件注册、登录等的查询,不再区分大小写 2025-09-17 17:46:42 +08:00
3c1d180ed6 BUGFIX: 试用订单邮件发送,区分环境 2025-09-17 11:33:25 +08:00
106528ce08 TASK: 教育管理员账号到期后降为游客并移除所有子账号 2025-09-16 17:01:18 +08:00
a59acb0903 BUGFIX: 2025-09-02 20:09:37 +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
c649907222 数据迁移代码 2025-08-31 14:16:08 +08:00
5287d83b82 BUGFIX:1、userLikeService中业务划分不清晰导致与generateService出现循环依赖问题。解决:将CollectionSort单独划分为一个Service
2、新建t_api_generate表用于补偿查询生成结果
2025-07-25 17:13:06 +08:00
370d9402f2 TASK: 试用邮件通知权限变更 2025-07-02 10:08:54 +08:00
dcd63668bd TASK: 添加注释 2025-06-27 13:09:36 +08:00
shahaibo
b01f5f59d1 TASK: 数据迁移拆分; 2025-06-27 09:59:08 +08:00
shahaibo
a5e743ce84 TASK: 数据迁移; 2025-06-19 14:29:44 +08:00
shahaibo
ea235b0d5c bugfix: delete collection; 2025-06-19 11:50:39 +08:00
78239d3ead Merge branch 'dev/dev_xp' into dev/dev 2025-06-13 16:41:15 +08:00
174d1bf0d0 TASK:1、将imageToSketch接口调用转为异步 2、imageToSketch加入flux 2025-06-13 16:37:45 +08:00
d5cf4e9d3f TASK: 添加“新增试用用户”通知对象chelseayu@code-create.com.hk 2025-06-08 09:19:36 +08:00
shahaibo
32c8aaec9b TASK:collection sort; 2025-06-03 11:26:21 +08:00
shahaibo
d6cc8ab9a2 TASK:test; 2025-05-30 11:42:27 +08:00
shahaibo
6d6768e6cb TASK:模块化; 2025-05-06 17:30:01 +08:00
shahaibo
a2bd2fa6c6 TASK:模块化; 2025-03-31 11:21:45 +08:00
shahaibo
48c7182f98 TASK:模块化; 2025-03-30 15:56:03 +08:00
shahaibo
83d9a5befb TASK:AiDA模块化 2025-03-19 14:08:16 +08:00
shahaibo
4be008382f TASK:AiDA模块化 2025-03-17 11:37:12 +08:00
shahaibo
8fa76c6732 TASK:AiDA模块化 2025-03-16 13:09:50 +08:00
614b8d0948 to prod 2025-02-21 17:56:50 +08:00
c4dbd10a85 to dev 2025-02-20 11:10:00 +08:00
a91643d2ec to prod 2025-02-19 17:44:14 +08:00
d2d5eebe12 to dev 2025-02-17 10:52:11 +08:00
shahaibo
6e53bc3ca5 TASK: 定时任务; 2025-02-12 09:28:04 +08:00
shahaibo
aff870fba7 Merge remote-tracking branch 'origin/dev/dev' into dev/dev 2025-02-11 10:25:08 +08:00
shahaibo
a2390a6ab2 BUGFIX:试用订单邮件 订单更新时间判断; 2025-02-10 10:34:01 +08:00
shahaibo
8dc5dcb1bd BUGFIX:试用订单邮件 订单更新时间判断; 2025-02-10 10:11:59 +08:00
shahaibo
5d010d2f77 BUGFIX:试用订单邮件 订单更新时间判断; 2025-02-10 10:08:48 +08:00
shahaibo
5f79c3276a BUGFIX:试用订单邮件 订单更新时间判断; 2025-02-10 10:03:28 +08:00
aadb717c9f to dev 2025-02-07 15:03:24 +08:00
c325927418 to prod 2025-02-06 14:46:50 +08:00