diff --git a/bjairAdmin/src/main/java/com/iformall/AdminApplication.java b/bjairAdmin/src/main/java/com/iformall/AdminApplication.java index cfc34ca..0b46feb 100644 --- a/bjairAdmin/src/main/java/com/iformall/AdminApplication.java +++ b/bjairAdmin/src/main/java/com/iformall/AdminApplication.java @@ -44,6 +44,9 @@ public class AdminApplication { @Value("${fm.videoType}") private String videoType; + @Value("${tcp.server.port}") + private int tcpServerPort; + @Bean public boolean isFmException() { return fmException; @@ -73,6 +76,11 @@ public class AdminApplication { public String videoType() { return videoType; } + + @Bean + public int tcpServerPort() { + return tcpServerPort; + } public static void main(String[] args) { SpringApplication.run(AdminApplication.class, args); diff --git a/bjairAdmin/src/main/resources/application-dev.yml b/bjairAdmin/src/main/resources/application-dev.yml index 57fc42d..3e061a0 100644 --- a/bjairAdmin/src/main/resources/application-dev.yml +++ b/bjairAdmin/src/main/resources/application-dev.yml @@ -160,6 +160,10 @@ video: maxPoolSize: 20 queueCapacity: 1000 namePrefix: aliyun-video-upload + +tcp: + server: + port: 9010 jasypt: diff --git a/bjairAdmin/src/main/resources/application-prod.yml b/bjairAdmin/src/main/resources/application-prod.yml index b7a5011..134320d 100644 --- a/bjairAdmin/src/main/resources/application-prod.yml +++ b/bjairAdmin/src/main/resources/application-prod.yml @@ -147,6 +147,10 @@ video: maxPoolSize: 20 queueCapacity: 1000 namePrefix: aliyun-video-upload + +tcp: + server: + port: 9010 fm: exception: false diff --git a/bjairCApi/src/main/java/com/iformall/CApplication.java b/bjairCApi/src/main/java/com/iformall/CApplication.java index 32fda08..3bbcbe9 100644 --- a/bjairCApi/src/main/java/com/iformall/CApplication.java +++ b/bjairCApi/src/main/java/com/iformall/CApplication.java @@ -42,6 +42,9 @@ public class CApplication { @Value("${fm.videoType}") private String videoType; + + @Value("${tcp.server.port}") + private int tcpServerPort; @Bean public boolean isFmException() { @@ -72,6 +75,11 @@ public class CApplication { public String videoType() { return videoType; } + + @Bean + public int tcpServerPort() { + return tcpServerPort; + } public static void main(String[] args) { SpringApplication.run(CApplication.class, args); diff --git a/bjairService/src/main/java/com/iformall/haikang/TcpServer.java b/bjairService/src/main/java/com/iformall/haikang/TcpServer.java index 35ad688..2fa2b79 100644 --- a/bjairService/src/main/java/com/iformall/haikang/TcpServer.java +++ b/bjairService/src/main/java/com/iformall/haikang/TcpServer.java @@ -15,7 +15,6 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import com.alibaba.fastjson.JSON; @@ -27,8 +26,8 @@ public class TcpServer { private final Logger log = LoggerFactory.getLogger(this.getClass()); - @Value("${tcp.server.port}") // Configure port in application.properties - private int port; + @Autowired + private int tcpServerPort; @Autowired HKPeopleNumberFactory peopleNumberFactory; @@ -36,8 +35,8 @@ public class TcpServer { @PostConstruct public void start() { new Thread(() -> { - try (ServerSocket serverSocket = new ServerSocket(port)) { - log.info("TCP Server started on port {}", port); + try (ServerSocket serverSocket = new ServerSocket(tcpServerPort)) { + log.info("TCP Server started on port {}", tcpServerPort); while (true) { Socket clientSocket = serverSocket.accept();