9768 Commits

Author SHA1 Message Date
YunaiV
7a8f2f51e6 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-08-24 16:01:30 +08:00
YunaiV
005d64aae6 Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17 2025-08-24 15:54:37 +08:00
芋道源码
b1521788bd
!1409 修复确认退款报错和取消订单定时任务报错
Merge pull request !1409 from sunway/fix-20250820
2025-08-24 07:54:28 +00:00
YunaiV
d943b5e491 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2025-08-24 15:50:23 +08:00
芋道源码
8645e88d3c
Merge pull request #935 from lb1565387341/fix_system_login_datapermission
fix:【system 系统功能】解决登录未禁用数据权限,前端带上旧token导致报错
2025-08-24 15:49:03 +08:00
YunaiV
b3b9c62937 fix:【framework 框架】注释 opentracing.Tracer 和 skywalking Tracer 不兼容的问题,后续换 opentelemetry 2025-08-24 15:47:18 +08:00
YunaiV
6dea634270 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-08-24 15:46:26 +08:00
YunaiV
6fa060c48b fix:【framework 框架】注释 opentracing.Tracer 和 skywalking Tracer 不兼容的问题,后续换 opentelemetry 2025-08-24 15:45:55 +08:00
YunaiV
83b391dbc5 chore:更新多个依赖版本,包括 druid、rocketmq-spring、skywalking、jedis-mock、jsoup、hutool、tika-core 和 netty 2025-08-24 14:50:29 +08:00
YunaiV
cc6aa84b38 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
2025-08-24 14:48:08 +08:00
YunaiV
acf722f72f chore:更新多个依赖版本,包括 druid、rocketmq-spring、skywalking、jedis-mock、jsoup、hutool、tika-core 和 netty 2025-08-24 14:46:30 +08:00
YunaiV
1d11b56558 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-08-24 11:48:24 +08:00
YunaiV
ddee20cb10 chore:maven-surefire-plugin 从 3.2.2 升级到 3.5.3 2025-08-24 11:48:17 +08:00
YunaiV
1ca4e8db45 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-08-24 11:11:04 +08:00
YunaiV
442f6e22b8 chore:commons-lang3 从 3.17 to 3.18(安全升级) 2025-08-24 11:10:46 +08:00
YunaiV
ca2d309f93 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
2025-08-24 11:06:37 +08:00
YunaiV
c6fd1080e8 chore:commons-lang3 从 3.17 to 3.18(安全升级) 2025-08-24 11:05:43 +08:00
YunaiV
2191c2e16c chore:redisson 从 3.4.1 to 3.50.0 2025-08-24 10:43:23 +08:00
YunaiV
c647a4fb9d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-08-24 10:39:00 +08:00
YunaiV
51d9611c62 chore:redisson 从 3.4.1 to 3.50.0 2025-08-24 10:36:26 +08:00
YunaiV
ba4c539330 feat:【bpm 工作流】审批结束后,增加 reason 返回 2025-08-24 10:19:28 +08:00
liubei
b68dd1e1f1 fix:【system 系统功能】解决登录未禁用数据权限,前端带上旧token导致报错 2025-08-21 17:55:48 +08:00
YunaiV
98ed800945 feat:【system 系统管理】oauth2 支持 ClientCredentials 模式 2025-08-21 12:58:10 +08:00
YunaiV
e83834079e fix:【framework 框架】TenantSecurityWebFilter 支持 context-path 校验无需租户 URL
https://github.com/YunaiV/ruoyi-vue-pro/issues/905
2025-08-21 09:17:08 +08:00
YunaiV
68d8c04ac0 feat:【framework 框架】兼容 knife4j 4.5.0 版本,升级 spring boot 到 3.5.4 2025-08-20 21:06:22 +08:00
YunaiV
082e6595a2 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-common/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/pom.xml
2025-08-20 20:59:04 +08:00
YunaiV
e91fc70f87 feat:【framework 框架】兼容 knife4j 4.5.0 版本,升级 spring boot 到 3.5.4 2025-08-20 20:56:25 +08:00
wusongwen
16efe7b6aa 修复确认退款报错和取消订单定时任务报错 2025-08-20 19:44:30 +08:00
YunaiV
7ef0d181c5 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-08-20 13:20:53 +08:00
YunaiV
236d953692 fix:【framework 框架】兼容 SpringBoot 2.X 版本的 API 加解密 2025-08-20 13:20:28 +08:00
YunaiV
0a62fa955d 【同步】jdk21 和 jdk8 的代码 2025-08-20 00:23:54 +08:00
YunaiV
8508bb4d92 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java
2025-08-19 23:20:14 +08:00
YunaiV
3e6ab43704 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-08-19 23:15:57 +08:00
YunaiV
df2ef43f85 feat:【system 系统管理】租户支持匹配多域名、微信小程序 appid 等 2025-08-19 22:58:44 +08:00
YunaiV
7db87c45a8 【同步】jdk21 和 jdk8 的代码 2025-08-19 13:10:48 +08:00
YunaiV
8d691ffcd2 【同步】jdk21 和 jdk8 的代码 2025-08-18 08:49:31 +08:00
YunaiV
86242fab09 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/s3/S3FileClientTest.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceImpl.java
2025-08-18 08:42:59 +08:00
YunaiV
ff90512cd5 feat:【infra 基础设施】支持私有桶 2025-08-18 08:42:23 +08:00
YunaiV
97a981c294 feat:【infra 基础设施】支持私有桶 2025-08-18 00:02:03 +08:00
YunaiV
4c5134ae1c fix:【system 系统功能】腾讯云短信回调没有 logId 需要 serialNo 来更新本地记录 2025-08-17 17:01:11 +08:00
YunaiV
5107322ee9 fix:【pay 支付】兼容微信支付 V3 可能 header 大小写多情况 2025-08-17 16:35:22 +08:00
YunaiV
fd6ca746fa feat:【infra 基础设施】writeAttachment 根据 contentType 设置其内容显示倾向 https://github.com/YunaiV/ruoyi-vue-pro/issues/692 2025-08-17 16:14:43 +08:00
YunaiV
4580bcf8e0 fix:【infra 基础设施】LocalFileClient 读取不到文件(getContent)时,返回 null 而不是抛出异常 https://github.com/YunaiV/ruoyi-vue-pro/issues/929 2025-08-17 15:52:53 +08:00
YunaiV
3e3bcc963d Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-08-17 15:41:21 +08:00
YunaiV
5b6723fc3c fix:【framework 框架】GlobalExceptionHandler 兼容更多 ServiceException 情况 2025-08-17 15:24:04 +08:00
YunaiV
728f4860bb Merge remote-tracking branch 'origin/master' 2025-08-17 15:06:04 +08:00
YunaiV
b3ecbfe8ea 【同步】jdk21 和 jdk8 的代码 2025-08-17 15:05:53 +08:00
YunaiV
fbec7d030d Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-08-17 15:02:24 +08:00
YunaiV
93d0bf5ead Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/CacheRequestBodyWrapper.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java
2025-08-17 15:00:52 +08:00
YunaiV
3adfeb3729 fix:【framework 框架】YudaoTracerAutoConfiguration 增加必须存在 Filter 2025-08-17 14:58:34 +08:00