From f63310cb98a78d91dda5cc2233d5dc736c674e69 Mon Sep 17 00:00:00 2001
From: linwl <304115325@qq.com>
Date: Mon, 18 Jan 2021 17:12:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B0docker=E5=A4=96?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/NettyServerHandler.java           | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/telpo/dipperposition/handler/NettyServerHandler.java b/src/main/java/com/telpo/dipperposition/handler/NettyServerHandler.java
index f176aeb..2ed49b1 100644
--- a/src/main/java/com/telpo/dipperposition/handler/NettyServerHandler.java
+++ b/src/main/java/com/telpo/dipperposition/handler/NettyServerHandler.java
@@ -58,10 +58,17 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
         //通知客户端链接建立成功
         // 默认返回取得时间成功
         String ackAckCheckRef = "233E0101020004020A1D";
-        if (Integer.parseInt(nettyServerConfig.getPosAsycServerPort()) == channel.localAddress().getPort()) {
+//        if (Integer.parseInt(nettyServerConfig.getPosAsycServerPort()) == channel.localAddress().getPort()) {
+//            ackAckCheckRef = "233E010102000401091C";
+//        }
+//        if (Integer.parseInt(nettyServerConfig.getStarsAsycServerPort()) == channel.localAddress().getPort()) {
+//            ackAckCheckRef = "233E010102000421293C";
+//        }
+
+        if (9013 == channel.localAddress().getPort()) {
             ackAckCheckRef = "233E010102000401091C";
         }
-        if (Integer.parseInt(nettyServerConfig.getStarsAsycServerPort()) == channel.localAddress().getPort()) {
+        if (9012 == channel.localAddress().getPort()) {
             ackAckCheckRef = "233E010102000421293C";
         }
         //String str = "通知客户端链接建立成功" + " " + LocalDateTime.now() + " " + channel.localAddress().getHostString() +
@@ -107,11 +114,16 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
         // if (Integer.parseInt(posAsycServerPort) == channel.localAddress().getPort()) {
 
         if (AST_POS_CMD.equals(recvmg)) {
+//            channelAns = dipperAstPosAsyncTaskService.pushAstPos(ipAddress,
+//                    positionConfig.getCenterProvinceFilePath(),
+//                    positionConfig.getCenterProvince(),
+//                    positionConfig.getIpPositionRequestPath(),
+//                    positionConfig.getIpPositionRequestKey());
             channelAns = dipperAstPosAsyncTaskService.pushAstPos(ipAddress,
-                    positionConfig.getCenterProvinceFilePath(),
-                    positionConfig.getCenterProvince(),
-                    positionConfig.getIpPositionRequestPath(),
-                    positionConfig.getIpPositionRequestKey());
+                    "/csv/provinceLonAlt.csv",
+                    "湖北省",
+                    "https://restapi.amap.com/v3/ip",
+                    "65e794b0a1a4b87eeec86f93fea05411");
             buf = Unpooled.buffer(channelAns.getBytes().length);
         }