From e208aa1ef8e861dba168e8d83ab3066fc9f1e02d Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 16 四月 2024 13:30:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java b/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
index c14c54f..13a3bde 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
@@ -1,35 +1,28 @@
package com.mes.tools;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.*;
+import javax.websocket.server.PathParam;
+import javax.websocket.server.ServerEndpoint;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
-
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.stereotype.Component;
-
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-
@ServerEndpoint(value = "/api/talk/{username}")
-@Component
+@Component("webSocketServer")
public class WebSocketServer {
// @Autowired
// HomeMapper homeMapper;
- static ConfigurableApplicationContext applicationContext;
+ public static ConfigurableApplicationContext applicationContext;
// 瑙ｅ喅鏃犳硶娉ㄥ叆mapper闂 //浣跨敤鏂规硶
// homeMapper=WebSocketServer.applicationContext.getBean(HomeMapper.class);
@@ -164,4 +157,8 @@
public void clearMessages() {
messages.clear();
}
+
+
+
+
}
--
Gitblit v1.8.0