From 2597f0251735d7e471b065fe5c27d87ebaea5a10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Thu, 4 Dec 2025 16:32:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tuoheng/gateway/config/GatewayConfig.java | 33 ++++++++++---------
 src/main/resources/application.yml            |  3 +-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/tuoheng/gateway/config/GatewayConfig.java b/src/main/java/com/tuoheng/gateway/config/GatewayConfig.java
index a641ed2..241dc6f 100644
--- a/src/main/java/com/tuoheng/gateway/config/GatewayConfig.java
+++ b/src/main/java/com/tuoheng/gateway/config/GatewayConfig.java
@@ -9,6 +9,8 @@ import org.springframework.context.annotation.Configuration;
 /**
  * Gateway 路由配置
  * 配置 WebSocket 转发规则
+ *
+ * 注意：路由配置已移至 application.yml，此 Java 配置已禁用以避免冲突
  */
 @Slf4j
 @Configuration
@@ -16,20 +18,21 @@ public class GatewayConfig {
 
     /**
      * 配置路由规则
-     * 将 /ws/api/** 转发到 ws://iot.t-aaron.com:18080/api/**
+     * 将 /api/ws/** 转发到 ws://iot.t-aaron.com:18080/api/ws/**
+     *
+     * 此配置已注释，使用 application.yml 中的配置
      */
-    @Bean
-    public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
-        return builder.routes()
-                .route("websocket-route", r -> r
-                        .path("/ws/api/**")
-                        .filters(f -> f
-                                .stripPrefix(1)  // 移除 /ws 前缀
-                                .filter(new com.tuoheng.gateway.filter.WebSocketFilter().apply(
-                                        new com.tuoheng.gateway.filter.WebSocketFilter.Config()))
-                        )
-                        .uri("ws://iot.t-aaron.com:18080")
-                )
-                .build();
-    }
+    // @Bean
+    // public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
+    //     return builder.routes()
+    //             .route("websocket-route", r -> r
+    //                     .path("/api/ws/**")
+    //                     .filters(f -> f
+    //                             .filter(new com.tuoheng.gateway.filter.WebSocketFilter().apply(
+    //                                     new com.tuoheng.gateway.filter.WebSocketFilter.Config()))
+    //                     )
+    //                     .uri("ws://iot.t-aaron.com:18080")
+    //             )
+    //             .build();
+    // }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c49e34b..46c862a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,9 +10,8 @@ spring:
         - id: websocket-route
           uri: ws://iot.t-aaron.com:18080
           predicates:
-            - Path=/ws/api/**
+            - Path=/api/ws/**
           filters:
-            - StripPrefix=1
             - name: WebSocketFilter
 
 # 启用 JWT 认证（默认为 false，即不启用）