Commit Graph

1681 Commits

Author SHA1 Message Date
litianxiang
042501f9b1 Merge remote-tracking branch 'origin/dev/3.1_release_merge' into dev/3.1_release_merge 2025-09-18 17:49:36 +08:00
litianxiang
9e6fcb4f73 fix:查询详细项目信息文件恢复 2025-09-18 17:48:40 +08:00
9386a2c6c4 隐藏检查管理员账号到期接口 2025-09-17 17:49:48 +08:00
c43a716104 BUGFIX: 所有通过邮件注册、登录等的查询,不再区分大小写 2025-09-17 17:46:42 +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
5eebb878ca Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge 2025-09-17 15:34:36 +08:00
litianxiang
d568129843 fix:增加projectID匹配,避免因为二创导致查询到多条记录 2025-09-17 15:19:19 +08:00
d093aa9d1a Merge branch 'dev/dev_xp' into dev/3.1_release_merge 2025-09-17 11:35:12 +08:00
3c1d180ed6 BUGFIX: 试用订单邮件发送,区分环境 2025-09-17 11:33:25 +08:00
b9c24386b9 BUGFIX: 未解析用户数据的接口使用了上一个使用这个线程的用户信息 2025-09-16 17:42:39 +08:00
litianxiang
8f53902d18 fix:点击我的喜欢会出现非喜欢的作品
fix:二创因为designID为-1导致报错的bug
2025-09-16 17:21:47 +08:00
c79535ac3f Merge branch 'dev/dev_xp' into dev/3.1_release_merge 2025-09-16 17:02:20 +08:00
106528ce08 TASK: 教育管理员账号到期后降为游客并移除所有子账号 2025-09-16 17:01:18 +08:00
litianxiang
23eda80389 Merge remote-tracking branch 'origin/dev/3.1_release_merge' into dev/3.1_release_merge 2025-09-16 11:49:43 +08:00
litianxiang
eccd2a35e9 fix:9.11代码覆盖恢复 2025-09-16 11:36:43 +08:00
9c69aeae53 Merge branch 'dev/dev_xp' into dev/3.1_release_merge 2025-09-16 11:26:12 +08:00
5bac740efd TASK: Affiliate审批通过后,邮件中添加邀请链接 2025-09-16 11:20:09 +08:00
litianxiang
fa74236035 fix:二创报错 2025-09-16 11:07:54 +08:00
litianxiang
630dfe98a4 /api/project/getModuleContent速度优化 2025-09-16 11:01:22 +08:00
c922563919 TASK: Affiliate审批通过后,邮件中添加邀请链接 2025-09-12 16:25:34 +08:00
ce68696934 TASK: 1. 登录不区分邮箱大小写
2. 将所有删除用户的操作更改为修改身份为游客
2025-09-12 15:46:35 +08:00
5d8bdf9ecc TASK: 子账号积分刷新沿用上月分配的积分
BUGFIX: 获取作品详情
2025-09-11 16:01:25 +08:00
e3b0d3bc0a BUGFIX:1. 新建的教育管理员无法登录、无法分配积分
2. 填写个人信息时会覆盖其他人的信息
TASK:教育用户不能通过个人版登录入口登录
2025-09-10 22:05:45 +08:00
5f5f2c83d7 管理员允许查看各功能使用数据表 2025-09-09 18:49:08 +08:00
aff51a2793 管理员允许查看各功能使用数据表 2025-09-09 18:48:42 +08:00
4c5d8d3c61 修改管理员页面权限校验 2025-09-09 17:32:12 +08:00
f667099f4f 修改管理员页面权限校验 2025-09-09 17:31:51 +08:00
d5a74c1ff3 新建子账号 默认密码修改 2025-09-09 12:04:37 +08:00
c187d25d74 新建子账号时已使用积分为空 2025-09-08 16:20:24 +08:00
4f93ec144b BUGFIX:添加已存在的子账号时,不指定密码则不会修改原账号密码 2025-09-04 21:18:21 +08:00
de16437d08 BUGFIX:1. 所有作品中无法查看个人刚发布的作品
2. 100月付用户的邮件中续订金额不对,发送给商家的邮件中夹杂中文
3. 推广码没有截止有效期时使用该推广码报错
2025-09-04 18:29:52 +08:00
c67d197da0 BUGFIX:无法通过谷歌登录/教育管理员无法查看design使用频次 2025-09-03 18:15:23 +08:00
d8f0188596 BUGFIX:无法通过谷歌登录 2025-09-03 15:50:13 +08:00
ddc089faa4 BUGFIX:印花pin的数量为9时无法design 2025-09-03 15:48:45 +08:00
f5ecd34a9c BUGFIX:无法查看我喜欢的作品 2025-09-03 00:23:32 +08:00
3c071378ad BUGFIX:无法查看我的作品 2025-09-02 23:46:40 +08:00
8b2aab2e5e Merge branch 'dev/3.1_release_merge' into release/3.1 2025-09-02 22:28:58 +08:00
c4a42b03f6 BUGFIX:发布作品中没有like的衣服导致查看作品详细报错 2025-09-02 22:28:33 +08:00
0dad9ff618 切换端口9994->9990 2025-09-02 21:12:34 +08:00
a59acb0903 BUGFIX: 2025-09-02 20:09:37 +08:00
feca192f53 BUGFIX: 无法二创 2025-09-01 23:13:54 +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
c649907222 数据迁移代码 2025-08-31 14:16:08 +08:00
c93ae85b65 BUGFIX: 1、singleDesign使用generate的印花没有传minio导致出现错误
2、项目中没有保存生成和上传的印花的类型
2025-08-29 14:18:17 +08:00
6441bfbbba BUGFIX: 子账号信息无法正确导出为excel 2025-08-28 19:22:55 +08:00
933522482b TASK:审批affiliate 2025-08-28 14:01:48 +08:00
56b56981b1 TASK:便利查询,查询所有用户id时根据用户身份限定查询范围 2025-08-28 11:29:30 +08:00
9e2ea2de62 TASK:导出数据时添加校验 2025-08-27 17:40:05 +08:00