952 Commits

Author SHA1 Message Date
199467a70d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-08-05 19:36:21 +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
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
59e91c7fb1 【同步】jdk21 和 jdk8 的代码 2025-07-27 19:19:45 +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
c25d1b3719 review:@InDict 的实现,以及相关的使用案例 2025-07-26 17:15:57 +08:00
413eb23893 feat.新增输入字母数字类型的验证码spi 2025-07-24 15:28:43 +08:00
8cef02613d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-07-23 22:23:10 +08:00
d128d78718 reactor:easy-trans 默认禁用,避免影响接口性能 2025-07-23 22:17:54 +08:00
7311dff4d6 (〃'▽'〃) v2.6.1 发布:Vben5 + antd 管理后台支持 BPM 工作流、CRM 客户管理 2025-07-19 16:17:51 +08:00
adece67532 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/vo/AppFileUploadReqVO.java
2025-07-15 22:37:27 +08:00
a54e743a88 feat:【SYSTEM 系统管理】手机验证码登录,增加限流 2025-07-13 16:15:18 +08:00
4d5e501a41 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/utils/FileTypeUtils.java
#	yudao-module-mp/src/main/java/cn/iocoder/yudao/module/mp/service/handler/user/SubscribeHandler.java
2025-07-11 21:54:11 +08:00
7fc522938d fix:【SYSTEM 系统管理】社交绑定,使用 code 授权码的参数错误 2025-07-09 19:27:07 +08:00
d5bda87435 reactor:统一导出的 url 都是 export-excel 2025-06-16 08:36:38 +08:00
a000048196 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.java
#	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/service/file/FileServiceImpl.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImpl.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleService.java
2025-06-16 08:35:21 +08:00
0fbffdc1d3 reactor:统一导出的 url 都是 export-excel 2025-06-16 08:30:00 +08:00
f38485ffd5 Merge branch 'refs/heads/master-jdk17' into master-jdk17-excel
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/SelectSheetWriteHandler.java
2025-06-15 18:54:13 +08:00
03d3ebdf05 review:【INFRA 基础设施】批量删除接口 2025-06-15 18:43:50 +08:00
bcd6ed4c4c !1366 feat: system、infra 模块新增批量删除接口
Merge pull request !1366 from puhui999/master-jdk17
2025-06-15 10:31:33 +00:00
f253c133fc Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2025-06-15 15:25:03 +08:00
ce69fd8ab2 feat: system 模块新增批量删除接口 2025-06-15 13:57:08 +08:00
39d1954ec9 feat: system 模块新增批量删除接口 2025-06-15 12:25:24 +08:00
47bf096b63 review:【System 系统管理】批量删除接口 2025-06-15 10:30:00 +08:00
7d867909d7 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	sql/oracle/ruoyi-vue-pro.sql
#	sql/sqlserver/ruoyi-vue-pro.sql
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2TokenController.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantPackageController.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImpl.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientService.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImpl.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelService.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateService.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageService.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImpl.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantService.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
2025-06-15 10:21:55 +08:00
d7dbb4817b review:【System 系统管理】批量删除接口 2025-06-15 10:04:04 +08:00
1c0c6710bb !1363 feat: system 模块新增批量删除接口
Merge pull request !1363 from puhui999/master-jdk17
2025-06-15 01:52:45 +00:00
78658347b1 feat: 新增批量删除邮件模版接口 2025-06-10 16:39:10 +08:00
7853ac9f23 feat: 新增批量删除邮箱账号接口 2025-06-10 16:38:54 +08:00
f0efbd76ba feat: 新增批量删除通知公告接口 2025-06-10 15:56:42 +08:00
d60aeb76a3 feat: 新增批量删除站内信模版接口 2025-06-10 15:48:54 +08:00
14a80f9cd9 feat: 新增批量删除访问令牌接口 2025-06-10 15:34:08 +08:00
33d7fdedf8 feat: 新增 OAuth2 客户端批量删除接口 2025-06-10 15:33:23 +08:00
e91096e4e0 feat: 新增短信渠道批量删除接口 2025-06-10 15:31:56 +08:00
9dec02d02e feat: 使用 fastExcel 替换 easyExcel (https://github.com/fast-excel/fastexcel) 2025-06-10 14:51:41 +08:00
775cb8896b feat: 新增短信模板批量删除接口 2025-06-10 14:21:56 +08:00
f6edee501b feat: 新增社交客户端批量删除接口 2025-06-10 14:21:19 +08:00
28bba9776c feat: 新增租户批量删除接口 2025-06-10 14:19:08 +08:00
18fcc8fbc5 feat: 新增用户批量删除接口 2025-06-10 10:14:27 +08:00
4af6b2bfb1 review:【infra 基础设施】代码生成的批量操作建议 2025-06-08 11:50:00 +08:00
129f9175ac feat: 优化语句 2025-06-02 21:55:03 +08:00
0fb8f683c8 fix: getPhoneNoInfo 已过期 2025-05-27 09:33:36 +08:00
1b37c47361 fix: deleteBatchIds 已过期 2025-05-26 14:09:31 +08:00
5caf990920 fix: selectBatchIds 已过期 2025-05-26 14:06:02 +08:00
Ken
41b17d4faf fix(微信小程序确认收货提醒接口): 修复 #839 - received_time 时间戳单位错误(应为秒)
根据微信小程序接口要求,订单签收时间 received_time 应为秒级时间戳,但现有实现传入了毫秒,导致微信接口返回错误代码 10060029(签收时间不合理)。

新增 LocalDateUtils.toEpochSecond 方法,统一将 LocalDateTime 转换为秒级时间戳,用于接口参数转换。

BREAKING CHANGE: 无

Closes #839
2025-05-20 12:57:33 +08:00
479dfb6c23 【同步】jdk21 和 jdk8 的代码 2025-05-19 20:12:12 +08:00