优化 solon-server-tomcat 适配

Author: noear

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

@@ -22,6 +22,7 @@
 import org.noear.solon.core.util.IoUtil;
 import org.noear.solon.server.ServerProps;
 import org.noear.solon.server.handle.SessionProps;
+import org.noear.solon.server.prop.impl.HttpServerProps;
 import org.noear.solon.server.tomcat.http.TCHttpContextHandler;
 
 import jakarta.servlet.MultipartConfigElement;
@@ -31,6 +32,21 @@
  * @since 2019/3/28 15:49
  */
 public class TomcatServer extends TomcatServerBase {
+    protected boolean isSecure;
+    protected boolean enableWebSocket;
+
+    public boolean isSecure() {
+        return isSecure;
+    }
+
+    public void enableWebSocket(boolean enableWebSocket) {
+        this.enableWebSocket = enableWebSocket;
+    }
+
+    public TomcatServer(HttpServerProps props) {
+        super(props);
+    }
+
     @Override
     protected Context initContext() {
         String _tempdir = IoUtil.getTempDirAsString("solon-server");
@@ -68,6 +84,16 @@ protected void addConnector(int port) 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");
+
+            isSecure = true;
+        }
+
         connector.setMaxPostSize(ServerProps.request_maxBodySizeAsInt());
         connector.setMaxPartHeaderSize(ServerProps.request_maxHeaderSize);
 

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

@@ -19,14 +19,79 @@
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
 import org.noear.solon.Utils;
+import org.noear.solon.lang.Nullable;
+import org.noear.solon.server.ServerConstants;
 import org.noear.solon.server.ServerLifecycle;
+import org.noear.solon.server.http.HttpServerConfigure;
+import org.noear.solon.server.prop.impl.HttpServerProps;
+import org.noear.solon.server.ssl.SslConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLContext;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.concurrent.Executor;
 
 /**
  * @author Yukai
  * @since 2022/8/26 17:01
  **/
-public abstract class TomcatServerBase implements ServerLifecycle {
+public abstract class TomcatServerBase implements ServerLifecycle, HttpServerConfigure {
+    static final Logger log = LoggerFactory.getLogger(TomcatServerBase.class);
+
     protected Tomcat _server;
+    protected final HttpServerProps props;
+    protected SslConfig sslConfig = new SslConfig(ServerConstants.SIGNAL_HTTP);
+
+    protected Set<Integer> addHttpPorts = new LinkedHashSet<>();
+
+    protected boolean enableHttp2 = false;
+
+    public TomcatServerBase(HttpServerProps props) {
+        this.props = props;
+    }
+
+    /**
+     * 是否允许Ssl
+     */
+    @Override
+    public void enableSsl(boolean enable, @Nullable SSLContext sslContext) {
+        sslConfig.set(enable, sslContext);
+    }
+
+    @Override
+    public boolean isSupportedHttp2() {
+        return true;
+    }
+
+    @Override
+    public void enableHttp2(boolean enable) {
+        this.enableHttp2 = enable;
+    }
+
+    public boolean isEnableHttp2(){
+        return enableHttp2;
+    }
+
+    /**
+     * 添加 HttpPort（当 ssl 时，可再开个 http 端口）
+     */
+    @Override
+    public void addHttpPort(int port) {
+        addHttpPorts.add(port);
+    }
+
+    @Override
+    public void setExecutor(Executor executor) {
+        log.warn("Tomcat does not support user-defined executor");
+    }
+
+    public HttpServerProps getProps() {
+        return props;
+    }
+
+
 
     @Override
     public void start(String host, int port) throws Throwable {

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

@@ -88,10 +88,6 @@ protected void setup(String host, int port) throws Throwable {
         builder.setIoThreads(props.getCoreThreads());
         builder.setWorkerThreads(props.getMaxThreads(props.isIoBound()));
 
-        if (isEnableHttp2()) {
-            builder.setServerOption(UndertowOptions.ENABLE_HTTP2, true);
-        }
-
         if (Utils.isEmpty(host)) {
             host = "0.0.0.0";
         }
@@ -105,6 +101,10 @@ protected void setup(String host, int port) throws Throwable {
             builder.addHttpListener(port, host);
         }
 
+        if (isEnableHttp2()) {
+            builder.setServerOption(UndertowOptions.ENABLE_HTTP2, true);
+        }
+
         //http add
         for (Integer portAdd : addHttpPorts) {
             builder.addHttpListener(portAdd, host);