From c1d4849a2cc28cc50c5405f2382a5e4bf008b891 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 八月 2025 10:16:45 +0800
Subject: [PATCH] update
---
MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java | 8 ++++----
MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java | 4 ++--
MessagePushTravel/src/main/java/com/sinata/push/util/applets/NettyWebSocketController.java | 2 +-
MessagePushTravel/src/main/java/com/sinata/push/util/URLUtil.java | 4 ++--
4 files changed, 9 insertions(+), 9 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 c39c8c9..f149d08 100644
--- a/MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java
+++ b/MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java
@@ -27,15 +27,15 @@
*/
@ResponseBody
@PostMapping("/sendMsgToClient")
- public String sendMsgToClient(Integer id, Integer type, String msg){
+ public String sendMsgToClient(Integer id, Integer type, String msg,String bussinessType){
System.out.println("推送参数：" + id + "---" + type + "---" + msg);
if(type == 1){//用户端
- ChannelHandlerContext channel = NettyChannelMap.getData("Applets" + id);//小程序
+ ChannelHandlerContext channel = NettyChannelMap.getData(bussinessType+":Applets" + id);//小程序
if(null != channel){
NettyWebSocketController.sendMsgToClient(channel, msg);
return JSON.toJSONString(ResultUtil.success());
}
- channel = NettyChannelMap.getData("USER" + id);
+ channel = NettyChannelMap.getData(bussinessType+":USER" + id);
if(null != channel){
NettyServerController.sendMsgToClient(channel, msg);
return JSON.toJSONString(ResultUtil.success());
@@ -46,7 +46,7 @@
if(type == 2){//司机端
System.out.println("长链接实例：" + JSON.toJSONString(NettyChannelMap.map));
- ChannelHandlerContext channel = NettyChannelMap.getData("DRIVER" + id);
+ ChannelHandlerContext channel = NettyChannelMap.getData(bussinessType+":DRIVER" + id);
if(null != channel){
NettyServerController.sendMsgToClient(channel, msg);
return JSON.toJSONString(ResultUtil.success());
diff --git a/MessagePushTravel/src/main/java/com/sinata/push/util/URLUtil.java b/MessagePushTravel/src/main/java/com/sinata/push/util/URLUtil.java
index 4f87b8d..e4f305e 100644
--- a/MessagePushTravel/src/main/java/com/sinata/push/util/URLUtil.java
+++ b/MessagePushTravel/src/main/java/com/sinata/push/util/URLUtil.java
@@ -8,9 +8,9 @@
/**
* 业务网关接口地址
*/
- String zuul = "http://192.168.110.111:5000";
+ String zuul = "http://192.168.110.85:5000";
/**
* 业务网关接口地址
*/
- String aj_zuul = "http://192.168.110.111:5000";
+ String aj_zuul = "http://192.168.110.106:3002";
}
diff --git a/MessagePushTravel/src/main/java/com/sinata/push/util/applets/NettyWebSocketController.java b/MessagePushTravel/src/main/java/com/sinata/push/util/applets/NettyWebSocketController.java
index f46c696..0513409 100644
--- a/MessagePushTravel/src/main/java/com/sinata/push/util/applets/NettyWebSocketController.java
+++ b/MessagePushTravel/src/main/java/com/sinata/push/util/applets/NettyWebSocketController.java
@@ -79,7 +79,7 @@
String token = jsonCon.getString("token");
String userId1 = jsonCon.getString("userId");
String businessType = jsonCon.getString("businessType");//1：打车，2=代驾
- String business = "1".equals(businessType) ? "dache" : "daijia";
+ String business = "2".equals(businessType) ? "daijia" : "dache";
if (StringUtil.isNotEmpty(userId1)) {
//确保账号在单个设备上登录
if (StringUtil.isNotEmpty(token)) {
diff --git a/MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java b/MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java
index e8c1a5f..97bc8f0 100644
--- a/MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java
+++ b/MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java
@@ -96,7 +96,7 @@
String device = jsonCon.getString("device");
String version = jsonCon.getString("version");
String businessType = jsonCon.getString("businessType");//1：打车，2=代驾
- String business = "1".equals(businessType) ? "dache" : "daijia";
+ String business = "2".equals(businessType) ? "daijia" : "dache";
if(StringUtil.isNotEmpty(userId1)){
//判断用户或者司机长连接
@@ -169,7 +169,7 @@
if(method.equals(Method.location)){
Integer driverId = jsonCon.getInteger("driverId");
String businessType = jsonCon.getString("businessType");//1：打车，2=代驾
- String business = "1".equals(businessType) ? "dache" : "daijia";
+ String business = "2".equals(businessType) || null==businessType ? "daijia" : "dache";
String fluid_control = redisUtil.getValue(business + ":location_" + driverId);
if(!StringUtils.hasLength(fluid_control)){
--
Gitblit v1.7.1