From 0c41f99c7f1a0d7deeeef23a5b3b890aed32ce63 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:20:50 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

---
 MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

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 a4bbdfb..622171c 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
@@ -5,7 +5,7 @@
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.sinata.push.config.QYTConfig;
+//import com.sinata.push.config.QYTConfig;
 import com.sinata.push.util.*;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -35,7 +35,7 @@
 
 	public static Hashtable<String,String> table;
 	
-	public static QYTConfig qytConfig;
+//	public static QYTConfig qytConfig;
 
 	private RedisUtil redisUtil = SpringUtil.getObject(RedisUtil.class);
 
@@ -51,9 +51,9 @@
 	}
 	
 	
-	public static void setQytConfig(QYTConfig qytConfig) {
-		NettyServerController.qytConfig = qytConfig;
-	}
+//	public static void setQytConfig(QYTConfig qytConfig) {
+//		NettyServerController.qytConfig = qytConfig;
+//	}
 	
 	public static boolean isdebug = false;
 	public static int i = 0;
@@ -82,9 +82,7 @@
 			if(msgStr.indexOf("{") == -1 || msgStr.indexOf("}") == -1 || msgStr.indexOf("code") == -1 || msgStr.indexOf("msg") == -1 || msgStr.indexOf("data") == -1 || msgStr.indexOf("method") == -1) {
 				return;
 			}
-			if(isdebug) {
-//				System.out.println("<<<--receive-->>>" + msg);
-			}
+			System.out.println("<<<--receive-->>>" + msg);
 			
 			// 获取socket信息,保存相应的socket
 			JSONObject jsonMsg = JSONObject.parseObject(msg.toString());
@@ -209,7 +207,7 @@
 								params.put("lat", String.valueOf(lat));
 								params.put("directionAngle", String.valueOf(computeAzimuth));
 								params.put("altitude", String.valueOf(altitude));
-								HttpRequest post = HttpUtil.createPost(qytConfig.getChuxingUrl() + "/driver-server/base/savePosition");
+								HttpRequest post = HttpUtil.createPost("http://10.31.182.11:8010/chuxing/driver-server/base/savePosition");
 								post.contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE);
 								post.form(params);
 								HttpResponse execute = post.execute();
@@ -236,7 +234,7 @@
 							params.put("lat", String.valueOf(lat));
 							params.put("directionAngle", String.valueOf(computeAzimuth));
 							params.put("altitude", String.valueOf(altitude));
-							HttpRequest post = HttpUtil.createPost(qytConfig.getDaijiaurl() + "/driver-server/base/driver/addDriverPosition");
+							HttpRequest post = HttpUtil.createPost("http://10.31.182.11:8010/daijia/driver-server/base/driver/addDriverPosition");
 							post.contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE);
 							post.form(params);
 							HttpResponse execute = post.execute();
@@ -249,7 +247,7 @@
 							}
 						}
 						
-						redisUtil.setStrValue(business + ":DRIVER" + driverId, lon + "," + lat, 30);//实时位置存入redis中
+						redisUtil.setStrValue(business + "_DRIVER" + driverId, lon + "," + lat, 30);//实时位置存入redis中
 					}else{
 						this.sendMsgToClient(ctx, "__error__" + msg.toString());
 					}

--
Gitblit v1.7.1