Commit Graph

712 Commits

Author SHA1 Message Date
YunaiV
485a70de6d 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/config/YudaoWebAutoConfiguration.java
2025-11-21 20:04:46 +08:00
YunaiV
539746d1d8 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2025-11-21 16:34:57 +08:00
YunaiV
1a7a21826b feat:【infra】代码生成:vben5 + ele 模版中,DatePicker 增加 class: '!w-full' 保证宽度 2025-11-19 10:28:09 +08:00
DevDengChao
243ec76df9 fix: 重置 currentRow 时没有对模板类型进行判断 2025-11-06 14:37:00 +08:00
YunaiV
6aba222d9e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceServiceInvokeSceneRuleAction.java
2025-10-12 11:04:05 +08:00
YunaiV
32758bc4c1 feat:【infra 基础设施】统一 InputNumber 的 controlsPosition 写法 2025-10-07 11:11:38 +08:00
YunaiV
a860aac468 feat:【antd】【ele】统一 await formApi.setValues(formData.value); 的写法 2025-10-03 09:07:11 +08:00
YunaiV
c80ffe437f 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/config/YudaoWebAutoConfiguration.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
2025-10-02 18:52:15 +08:00
YunaiV
11dd2308b3 feat:【infra】优化 codegen 的 vben 模版 2025-10-01 15:39:36 +08:00
YunaiV
a4e230828f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm
2025-10-01 09:50:48 +08:00
YunaiV
5d456f1336 feat:【infra 基础设施】ftp、sftp 库升级与兼容 2025-09-20 21:33:27 +08:00
YunaiV
455a012644 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/ftp/FtpFileClientConfig.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/sftp/SftpFileClientConfig.java
2025-09-20 21:32:03 +08:00
YunaiV
568216084e feat:【infra 基础设施】ftp、sftp 库升级与兼容 2025-09-20 21:30:53 +08:00
YunaiV
d40c2a39de fix:【infra 基础设施】文件路径url "+"号解码问题 2025-09-20 18:10:05 +08:00
xingyu4j
e7be2a03bc feat: vben5 codegen 2025-09-12 16:51:04 +08:00
YunaiV
0cfd2143d1 fix:【element-plus】button 的 text 类型,后续会废弃 2025-09-08 23:01:01 +08:00
YunaiV
2463447cf1 fix:【infra 基础设施】修复 vben 的 allowClear 应该是 clearable 2025-09-06 10:11:43 +08:00
YunaiV
9f66283052 reactor:【infra 基础设施】处理 vben + vben 代码模版(onRefresh => handleRefresh,toggleExpand => handleExpand) 2025-09-06 09:42:40 +08:00
YunaiV
5b29d5ff13 reactor:【infra 基础设施】处理 vben + vben 树形模版 2025-09-05 23:12:42 +08:00
YunaiV
716ac2f9ff reactor:【infra 基础设施】处理 vben + element-plus 树形模版 2025-09-05 22:59:57 +08:00
YunaiV
bc9d9bcda3 reactor:【infra 基础设施】增加 duration 代码模版 2025-09-05 19:32:40 +08:00
YunaiV
8170d1563f reactor:【infra 基础设施】调整 vben 字典重构结果 2025-09-05 19:29:18 +08:00
YunaiV
8193e9801c reactor:【infra 基础设施】优化 vben5 + antd 的 schema 模版 2025-09-05 19:11:22 +08:00
YunaiV
f29abe853d reactor:【infra 基础设施】优化 vben5 + element-plus 的 schema 模版 2025-09-05 01:05:41 +08:00
YunaiV
d7c621688c fix:【infra 基础设施】vben 导出时,params 未传递的问题 2025-09-04 23:08:03 +08:00
YunaiV
fd064abfbe fix:【infra 基础设施】导出 excel 参数不正确的问题 2025-09-02 09:43:26 +08:00
YunaiV
269c1fdabf Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java
2025-08-31 10:08:12 +08:00
YunaiV
040899d8c9 reactor:移除 @Accessors 和 @EqualsAndHashCode 注解 2025-08-30 17:48:16 +08:00
YunaiV
c86cf9286c Merge branch 'feature/ai' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-08-29 13:26:35 +08:00
YunaiV
a5a0383f10 feat:【ai 大模型】对话增加附件的支持 2025-08-24 20:32:19 +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
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
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
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
199467a70d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-08-05 19:36:21 +08:00
YunaiV
dd1696878a fix:【infra 基础设施】FileController 的 uploadFile 接口,缺少 @Valid 注解 2025-08-03 19:53:54 +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
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
YunaiV
ae9e35f184 feat:【infra 基础设施】优化 vben3 模版路径,不在使用 vue3 避免误解 https://github.com/yudaocode/yudao-ui-admin-vben/issues/60 2025-07-27 11:04:19 +08:00
YunaiV
99442ec05c fix:ApiErrorLogServiceImpl 在微服务场景下,记录日志存在的循环调用的问题 2025-07-26 21:21:02 +08:00
YunaiV
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
YunaiV
8b2247f7f9 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1382/ 贡献 2025-07-26 17:16:07 +08:00