Commit Graph

2328 Commits (master)

Author SHA1 Message Date
YunaiV 1e0c4503aa Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# 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/admin/brokerage/vo/withdraw/BrokerageWithdrawRejectReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageRecordController.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/dto/PayTransferCreateReqDTO.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/admin/wallet/PayWalletRechargeController.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/PayDemoOrderService.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/PayOrderServiceImpl.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/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/dto/transfer/PayTransferUnifiedReqDTO.java
2025-05-12 09:29:58 +08:00
YunaiV d238b24471 fix:【IoT 物联网】打包缺少 jar 信息 2025-05-12 09:27:33 +08:00
YunaiV d8fc6259d1 feat:同步最新菜单 sql 2025-05-12 09:11:26 +08:00
YunaiV 5e2138265f 【同步】BOOT 和 CLOUD 的功能(PAY 相关功能) 2025-05-11 18:08:17 +08:00
YunaiV d9178edd32 【同步】BOOT 和 CLOUD 的功能 2025-05-11 17:13:34 +08:00
YunaiV 4c0c3dd019 【同步】BOOT 和 CLOUD 的功能 2025-05-06 21:07:35 +08:00
YunaiV 58c8a7dbc2 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageServiceImpl.java
2025-05-06 21:05:46 +08:00
YunaiV 5b81612086 【同步】BOOT 和 CLOUD 的功能 2025-05-06 21:05:35 +08:00
YunaiV 0fa162876f 【同步】BOOT 和 CLOUD 的功能 2025-05-06 20:59:34 +08:00
YunaiV 829d200302 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
#	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
2025-05-06 20:56:21 +08:00
YunaiV fdbda95984 feat:【MALL 商城】增加微信物流的对接(和社区同学,一起测试中。。。) 2025-05-06 20:49:23 +08:00
YunaiV a27e0ec757 feat:weixin-java from 4.7.2.B => 4.7.4.B
feat:微信支付 v3 从平台证书切换成微信支付公钥
feat:微信支付 v3 增加 header 解析
2025-05-05 22:35:53 +08:00
YunaiV a079633355 feat:增加租户切换的能力 2025-05-05 17:27:48 +08:00
YunaiV bd843a64b6 fix:TenantDatabaseInterceptor 针对 TenantBaseDO 忽略不正确 2025-05-05 15:31:51 +08:00
YunaiV 00d92d0f2a reactor:@TenantIgnore 增加 enable 属性,用于是否开启 2025-05-05 11:34:19 +08:00
YunaiV 0d51d6c8b6 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-05 11:19:38 +08:00
YunaiV cbb239117d reactor:@TenantIgnore 添加在 DO 实体类上,该表自动忽略租户 2025-05-05 11:18:15 +08:00
YunaiV 3d3bc3b25f reactor:@TenantIgnore 添加在 Controller 时,自动添加到 TenantProperties 中 2025-05-05 10:29:01 +08:00
YunaiV 2084321637 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApiImpl.java
2025-05-05 10:26:58 +08:00
fish steak 2890279e3d
Update MPJLambdaWrapperX.java 2025-05-05 10:26:10 +08:00
fish steak 92d3012995
Update MPJLambdaWrapperX.java 2025-05-05 10:25:34 +08:00
YunaiV f92f9d2e17 reactor:@TenantIgnore 添加在 Controller 时,自动添加到 TenantProperties 中 2025-05-05 10:23:58 +08:00
fish steak 6a5a643b18
Update MPJLambdaWrapperX.java 2025-05-05 10:21:48 +08:00
东宇 c8f6612104 feat(mybatis): 优化 MPJLambdaWrapperX 类
- 移除了未使用的 import 语句- 更新了泛型参数,使代码更加通用和安全
- 添加了新的 betweenIfPresent 方法,支持更灵活的条件判断
-重写了 leftJoin、rightJoin 和 innerJoin 方法,使它们返回当前类型
- 新增了带有扩展参数的 Join 方法,支持更复杂的查询需求
2025-05-05 10:17:55 +08:00
YunaiV 9f7c9eff96 reactor:@TenantIgnore 添加在 Controller 时,自动添加到 TenantProperties 中 2025-05-05 10:14:35 +08:00
YunaiV a31ff349f6 feat:增加 yudao-server,用于单体启动! 2025-05-04 19:16:41 +08:00
YunaiV ff33a0dc22 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-04 18:29:22 +08:00
YunaiV 18e4b1f33e feat:增加 yudao-server,用于单体启动! 2025-05-04 18:28:01 +08:00
YunaiV c31cd0f73a Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-04 16:01:16 +08:00
YunaiV dc36767708 fix:【Gateway 网关】jackson 针对 fail-on-empty-beans 等的处理 2025-05-04 16:01:06 +08:00
YunaiV 065bada15b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-04 15:55:15 +08:00
YunaiV 1cc38159f2 fix:【Gateway 网关】Exceeded limit on max bytes to buffer : 262144 2025-05-04 15:55:08 +08:00
YunaiV e20e5c3452 Merge branch 'master' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-04 15:54:20 +08:00
芋道源码 ac270a4c88
!176 update yudao-gateway/src/main/resources/application.yaml.
Merge pull request !176 from 肖钦云/yudao-cloud-pull-request
2025-05-04 07:53:05 +00:00
YunaiV 5a2668a5e5 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/cors/CorsResponseHeaderFilter.java
2025-05-04 15:51:00 +08:00
YunaiV a7e38d8e34 fix:【Gateway 网关】CorsResponseHeaderFilter 处理不正确的问题 2025-05-04 15:50:07 +08:00
YunaiV e354108f31 Merge branch 'master' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-04 15:48:55 +08:00
YunaiV d435645957 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-04 15:48:49 +08:00
芋道源码 011974b303
!177 fix(yudao-gateway):
Merge pull request !177 from Before Trilogy/master
2025-05-04 07:48:37 +00:00
芋道源码 0f7101fef6
!183 bugfix:网关token移除login-user头信息后重新赋值引用
Merge pull request !183 from 司徒俊杰/N/A
2025-05-04 07:44:11 +00:00
YunaiV 4e53fde33a Merge branch 'master' of https://github.com/YunaiV/yudao-cloud
# Conflicts:
#	yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java
2025-05-04 15:42:34 +08:00
YunaiV 4121ca2543 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-04 15:42:22 +08:00
YunaiV fb238738a0 refactor(gateway): 调整灰度负载均衡过滤器的执行顺序 #213 2025-05-04 15:42:13 +08:00
芋道源码 e005e4d9c6
Merge pull request #213 from russell7/feat/gateway-grayLb-order
refactor(gateway): 调整灰度负载均衡过滤器的执行顺序
2025-05-04 15:42:00 +08:00
YunaiV 767d503790 fix:【MALL 商城】linux 部署时,express.client 配置项,因为大写无法识别 2025-05-04 10:53:01 +08:00
YunaiV e181529b05 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-04 10:11:17 +08:00
YunaiV 5511a6e063 chore:mybatis from 3.5.11 -> 3.5.19 2025-05-04 10:11:08 +08:00
YunaiV a1fcfbd7b6 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-05-04 09:59:56 +08:00
YunaiV ee660465ba chore:guava from 33.4.0-jre => 33.4.8-jre 2025-05-04 09:59:32 +08:00
YunaiV 8dd21005d5 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelService.java
2025-05-04 09:54:48 +08:00