Administrator 4 년 전
부모
커밋
03ad0e0078

+ 0 - 7
src/main/java/com/goafanti/core/websocket/SystemWebSocketHandler.java

@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.socket.CloseStatus;
 import org.springframework.web.socket.TextMessage;
@@ -13,8 +12,6 @@ import org.springframework.web.socket.WebSocketMessage;
 import org.springframework.web.socket.WebSocketSession;
 
 import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.core.mybatis.JDBCIdGenerator;
-import com.goafanti.core.shiro.token.TokenManager;
 
 @Service
 public class SystemWebSocketHandler implements WebSocketHandler {
@@ -26,10 +23,6 @@ public class SystemWebSocketHandler implements WebSocketHandler {
 	@Override
 	public void afterConnectionEstablished(WebSocketSession session) throws Exception {
 		String userId = (String) session.getAttributes().get(Constants.WEBSOCKET_USERNAME);
-		if (userId==null) {
-			userId=TokenManager.getAdminId();
-		}
-		LoggerUtils.debug(getClass(), "websoucket未找到uid" + userId);
 		if (userId != null) {
 			users.put(userId, session);
 			LoggerUtils.debug(getClass(), "添加用户websocket:" + userId);

+ 1 - 1
src/main/java/com/goafanti/core/websocket/WebSocketConfig.java

@@ -21,7 +21,7 @@ public class WebSocketConfig extends WebMvcConfigurerAdapter implements WebSocke
 	@Override
 	public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
 		registry.addHandler(systemWebSocketHandler, "/webSocketServer")
-//		.addInterceptors(new WebSocketHandshakeInterceptor())
+		.addInterceptors(new WebSocketHandshakeInterceptor())
 				.setAllowedOrigins("*");
 //		registry.addHandler(systemWebSocketHandler, "/sockjs/webSocketServer").setAllowedOrigins("*")
 //				.addInterceptors(new WebSocketHandshakeInterceptor()).withSockJS();

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/websocket.html

@@ -31,7 +31,7 @@
 
 	<script type="text/javascript">
 
-		var ws = new WebSocket("wss://" + window.location.host + "/webSocketServer");
+		var ws = new WebSocket("ws://" + window.location.host + "/webSocketServer");
 
 		function sendData()
 		{