From b92a2bf0fdb56b51066c2d484f8880d1b05941de Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期六, 18 四月 2026 17:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/config/WebSocketConfig.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/config/WebSocketConfig.java b/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/config/WebSocketConfig.java
index 8d32909..0bf22d3 100644
--- a/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/config/WebSocketConfig.java
+++ b/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/webSocket/config/WebSocketConfig.java
@@ -1,27 +1,27 @@
-package com.xiaopeng.pushMessage.webSocket.config;
-
-import com.xiaopeng.pushMessage.webSocket.handler.PushMessageWebSocketHandler;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.config.annotation.EnableWebSocket;
-import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
-import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
-
-/**
- * Spring WebSocket 配置
- * 注册 /websocket 端点，共用 Spring Boot HTTP 端口
- */
-@Configuration
-@EnableWebSocket
-public class WebSocketConfig implements WebSocketConfigurer {
-
- @Autowired
- private PushMessageWebSocketHandler pushMessageWebSocketHandler;
-
- @Override
- public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
- registry.addHandler(pushMessageWebSocketHandler, "/websocket")
- // 允许所有跨域来源，生产环境可按需收紧
- .setAllowedOrigins("*");
- }
-}
+//package com.xiaopeng.pushMessage.webSocket.config;
+//
+//import com.xiaopeng.pushMessage.webSocket.handler.PushMessageWebSocketHandler;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.socket.config.annotation.EnableWebSocket;
+//import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
+//import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
+//
+///**
+// * Spring WebSocket 配置
+// * 注册 /websocket 端点，共用 Spring Boot HTTP 端口
+// */
+//@Configuration
+//@EnableWebSocket
+//public class WebSocketConfig implements WebSocketConfigurer {
+//
+// @Autowired
+// private PushMessageWebSocketHandler pushMessageWebSocketHandler;
+//
+// @Override
+// public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
+// registry.addHandler(pushMessageWebSocketHandler, "/websocket")
+// // 允许所有跨域来源，生产环境可按需收紧
+// .setAllowedOrigins("*");
+// }
+//}
--
Gitblit v1.7.1