YunaiV
|
9392da82b2
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# 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/controller/admin/device/vo/device/IotDeviceImportExcelVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.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/message/IotDeviceMessageService.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/rule/data/action/IotWebSocketDataRuleAction.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/websocket/IotWebSocketClient.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.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-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqttws/IotMqttWsDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqttws/IotMqttWsUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java
|
2026-01-29 22:17:13 +08:00 |
|
YunaiV
|
edc460a2b9
|
fix(iot):禁用 iot 不通过的单测,避免影响编译
|
2026-01-29 22:08:09 +08:00 |
|
芋道源码
|
e4bcb2fa37
|
!1510 feat(BPM): AsyncTaskExecutor 如果不创建,会导致项目启动时,Flowable 报错的问题
Merge pull request !1510 from puhui999/master-jdk17
|
2026-01-29 11:47:37 +00:00 |
|
芋道源码
|
e5d9d97096
|
!1511 modify(mall): 自提订单核销校验订单是否是待核销状态
Merge pull request !1511 from Jarrett/pick-up-verification
|
2026-01-29 11:44:41 +00:00 |
|
芋道源码
|
8957e94159
|
!1512 feat(mybatis): 扩展 MPJLambdaWrapperX 查询功能- 重写 orderByAsc 方法支持升序排序功能
Merge pull request !1512 from Manumiter/master-jdk17
|
2026-01-29 11:40:32 +00:00 |
|
YunaiV
|
fcfeb49209
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2026-01-29 19:27:52 +08:00 |
|
芋道源码
|
e46c0f3421
|
!1506 iot:最新的 tcp、udp、coap、mqtt、emqx 等同步
Merge pull request !1506 from 芋道源码/feature/iot
|
2026-01-29 11:27:36 +00:00 |
|
manumiter
|
3819ed1cf9
|
feat(mybatis): 扩展 MPJLambdaWrapperX 查询功能- 重写 orderByAsc 方法支持升序排序功能
|
2026-01-28 09:33:44 +08:00 |
|
Jarrett
|
7580b8cf28
|
modify(mall): 自提订单核销校验订单是否是待核销状态
|
2026-01-28 08:59:50 +08:00 |
|
YunaiV
|
d01a6e2158
|
fix(iot): 修复多协议处理器的空值校验和错误码问题
1. HTTP: 增加请求体空值保护,避免 NPE 导致 500
2. HTTP: 修复 Vertx 资源泄漏,改为 Spring 管理生命周期
3. UDP/MQTT/WS/TCP: 增加动态注册参数必填字段校验
4. EMQX: 事件接口解析失败时返回空响应体,符合 Webhook 规范
5. CoAP: method 不匹配返回 4.00 而非 5.00
|
2026-01-28 00:39:31 +08:00 |
|
YunaiV
|
867ec8c070
|
feat(iot): 更新 WebSocket 编解码器为 Alink,实现更标准的协议支持
|
2026-01-27 23:42:09 +08:00 |
|
YunaiV
|
0072482af8
|
feat(iot): 完善 WebSocket 协议实现,优化代码质量
1. 配置属性校验完善
- CoAP 配置添加 @NotNull 校验注解,替换 TODO 注释
2. WebSocket 协议核心优化
- ConnectionInfo 新增 codecType 字段,支持动态编解码类型
- 上行/下行处理器根据连接的 codecType 进行消息编解码
- 使用 StrUtil.utf8Str/utf8Bytes 替换 StandardCharsets 硬编码
3. 包注释完善
- http/tcp package-info.java 添加规范的包级注释
4. 单元测试重构
- 使用 WebSocketClient.connect() 替换废弃的 HttpClient.webSocket()
- 提取公共方法,简化测试代码结构
|
2026-01-27 21:09:00 +08:00 |
|
YunaiV
|
610ae6d532
|
feat:【iot】优化 gateway 整体代码风格(空行)等
|
2026-01-27 20:21:10 +08:00 |
|
YunaiV
|
432e1ed230
|
feat:【iot】单元测试:优化单测质量(格式)
|
2026-01-27 20:03:51 +08:00 |
|
puhui999
|
8da6ca04a8
|
feat(BPM): AsyncTaskExecutor 如果不创建,会导致项目启动时,Flowable 报错的问题
|
2026-01-27 18:55:12 +08:00 |
|
YunaiV
|
d2c000d64d
|
feat:【iot】websocket 协议:初始化
|
2026-01-27 09:58:07 +08:00 |
|
YunaiV
|
b87bc19116
|
feat:【iot】移除不再使用的 MQTT WebSocket 协议配置类(实现不够标准,使用 MQTT 即可)
|
2026-01-27 08:43:03 +08:00 |
|
YunaiV
|
1b4ac9fb24
|
feat:【iot】MQTT 协议:1)增加 gateway 相关的单测
feat:【iot】统一几个协议的单测风格
|
2026-01-27 00:05:07 +08:00 |
|
YunaiV
|
99bcd252a3
|
feat:【iot】MQTT 协议:1)增加 register 接口
feat:【iot】TCP/UDP 协议:统一 register 返回数据的格式
|
2026-01-26 23:51:28 +08:00 |
|
YunaiV
|
70135174e5
|
feat:【iot】MQTT 协议:1)增加 IotDirectDeviceMqttProtocolIntegrationTest 单测案例
|
2026-01-26 23:03:02 +08:00 |
|
YunaiV
|
63d7bfe2d2
|
feat:【iot】TCP 协议:1)增加 register 协议;2)增加 gateway 相关的单测
|
2026-01-26 21:39:59 +08:00 |
|
YunaiV
|
de1a53a5f1
|
feat:【iot】UDP 协议:兼容下行的时候,基于连接的 codec 处理
|
2026-01-26 21:16:43 +08:00 |
|
YunaiV
|
4003f4b028
|
feat:【iot】TCP 协议:1)合并单测,通过 codec 切换;2)兼容下行的时候,基于连接的 codec 处理
|
2026-01-26 19:20:05 +08:00 |
|
YunaiV
|
b0ab37cc01
|
feat:【iot】TCP 协议:增加 2 套单测(暂未完善,等本周补充完)
|
2026-01-26 13:23:46 +08:00 |
|
YunaiV
|
136da4eb50
|
feat:【iot】COAP 协议:增加 3 个单测
|
2026-01-26 12:44:03 +08:00 |
|
YunaiV
|
572a3d1051
|
feat:【iot】COAP 协议:合并最新代码和冲突
|
2026-01-25 22:47:01 +08:00 |
|
YunaiV
|
91dcd9223a
|
Merge branch 'feature/iot-coap' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
# yudao-dependencies/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
|
2026-01-25 22:45:35 +08:00 |
|
YunaiV
|
7ac6c02e76
|
feat:【iot】UDP 协议:1)兼容 TOKEN 在 list 的情况,基于 token、body 拆分;2)新增网关设备的单测;3)去掉 udp 默认响应,避免响应多次。
|
2026-01-25 22:38:56 +08:00 |
|
YunaiV
|
9be7d6fac0
|
review(iot):【场景联动】增加相关的 review 说明
|
2026-01-25 21:57:22 +08:00 |
|
芋道源码
|
f3878c3056
|
!1505 perf(iot):【场景联动】优化
Merge pull request !1505 from puhui999/feature/iot
|
2026-01-25 13:39:03 +00:00 |
|
YunaiV
|
f8ebdbdd76
|
fix:【mall】移除 firstFixedPrice 的校验,对应 https://t.zsxq.com/zIbji
|
2026-01-25 21:24:26 +08:00 |
|
YunaiV
|
b29c5f0e40
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2026-01-25 21:06:53 +08:00 |
|
YunaiV
|
fa1e527db3
|
239 AuthLoginReqVO同步AuthRegisterReqVO、TenantSaveReqVO、UserSaveReqVO的username验证
|
2026-01-25 20:59:29 +08:00 |
|
YunaiV
|
1233921b86
|
fix:【system】refreshAccessToken 时,抛出 UNAUTHORIZED 导致回滚,对应 https://gitee.com/zhijiantianya/yudao-cloud/issues/IDL4OW
|
2026-01-25 20:56:55 +08:00 |
|
YunaiV
|
0c0a6ae40a
|
feat:【bpm】删除AsyncListenableTaskExecutor配置
|
2026-01-25 20:51:26 +08:00 |
|
芋道源码
|
7ce2a19ea5
|
Merge pull request #1062 from xuyunan/master-jdk17
fix: 屏蔽解析器覆写, 避免解析 ${coll_userList} 变量报错 (#1061)
|
2026-01-25 20:30:41 +08:00 |
|
YunaiV
|
4b67fc2d65
|
feat(iot):tcp 协议完善 IotDirectDeviceUdpProtocolIntegrationTest 单测,并支持动态注册
|
2026-01-25 20:28:42 +08:00 |
|
芋道源码
|
eb5fa9fd91
|
!1500 feat:【iot】udp 协议 100%:完善注释、完善单测
Merge pull request !1500 from 芋道源码/feature/iot-udp
|
2026-01-25 10:53:21 +00:00 |
|
芋道源码
|
8a2c38a026
|
!1504 feat(iot):【网关设备】
Merge pull request !1504 from 芋道源码/feature/iot-sub
|
2026-01-25 10:52:16 +00:00 |
|
puhui999
|
7ec541e5bb
|
perf(iot):【场景联动】WebSocket 重连锁从 Redisson 分布式锁改为 ReentrantLock 单机锁
|
2026-01-25 18:24:43 +08:00 |
|
puhui999
|
6c971631b0
|
Merge remote-tracking branch 'origin/feature/iot' into feature/iot
|
2026-01-25 17:45:56 +08:00 |
|
puhui999
|
4901912ece
|
feat(iot):【场景联动】定时触发,增加条件组
|
2026-01-25 17:30:16 +08:00 |
|
YunaiV
|
e013b1add4
|
feat(iot):【网关设备:80%】动态注册的初步实现(已测试)
|
2026-01-25 16:58:00 +08:00 |
|
YunaiV
|
b4ce72ea7d
|
feat(iot):【网关设备:72%】动态注册的初步实现(未测试、额外优化代码),基于 stateful-sauteeing-pillow.md 规划
|
2026-01-25 12:58:17 +08:00 |
|
YunaiV
|
38a21ad59c
|
feat(iot):【网关设备:70%】动态注册的初步实现(未测试),基于 stateful-sauteeing-pillow.md 规划
|
2026-01-25 11:16:07 +08:00 |
|
YunaiV
|
1309be39c3
|
feat(iot):【网关设备:80%】整体流程跑通,并增加 IotGatewayDeviceHttpProtocolIntegrationTest、IotGatewaySubDeviceHttpProtocolIntegrationTest 单测
|
2026-01-24 23:00:05 +08:00 |
|
YunaiV
|
679b696abe
|
feat(iot):HTTP 协议增加 IotDirectDeviceHttpProtocolIntegrationTest 测试类
|
2026-01-24 21:06:03 +08:00 |
|
YunaiV
|
268a2ad4cf
|
feat(iot):【网关设备:68%】整体初步实现(修复少量 review agent 发现的缺陷)
|
2026-01-24 19:31:47 +08:00 |
|
YunaiV
|
05eb745f2a
|
feat(iot):【网关设备:67%】整体初步实现(优化部分代码)
|
2026-01-24 19:14:34 +08:00 |
|
YunaiV
|
bfbc352a1c
|
feat(iot):【网关设备:65%】整体初步实现(优化部分代码)
|
2026-01-24 13:12:37 +08:00 |
|