优化 solon-server-tomcat 适配

Author: noear

solon-jakarta-projects/solon-server/solon-server-tomcat-jakarta/src/main/java/org/noear/solon/server/tomcat/TomcatServer.java

@@ -80,18 +80,20 @@ protected Context initContext() {
     }
 
     @Override
-    protected void addConnector(int port) throws Throwable {
+    protected void addConnector(int port, boolean isMain) throws Throwable {
         Connector connector = new Connector("HTTP/1.1");
 
         connector.setPort(port);
 
-        //for ssl
-        if(sslConfig.isSslEnable()) {
-            // 1. 标识 ssl
-            connector.setSecure(true);
-            connector.setScheme("https");
+        if (isMain) {
+            //for ssl
+            if (sslConfig.isSslEnable()) {
+                // 1. 标识 ssl
+                connector.setSecure(true);
+                connector.setScheme("https");
 
-            isSecure = true;
+                isSecure = true;
+            }
         }
 
         connector.setMaxPostSize(ServerProps.request_maxBodySizeAsInt());

solon-jakarta-projects/solon-server/solon-server-tomcat-jakarta/src/main/java/org/noear/solon/server/tomcat/TomcatServerBase.java

@@ -105,7 +105,12 @@ public void start(String host, int port) throws Throwable {
         initContext();
 
         //添加连接端口
-        addConnector(port);
+        addConnector(port, true);
+
+        //http add
+        for (Integer portAdd : addHttpPorts) {
+            addConnector(portAdd, false);
+        }
 
         _server.start();
     }
@@ -121,5 +126,5 @@ public void stop() throws Throwable {
 
     protected abstract Context initContext() throws Throwable;
 
-    protected abstract void addConnector(int port) throws Throwable;
+    protected abstract void addConnector(int port, boolean isMain) throws Throwable;
 }

solon-jakarta-projects/solon-server/solon-server-tomcat-jakarta/src/main/java/org/noear/solon/server/tomcat/integration/TomcatPlugin.java

@@ -17,14 +17,14 @@
 
 import org.apache.catalina.util.ServerInfo;
 import org.noear.solon.Solon;
-import org.noear.solon.SolonApp;
+import org.noear.solon.Utils;
+import org.noear.solon.core.event.EventBus;
 import org.noear.solon.server.ServerConstants;
-import org.noear.solon.server.ServerLifecycle;
 import org.noear.solon.server.ServerProps;
 import org.noear.solon.server.prop.impl.HttpServerProps;
 import org.noear.solon.core.*;
-import org.noear.solon.core.util.ClassUtil;
 
+import org.noear.solon.server.prop.impl.WebSocketServerProps;
 import org.noear.solon.server.tomcat.TomcatServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,7 +42,7 @@ public static Signal signal() {
         return _signal;
     }
 
-    private ServerLifecycle _server = null;
+    private TomcatServer _server = null;
 
     public static String solon_server_ver() {
     	return ServerInfo.getServerInfo() + "/" + Solon.version();
@@ -62,42 +62,53 @@ public void start(AppContext context) {
         });
 
         context.lifecycle(ServerConstants.SIGNAL_LIFECYCLE_INDEX, () -> {
-            start0(Solon.app());
+            start0(context);
         });
     }
 
-    private void start0(SolonApp app) throws Throwable {
+    private void start0(AppContext context) throws Throwable {
         //初始化属性
         ServerProps.init();
 
-        Class<?> jspClz = ClassUtil.loadClass("org.apache.jasper.servlet.JspServlet");
+        long time_start = System.currentTimeMillis();
 
-        HttpServerProps props = HttpServerProps.getInstance();
+        HttpServerProps props = new HttpServerProps();
         final String _host = props.getHost();
         final int _port = props.getPort();
         final String _name = props.getName();
 
-        _server = new TomcatServer();
-
-        long time_start = System.currentTimeMillis();
+        _server = new TomcatServer(props);
+        _server.enableWebSocket(context.app().enableWebSocket());
 
+        EventBus.publish(_server);
         _server.start(_host, _port);
 
+
         final String _wrapHost = props.getWrapHost();
         final int _wrapPort = props.getWrapPort();
         _signal = new SignalSim(_name, _wrapHost, _wrapPort, "http", SignalType.HTTP);
 
-        app.signalAdd(_signal);
+        context.app().signalAdd(_signal);
 
         long time_end = System.currentTimeMillis();
 
-        String connectorInfo = "solon.connector:main: tomcat: Started ServerConnector@{HTTP/1.1,[http/1.1]";
-        if (app.enableWebSocket()) {
-            String wsServerUrl = props.buildWsServerUrl(false);
+        String connectorInfo = "Connector:main: tomcat: Started ServerConnector@{HTTP/1.1,[http/1.1]";
+        if (_server.isSecure() && _server.isEnableHttp2()) {
+            connectorInfo += ";HTTP/2,[http/2]";
+        }
+        if (context.app().enableWebSocket()) {
+            //有名字定义时，添加信号注册
+            WebSocketServerProps wsProps = WebSocketServerProps.getInstance();
+            if (Utils.isNotEmpty(wsProps.getName())) {
+                SignalSim wsSignal = new SignalSim(wsProps.getName(), _wrapHost, _wrapPort, "ws", SignalType.WEBSOCKET);
+                context.app().signalAdd(wsSignal);
+            }
+
+            String wsServerUrl = props.buildWsServerUrl(_server.isSecure());
             log.info(connectorInfo + "[WebSocket]}{" + wsServerUrl + "}");
         }
 
-        String httpServerUrl = props.buildHttpServerUrl(false);
+        String httpServerUrl = props.buildHttpServerUrl(_server.isSecure());
         log.info(connectorInfo + "}{" + httpServerUrl + "}");
         log.info("Server:main: tomcat: Started (" + solon_server_ver() + ") @" + (time_end - time_start) + "ms");
     }

solon-jakarta-projects/solon-server/solon-server-undertow-jakarta/src/main/java/org/noear/solon/server/undertow/integration/UndertowPlugin.java

@@ -78,7 +78,6 @@ private void start0(AppContext context) throws Throwable {
         //初始化属性
         ServerProps.init();
 
-
         long time_start = System.currentTimeMillis();
 
         HttpServerProps props = new HttpServerProps();