From df11956c3c203434d3ef54955a502c466f1382dd Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 07 六月 2021 15:42:01 +0800
Subject: [PATCH] 取出错误配置

---
 src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java |   72 ++++++++++++++++--------------------
 1 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
index 6d53033..6db63ee 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -1,82 +1,74 @@
 package com.genersoft.iot.vmp.conf;
 
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
-@Configuration
+@Configuration("sipConfig")
 public class SipConfig {
 
 	@Value("${sip.ip}")
-	String sipIp;
+	private String sipIp;
+
+	/**
+	 * 榛樿浣跨敤sip.ip
+	 */
+	@Value("${sip.monitorIp:0.0.0.0}")
+	private String monitorIp;
+
 	@Value("${sip.port}")
-	Integer sipPort;
+	private Integer sipPort;
+
 	@Value("${sip.domain}")
-	String sipDomain;
+	private String sipDomain;
+
+	@Value("${sip.id}")
+	private String sipId;
+
 	@Value("${sip.password}")
-	String sipPassword;
-	@Value("${media.ip}")
-	String mediaIp;
-	@Value("${media.port}")
-	Integer mediaPort;
+	private String sipPassword;
 	
 	@Value("${sip.ptz.speed:50}")
 	Integer speed;
+
+	@Value("${sip.keepaliveTimeOut:180}")
+	Integer keepaliveTimeOut;
+
+	public String getMonitorIp() {
+		return monitorIp;
+	}
 
 	public String getSipIp() {
 		return sipIp;
 	}
 
-	public void setSipIp(String sipIp) {
-		this.sipIp = sipIp;
-	}
 
 	public Integer getSipPort() {
 		return sipPort;
 	}
 
-	public void setSipPort(Integer sipPort) {
-		this.sipPort = sipPort;
-	}
 
 	public String getSipDomain() {
 		return sipDomain;
 	}
 
-	public void setSipDomain(String sipDomain) {
-		this.sipDomain = sipDomain;
+
+	public String getSipId() {
+		return sipId;
 	}
 
 	public String getSipPassword() {
 		return sipPassword;
 	}
 
-	public void setSipPassword(String sipPassword) {
-		this.sipPassword = sipPassword;
-	}
-
-	public String getMediaIp() {
-		return mediaIp;
-	}
-
-	public void setMediaIp(String mediaIp) {
-		this.mediaIp = mediaIp;
-	}
-
-	public Integer getMediaPort() {
-		return mediaPort;
-	}
-
-	public void setMediaPort(Integer mediaPort) {
-		this.mediaPort = mediaPort;
-	}
 
 	public Integer getSpeed() {
 		return speed;
 	}
 
-	public void setSpeed(Integer speed) {
-		this.speed = speed;
+	public Integer getKeepaliveTimeOut() {
+		return keepaliveTimeOut;
 	}
-	
-	
+
+
 }

--
Gitblit v1.8.0