From d50631575ab11402968df453442a1cb6db88281d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 11 Jun 2026 14:48:47 +0800 Subject: [PATCH] update springboot 4.1.0 update springdoc 3.0.3 update fesod 2.0.2 update hutool 5.8.46 update redisson 4.5.0 update mica-mqtt 2.6.5 --- pom.xml | 14 +++++++------- ruoyi-admin/src/main/resources/application.yml | 4 ++-- .../common/mqtt/config/MqttAutoConfiguration.java | 6 +++--- .../mqtt/listener/MqttClientConnectListener.java | 2 +- .../listener/MqttClientGlobalMessageListener.java | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 12a4d4d9f..72fd25be9 100644 --- a/pom.xml +++ b/pom.xml @@ -14,22 +14,22 @@ 5.5.3 - 4.0.6 + 4.1.0 UTF-8 UTF-8 21 3.5.19 - 3.0.2 + 3.0.3 0.15.0 - 2.0.1-incubating + 2.0.2-incubating 2.4.1 1.45.0 3.5.16 1.5.6 3.9.1 - 5.8.44 + 5.8.46 4.0.4 - 4.4.0 + 4.5.0 2.2.7 4.5.0 2.0.0 @@ -52,7 +52,7 @@ 1.8.7 - 2.5.12 + 2.6.5 3.0.2 7.17.28 @@ -66,7 +66,7 @@ 1.7.3 - true + true diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 46e66ff5c..01963ea80 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -263,8 +263,8 @@ mqtt.client: timeout: 5 # 重连时间,默认 5000 毫秒 re-interval: 5000 - # mqtt 协议版本,可选 MQTT_3_1、mqtt_3_1_1、mqtt_5,默认:mqtt_3_1_1 - version: mqtt_3_1_1 + # mqtt 协议版本,可选 MQTT_3_1、mqtt_3_1_1、mqtt_5,默认:mqtt_5 + version: mqtt_5 # 接收数据的 buffer size,默认:8k read-buffer-size: 8KB # 消息解析最大 bytes 长度,默认:10M diff --git a/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/config/MqttAutoConfiguration.java b/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/config/MqttAutoConfiguration.java index b59878c76..aa878b88f 100644 --- a/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/config/MqttAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/config/MqttAutoConfiguration.java @@ -1,5 +1,8 @@ package org.dromara.common.mqtt.config; +import net.dreamlu.mica.net.utils.thread.ThreadUtils; +import net.dreamlu.mica.net.utils.thread.pool.SynThreadPoolExecutor; +import net.dreamlu.mica.net.utils.thread.pool.TioCallerRunsPolicy; import org.dromara.common.mqtt.listener.MqttClientConnectListener; import org.dromara.common.mqtt.listener.MqttClientGlobalMessageListener; import org.dromara.mica.mqtt.core.client.MqttClientCreator; @@ -8,9 +11,6 @@ import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.core.task.VirtualThreadTaskExecutor; -import org.tio.utils.thread.ThreadUtils; -import org.tio.utils.thread.pool.SynThreadPoolExecutor; -import org.tio.utils.thread.pool.TioCallerRunsPolicy; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadFactory; diff --git a/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/listener/MqttClientConnectListener.java b/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/listener/MqttClientConnectListener.java index 35afe485e..3548e1503 100644 --- a/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/listener/MqttClientConnectListener.java +++ b/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/listener/MqttClientConnectListener.java @@ -1,9 +1,9 @@ package org.dromara.common.mqtt.listener; import lombok.extern.slf4j.Slf4j; +import net.dreamlu.mica.net.core.ChannelContext; import org.dromara.mica.mqtt.core.client.IMqttClientConnectListener; import org.dromara.mica.mqtt.core.client.MqttClientCreator; -import org.tio.core.ChannelContext; /** * 客户端连接状态监听 diff --git a/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/listener/MqttClientGlobalMessageListener.java b/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/listener/MqttClientGlobalMessageListener.java index 0c76a343b..defc1946c 100644 --- a/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/listener/MqttClientGlobalMessageListener.java +++ b/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/listener/MqttClientGlobalMessageListener.java @@ -1,9 +1,9 @@ package org.dromara.common.mqtt.listener; import lombok.extern.slf4j.Slf4j; +import net.dreamlu.mica.net.core.ChannelContext; import org.dromara.mica.mqtt.codec.message.MqttPublishMessage; import org.dromara.mica.mqtt.core.client.IMqttClientGlobalMessageListener; -import org.tio.core.ChannelContext; import java.nio.charset.StandardCharsets;