Commit Graph

1897 Commits (edefc6cedb8ddd4fa1ca60ac571124247631e758)

Author SHA1 Message Date
YunaiV edefc6cedb Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-07-27 15:41:44 +08:00
YunaiV c9a64030da 【同步】BOOT 和 CLOUD 的功能 2024-07-27 15:41:35 +08:00
芋道源码 7d79a49beb
!127 【修复】AI模块redis配置错误
Merge pull request !127 from OnPeaceOfMind/master-jdk17
2024-07-27 07:33:32 +00:00
芋道源码 e44c21dc75
!123 【修复】工作流:发起用户可能没有部门
Merge pull request !123 from 今晚打老虎/master-jdk17
2024-07-27 07:28:39 +00:00
YunaiV 4ec21f8d95 【功能优化】PAY:微信支付使用 certSerialNo 替代 privateCertContent 2024-07-27 14:05:50 +08:00
YunaiV d19759afc8 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-07-27 14:03:49 +08:00
YunaiV b9ad4aa243 【功能修复】定时任务:统一所有 xxl-job 走 9090,保持和《定时任务》文档一致 2024-07-27 14:02:36 +08:00
YunaiV b026d186a6 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPayClientConfig.java
2024-07-26 09:25:01 +08:00
YunaiV 5fc4b5a64b 【功能优化】PAY:微信支付使用 certSerialNo 替代 privateCertContent 2024-07-26 09:23:32 +08:00
YunaiV 41f56969e1 【代码优化】PAY:移除 PayClient 缓存,减少复杂性,性能足够(非高频读取) 2024-07-24 23:06:11 +08:00
YunaiV f717c0f9c6 【代码优化】PAY:移除 PayClient 缓存,减少复杂性,性能足够(非高频读取) 2024-07-24 23:03:59 +08:00
YunaiV 61ebfc79a1 【同步】BOOT 和 CLOUD 的功能 2024-07-24 19:09:45 +08:00
YunaiV 0536fa3957 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java
2024-07-24 19:05:47 +08:00
YunaiV c0df6eab4e 【同步】BOOT 和 CLOUD 的功能 2024-07-24 19:05:11 +08:00
YunaiV 1c95e12aea 【功能新增】全局:多租户缓存,增加忽略的 Spring Cache 配置 2024-07-23 23:26:09 +08:00
YunaiV 74f66735c6 【代码优化】全局:userId 为空时,直接校验权限不通过 2024-07-23 22:40:42 +08:00
YunaiV 496c7880c8 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
2024-07-22 22:32:10 +08:00
YunaiV a981ad6e1c 【同步】BOOT 和 CLOUD 的功能 2024-07-22 22:32:00 +08:00
YunaiV ec62043a65 【代码修复】全局:BaseMapperX 的分页 pageSize 不分页判断不对的问题 2024-07-21 18:03:31 +08:00
YunaiV a9837ae8fe 【代码代码】PAY:移除对 member 的依赖 2024-07-21 17:51:16 +08:00
YunaiV 88c5c7fdf7 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/pay/PayWalletStatisticsServiceImpl.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/notify/dto/PayOrderNotifyReqDTO.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/notify/dto/PayRefundNotifyReqDTO.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/dto/PayOrderCreateReqDTO.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/refund/dto/PayRefundCreateReqDTO.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/controller/admin/app/PayAppController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/vo/PayAppBaseVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/vo/PayAppUpdateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/vo/PayAppUpdateStatusReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/channel/PayChannelController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/channel/vo/PayChannelBaseVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/channel/vo/PayChannelCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/channel/vo/PayChannelUpdateReqVO.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/order/PayDemoOrderCreateReqVO.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/notify/PayNotifyController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/vo/PayOrderBaseVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/vo/PayOrderSubmitReqVO.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/PayTransferSubmitReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletRechargeController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletRechargePackageController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletTransactionController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/vo/rechargepackage/WalletRechargePackageBaseVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/vo/rechargepackage/WalletRechargePackageUpdateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/vo/wallet/PayWalletBaseVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/vo/wallet/PayWalletUserReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/channel/AppPayChannelController.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/controller/app/wallet/AppPayWalletController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/AppPayWalletRechargeController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/AppPayWalletTransactionController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/redis/no/PayNoRedisDAO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/redis/notify/PayNotifyLockRedisDAO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/app/PayAppService.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelService.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoOrderService.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoOrderServiceImpl.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/notify/PayNotifyServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderService.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceImpl.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-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargePackageService.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargePackageServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletTransactionService.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletTransactionServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/bo/WalletTransactionCreateReqBO.java
#	yudao-module-pay/yudao-module-pay-biz/src/test-integration/java/cn/iocoder/yudao/module/pay/dal/mysql/merchant/PayChannelMapperIntegrationTest.java
#	yudao-module-pay/yudao-module-pay-biz/src/test-integration/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceIntegrationTest.java
#	yudao-module-pay/yudao-module-pay-biz/src/test-integration/resources/application-integration-test.yaml
#	yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceTest.java
#	yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java
#	yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceTest.java
#	yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java
#	yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceTest.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientConfig.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/order/PayOrderUnifiedReqDTO.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/refund/PayRefundUnifiedReqDTO.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/transfer/PayTransferUnifiedReqDTO.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/NonePayClientConfig.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPayClientConfig.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/mock/MockPayClientConfig.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPayClientConfig.java
2024-07-21 17:06:14 +08:00
YunaiV 468d4cc6f6 【代码代码】PAY:移除对 member 的依赖 2024-07-21 11:52:07 +08:00
YunaiV 2ba141a5c4 【同步】BOOT 和 CLOUD 的功能 2024-07-21 10:04:50 +08:00
YunaiV be67194cfb Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-07-20 22:36:42 +08:00
YunaiV a9fe595823 【功能优化】全局:LoginUser 新增过期时间,方便判断 token 过期 2024-07-20 22:36:30 +08:00
YunaiV c7d5c68b3b 【功能修复】全局:SelectSheetWriteHandler 在没有任何 SelectSheetWriteHandler 的情况下,导致 Excel 导入不解析下拉框的问题 2024-07-20 18:59:07 +08:00
YunaiV b0c2f75a3f 【功能优化】全局:LoginUser 新增过期时间,方便判断 token 过期 2024-07-20 18:42:26 +08:00
YunaiV 35ccb222a8 【功能新增】INFRA:增加 ConfigApi,支持参数配置的读取 2024-07-20 17:59:37 +08:00
YunaiV 5bf8c47587 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-07-20 17:58:19 +08:00
YunaiV b728e66282 【功能新增】INFRA:增加 ConfigApi,支持参数配置的读取 2024-07-20 17:57:31 +08:00
YunaiV d78d15215a 【代码优化】全局:去除 application.yaml 相关配置文件的冗余 2024-07-20 16:25:44 +08:00
YunaiV 43363c1167 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-07-20 16:14:23 +08:00
YunaiV 7fbb96b0f0 【代码优化】全局:去除 application.yaml 相关配置文件的冗余 2024-07-20 16:14:15 +08:00
YunaiV 3ae388d886 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-local.yaml
2024-07-20 16:13:17 +08:00
YunaiV a034b3d218 【代码优化】全局:去除 application.yaml 相关配置文件的冗余 2024-07-20 16:12:55 +08:00
YunaiV 5e9113a5c8 【功能优化】全局:支持数据权限在 RPC 调用时,传递忽略数据权限的能力 2024-07-20 14:00:08 +08:00
YunaiV 08b958876d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-07-20 13:58:35 +08:00
YunaiV e18069d45f 【功能优化】全局:支持数据权限在 RPC 调用时,传递忽略数据权限的能力 2024-07-20 13:55:28 +08:00
YunaiV 3d29a981f7 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-07-19 23:37:09 +08:00
YunaiV 825be64d6d 【功能优化】全局:简化 GlobalExceptionHandler 对 ServiceException 的打印 2024-07-19 23:37:00 +08:00
YunaiV 1bc91e3ddf 【功能优化】全局:处理 HttpRequestMethodNotSupportedException 异常 2024-07-19 23:15:31 +08:00
YunaiV 0af36c40a0 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-07-19 23:15:03 +08:00
YunaiV f6ff5086be 【功能优化】全局:处理 HttpRequestMethodNotSupportedException 异常 2024-07-19 23:14:54 +08:00
YunaiV ec33e42f2b 【功能修复】全局:请求租户不存在时,记录访问日志、操作日志异常的问题 2024-07-19 23:04:10 +08:00
YunaiV 84379445dd Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-07-19 23:02:49 +08:00
YunaiV 24eaa68269 【功能修复】全局:请求租户不存在时,记录访问日志、操作日志异常的问题 2024-07-19 22:54:25 +08:00
YunaiV 906287be21 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
2024-07-19 19:30:37 +08:00
芋道源码 6a283eee89
!129 修复“启动时报错动态数据源不能找到主数据源”
Merge pull request !129 from 9527/master
2024-07-19 11:29:23 +00:00
YunaiV 398171a402 【功能修复】CRM:操作日志读取不正确的问题 2024-07-19 19:27:33 +08:00
15320521142 b0ffc6049a bpm中本地配置文件增加“spring:”,解决由于注释配置失效问题 2024-07-19 14:37:29 +08:00