diff --git a/src/main/java/com/telpo/dipperposition/handler/NettyServerHandler.java b/src/main/java/com/telpo/dipperposition/handler/NettyServerHandler.java index 4802fe9..5776681 100644 --- a/src/main/java/com/telpo/dipperposition/handler/NettyServerHandler.java +++ b/src/main/java/com/telpo/dipperposition/handler/NettyServerHandler.java @@ -32,13 +32,13 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter { @Autowired private IDipperDataAsyncTaskService dipperDataAsyncTaskService; - @Value(value = "${position.server.timeAsycPort}") + @Value(value = "${position-server.timeAsycPort}") private String timeAsycServerPort; - @Value(value = "${position.server.posAsycPort}") + @Value(value = "${position-server.posAsycPort}") private String posAsycServerPort; - @Value(value = "${position.server.starsAsycPort}") + @Value(value = "${position-server.starsAsycPort}") private String starsAsycServerPort; diff --git a/src/main/java/com/telpo/dipperposition/server/DipperPositionServer.java b/src/main/java/com/telpo/dipperposition/server/DipperPositionServer.java index a2bba72..ab95c72 100644 --- a/src/main/java/com/telpo/dipperposition/server/DipperPositionServer.java +++ b/src/main/java/com/telpo/dipperposition/server/DipperPositionServer.java @@ -16,14 +16,9 @@ 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.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.beans.factory.config.YamlMapFactoryBean; import org.yaml.snakeyaml.Yaml; import java.io.ByteArrayInputStream; -import java.io.FileInputStream; -import java.io.InputStream; import java.net.InetSocketAddress; import java.util.Map; import java.util.Properties; diff --git a/src/main/resources/bootstrap.yaml b/src/main/resources/bootstrap.yaml index 57e192e..66034b2 100644 --- a/src/main/resources/bootstrap.yaml +++ b/src/main/resources/bootstrap.yaml @@ -27,8 +27,7 @@ pos: ephAstHexPort: 9012 timeout: 30000 -position: - server: +position-server: serverAddr: 172.16.192.26 timeAsycPort: 9011 posAsycPort: 9013