Commit Graph

2635 Commits

Author SHA1 Message Date
YunaiV
99ffe0fd41 【同步】BOOT 和 CLOUD 的功能
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
2026-01-18 19:19:42 +08:00
YunaiV
e10be5160b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
#	yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
2026-01-18 19:04:00 +08:00
YunaiV
17a1af1069 【同步】BOOT 和 CLOUD 的功能 2026-01-18 19:03:30 +08:00
YunaiV
304b2f102a 【同步】BOOT 和 CLOUD 的功能 2026-01-18 19:01:29 +08:00
YunaiV
2e317b165b fix:【crm】CrmProductRespVO 的 easy-trans 翻译错误,对应 https://t.zsxq.com/o6w8b 2026-01-18 18:01:28 +08:00
YunaiV
61b6b6c7bd fix:【system】MailSendServiceImplTest 单测报错的问题,MockedStatic 存在差异
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
2026-01-18 17:56:44 +08:00
YunaiV
bcf00e3332 【同步】BOOT 和 CLOUD 的功能 2026-01-18 17:29:49 +08:00
YunaiV
c95268dfba Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2026-01-18 17:22:52 +08:00
YunaiV
09d58706cc 【同步】BOOT 和 CLOUD 的功能 2026-01-18 17:22:44 +08:00
YunaiV
c6f8680da3 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
2026-01-18 17:14:18 +08:00
YunaiV
f6eff05053 【同步】BOOT 和 CLOUD 的功能 2026-01-18 17:13:07 +08:00
芋道源码
efae658cc5 !229 采用 https://github.com/spring-cloud/spring-cloud-gateway/pull/866 解决响应头重复问题
Merge pull request !229 from alexz10248080/master
2026-01-18 08:58:50 +00:00
YunaiV
d5ed2f4728 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-gateway/src/main/resources/application.yaml
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
#	yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
#	yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
#	yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
#	yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
2026-01-18 16:58:19 +08:00
芋道源码
9defcf736c !228 采用spring-cloud-gateway pull/866 解决响应头重复问题
Merge pull request !228 from alexz10248080/master-jdk17
2026-01-18 08:57:09 +00:00
Danlin
b292bc2c19 !233 【system】发送邮件时,携带附件
* 发送邮件时,带上附件
2026-01-18 07:28:25 +00:00
芋道源码
72c0c013a0 !231 feat(trade): 优化订单日志切面中的用户信息获取逻辑
Merge pull request !231 from wuKong/feat(trade)-优化订单日志切面中的用户信息获取逻辑
2026-01-18 07:26:38 +00:00
YunaiV
6b519a7654 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1485/files 2026-01-09 19:16:16 +08:00
wuKong
29e4976da3 feat(trade): 优化订单日志切面中的用户信息获取逻辑
- 使用 ThreadLocal 获取用户类型和用户ID,提高性能
- 添加空值检查确保在 ThreadLocal 未设置时回退到原方法
- 将订单ID检查从 == null 改为 ObjectUtil.isNull 提高一致性
2026-01-05 10:15:13 +08:00
zhengpingzhong
d61554c9bb 采用 https://github.com/spring-cloud/spring-cloud-gateway/pull/866 解决响应头重复问题 2026-01-04 10:28:31 +08:00
YunaiV
6e9933cf0f fix:【system】getUser 默认忽略数据权限,基础数据较为通用 2026-01-02 17:15:24 +08:00
zhengpingzhong
edb74f64d9 采用 https://github.com/spring-cloud/spring-cloud-gateway/pull/866 解决响应头重复问题 2025-12-30 14:07:06 +08:00
YunaiV
51da2a2f36 (〃'▽'〃) v2025.12 发布:极大极大完善 vben5 的 antd、vben 版本的功能,新增 admin uniapp vue3 版本
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
v2025.12(jdk8/11)
2025-12-28 10:52:44 +08:00
YunaiV
fead40e564 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2025-12-28 10:51:23 +08:00
YunaiV
716e2a63c1 (〃'▽'〃) v2025.12 发布:极大极大完善 vben5 的 antd、vben 版本的功能,新增 admin uniapp vue3 版本 v2025.12(jdk17/21) 2025-12-28 10:50:53 +08:00
YunaiV
7739c2a35d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateService.java
#	yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
2025-12-28 10:22:38 +08:00
YunaiV
0f27c0aa72 【同步】BOOT 和 CLOUD 的功能 2025-12-28 10:22:05 +08:00
YunaiV
cad6da432b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
# Conflicts:
#	yudao-dependencies/pom.xml
2025-12-27 21:43:00 +08:00
YunaiV
f922d3fd55 fix:【mall】优惠劵:相关的判断不对,关联 https://t.zsxq.com/fYaKv 2025-12-27 21:41:46 +08:00
YunaiV
3b4d1ef4d8 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-12-27 21:41:10 +08:00
芋道源码
291d705307 !226 修改知识库和联网搜索仅初始化一次
Merge pull request !226 from 瞿佐鹏/feat/ai-stream-resp-fit
2025-12-27 03:07:31 +00:00
YunaiV
0869ad0513 feat:【infra】spring boot admin 默认需要登录
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
2025-12-27 10:30:47 +08:00
YunaiV
e60f5496fa Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-12-27 10:29:58 +08:00
YunaiV
be65f9cf97 feat:【infra】spring boot admin 默认需要登录 2025-12-27 10:29:42 +08:00
YunaiV
bc4d8f85ad Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
2025-12-25 22:52:32 +08:00
YunaiV
c93f2ac2a4 【升级】dynamic-datasource from 4.3.1 to 4.5.0 2025-12-25 22:52:20 +08:00
YunaiV
15a2f2611f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-12-25 22:48:22 +08:00
YunaiV
845315ff8a 【升级】jimubi from 2.2.0 to 2.3.0 2025-12-25 22:47:39 +08:00
YunaiV
acbbdf2237 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2025-12-25 22:45:29 +08:00
YunaiV
742a6f3caf 【升级】spring-boot from 3.5.8 to 3.5.9 2025-12-25 22:45:13 +08:00
YunaiV
45b06e285a 【同步】BOOT 和 CLOUD 的功能 2025-12-25 22:34:17 +08:00
YunaiV
382e9e8cdd Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractStatusListener.java
#	yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/listener/CrmReceivableStatusListener.java
2025-12-25 22:30:00 +08:00
YunaiV
8e07be59d5 Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17 2025-12-25 22:28:19 +08:00
YunaiV
201711cec1 【升级】mybatis-plus from 3.5.14 to 3.5.15
【升级】mybatis-plus-join from 1.5.4 to 1.5.5
【升级】rocketmq-spring from 2.3.4 to 2.3.5
【升级】netty from 4.2.7 to 4.2.9
【升级】awssdk from 2.39.2 to 2.40.15
2025-12-25 22:28:13 +08:00
瞿佐鹏
677110ff91 修改知识库和联网搜索仅初始化一次 2025-12-23 16:43:12 +08:00
芋道源码
bec1b083ec !224 fix(system): 当用户没有绑定微信小程序时获取到socialUser为null,会导致发货失败
Merge pull request !224 from wuKong/fix(system)-当用户没有绑定微信小程序时获取到socialUser为null,会导致发货失败
2025-12-20 09:45:40 +00:00
YunaiV
7015d221b1 fix:【bpm】CrmContractStatusListener、CrmReceivableStatusListener 无需 @FeignClient(name = ApiConstants.NAME) 注解,对应 https://t.zsxq.com/8ETgM 2025-12-20 15:08:09 +08:00
YunaiV
e63b792741 chore:升级 spring-ai 至 1.1.2,alibaba-ai 至 1.1.0.0-RC2 2025-12-20 10:21:33 +08:00
wuKong
e455572adb refactor(system): 替换 ObjectUtil 为 ObjUtil
- 将 SocialClientApiImpl 中的 ObjectUtil.isNull 替换为 ObjUtil.isNull
- 移除未使用的 ObjectUtil 导入包
- 保持空值判断逻辑一致性
2025-12-15 18:58:13 +08:00
wuKong
13a1993dd2 fix(system): 当用户没有绑定微信小程序时获取到socialUser为null,会导致发货失败
- 在发送订阅消息前增加社交用户空值判断
- 避免因社交用户信息缺失导致的空指针异常
- 完善日志记录,提高问题排查效率
2025-12-15 18:55:08 +08:00
YunaiV
4017f71d10 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
2025-12-13 12:33:06 +08:00