@@ -32,13 +32,13 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter { | |||||
@Autowired | @Autowired | ||||
private IDipperDataAsyncTaskService dipperDataAsyncTaskService; | private IDipperDataAsyncTaskService dipperDataAsyncTaskService; | ||||
@Value(value = "${position.server.timeAsycPort}") | |||||
@Value(value = "${position-server.timeAsycPort}") | |||||
private String timeAsycServerPort; | private String timeAsycServerPort; | ||||
@Value(value = "${position.server.posAsycPort}") | |||||
@Value(value = "${position-server.posAsycPort}") | |||||
private String posAsycServerPort; | private String posAsycServerPort; | ||||
@Value(value = "${position.server.starsAsycPort}") | |||||
@Value(value = "${position-server.starsAsycPort}") | |||||
private String starsAsycServerPort; | private String starsAsycServerPort; | ||||
@@ -16,14 +16,9 @@ import io.netty.channel.EventLoopGroup; | |||||
import io.netty.channel.nio.NioEventLoopGroup; | import io.netty.channel.nio.NioEventLoopGroup; | ||||
import io.netty.channel.socket.nio.NioServerSocketChannel; | import io.netty.channel.socket.nio.NioServerSocketChannel; | ||||
import lombok.extern.slf4j.Slf4j; | 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 org.yaml.snakeyaml.Yaml; | ||||
import java.io.ByteArrayInputStream; | import java.io.ByteArrayInputStream; | ||||
import java.io.FileInputStream; | |||||
import java.io.InputStream; | |||||
import java.net.InetSocketAddress; | import java.net.InetSocketAddress; | ||||
import java.util.Map; | import java.util.Map; | ||||
import java.util.Properties; | import java.util.Properties; | ||||
@@ -27,8 +27,7 @@ pos: | |||||
ephAstHexPort: 9012 | ephAstHexPort: 9012 | ||||
timeout: 30000 | timeout: 30000 | ||||
position: | |||||
server: | |||||
position-server: | |||||
serverAddr: 172.16.192.26 | serverAddr: 172.16.192.26 | ||||
timeAsycPort: 9011 | timeAsycPort: 9011 | ||||
posAsycPort: 9013 | posAsycPort: 9013 |