From 4231cb0417322b6b974210d31ff4cbd8a842da96 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 12 八月 2025 10:42:39 +0800
Subject: [PATCH] 合并代码
---
MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java b/MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java
index 7056cec..c39c8c9 100644
--- a/MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java
+++ b/MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java
@@ -18,11 +18,6 @@
@RequestMapping("/netty")
public class NettyController {
- @Autowired
- private NettyServerController nettyServerController;
-
- @Autowired
- private NettyWebSocketController nettyWebSocketController;
/**
@@ -37,12 +32,12 @@
if(type == 1){//用户端
ChannelHandlerContext channel = NettyChannelMap.getData("Applets" + id);//小程序
if(null != channel){
- nettyWebSocketController.sendMsgToClient(channel, msg);
+ NettyWebSocketController.sendMsgToClient(channel, msg);
return JSON.toJSONString(ResultUtil.success());
}
channel = NettyChannelMap.getData("USER" + id);
if(null != channel){
- nettyServerController.sendMsgToClient(channel, msg);
+ NettyServerController.sendMsgToClient(channel, msg);
return JSON.toJSONString(ResultUtil.success());
}
return JSON.toJSONString(ResultUtil.error("推送失败-----用户id=" + id));
@@ -53,7 +48,7 @@
System.out.println("长链接实例：" + JSON.toJSONString(NettyChannelMap.map));
ChannelHandlerContext channel = NettyChannelMap.getData("DRIVER" + id);
if(null != channel){
- nettyServerController.sendMsgToClient(channel, msg);
+ NettyServerController.sendMsgToClient(channel, msg);
return JSON.toJSONString(ResultUtil.success());
}
return JSON.toJSONString(ResultUtil.error("推送失败-----司机id=" + id));
--
Gitblit v1.7.1