Administrator 4 年 前
コミット
e88c1f7e05

+ 1 - 0
pom.xml

@@ -92,6 +92,7 @@
 			<groupId>de.dfki.cos.basys.platform.wrapper-bundle-settings</groupId>
 			<artifactId>javax.websocket-api</artifactId>
 			<version>0.2.6</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>

+ 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();

+ 2 - 2
src/main/resources/spring/spring-websocket.xml

@@ -17,9 +17,9 @@
         <!--指定 webSocket 地址-->
         <websocket:mapping path="/webSocketServer" handler="systemWebSocketHandler"/>
         <!-- 过滤器 -->
-        <websocket:handshake-interceptors>
+        <!-- <websocket:handshake-interceptors>
         	<bean class="com.goafanti.core.websocket.WebSocketHandshakeInterceptor"/>
-        </websocket:handshake-interceptors> 
+        </websocket:handshake-interceptors> --> 
     </websocket:handlers>
  
 </beans>

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

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