Commit Graph

9720 Commits

Author SHA1 Message Date
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
YunaiV
dac0c278bf feat:【framework 框架】ApiEncryptFilter 的 getApiEncrypt 优化成 jdk8 写法,更好适配 2025-08-17 11:35:20 +08:00
YunaiV
2e47ffdba1 fix:【framework 框架】MyBatisUtils addOrder 时,未兼容 LambdaQueryWrapper 场景 2025-08-17 11:24:31 +08:00
YunaiV
b5d5fa8ea4 fix:【mall 商城】门店自提时,缺少上传订单物流信息到微信小程序 2025-08-17 10:56:13 +08:00
YunaiV
ba068c353a feat:【framework 框架】增加对 MaxUploadSizeExceededException 文件上传过大的提示优化 2025-08-17 10:46:50 +08:00
YunaiV
e44d9fe136 fix:【mall 商城】优惠劵在“领取之后”场景下,计算不正确的问题 2025-08-17 10:37:06 +08:00
芋道源码
e2edd7a49f !1404 feat:【framework 框架】增加 api 加解密能力
Merge pull request !1404 from 芋道源码/develop
2025-08-16 09:44:44 +00:00
YunaiV
2cad35f361 feat:【framework 框架】增加 api 加解密能力 2025-08-16 15:57:47 +08:00
YunaiV
be39a26380 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2025-08-09 16:06:46 +08:00
芋道源码
8e21924444 !1400 fix: 【infra 基础设施】代码生成修复批量删除后 checkedIds 未重置的问题
Merge pull request !1400 from puhui999/master-jdk17
2025-08-09 07:15:06 +00:00
puhui999
ccfc5e18cc fix: 【infra 基础设施】代码生成修复批量删除后 checkedIds 未重置的问题 2025-08-09 12:29:27 +08:00
puhui999
60e5f2b542 fix: 【infra 基础设施】代码生成修复批量删除后 checkedIds 未重置的问题 2025-08-09 12:26:47 +08:00
YunaiV
784a9964ba feat:【mp 公众号】添加用户 ID 筛选条件以提升消息查询功能 2025-08-09 10:22:05 +08:00
YunaiV
dfc92c9450 fix:【system 系统功能】修复阿里云sms api缺少参数的问题 !159 2025-08-09 10:17:31 +08:00
YunaiV
3ca2981af3 fix:【system 系统功能】修复菜单组件名重复校验不严谨问题 !201 2025-08-09 10:14:49 +08:00
YunaiV
0004f1f6fb fix:【crm 客户管理】修复线索池操操作日志显示空的问题 !1397 2025-08-09 10:04:07 +08:00
芋道源码
886c03a6b7 !1399 chore: 代码评审
Merge pull request !1399 from Lesan/feature/bpm-审批人撤回
2025-08-06 14:50:48 +00:00
LesanOuO
d4357a7471 chore: 代码评审 2025-08-06 19:29:14 +08:00
YunaiV
93cb8bad06 feat:【system 系统功能】邮箱增加抄送、密送,支持多个 2025-08-05 21:14:08 +08:00
YunaiV
199467a70d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-08-05 19:36:21 +08:00
YunaiV
9d26bf9224 fix:【pay 支付】修复 expireOrder logger 文案错误的问题 2025-08-04 18:41:17 +08:00
芋道源码
828901991d !1209 【功能优化】邮件发送支持抄送和密送
Merge pull request !1209 from jinmh/master-jdk17
2025-08-04 05:28:00 +00:00
YunaiV
9c2243419b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2025-08-04 13:23:44 +08:00
YunaiV
8108b9b826 fix:【bpm 工作流】BpmSequentialMultiInstanceBehavior 兼容 CallActivity、SubProcess 场景 2025-08-04 12:52:07 +08:00
YunaiV
7d1946d91e reactor:【system 系统功能】优化“文字验证码”的代码 2025-08-04 10:00:08 +08:00
芋道源码
3102fc1f9c !1393 feat.新增输入字母数字类型的验证码spi
Merge pull request !1393 from DanielTsui/master-jdk17-pictureWordCaptcha
2025-08-04 01:03:28 +00:00
芋道源码
fd48795b8a !1392 refactor(yudao-common):调整 CommonResult 和 PageResult 类的属性顺序(基于master-jdk17)
Merge pull request !1392 from 长草颜团子/result-order-jdk17
2025-08-04 00:59:51 +00:00
YunaiV
dd1696878a fix:【infra 基础设施】FileController 的 uploadFile 接口,缺少 @Valid 注解 2025-08-03 19:53:54 +08:00
YunaiV
6ee5440218 fix:【framework 全局】GlobalExceptionHandler 处理 guava UncheckedExecutionException 异常,https://t.zsxq.com/UszdH 2025-08-03 19:50:45 +08:00
YunaiV
ef26a1462e 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/handler/GlobalExceptionHandler.java
2025-08-03 19:47:19 +08:00
YunaiV
896113bb40 fix:【framework 全局】GlobalExceptionHandler 处理 guava UncheckedExecutionException 异常,https://t.zsxq.com/UszdH 2025-08-03 19:46:56 +08:00
YunaiV
d3888d7b4a Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-08-03 19:46:21 +08:00
YunaiV
3d68072584 fix:【framework 全局】GlobalExceptionHandler 处理 guava UncheckedExecutionException 异常,https://t.zsxq.com/UszdH 2025-08-03 19:45:55 +08:00
YunaiV
192bbf6e92 fix:【bpm 工作流】BpmSequentialMultiInstanceBehavior 兼容 CallActivity、SubProcess 场景 2025-08-03 19:16:37 +08:00
YunaiV
2653b614d1 feat:【bpm 工作流】审批人自选时,相同节点共享数据 2025-08-02 22:08:39 +08:00
YunaiV
4fbdd3dc5c feat:【bpm 工作流】兼容 bpmn 场景下,使用 START_USER_NODE_ID 的预测 2025-08-02 20:56:25 +08:00
YunaiV
8ee1fef9e4 fix:【crm 客户管理】联系人删除时,校验权限不正确的问题 2025-08-02 19:41:59 +08:00
YunaiV
ef9fcc9aa4 reactor:@MockBean => @MockitoBean 2025-08-02 17:58:49 +08:00
YunaiV
863ec14f0b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImplTest.java
#	yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImplTest.java
#	yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java
#	yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImplTest.java
#	yudao-module-mall/yudao-module-product/src/test/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceTest.java
#	yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceTest.java
#	yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java
#	yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java
#	yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImplTest.java
#	yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java
#	yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/tag/MemberTagServiceImplTest.java
#	yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceTest.java
#	yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java
#	yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceTest.java
#	yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceTest.java
#	yudao-module-report/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImplTest.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImplTest.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImplTest.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImplTest.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImplTest.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java
2025-08-02 17:34:02 +08:00
YunaiV
e79005a0a0 reactor:@MockBean => @MockitoBean 2025-08-02 17:32:12 +08:00
YunaiV
d4b1acb11e feat:【system 系统管理】dept 增加批量删除 2025-08-02 16:40:09 +08:00
YunaiV
51e5294a3e review:【bpm 工作流】撤回逻辑(没问题) 2025-08-02 15:44:19 +08:00
芋道源码
937fd73160 !1395 feat: 工作流支持审批人撤回
Merge pull request !1395 from Lesan/feature/bpm-审批人撤回
2025-08-02 07:28:14 +00:00
LesanOuO
d2bf9945f7 feat: 工作流支持审批人撤回 2025-08-02 14:14:42 +08:00
YunaiV
7a8e91345f (〃'▽'〃) v2.6.1 发布:Vben5 + antd 管理后台支持 BPM 工作流、CRM 客户管理 v2025.08(jdk8/11) 2025-07-31 23:48:47 +08:00
YunaiV
6341e869a1 【同步】jdk21 和 jdk8 的代码 2025-07-31 22:58:35 +08:00
YunaiV
83537fd2d9 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
#	yudao-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/service/category/BpmCategoryServiceImplTest.java
2025-07-31 13:50:09 +08:00