YunaiV
|
b8ad3d6829
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
|
2025-09-20 21:33:57 +08:00 |
|
YunaiV
|
5d456f1336
|
feat：【infra 基础设施】ftp、sftp 库升级与兼容
|
2025-09-20 21:33:27 +08:00 |
|
YunaiV
|
455a012644
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# 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/framework/file/core/client/ftp/FtpFileClientConfig.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/sftp/SftpFileClientConfig.java
|
2025-09-20 21:32:03 +08:00 |
|
YunaiV
|
568216084e
|
feat：【infra 基础设施】ftp、sftp 库升级与兼容
|
2025-09-20 21:30:53 +08:00 |
|
YunaiV
|
6d1b7ec414
|
fix：【mall 商城】RewardActivityRespVO 的 id 类型不正确
|
2025-09-20 18:16:39 +08:00 |
|
芋道源码
|
fa65a6e1d0
|
!1421 雪花 ID 溢出问题 update yudao-module-mall/yudao-module-promotion/src/.../RewardActivityRespVO.java.
Merge pull request !1421 from 山野羡民/N/A
|
2025-09-20 10:15:58 +00:00 |
|
YunaiV
|
66d9abeabe
|
fix：【bpm 工作流】定时边界事件固定日期和固定时长参数传反问题
|
2025-09-20 18:14:30 +08:00 |
|
芋道源码
|
b5ffa43d2f
|
!1426 fix: 【BPM 工作流】定时边界事件固定日期和固定时长参数传反问题
Merge pull request !1426 from dylannier/master
|
2025-09-20 10:13:35 +00:00 |
|
YunaiV
|
d40c2a39de
|
fix：【infra 基础设施】文件路径url "+"号解码问题
|
2025-09-20 18:10:05 +08:00 |
|
YunaiV
|
5ca386bfac
|
fix：【framework 框架】knife4j 在改包下，Knife4jOpenApiCustomizer 无法生效
|
2025-09-20 16:01:56 +08:00 |
|
YunaiV
|
d9e729e1a8
|
fix：【framework 框架】
app-api 前缀不生效，都是使用 admin-api
|
2025-09-20 15:19:02 +08:00 |
|
YunaiV
|
f441de534b
|
fix：【bpm 工作流】流程自定义 ID 序号，无 infix 前缀时，永不过期，可见 https://t.zsxq.com/MU1E2 讨论
|
2025-09-20 12:30:18 +08:00 |
|
YunaiV
|
ef0bf372e5
|
fix：【iot 物联网】设备配置 CONFIG_PUSH 应该是下行
|
2025-09-20 12:20:08 +08:00 |
|
YunaiV
|
5573ce20db
|
fix：【iot 物联网】增强 jdk8 的兼容性
|
2025-09-20 12:17:46 +08:00 |
|
YunaiV
|
21bd03b4cd
|
fix：【iot 物联网】增强 jdk8 的兼容性
|
2025-09-20 12:09:46 +08:00 |
|
YunaiV
|
a6d9da31e8
|
fix：【framework 框架】JacksonTypeHandler 导致 String 处理问题
|
2025-09-20 11:54:01 +08:00 |
|
YunaiV
|
100bdf8230
|
fix：【ai 大模型】swagger-annotations-jakarta 依赖冲突
|
2025-09-20 11:02:39 +08:00 |
|
dylannier
|
4eae5bd09b
|
fix: 【BPM 工作流】定时边界事件固定日期和固定时长参数传反问题
|
2025-09-10 11:15:43 +08:00 |
|
山野羡民
|
3e001a3faf
|
雪花 ID 溢出问题 update yudao-module-mall/yudao-module-promotion/src/.../RewardActivityRespVO.java.
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
|
2025-09-05 03:37:46 +00:00 |
|
YunaiV
|
fd064abfbe
|
fix：【infra 基础设施】导出 excel 参数不正确的问题
|
2025-09-02 09:43:26 +08:00 |
|
YunaiV
|
a303e09ae9
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-09-01 13:14:02 +08:00 |
|
YunaiV
|
906ed512ff
|
chore: mybatis-plus from 3.5.12 to 3.5.14
fix：BaseDO 移除 jdbcType = JdbcType.VARCHAR 避免被转义
|
2025-09-01 13:13:46 +08:00 |
|
YunaiV
|
d11ffb1420
|
Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17
v2025.09(jdk17/21)
|
2025-08-31 16:05:13 +08:00 |
|
YunaiV
|
543d7275b0
|
fix：【ai 大模型】兼容 mcp server 关闭的情况
|
2025-08-31 16:05:03 +08:00 |
|
YunaiV
|
a378e9e4dc
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
v2025.09(jdk8/11)
|
2025-08-31 11:18:12 +08:00 |
|
YunaiV
|
2acb1720bc
|
(〃'▽'〃) v2025.09 发布：新增 AI 支持联网搜索、推理、文件/图片、MCP 等功能，完善 IoT 场景联动
|
2025-08-31 11:17:53 +08:00 |
|
YunaiV
|
a1ea26b84a
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2025-08-31 11:16:21 +08:00 |
|
YunaiV
|
855b131985
|
(〃'▽'〃) v2025.09 发布：新增 AI 支持联网搜索、推理、文件/图片、MCP 等功能，完善 IoT 场景联动
|
2025-08-31 11:15:51 +08:00 |
|
YunaiV
|
f7023761ec
|
【同步】jdk21 和 jdk8 的代码
|
2025-08-31 10:18:31 +08:00 |
|
YunaiV
|
269c1fdabf
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java
|
2025-08-31 10:08:12 +08:00 |
|
YunaiV
|
ecda40d300
|
fix：单测报错
|
2025-08-31 10:07:33 +08:00 |
|
YunaiV
|
efb2092261
|
feat：【framework 框架】@PermitAll、@TenantIgnore 支持接口级
|
2025-08-31 09:12:02 +08:00 |
|
YunaiV
|
f0402f69e1
|
fix：【framework 框架】修改配置会导致 TenantIgnore 注解的 controller 接口过滤失效，https://gitee.com/zhijiantianya/yudao-cloud/issues/ICUQL9
|
2025-08-30 19:59:15 +08:00 |
|
YunaiV
|
040899d8c9
|
reactor：移除 @Accessors 和 @EqualsAndHashCode 注解
|
2025-08-30 17:48:16 +08:00 |
|
YunaiV
|
a3bbfe6cca
|
feat：【IoT 物联网】新版本同步
|
2025-08-30 11:31:23 +08:00 |
|
YunaiV
|
0d70b4dd87
|
feat：【IoT 物联网】新版本同步
|
2025-08-30 11:16:26 +08:00 |
|
YunaiV
|
e86be20a8e
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/IotDeviceUpstreamApi.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDeviceConfigSetReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDeviceDownstreamAbstractReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDevicePropertyGetReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDevicePropertySetReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDeviceServiceInvokeReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceEventReportReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDevicePropertyReportReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceRegisterSubReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceStateUpdateReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceTopologyAddReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceUpstreamAbstractReqDTO.java
# yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotPluginInstanceHeartbeatReqDTO.java
# yudao-module-iot/yudao-module-iot-biz/pom.xml
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceUpstreamApiImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceLogController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/control/IotDeviceDownstreamReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/control/IotDeviceUpstreamReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDeviceLogPageReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceImportExcelVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceSaveReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/IotOtaUpgradeRecordController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/IotOtaUpgradeTaskController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareUpdateReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/record/IotOtaUpgradeRecordPageReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskPageReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/plugin/PluginConfigController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/plugin/vo/config/PluginConfigImportReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/IotDataBridgeController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/IotRuleSceneController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/databridge/IotDataBridgeSaveReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/statistics/vo/IotStatisticsReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/redis/plugin/DevicePluginProcessIdRedisDAO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/device/IotDeviceOfflineCheckJob.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/plugin/IotPluginInstancesJob.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/rule/IotRuleSceneJob.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/device/IotDeviceLogMessageConsumer.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/device/IotDeviceOnlineMessageConsumer.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/device/IotDevicePropertyMessageConsumer.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/rule/IotRuleSceneMessageHandler.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/producer/device/IotDeviceProducer.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/device/IotDeviceServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceDownstreamService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceDownstreamServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/data/IotDeviceLogServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/data/IotDevicePropertyService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaFirmwareServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeTaskService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeTaskServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/IotPluginConfigService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/IotPluginConfigServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/IotPluginInstanceServiceImpl.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/rule/IotDataBridgeService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotDataBridgeServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotRuleSceneServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneDataBridgeAction.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneDeviceControlAction.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotHttpDataSinkAction.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelServiceImpl.java
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/biz/dto/IotDeviceAuthReqDTO.java
# yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/config/IotPluginCommonAutoConfiguration.java
# yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/config/IotPluginCommonProperties.java
# yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/IotDeviceUpstreamServer.java
# yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/router/IotDeviceMqttMessageHandler.java
# yudao-server/src/main/resources/application-local.yaml
|
2025-08-30 11:02:21 +08:00 |
|
YunaiV
|
661c55cb49
|
feat：【IoT 物联网】新版本同步
|
2025-08-30 11:00:09 +08:00 |
|
YunaiV
|
37db99e20b
|
feat：【IoT 物联网】新版本同步
|
2025-08-30 10:57:10 +08:00 |
|
YunaiV
|
c4c451320d
|
Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2025-08-29 23:20:54 +08:00 |
|
YunaiV
|
32a4a99e2f
|
fix：【pay 支付】单测报错的问题
|
2025-08-29 22:59:39 +08:00 |
|
YunaiV
|
314bc12a45
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2025-08-29 22:22:17 +08:00 |
|
YunaiV
|
66c8c970ee
|
chore: update dependencies for jimureport and jimubi versions
|
2025-08-29 22:19:43 +08:00 |
|
YunaiV
|
57a9175af8
|
feat：【AI 大模型】默认 mcp 不开启，避免报错
|
2025-08-29 21:54:43 +08:00 |
|
YunaiV
|
e8b81430ca
|
reactor：优化 application 配置项的 autoconfigure
|
2025-08-29 20:49:55 +08:00 |
|
YunaiV
|
72af865804
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2025-08-29 20:40:35 +08:00 |
|
YunaiV
|
c28ca2d87f
|
review：【bpm 工作流】子流程不通过的情况
|
2025-08-29 20:40:14 +08:00 |
|
YunaiV
|
97cec236e0
|
reactor：【ai 大模型】独立 FileTypeUtils 工具类，避免 cloud 无法依赖
|
2025-08-29 20:26:42 +08:00 |
|
芋道源码
|
839085edad
|
!1415 AI 大模型最新特性
Merge pull request !1415 from 芋道源码/feature/ai
|
2025-08-29 11:25:27 +00:00 |
|
YunaiV
|
6a71622a80
|
【同步】jdk21 和 jdk8 的代码
|
2025-08-29 13:46:18 +08:00 |
|