⬆️ 依赖升级

dromara · Oct 5, 2023 · f234aeb · f234aeb
1 parent 03d1e7f
commit f234aeb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## 发行版本
 
+### v2.2.5 - 2023-10-05
+- :sparkles: mqtt 业务线程池支持自定义设置为 java21虚拟线程。
+- :sparkles: 更新 GitHub action，java17 改为 java21。
+- :sparkles: ThreadUtil 弃用（暂时未删），切换到 mica-net 中的 ThreadUtils。
+
 ### v2.2.4 - 2023-09-02
 - :sparkles: 合并去年开源之夏的服务端共享订阅和完善（捐助VIP版采用 topic 树存储，跟 topic 数无关，百万 topic 性能依旧）。
 - :sparkles: 优化 topic 检验

diff --git a/mica-mqtt-server/src/main/java/net/dreamlu/iot/mqtt/core/server/http/core/MqttWebServer.java b/mica-mqtt-server/src/main/java/net/dreamlu/iot/mqtt/core/server/http/core/MqttWebServer.java
@@ -200,9 +200,9 @@ recommend that a file or class name and description of purpose be included on
 import net.dreamlu.iot.mqtt.core.server.http.handler.MqttHttpRequestHandler;
 import net.dreamlu.iot.mqtt.core.server.http.handler.MqttHttpRoutes;
 import net.dreamlu.iot.mqtt.core.server.http.websocket.MqttWsMsgHandler;
+import org.tio.core.uuid.SeqTioUuid;
 import org.tio.http.common.HttpConfig;
 import org.tio.http.common.handler.HttpRequestHandler;
-import org.tio.core.uuid.SeqTioUuid;
 import org.tio.server.TioServer;
 import org.tio.server.TioServerConfig;
 import org.tio.server.intf.TioServerListener;
@@ -212,7 +212,7 @@ recommend that a file or class name and description of purpose be included on
 
 import java.io.IOException;
 import java.util.Objects;
-import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.ExecutorService;
 
 /**
  * mqtt web Server，集成 http 和 websocket
@@ -231,7 +231,7 @@ public MqttWebServer(MqttServerCreator serverCreator, TioServerConfig mqttServer
 		this(serverCreator, mqttServerConfig.getTioServerListener(), wsMsgHandler, mqttServerConfig.tioExecutor, mqttServerConfig.groupExecutor);
 	}
 
-	public MqttWebServer(MqttServerCreator serverCreator, TioServerListener serverAioListener, IWsMsgHandler wsMsgHandler, SynThreadPoolExecutor tioExecutor, ThreadPoolExecutor groupExecutor) {
+	public MqttWebServer(MqttServerCreator serverCreator, TioServerListener serverAioListener, IWsMsgHandler wsMsgHandler, SynThreadPoolExecutor tioExecutor, ExecutorService groupExecutor) {
 		this.httpRequestHandler = new MqttHttpRequestHandler();
 		this.httpConfig = new HttpConfig(serverCreator.getWebPort());
 		this.httpConfig.setBindIp(serverCreator.getIp());