diff --git a/build.gradle b/build.gradle
index 6a061e2..7d93c8b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,6 @@ dependencies {
runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.12.6'
runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.12.6'
implementation group: 'com.alibaba', name: 'fastjson', version: '2.0.54'
- implementation group: 'org.springframework.boot', name: 'spring-boot-starter-websocket', version: '3.4.2'
implementation group: 'io.netty', name: 'netty-all', version: '4.1.117.Final'
//++++++++项目级别的放到下面++++++++
diff --git a/demo/ws_demo.html b/demo/ws_demo.html
deleted file mode 100644
index 3bf84e0..0000000
--- a/demo/ws_demo.html
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
- WebSocket with STOMP
-
-
-
-
- WebSocket STOMP Client
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/java/com/qyft/gd/config/WebSocketConfig.java b/src/main/java/com/qyft/gd/config/WebSocketConfig.java
deleted file mode 100644
index 81049f1..0000000
--- a/src/main/java/com/qyft/gd/config/WebSocketConfig.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.qyft.gd.config;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.messaging.simp.config.MessageBrokerRegistry;
-import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
-import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
-import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
-
-@Configuration
-@EnableWebSocketMessageBroker
-@RequiredArgsConstructor
-@Slf4j
-public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
- @Override
- public void configureMessageBroker(MessageBrokerRegistry registry) {
- // 配置消息代理
- registry.enableSimpleBroker("/topic"); // 消息广播前缀
- registry.setApplicationDestinationPrefixes("/app"); // 客户端发送消息的前缀
- }
-
- @Override
- public void registerStompEndpoints(StompEndpointRegistry registry) {
- // 使用相对路径注册 WebSocket 端点
- registry.addEndpoint("/ws")
- .setAllowedOriginPatterns("*")
- .withSockJS();
- }
-}
diff --git a/src/main/java/com/qyft/gd/controller/WebSocketController.java b/src/main/java/com/qyft/gd/controller/WebSocketController.java
deleted file mode 100644
index d4b5f50..0000000
--- a/src/main/java/com/qyft/gd/controller/WebSocketController.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.qyft.gd.controller;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.messaging.handler.annotation.MessageMapping;
-import org.springframework.messaging.handler.annotation.SendTo;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
-import org.springframework.stereotype.Controller;
-
-import java.security.Principal;
-
-@Controller
-@RequiredArgsConstructor
-@Slf4j
-public class WebSocketController {
- private final SimpMessagingTemplate messagingTemplate;
-
- @MessageMapping("/hello")
- @SendTo("/topic/greetings")
- public String sendGreeting(String message) throws Exception {
- // 处理收到的消息并发送到主题 "/topic/greetings"
- return "Hello, " + message;
- }
-
-}
diff --git a/src/main/java/com/qyft/gd/service/CMDService.java b/src/main/java/com/qyft/gd/service/CMDService.java
index 1aed353..ac06908 100644
--- a/src/main/java/com/qyft/gd/service/CMDService.java
+++ b/src/main/java/com/qyft/gd/service/CMDService.java
@@ -6,7 +6,6 @@ import com.qyft.gd.device.service.DeviceService;
import com.qyft.gd.model.form.CMDForm;
import com.qyft.gd.model.vo.ExecutionResult;
import lombok.RequiredArgsConstructor;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
import org.springframework.stereotype.Service;
@Service
@@ -15,8 +14,6 @@ public class CMDService {
DeviceService deviceService;
- private final SimpMessagingTemplate messagingTemplate;
-
public boolean executeCommand(CMDForm cmdForm) {
switch (cmdForm.getCommand()) {
case Commands.UP_TRAY:
@@ -35,7 +32,6 @@ public class CMDService {
executionResult.setCommandId(cmdForm.getCommandId());
executionResult.setStatus(CMDResultCode.SUCCESS.getCode());
executionResult.setMessage(CMDResultCode.SUCCESS.getMsg());
- messagingTemplate.convertAndSend("/topic/cmd", executionResult);
}
}