3.7.3

Author: noear

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

@@ -44,7 +44,6 @@
  */
 public class TomcatServer extends TomcatServerBase {
     protected boolean isSecure;
-    protected boolean enableWebSocket;
 
     public boolean isSecure() {
         return isSecure;

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

@@ -49,6 +49,7 @@ public abstract class TomcatServerBase implements ServerLifecycle, HttpServerCon
 
     protected Set<Integer> addHttpPorts = new LinkedHashSet<>();
 
+    protected boolean enableWebSocket;
     protected boolean enableHttp2 = false;
 
     public TomcatServerBase(HttpServerProps props) {
@@ -115,9 +116,9 @@ public void start(String host, int port) throws Throwable {
         }
 
         _server.start();
-        
-        if(TcWebSocketManager.isEnableWebSocket()) {
-        	TcWebSocketManager.registerEndpoints(_context);        	
+
+        if(enableWebSocket) {
+            TcWebSocketManager.registerEndpoints(_context);
         }
     }
 

solon-projects/solon-server/solon-server-tomcat/src/main/java/org/noear/solon/server/tomcat/websocket/TcWebSocketManager.java

@@ -34,10 +34,10 @@
  */
 public class TcWebSocketManager {
     private static final Logger log = LoggerFactory.getLogger(TcWebSocketManager.class);
-    private static boolean enableWebSocket = false;
-    
-    private TcWebSocketManager() {}
-    
+
+    private TcWebSocketManager() {
+    }
+
     /**
      * 在Tomcat上下文中初始化WebSocket支持
      * 注意：此方法需要在上下文初始化之前调用
@@ -47,17 +47,16 @@ public static void init(Context context) {
             log.error("Tomcat Context is null, cannot initialize WebSocket");
             return;
         }
-        
+
         try {
             // 注册WebSocket容器初始化器
             context.addServletContainerInitializer(new WsSci(), null);
-            enableWebSocket = true;
             log.info("Tomcat WebSocket initialized");
         } catch (Exception e) {
             log.error("Failed to initialize Tomcat WebSocket", e);
         }
     }
-    
+
     /**
      * 注册WebSocket端点
      * 注意：此方法需要在服务器启动后调用
@@ -67,12 +66,12 @@ public static void registerEndpoints(Context context) {
             log.error("Tomcat Context is null, cannot register WebSocket endpoints");
             return;
         }
-        
+
         try {
             // 获取ServerContainer
             ServerContainer serverContainer = (ServerContainer) context.getServletContext()
                     .getAttribute("javax.websocket.server.ServerContainer");
-            
+
             if (serverContainer == null) {
                 log.error("Tomcat Context Missing javax.websocket.server.ServerContainer");
                 return;
@@ -88,7 +87,7 @@ public static void registerEndpoints(Context context) {
                             .create(TcWebSocketEndpoint.class, path)
                             .configurator(new TcWebSocketConfigurator())
                             .build();
-                    
+
                     serverContainer.addEndpoint(endpointConfig);
                     log.info("Tomcat Registered WebSocket endpoint: {}", path);
                 }
@@ -97,23 +96,4 @@ public static void registerEndpoints(Context context) {
             log.error("Failed to register Tomcat WebSocket endpoints", e);
         }
     }
-
-    /**
-     * 检查WebSocket是否已启用
-     */
-    public static boolean isEnableWebSocket() {
-        return enableWebSocket;
-    }
-    
-    /**
-     * 获取WebSocket容器
-     */
-//    public static ServerContainer getServerContainer(Context context) {
-//        if (context == null) {
-//            return null;
-//        }
-//        
-//        return (ServerContainer) context.getServletContext()
-//                .getAttribute("javax.websocket.server.ServerContainer");
-//    }
 }