2.8.6

opensolon · Jul 25, 2024 · 7a05097 · 7a05097
1 parent 3bc5f11
commit 7a05097
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 15 deletions.
diff --git a/UPDATE_LOG.md b/UPDATE_LOG.md
@@ -28,6 +28,8 @@
 * 添加 solon `@Bean(initMethod, destroyMethod)` 配置属性
 * 添加 solon ActionLoaderDefault:postActionPath 方法（方便重写）
 * 添加 solon.boot `server.request.useRawpath` 配置
+* 添加 solon.boot http-server 同端口的 ws 信号注册
+* 优化 solon.boot 当有 `server.?.name` 配置时才注册 ws,sd 信号
 * 优化 solon MvcFactory:resolveParam 更名为 resolveActionParam（旧名，标为弃用）
 * 优化 solon DownloadedFile 取消空构造函数，避免内容为 null 的情况
 * 优化 solon UploadedFile::getContentSize 避免可能为 null 的情况

diff --git a/...ects/solon-boot/solon.boot.jetty/src/main/java/org/noear/solon/boot/jetty/XPluginImp.java b/...ects/solon-boot/solon.boot.jetty/src/main/java/org/noear/solon/boot/jetty/XPluginImp.java
@@ -18,9 +18,11 @@
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.noear.solon.Solon;
 import org.noear.solon.SolonApp;
+import org.noear.solon.Utils;
 import org.noear.solon.boot.ServerConstants;
 import org.noear.solon.boot.ServerProps;
 import org.noear.solon.boot.prop.impl.HttpServerProps;
+import org.noear.solon.boot.prop.impl.WebSocketServerProps;
 import org.noear.solon.core.*;
 import org.noear.solon.core.event.EventBus;
 import org.noear.solon.core.util.ClassUtil;
@@ -101,6 +103,13 @@ private void start0(SolonApp app) throws Throwable {
 
         String connectorInfo = "Connector:main: jetty: Started ServerConnector@{HTTP/1.1,[http/1.1]";
         if (app.enableWebSocket()) {
+            //有名字定义时，添加信号注册
+            WebSocketServerProps wsProps = WebSocketServerProps.getInstance();
+            if (Utils.isNotEmpty(wsProps.getName())) {
+                SignalSim wsSignal = new SignalSim(wsProps.getName(), _wrapHost, _wrapPort, "ws", SignalType.WEBSOCKET);
+                app.signalAdd(wsSignal);
+            }
+
             String wsServerUrl = props.buildWsServerUrl(_server.isSecure());
             LogUtil.global().info(connectorInfo + "[WebSocket]}{" + wsServerUrl + "}");
         }

diff --git a/...on-boot/solon.boot.smarthttp/src/main/java/org/noear/solon/boot/smarthttp/XPluginImp.java b/...on-boot/solon.boot.smarthttp/src/main/java/org/noear/solon/boot/smarthttp/XPluginImp.java
@@ -21,6 +21,7 @@
 import org.noear.solon.boot.ServerConstants;
 import org.noear.solon.boot.ServerProps;
 import org.noear.solon.boot.prop.impl.HttpServerProps;
+import org.noear.solon.boot.prop.impl.WebSocketServerProps;
 import org.noear.solon.core.*;
 import org.noear.solon.core.event.EventBus;
 import org.noear.solon.core.util.ClassUtil;
@@ -108,6 +109,13 @@ private void start0(SolonApp app) throws Throwable {
 
         String connectorInfo = "solon.connector:main: smarthttp: Started ServerConnector@{HTTP/1.1,[http/1.1]";
         if (app.enableWebSocket()) {
+            //有名字定义时，添加信号注册
+            WebSocketServerProps wsProps = WebSocketServerProps.getInstance();
+            if (Utils.isNotEmpty(wsProps.getName())) {
+                SignalSim wsSignal = new SignalSim(wsProps.getName(), _wrapHost, _wrapPort, "ws", SignalType.WEBSOCKET);
+                app.signalAdd(wsSignal);
+            }
+
             String wsServerUrl = props.buildWsServerUrl(_server.isSecure());
             LogUtil.global().info(connectorInfo + "[WebSocket]}{" + wsServerUrl + "}");
         }

diff --git a/...solon-boot/solon.boot.socketd/src/main/java/org/noear/solon/boot/socketd/XPluginImpl.java b/...solon-boot/solon.boot.socketd/src/main/java/org/noear/solon/boot/socketd/XPluginImpl.java
@@ -19,6 +19,7 @@
 import org.noear.socketd.transport.server.Server;
 import org.noear.socketd.transport.server.ServerConfigHandler;
 import org.noear.solon.Solon;
+import org.noear.solon.Utils;
 import org.noear.solon.boot.ServerConstants;
 import org.noear.solon.boot.ServerProps;
 import org.noear.solon.boot.prop.impl.SocketServerProps;
@@ -123,10 +124,13 @@ private void startServer1(Server server, SocketServerProps serverProps, int port
 
         server.start();
 
-        final String _wrapHost = serverProps.getWrapHost();
-        final int _wrapPort = serverProps.getWrapPort() + portAdd;
-        Signal _signal = new SignalSim(serverProps.getName(), _wrapHost, _wrapPort, "socketd", SignalType.SOCKET);
-        Solon.app().signalAdd(_signal);
+        if(Utils.isNotEmpty(serverProps.getName())) {
+            final String _wrapHost = serverProps.getWrapHost();
+            final int _wrapPort = serverProps.getWrapPort() + portAdd;
+            Signal _signal = new SignalSim(serverProps.getName(), _wrapHost, _wrapPort, "socketd", SignalType.SOCKET);
+
+            Solon.app().signalAdd(_signal);
+        }
 
         long time_end = System.currentTimeMillis();
 

diff --git a/...olon-boot/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/XPluginImp.java b/...olon-boot/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/XPluginImp.java
@@ -17,9 +17,11 @@
 
 import org.noear.solon.Solon;
 import org.noear.solon.SolonApp;
+import org.noear.solon.Utils;
 import org.noear.solon.boot.ServerConstants;
 import org.noear.solon.boot.ServerProps;
 import org.noear.solon.boot.prop.impl.HttpServerProps;
+import org.noear.solon.boot.prop.impl.WebSocketServerProps;
 import org.noear.solon.core.*;
 import org.noear.solon.core.event.EventBus;
 import org.noear.solon.core.util.ClassUtil;
@@ -97,6 +99,13 @@ private void start0(SolonApp app) throws Throwable {
             connectorInfo += ";HTTP/2,[http/2]";
         }
         if (app.enableWebSocket()) {
+            //有名字定义时，添加信号注册
+            WebSocketServerProps wsProps = WebSocketServerProps.getInstance();
+            if (Utils.isNotEmpty(wsProps.getName())) {
+                SignalSim wsSignal = new SignalSim(wsProps.getName(), _wrapHost, _wrapPort, "ws", SignalType.WEBSOCKET);
+                app.signalAdd(wsSignal);
+            }
+
             String wsServerUrl = props.buildWsServerUrl(_server.isSecure());
             LogUtil.global().info(connectorInfo + "[WebSocket]}{" + wsServerUrl + "}");
         }

diff --git a/....boot.websocket.netty/src/main/java/org/noear/solon/boot/websocket/netty/XPluginImpl.java b/....boot.websocket.netty/src/main/java/org/noear/solon/boot/websocket/netty/XPluginImpl.java
@@ -17,6 +17,7 @@
 
 import org.noear.solon.Solon;
 import org.noear.solon.SolonApp;
+import org.noear.solon.Utils;
 import org.noear.solon.boot.ServerConstants;
 import org.noear.solon.boot.ServerProps;
 import org.noear.solon.boot.prop.impl.WebSocketServerProps;
@@ -60,7 +61,6 @@ private void start0(SolonApp app) throws Throwable {
         WebSocketServerProps props = WebSocketServerProps.getInstance();
         final String _host = props.getHost();
         final int _port = props.getPort();
-        final String _name = props.getName();
 
         long time_start = System.currentTimeMillis();
 
@@ -71,12 +71,13 @@ private void start0(SolonApp app) throws Throwable {
 
 
         //==========
+        if (Utils.isNotEmpty(props.getName())) {
+            final String _wrapHost = props.getWrapHost();
+            final int _wrapPort = props.getWrapPort();
+            _signal = new SignalSim(props.getName(), _wrapHost, _wrapPort, "ws", SignalType.WEBSOCKET);
 
-        final String _wrapHost = props.getWrapHost();
-        final int _wrapPort = props.getWrapPort();
-        _signal = new SignalSim(_name, _wrapHost, _wrapPort, "ws", SignalType.WEBSOCKET);
-
-        app.signalAdd(_signal);
+            app.signalAdd(_signal);
+        }
 
         long time_end = System.currentTimeMillis();
 

diff --git a/...on-boot/solon.boot.websocket/src/main/java/org/noear/solon/boot/websocket/XPluginImp.java b/...on-boot/solon.boot.websocket/src/main/java/org/noear/solon/boot/websocket/XPluginImp.java
@@ -57,7 +57,6 @@ private void start0(SolonApp app) throws Throwable {
         WebSocketServerProps props = WebSocketServerProps.getInstance();
         final String _host = props.getHost();
         final int _port = props.getPort();
-        final String _name = props.getName();
 
         long time_start = System.currentTimeMillis();
 
@@ -70,11 +69,11 @@ private void start0(SolonApp app) throws Throwable {
         _server.setReuseAddr(true); //重启时，端口可立即复用
         _server.start();
 
-        final String _wrapHost = props.getWrapHost();
-        final int _wrapPort = props.getWrapPort();
-        _signal = new SignalSim(_name, _wrapHost, _wrapPort, "ws", SignalType.WEBSOCKET);
+        if (Utils.isNotEmpty(props.getName())) {
+            _signal = new SignalSim(props.getName(), props.getWrapHost(), props.getWrapPort(), "ws", SignalType.WEBSOCKET);
 
-        app.signalAdd(_signal);
+            app.signalAdd(_signal);
+        }
 
         long time_end = System.currentTimeMillis();