Commit Graph

936 Commits

Author SHA1 Message Date
YunaiV
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
YunaiV
a54e743a88 feat:【SYSTEM 系统管理】手机验证码登录,增加限流 2025-07-13 16:15:18 +08:00
YunaiV
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
YunaiV
7fc522938d fix:【SYSTEM 系统管理】社交绑定,使用 code 授权码的参数错误 2025-07-09 19:27:07 +08:00
YunaiV
d5bda87435 reactor:统一导出的 url 都是 export-excel 2025-06-16 08:36:38 +08:00
YunaiV
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
YunaiV
0fbffdc1d3 reactor:统一导出的 url 都是 export-excel 2025-06-16 08:30:00 +08:00
YunaiV
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
YunaiV
f253c133fc Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2025-06-15 15:25:03 +08:00
puhui999
ce69fd8ab2 feat: system 模块新增批量删除接口 2025-06-15 13:57:08 +08:00
puhui999
39d1954ec9 feat: system 模块新增批量删除接口 2025-06-15 12:25:24 +08:00
YunaiV
47bf096b63 review:【System 系统管理】批量删除接口 2025-06-15 10:30:00 +08:00
YunaiV
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
YunaiV
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
puhui999
78658347b1 feat: 新增批量删除邮件模版接口 2025-06-10 16:39:10 +08:00
puhui999
7853ac9f23 feat: 新增批量删除邮箱账号接口 2025-06-10 16:38:54 +08:00
puhui999
f0efbd76ba feat: 新增批量删除通知公告接口 2025-06-10 15:56:42 +08:00
puhui999
d60aeb76a3 feat: 新增批量删除站内信模版接口 2025-06-10 15:48:54 +08:00
puhui999
14a80f9cd9 feat: 新增批量删除访问令牌接口 2025-06-10 15:34:08 +08:00
puhui999
33d7fdedf8 feat: 新增 OAuth2 客户端批量删除接口 2025-06-10 15:33:23 +08:00
puhui999
e91096e4e0 feat: 新增短信渠道批量删除接口 2025-06-10 15:31:56 +08:00
puhui999
775cb8896b feat: 新增短信模板批量删除接口 2025-06-10 14:21:56 +08:00
puhui999
f6edee501b feat: 新增社交客户端批量删除接口 2025-06-10 14:21:19 +08:00
puhui999
28bba9776c feat: 新增租户批量删除接口 2025-06-10 14:19:08 +08:00
puhui999
18fcc8fbc5 feat: 新增用户批量删除接口 2025-06-10 10:14:27 +08:00
YunaiV
4af6b2bfb1 review:【infra 基础设施】代码生成的批量操作建议 2025-06-08 11:50:00 +08:00
xingyu4j
129f9175ac feat: 优化语句 2025-06-02 21:55:03 +08:00
xingyu4j
0fb8f683c8 fix: getPhoneNoInfo 已过期 2025-05-27 09:33:36 +08:00
xingyu4j
1b37c47361 fix: deleteBatchIds 已过期 2025-05-26 14:09:31 +08:00
xingyu4j
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
YunaiV
479dfb6c23 【同步】jdk21 和 jdk8 的代码 2025-05-19 20:12:12 +08:00
YunaiV
e00bfd02a1 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/CrmOperateLogController.java
#	yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsPerformanceController.java
#	yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/performance/CrmStatisticsPerformanceReqVO.java
#	yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
#	yudao-module-mall/yudao-module-promotion/pom.xml
#	yudao-module-mall/yudao-module-trade/pom.xml
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
2025-05-17 14:14:23 +08:00
YunaiV
86f88ea590 reactor:移除 pay 的 api 包 2025-05-17 09:48:32 +08:00
YunaiV
e31b6dbff9 reactor:移除 system 和 infra 的 api 包 2025-05-15 17:11:33 +08:00
YunaiV
b758e690c1 reactor:移除 system 和 infra 的 api 包 2025-05-15 00:08:11 +08:00
YunaiV
e4e162a47b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/infra/logger/ApiAccessLogCommonApi.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/infra/logger/ApiErrorLogCommonApi.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/infra/logger/dto/ApiAccessLogCreateReqDTO.java
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApiImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
2025-05-14 21:04:37 +08:00
YunaiV
6c6babb4c3 reactor:yudao-common 增加 biz 包,将 framework 依赖的 api 统一迁移,方便后续 yudao-framework 独立仓库 2025-05-14 19:23:40 +08:00
YunaiV
efc535c051 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageWithdrawController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/aftersale/core/aop/AfterSaleLogAspect.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/notify/dto/PayTransferNotifyReqDTO.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/PayTransferApi.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/dto/PayTransferCreateReqDTO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/api/refund/PayRefundApiImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/PayDemoOrderController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/PayDemoTransferController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/vo/transfer/PayDemoTransferCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/transfer/PayTransferController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/transfer/vo/PayTransferCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoTransferService.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoTransferServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferService.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/transfer/PayTransferUnifiedReqDTO.java
2025-05-12 09:19:22 +08:00
YunaiV
7c38a32fc9 fix:【MALL 商城】小程序发货,uploadTime 不正确的问题 2025-05-11 17:11:38 +08:00
YunaiV
8eb76c210d 【同步】jdk21 和 jdk8 的代码 2025-05-06 20:58:00 +08:00
YunaiV
e633c7cfe3 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/util/WebFrameworkUtils.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientConfig.java
2025-05-06 20:50:33 +08:00
YunaiV
a34de9f223 feat:【MALL 商城】增加微信物流的对接(和社区同学,一起测试中。。。) 2025-05-06 20:49:13 +08:00
YunaiV
59234e1eea feat:增加租户切换的能力 2025-05-05 17:27:40 +08:00
YunaiV
e6fcb60332 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-05-05 11:19:27 +08:00
YunaiV
70cbb82c84 reactor:@TenantIgnore 添加在 DO 实体类上,该表自动忽略租户 2025-05-05 11:18:19 +08:00
YunaiV
8e0398bce6 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageServiceImpl.java
2025-05-05 09:33:51 +08:00
YunaiV
be86cdfd51 reactor:@TenantIgnore 添加在 Controller 时,自动添加到 TenantProperties 中 2025-05-05 09:33:34 +08:00