From 101b5cb583322e07a4825a39609fdc437afcd31e Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 16 Sep 2020 10:46:37 +0800
Subject: [PATCH] 跨域响应头添加
---
src/main/java/com/moral/config/WebSocketConfig.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java
index dc2b9eb..5e8a3b3 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -1,7 +1,12 @@
package com.moral.config;
+import com.moral.service.DeviceService;
+import com.moral.webSocketServer.WebSocketServer;
+
+import com.moral.webSocketServer.WebSocketServerNew;
import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
import org.springframework.amqp.support.converter.MessageConverter;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;
@@ -9,14 +14,20 @@
@Configuration
public class WebSocketConfig {
- @Bean
+/* @Bean
public ServerEndpointExporter serverEndpointExporter() {
return new ServerEndpointExporter();
- }
+ }*/
@Bean
public MessageConverter jsonMessageConverter() {
return new Jackson2JsonMessageConverter();
}
+ @Autowired
+ public void setMessageService(DeviceService deviceService){
+ WebSocketServer.deviceService=deviceService;
+ WebSocketServerNew.deviceService=deviceService;
+ }
+
}
--
Gitblit v1.8.0