Commit Graph

469 Commits

Author SHA1 Message Date
YunaiV 6bb02e6053 (〃'▽'〃) v2.5.0 发布:又熬过 30 个夜,头发还在 2025-05-13 20:16:23 +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 b91a30dd3e feat:【PAY 支付】增加 channelPackageInfo 字段,对接微信新的转账 API(太难了!!!!!!!!!!!!!!!!!!!!) 2025-05-10 20:05:17 +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 a2bfa7a95a feat:weixin-java from 4.7.2.B => 4.7.4.B
feat:微信支付 v3 从平台证书切换成微信支付公钥
feat:微信支付 v3 增加 header 解析
2025-05-05 22:35:49 +08:00
YunaiV 59e5f780be Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-05-04 10:06:53 +08:00
YunaiV 2ee64635f3 chore:mybatis from 3.5.11 -> 3.5.19 2025-05-04 10:06:27 +08:00
YunaiV ded7a38a38 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-05-04 09:59:10 +08:00
YunaiV d3963644b8 chore:guava from 33.4.0-jre => 33.4.8-jre 2025-05-04 09:58:49 +08:00
YunaiV 3bcb9890e8 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-05-04 09:53:43 +08:00
YunaiV 163839926a fix:justauth-spring-boot-starter 引入的 hutool-core 冲突 2025-05-04 09:53:34 +08:00
YunaiV 8176278086 feat:集成积木仪表盘 2025-05-03 10:28:41 +08:00
YunaiV 09b872a882 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-05-03 10:26:44 +08:00
YunaiV 4fb4af2c5c feat:集成积木仪表盘 2025-05-03 10:26:14 +08:00
YunaiV 0038aa0cdf chore:guice version 移除 2025-05-03 09:15:35 +08:00
YunaiV b0a53a26cd Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
2025-05-03 09:07:55 +08:00
YunaiV 0b98ef4ecf chore:jimureport 1.8.1 to 1.9.4 2025-05-03 09:06:36 +08:00
YunaiV 28c20fa323 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-05-03 08:45:47 +08:00
YunaiV bd057ce14d chore:mybatis 相关依赖升级 2025-05-03 08:45:36 +08:00
YunaiV 585a124d34 chore:spring 相关依赖升级 2025-05-03 08:35:31 +08:00
YunaiV e7ad73c278 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
2025-04-30 15:02:49 +08:00
YunaiV d7656535a2 reactor:使用 aj-captcha 官方 1.4.0 2025-04-30 15:01:19 +08:00
YunaiV 3c361527fc reactor:使用 justauth 官方 1.16.7(jdk8 特殊适配,等 1.4.1) 2025-04-30 09:42:33 +08:00
YunaiV 4cebe4af14 reactor:使用 justauth 官方 1.16.7 2025-04-30 00:05:54 +08:00
YunaiV a9bb55340b feat:使用 aws s3 2.0 客户端 2025-04-26 10:00:53 +08:00
YunaiV cc0c92b868 feat:使用 aws s3 2.0 客户端 2025-04-26 10:00:29 +08:00
YunaiV 46676a439d feat:【INFRA】文件存储,增加 enablePathStyleAccess 选项 2025-04-25 21:48:37 +08:00
芋道源码 0885eb7c70
!1219 【依赖升级】AWS SDK for Java 1.x to 2.x
Merge pull request !1219 from puhui999/develop
2025-04-24 14:20:39 +00:00
YunaiV 61edbcb9ce 2.4.2 版本发布 2025-04-12 12:24:50 +08:00
YunaiV 7c94085499 2.4.2 版本发布 2025-04-12 12:19:56 +08:00
YunaiV 77e64c217e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceController.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/IotDeviceStatusUpdateReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductController.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/vo/IotThingModelSaveReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/IotThinkModelFunctionController.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/vo/IotThinkModelFunctionPageReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/callback/EmqxCallback.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/client/EmqxClient.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/start/EmqxStart.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductService.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionService.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionServiceImpl.java
#	yudao-server/src/main/resources/application-local.yaml
2025-03-17 13:16:59 +08:00
YunaiV eb7269083a Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-03-17 08:54:10 +08:00
YunaiV 8203e074ac 【代码评审】IoT:OTA 的实现 2025-03-16 22:28:10 +08:00
YunaiV bba36bfca9 【依赖升级】weixin-java from 4.6.0 to 4.7.2.B 2025-03-15 20:51:05 +08:00
YunaiV 075545c11e 【依赖升级】weixin-java from 4.6.0 to 4.7.2.B 2025-03-15 20:50:19 +08:00
YunaiV 0cc99b8279 【缺陷修复】升级 springdoc 1.7.0 到 1.8.0,解决 knife4j get 和 post 参数不正确的问题 2025-03-15 19:45:01 +08:00
YunaiV 6e89d33d39 【依赖管理】全局:tika-core 从 3.1.0 降低到 2.9.3 版本,解决 jdk8 兼容性 2025-03-15 07:06:01 +08:00
YunaiV 2379e34012 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-03-15 07:02:23 +08:00
YunaiV d94e577943 【依赖管理】全局:tika-core 使用 3.1.0 确认 2025-03-15 07:00:39 +08:00
YunaiV 41640642d4 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
2025-03-15 06:56:16 +08:00
YunaiV f286a81392 【功能修复】AI:升级 tika 版本,解决 pdf 读取问题 2025-03-09 09:43:12 +08:00
puhui999 7b449b81e7 【功能新增】IoT: 新增 RabbitMQ 数据桥梁实现 2025-02-28 18:03:34 +08:00
puhui999 69a27b1ee2 【功能新增】IoT: 新增 Kafka 数据桥梁实现 2025-02-28 14:46:02 +08:00
安浩浩 53697b55c2 【功能完善】IoT: 更新 EMQX 插件配置,添加 MQTT 连接参数,重构相关逻辑 2025-02-22 22:50:37 +08:00
puhui999 add90365df 【功能新增】IoT: 数据桥梁增加 RocketMQConfig 配置,实现executeRocketMQ 发送消息 2025-02-19 15:51:34 +08:00
YunaiV 6f88f8596c V2.4.1 发布~ 2025-02-09 12:34:31 +08:00
YunaiV 2d18f593ae V2.4.1 发布~ 2025-02-09 12:33:24 +08:00
puhui999 f141d64eb2 【依赖升级】AWS SDK for Java 1.x to 2.x 2025-02-06 16:05:56 +08:00
YunaiV 252366781d 【代码优化】IoT:优化插件 common 和 http 的配置类 2025-01-31 21:51:06 +08:00
YunaiV 8236154ae8 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotProductStatusEnum.java
#	yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/thingmodel/IotThingModelTypeEnum.java
2025-01-28 03:54:16 +08:00