YunaiV
|
4dabfea1df
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2026-05-04 10:27:30 +08:00 |
YunaiV
|
11a6a049fd
|
fix(IotDeviceMessageUtils): skip JDK built-in types in reflection to avoid internal field access
|
2026-05-04 10:27:09 +08:00 |
YunaiV
|
d545eb5631
|
【同步】BOOT 和 CLOUD 的功能(MES)
|
2026-05-04 10:08:04 +08:00 |
YunaiV
|
6780ed6879
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/alert/IotAlertRecordService.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/alert/IotAlertRecordServiceImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotAlertTriggerSceneRuleAction.java
|
2026-05-03 23:48:55 +08:00 |
YunaiV
|
d07426e43f
|
refactor(tests): replace JSON params with MapUtil for better readability in IOT tests
|
2026-05-03 23:47:40 +08:00 |
YunaiV
|
996ac02c0b
|
【同步】BOOT 和 CLOUD 的功能(iot)
|
2026-05-03 23:25:40 +08:00 |
YunaiV
|
e3a34d9067
|
【同步】BOOT 和 CLOUD 的功能
|
2026-05-03 23:13:12 +08:00 |
YunaiV
|
116b6766b3
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java
|
2026-05-03 23:03:42 +08:00 |
YunaiV
|
e1b3589bff
|
fix: 修正Lock4j配置中的超时时间注释
|
2026-05-03 20:46:37 +08:00 |
YunaiV
|
c3125dbc92
|
【修复】IoT 网关调用 biz 的设备注册 / 子设备注册 RPC URL 缺前缀,导致动态注册失败
|
2026-05-02 09:45:20 +08:00 |
YunaiV
|
9ffec01fa0
|
refactor(iot): update import paths for IotDeviceStateEnum to reflect new package structure
|
2026-03-28 16:17:16 +08:00 |
YunaiV
|
3f599a623a
|
【同步】BOOT 和 CLOUD 的功能
|
2026-03-08 10:18:09 +08:00 |
YunaiV
|
1fca0acc92
|
【同步】BOOT 和 CLOUD 的功能(IoT)
|
2026-02-14 16:52:20 +08:00 |
YunaiV
|
6ca2c97849
|
【同步】BOOT 和 CLOUD 的功能(IoT)
|
2026-02-14 16:41:18 +08:00 |
YunaiV
|
71393eed21
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/config/IotMessageBusProperties.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
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/rule/IotSceneRuleMessageSubscriber.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java
|
2026-02-14 16:36:52 +08:00 |
YunaiV
|
92eda45afd
|
【同步】BOOT 和 CLOUD 的功能(IoT)
|
2026-02-14 16:35:48 +08:00 |
YunaiV
|
5a0d95e493
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2026-01-29 22:39:15 +08:00 |
YunaiV
|
456c96df16
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-29 22:38:05 +08:00 |
YunaiV
|
560636ed50
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-29 22:36:17 +08:00 |
YunaiV
|
8fd3173670
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-29 22:29:41 +08:00 |
YunaiV
|
c57d3a65f9
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# 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
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceImportExcelVO.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/message/IotDeviceMessageService.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotWebSocketDataRuleAction.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/websocket/IotWebSocketClient.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
|
2026-01-29 22:25:16 +08:00 |
YunaiV
|
fa72dc4e59
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-29 22:14:05 +08:00 |
YunaiV
|
99ffe0fd41
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-18 19:19:42 +08:00 |
YunaiV
|
e10be5160b
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
# yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
|
2026-01-18 19:04:00 +08:00 |
YunaiV
|
17a1af1069
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-18 19:03:30 +08:00 |
YunaiV
|
304b2f102a
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-18 19:01:29 +08:00 |
YunaiV
|
e60f5496fa
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2025-12-27 10:29:58 +08:00 |
YunaiV
|
be65f9cf97
|
feat:【infra】spring boot admin 默认需要登录
|
2025-12-27 10:29:42 +08:00 |
YunaiV
|
d369c8210c
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-mp/yudao-module-mp-server/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/user/vo/MpUserPageReqVO.java
|
2025-11-26 18:34:57 +08:00 |
YunaiV
|
8becb49a3b
|
【同步】BOOT 和 CLOUD 的功能
|
2025-11-25 12:58:25 +08:00 |
YunaiV
|
6c295f8782
|
fix:【iot】spring redis 配置多了 data 层,修复 https://t.zsxq.com/51v5n
|
2025-11-24 19:25:28 +08:00 |
YunaiV
|
a483d57eca
|
feat:【iot】tdengine 调整成 WS 以支持 decimal 字段
|
2025-11-24 19:21:58 +08:00 |
YunaiV
|
a1c07f1924
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2025-11-24 18:24:19 +08:00 |
YunaiV
|
5dc81ab895
|
fix:【iot】单测报错的问题
|
2025-11-24 18:24:10 +08:00 |
YunaiV
|
9858d5e42a
|
fix:iot-gateway-server 的 spring-boot-maven-plugin 缺少版本号,对应 https://gitee.com/zhijiantianya/yudao-cloud/issues/ID5LU4
|
2025-11-24 18:04:28 +08:00 |
YunaiV
|
45158ab898
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2025-11-24 16:59:44 +08:00 |
YunaiV
|
e286630fdd
|
chore:依赖升级最新版本
|
2025-11-24 16:56:55 +08:00 |
YunaiV
|
4f1de29748
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/api/event/CrmContractStatusListener.java
# yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/api/event/CrmReceivableStatusListener.java
|
2025-11-24 11:26:03 +08:00 |
YunaiV
|
69e595d62e
|
【同步】BOOT 和 CLOUD 的功能
|
2025-11-23 09:07:03 +08:00 |
芋道源码
|
d64f4e9343
|
!211 修改iot中xxljob任务名称重复导致服务启动报错
Merge pull request !211 from huppygo/master-jdk17
|
2025-10-19 10:36:05 +00:00 |
YunaiV
|
517fb22ecc
|
【同步】BOOT 和 CLOUD 的功能
|
2025-10-12 15:19:36 +08:00 |
YunaiV
|
909890f68c
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2025-10-12 15:13:11 +08:00 |
YunaiV
|
1d41aa37c8
|
【同步】BOOT 和 CLOUD 的功能
|
2025-10-12 15:11:45 +08:00 |
huppygo
|
1618213494
|
修改iot中xxljob任务名称重复导致服务启动报错
Signed-off-by: huppygo <huppygo@qq.com>
|
2025-10-11 01:44:54 +00:00 |
YunaiV
|
bf7bd49dd2
|
【同步】BOOT 和 CLOUD 的功能
|
2025-10-02 18:51:44 +08:00 |
YunaiV
|
bf0c7dadc7
|
【同步】BOOT 和 CLOUD 的功能
|
2025-10-02 18:51:27 +08:00 |
YunaiV
|
25ebe6edef
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2025-10-02 17:59:00 +08:00 |
YunaiV
|
cd685e2304
|
【同步】BOOT 和 CLOUD 的功能
|
2025-10-02 17:58:54 +08:00 |
YunaiV
|
4f7a61d8d8
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2025-10-02 17:57:47 +08:00 |
YunaiV
|
186bb144c9
|
【同步】BOOT 和 CLOUD 的功能
|
2025-10-02 17:57:40 +08:00 |