zhangqiankun 2 年 前
コミット
8045c34c40

+ 4 - 4
src/main/java/com/persagy/cameractl/conf/CameraApiConfig.java

@@ -5,16 +5,16 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class CameraApiConfig {
-	@Value("${global.group-code}")
+	@Value("${global.group-code:}")
 	private String groupCode;
 	
-	@Value("${global.project-id}")
+	@Value("${global.project-id:}")
 	private String projectId;
 	
-	@Value("${toup-tcp.ip}")
+	@Value("${toup-tcp.ip:}")
 	private String toupIp;
 	
-	@Value("${toup-tcp.port}")
+	@Value("${toup-tcp.port:}")
 	private String toupPort;
 	
 	@Value("${dahua-config.mesHost}")

+ 4 - 1
src/main/java/com/persagy/cameractl/init/SystemInit.java

@@ -11,6 +11,9 @@ import org.springframework.stereotype.Component;
 import com.persagy.cameractl.conf.CameraApiConfig;
 import com.persagy.cameractl.conf.ServerConfig;
 import com.persagy.cameractl.utils.TimerInterval;
+
+import cn.hutool.core.util.StrUtil;
+
 import com.persagy.cameractl.conf.AllStaticConfig;
 
 @Component
@@ -29,7 +32,7 @@ public class SystemInit implements ApplicationRunner {
 		AllStaticConfig.groupCode=cameraApiConfig.getGroupCode();
 		AllStaticConfig.projectId=cameraApiConfig.getProjectId();
 		AllStaticConfig.toupIp=cameraApiConfig.getToupIp();
-		AllStaticConfig.toupPort=Integer.valueOf(cameraApiConfig.getToupPort());
+		AllStaticConfig.toupPort=StrUtil.isBlank(cameraApiConfig.getToupPort()) ? -1 : Integer.valueOf(cameraApiConfig.getToupPort());
 		AllStaticConfig.dahuaMesHost=cameraApiConfig.getDahuaMesHost();
 		AllStaticConfig.dahuaApiIp=cameraApiConfig.getDahuaApiIp();
 		AllStaticConfig.dahuaApiPort=cameraApiConfig.getDahuaApiPort();