YunaiV
|
d3400b70d6
|
【同步】jdk21 和 jdk8 的代码（IoT）
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
|
2026-03-08 10:13:47 +08:00 |
|
YunaiV
|
7d1a33ca89
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/app/tenant/AppTenantController.java
|
2026-03-08 10:08:26 +08:00 |
|
YunaiV
|
d844f06f5c
|
fix(trade): 修复订单项价格计算逻辑,分摊比例修改成用子订单支付金额来计算
|
2026-03-08 09:54:55 +08:00 |
|
YunaiV
|
67426d72f4
|
refactor(ip): 使用 static 块优化 IPUtils 和 AreaUtils 初始化逻辑
|
2026-03-08 09:49:39 +08:00 |
|
YunaiV
|
c88f33c919
|
fix(infra): 修复文件名包含 + 号时预签名 URL 解码错误
|
2026-03-07 19:24:10 +08:00 |
|
YunaiV
|
ba6cdabe62
|
fix(bpm): 串行多实例审批使用 LinkedHashSet 保证审批人顺序
|
2026-03-07 18:01:11 +08:00 |
|
YunaiV
|
5adf07b766
|
feat: add validation for website parameter in TenantController and AppTenantController
|
2026-02-26 22:18:39 +08:00 |
|
YunaiV
|
4b0cf02206
|
【同步】jdk21 和 jdk8 的代码（IoT）
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
|
2026-02-14 16:54:20 +08:00 |
|
YunaiV
|
087868f976
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/rule/IotSceneRuleMessageSubscriber.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-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/auth/IotDeviceRegisterReqDTO.java
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/auth/IotSubDeviceRegisterReqDTO.java
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/topo/IotDeviceTopoAddReqDTO.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/config/IotGatewayProperties.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/AbstractIotProtocolDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/coap/IotCoapDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/coap/IotCoapUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/emqx/IotEmqxAuthEventProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/emqx/IotEmqxUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/http/IotHttpDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/http/IotHttpUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqtt/IotMqttDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqtt/IotMqttUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/tcp/IotTcpDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/tcp/IotTcpUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/udp/IotUdpDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/udp/IotUdpUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/websocket/IotWebSocketDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/websocket/IotWebSocketUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java
|
2026-02-14 16:36:38 +08:00 |
|
YunaiV
|
566f5a12b7
|
feat(iot): add j2mod dependency and refactor connection info method
|
2026-02-14 16:33:27 +08:00 |
|
YunaiV
|
9240e16c39
|
feat：同步最新 mysql 脚本
|
2026-02-14 16:02:33 +08:00 |
|
芋道源码
|
78bcd54e34
|
!1518 接入 modbus 协议，重构所有协议的配置
Merge pull request !1518 from 芋道源码/feature/iot
|
2026-02-14 03:19:51 +00:00 |
|
芋道源码
|
bf3b19d3fb
|
!1498 feat：【iot】modbus-tcp 协议接入：100%
Merge pull request !1498 from 芋道源码/feature/iot-modbus
|
2026-02-14 03:08:01 +00:00 |
|
芋道源码
|
ff2618bbf1
|
!1513 feat（iot）：【协议改造】http、websocket、tcp、udp、coap、mqtt 初步改造
Merge pull request !1513 from 芋道源码/feature/iot-protocol
|
2026-02-14 03:07:28 +00:00 |
|
芋道源码
|
6c2cd0ec55
|
!1516 修复master-jdk17分支的maven编译错误：AuthController.java中未import DataPermission类
Merge pull request !1516 from mcarthorlee/fix/master-jdk17-build-failure
|
2026-02-14 03:06:36 +00:00 |
|
YunaiV
|
cc9cca82cb
|
fix(iot): 修复注释和枚举描述中的错误
- IotDeviceMessage/IotDeviceMessageDO/IotDeviceMessageRespVO: thing.property.report→thing.property.post
- IotDeviceMessageMethodEnum: OTA 固定信息推送→OTA 固件信息推送
|
2026-02-14 09:31:51 +08:00 |
|
YunaiV
|
5083dab10b
|
feat(iot): 为所有消息方法补齐 Topic DTO，消除通用 Map
1. 新增 3 个 DTO：
- IotDevicePropertySetReqDTO：属性设置（下行）
- IotDeviceServiceInvokeReqDTO：服务调用（下行）
- IotDeviceConfigPushReqDTO：配置推送（下行）
2. 所有现有 DTO 的 javadoc 补充 {@link IotDeviceMessageMethodEnum#XXX} 引用
|
2026-02-14 08:56:14 +08:00 |
|
YunaiV
|
5efb578385
|
feat(iot): 为所有消息方法补齐 Topic DTO，消除通用 Map
1. 新增 3 个 DTO：
- IotDevicePropertySetReqDTO：属性设置（下行）
- IotDeviceServiceInvokeReqDTO：服务调用（下行）
- IotDeviceConfigPushReqDTO：配置推送（下行）
2. 所有现有 DTO 的 javadoc 补充 {@link IotDeviceMessageMethodEnum#XXX} 引用
|
2026-02-14 08:56:06 +08:00 |
|
YunaiV
|
f64d84bb0c
|
feat（iot）：将 IotDeviceMessage 中的 Map params 抽成 Topic DTO 对象
新增 IotDeviceStateUpdateReqDTO、IotDeviceOtaUpgradeReqDTO、IotDeviceOtaProgressReqDTO，
替换 IotDeviceMessage 和 IotOtaTaskRecordServiceImpl 中的裸 Map 构造和解析，
删除 IotDeviceMessage.buildOtaUpgrade() 方法。
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
|
2026-02-13 23:39:14 +08:00 |
|
YunaiV
|
df4849d17c
|
feat（iot）：将 IotDeviceControlSceneRuleAction 重名为 IotDevicePropertySetSceneRuleAction
|
2026-02-13 22:17:21 +08:00 |
|
YunaiV
|
fe8044c8a1
|
feat（iot）：Modbus 支持 Master/Slave 双模式，配置表单和详情按协议类型区分展示
|
2026-02-13 15:36:17 +08:00 |
|
YunaiV
|
9031c06811
|
feat(iot): 调整下包名，降低理解成本
|
2026-02-11 20:16:19 +08:00 |
|
YunaiV
|
baa779a271
|
feat(iot): 新增产品 TDengine 表结构同步接口
|
2026-02-10 13:12:12 +08:00 |
|
YunaiV
|
b800d274a4
|
feat（iot）：支持 MQTT 设备回复消息的 _reply 方法标准化，并精简上行处理器异常处理
|
2026-02-09 13:10:08 +08:00 |
|
mcarthorlee
|
b88d9a702e
|
修复maven编译错误：AuthController.java中未import DataPermission类
Signed-off-by: mcarthorlee <macarthorzhuce@126.com>
|
2026-02-09 03:54:45 +00:00 |
|
YunaiV
|
fcca74ac7d
|
feat（iot）：统一优化网关协议的资源清理逻辑，主要是 stop0
|
2026-02-09 08:02:41 +08:00 |
|
YunaiV
|
88f090b66f
|
feat（iot）：modbus-tcp-slave、modbus-tcp-master 接着大量优化，并且修复 modbus rtu 编解码的问题
|
2026-02-08 23:11:38 +08:00 |
|
YunaiV
|
4e4c776bed
|
feat（iot）：modbus-tcp-slave、modbus-tcp-master 继续优化大量代码，并对接管理后台
|
2026-02-08 20:48:24 +08:00 |
|
YunaiV
|
c608b81c4e
|
feat（iot）：modbus-tcp-slave 优化大量代码，主要是 polling 轮询的复用；
|
2026-02-08 16:34:22 +08:00 |
|
YunaiV
|
e13cd545cc
|
feat（iot）：modbus-tcp-slave 继续优化，处理各种连接的边界、轮询的间隔等
|
2026-02-08 15:54:18 +08:00 |
|
YunaiV
|
4d578b239c
|
feat（iot）：modbus-tcp-slave 整体代码进一步优化
|
2026-02-08 10:13:11 +08:00 |
|
YunaiV
|
3ab33527e3
|
feat（iot）：modbus-tcp-slave 整体代码进一步优化
|
2026-02-08 10:13:06 +08:00 |
|
YunaiV
|
346ae3ff48
|
feat（iot）：modbus-tcp-slave 优化它的 code、decode 逻辑；
|
2026-02-08 01:41:30 +08:00 |
|
YunaiV
|
a0db86848d
|
feat（iot）：1）重构 modbus tcp 连接的实现为 modbus-tcp-master；2）新增 modbus-tcp-slave【初步实现，代码准备优化】
|
2026-02-07 23:04:03 +08:00 |
|
YunaiV
|
2ef7612fc2
|
fix（system）: 修复 getPermissionInfo 因数据权限过滤导致查不到用户，登录报错
|
2026-02-07 17:42:50 +08:00 |
|
YunaiV
|
4319220750
|
feat（iot）：【协议改造】modbus-tcp：改造新的协议方式
|
2026-02-06 00:18:42 +08:00 |
|
YunaiV
|
e275cb57e9
|
Merge branch 'feature/iot-protocol' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot-modbus
# Conflicts:
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/codec/tcp/IotTcpBinaryDeviceMessageCodec.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/codec/tcp/IotTcpJsonDeviceMessageCodec.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/config/IotGatewayConfiguration.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/config/IotGatewayProperties.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/resources/application.yaml
|
2026-02-05 00:55:07 +08:00 |
|
YunaiV
|
eb9d27ae9e
|
feat（iot）：【协议改造】SSL 配置，统一使用 SslConfig 替代，更统一
|
2026-02-04 18:41:31 +08:00 |
|
YunaiV
|
a77e1780cc
|
feat（iot）：【协议改造】移除 codecType，使用 protocolType 替代
|
2026-02-04 10:00:15 +08:00 |
|
YunaiV
|
cc0d786d0f
|
feat（iot）：【协议改造】emqx 初步改造（60%）：支持 device register 设备注册
|
2026-02-03 22:29:06 +08:00 |
|
YunaiV
|
85c1b05bca
|
feat（iot）：【协议改造】emqx 初步改造（50%）：修复 Review Agent 反馈的 bug（增强稳定性）
|
2026-02-03 20:21:19 +08:00 |
|
YunaiV
|
e2b995d448
|
feat（iot）：【协议改造】emqx 初步改造（40%）：整体代码风格的优化
|
2026-02-03 19:59:53 +08:00 |
|
YunaiV
|
e41d66ff92
|
feat（iot）：【协议改造】emqx 初步改造（20%）：调整包目录
|
2026-02-03 12:50:02 +08:00 |
|
YunaiV
|
d357105d7f
|
feat（iot）：【协议改造】将 protocols 的 type 字段，改成 protocol 更好理解。
|
2026-02-03 08:34:34 +08:00 |
|
YunaiV
|
4f6ee4c5eb
|
feat（iot）：【协议改造】优化各种 code review 的代码
|
2026-02-02 22:57:06 +08:00 |
|
YunaiV
|
83990086fa
|
feat（iot）：【协议改造】设备注册，跟阿里云 iot 进一步对齐，使用 sign 替代 password 参数
|
2026-02-02 08:34:52 +08:00 |
|
YunaiV
|
9156aef4e3
|
feat（iot）：【协议改造】mqtt 初步改造（20%）
|
2026-02-01 22:50:44 +08:00 |
|
YunaiV
|
1e2dc281e3
|
feat（iot）：【协议改造】mqtt 初步改造（20%）
|
2026-02-01 20:56:56 +08:00 |
|
YunaiV
|
3a26b2e39f
|
feat：【iot】合并最新 protocol 最新代码
|
2026-02-01 19:33:47 +08:00 |
|
YunaiV
|
fa159b4bef
|
Merge branch 'feature/iot-protocol' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot-modbus
# Conflicts:
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/biz/IotDeviceCommonApi.java
# yudao-module-iot/yudao-module-iot-gateway/pom.xml
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/config/IotGatewayConfiguration.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/config/IotGatewayProperties.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/resources/application.yaml
# yudao-module-iot/yudao-module-iot-gateway/src/test/resources/tcp-binary-packet-examples.md
# yudao-module-iot/yudao-module-iot-gateway/src/test/resources/tcp-json-packet-examples.md
|
2026-02-01 19:30:54 +08:00 |
|