9692 Commits

Author SHA1 Message Date
e5da9a10e6 Update README with comprehensive project overview and features
Co-authored-by: dingjiangying <dingjiangying@meituan.com>
2025-08-06 06:36:50 +00:00
199467a70d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-08-05 19:36:21 +08:00
9d26bf9224 fix:【pay 支付】修复 expireOrder logger 文案错误的问题 2025-08-04 18:41:17 +08:00
8108b9b826 fix:【bpm 工作流】BpmSequentialMultiInstanceBehavior 兼容 CallActivity、SubProcess 场景 2025-08-04 12:52:07 +08:00
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
dd1696878a fix:【infra 基础设施】FileController 的 uploadFile 接口,缺少 @Valid 注解 2025-08-03 19:53:54 +08:00
6ee5440218 fix:【framework 全局】GlobalExceptionHandler 处理 guava UncheckedExecutionException 异常,https://t.zsxq.com/UszdH 2025-08-03 19:50:45 +08:00
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
896113bb40 fix:【framework 全局】GlobalExceptionHandler 处理 guava UncheckedExecutionException 异常,https://t.zsxq.com/UszdH 2025-08-03 19:46:56 +08:00
d3888d7b4a Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-08-03 19:46:21 +08:00
3d68072584 fix:【framework 全局】GlobalExceptionHandler 处理 guava UncheckedExecutionException 异常,https://t.zsxq.com/UszdH 2025-08-03 19:45:55 +08:00
192bbf6e92 fix:【bpm 工作流】BpmSequentialMultiInstanceBehavior 兼容 CallActivity、SubProcess 场景 2025-08-03 19:16:37 +08:00
2653b614d1 feat:【bpm 工作流】审批人自选时,相同节点共享数据 2025-08-02 22:08:39 +08:00
4fbdd3dc5c feat:【bpm 工作流】兼容 bpmn 场景下,使用 START_USER_NODE_ID 的预测 2025-08-02 20:56:25 +08:00
8ee1fef9e4 fix:【crm 客户管理】联系人删除时,校验权限不正确的问题 2025-08-02 19:41:59 +08:00
ef9fcc9aa4 reactor:@MockBean => @MockitoBean 2025-08-02 17:58:49 +08:00
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
e79005a0a0 reactor:@MockBean => @MockitoBean 2025-08-02 17:32:12 +08:00
7a8e91345f (〃'▽'〃) v2.6.1 发布:Vben5 + antd 管理后台支持 BPM 工作流、CRM 客户管理 v2025.08(jdk8/11) 2025-07-31 23:48:47 +08:00
6341e869a1 【同步】jdk21 和 jdk8 的代码 2025-07-31 22:58:35 +08:00
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
3a07bcc3c6 (〃'▽'〃) v2025.08 发布:完善 vben5(antd) 工作流、迁移 vben5(ep) 商城、支持 IoT TCP 协议 v2025.08(jdk17/21) 2025-07-31 12:57:33 +08:00
aefaff2cad fix:【bpm 工作流】BpmCategoryServiceImplTest 单测不正确的问题 2025-07-31 09:56:34 +08:00
9a3a56130d 【同步】jdk21 和 jdk8 的代码 2025-07-30 19:09:09 +08:00
c4df87f7ee 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-07-30 19:07:46 +08:00
f71ec38456 【同步】BOOT 和 CLOUD 的功能 2025-07-30 19:06:44 +08:00
ff70aaa6a9 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-07-30 18:59:32 +08:00
176e87141e feat:GlobalExceptionHandler 支持更多请求参数不对的问题 2025-07-29 22:24:20 +08:00
ab7d9fdf72 fix:【bpm 工作流】委派、转办时,owner 不重复设置 2025-07-29 20:08:27 +08:00
e07fb6c8fe review:【bpm 工作流】usertask 的跳过表达式 2025-07-29 13:13:47 +08:00
1e271f5270 Merge remote-tracking branch 'origin/develop' into develop 2025-07-29 09:38:22 +08:00
1684706e9a feat: [BPM 工作流] 增加跳过表达式判断。 2025-07-29 09:36:53 +08:00
68645c2db0 【同步】jdk21 和 jdk8 的代码 2025-07-27 19:28:23 +08:00
8939c04282 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
#	yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/api/order/dto/PayOrderCreateReqDTO.java
#	yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/api/refund/dto/PayRefundCreateReqDTO.java
#	yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/dto/PayTransferCreateReqDTO.java
2025-07-27 19:20:31 +08:00
672db2c7d2 Merge remote-tracking branch 'origin/master' 2025-07-27 19:20:05 +08:00
59e91c7fb1 【同步】jdk21 和 jdk8 的代码 2025-07-27 19:19:45 +08:00
8ffe9272e8 feat:【pay 支付】增加 userid、usertype,并额外支持权限校验 2025-07-27 19:18:04 +08:00
ae9e35f184 feat:【infra 基础设施】优化 vben3 模版路径,不在使用 vue3 避免误解 https://github.com/yudaocode/yudao-ui-admin-vben/issues/60 2025-07-27 11:04:19 +08:00
47ff2bf922 fix:Xss 开启不生效的问题 https://t.zsxq.com/qq02q 2025-07-27 10:11:39 +08:00
4a8c485b92 fix:【数据权限】强制需要 PermissionCommonApi 2025-07-26 23:06:21 +08:00
ee0d8589d5 !1389 feat: sql/tools 错误信息输出到 stderr
Merge pull request !1389 from dhb52/N/A
2025-07-26 13:59:22 +00:00
bf5ac4ede2 feat:CacheUtils 增加 CACHE_MAX_SIZE 默认大小 2025-07-26 21:30:16 +08:00
99442ec05c fix:ApiErrorLogServiceImpl 在微服务场景下,记录日志存在的循环调用的问题 2025-07-26 21:21:02 +08:00
77193102a2 feat:添加自适应列宽处理器并替换默认列宽策略 2025-07-26 20:08:04 +08:00
1b412546eb fix:【Mall 商城】修复积分商品新增时校验商品是否参与其他活动校验失败 2025-07-26 19:49:50 +08:00
b208f100a6 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java
2025-07-26 17:25:10 +08:00
b8889a94c7 !1362 feat: 使用 fastExcel 替换 easyExcel (<a href="https://gitee.com/link?target=https%3A%2F%2Fgithub.com%2Ffast-excel%2Ffastexcel">https://github.com/fast-excel/fastexcel</a>)
Merge pull request !1362 from xingyu/master-jdk17-excel
2025-07-26 09:20:20 +00:00
050e718a56 !1382 fix: 主子表(ERP模式)删除主表数据,对应的子表数据还会显示,需要手动刷新之后才不显示
Merge pull request !1382 from 顾北清/master
2025-07-26 09:16:12 +00:00