From 2e7c33a4280f5bc6c3ec0afb6c7010a3598f43ba Mon Sep 17 00:00:00 2001
From: linwl <304115325@qq.com>
Date: Fri, 15 Jan 2021 23:04:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0OkHttp=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dipperposition/DipperPositionApplication.java     |  9 ++++++---
 .../dipperposition/server/DipperPositionServer.java   | 11 ++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/telpo/dipperposition/DipperPositionApplication.java b/src/main/java/com/telpo/dipperposition/DipperPositionApplication.java
index 5f66554..126a78b 100644
--- a/src/main/java/com/telpo/dipperposition/DipperPositionApplication.java
+++ b/src/main/java/com/telpo/dipperposition/DipperPositionApplication.java
@@ -44,9 +44,12 @@ public class DipperPositionApplication {
       log.info("北斗定位服务启动!");
       //启动服务端
       ConfigurableEnvironment environment = applicationContext.getEnvironment();
-      PositionConfigInfo pci;
-      pci = (PositionConfigInfo)environment.getSystemProperties().get("position-server");
-      DipperPositionServer nettyServer2 = new DipperPositionServer(pci);
+      log.info(environment.toString());
+      log.info(environment.getProperty("position-server"));
+      //PositionConfigInfo pci;
+      //pci = (PositionConfigInfo)environment.getProperty("position-server");
+      DipperPositionServer nettyServer2 = new DipperPositionServer(environment);
+      log.info(environment.getSystemProperties().toString());
       nettyServer2.start();
     } catch (Exception e) {
       log.error(e.getMessage());
diff --git a/src/main/java/com/telpo/dipperposition/server/DipperPositionServer.java b/src/main/java/com/telpo/dipperposition/server/DipperPositionServer.java
index 435a798..5a1828b 100644
--- a/src/main/java/com/telpo/dipperposition/server/DipperPositionServer.java
+++ b/src/main/java/com/telpo/dipperposition/server/DipperPositionServer.java
@@ -13,6 +13,7 @@ import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.env.ConfigurableEnvironment;
 
 import java.net.InetSocketAddress;
 
@@ -31,12 +32,12 @@ public class DipperPositionServer {
     private Integer posAsycPort;
     private Integer starsAsycPort;
 
-    public DipperPositionServer(PositionConfigInfo pci) throws NacosException {
+    public DipperPositionServer(ConfigurableEnvironment environment) throws NacosException {
 
-        this.serverAddr = pci.getServerAddr();
-        this.timeAsycPort = Integer.parseInt(pci.getTimeAsycPort());
-        this.posAsycPort = Integer.parseInt(pci.getPosAsycPort());
-        this.starsAsycPort = Integer.parseInt(pci.getStarsAsycPort());
+        this.serverAddr = environment.getProperty("position-server.serverAddr");
+        this.timeAsycPort = Integer.parseInt(environment.getProperty("position-server.timeAsycPort"));
+        this.posAsycPort = Integer.parseInt(environment.getProperty("position-server.posAsycPort"));
+        this.starsAsycPort = Integer.parseInt(environment.getProperty("position-server.starsAsycPort"));
         //String serverAddr = positionConfigInfo.getServerAddr();
 //        try {
 //            try {