From 33b51c40ddd9750a19b2c6a6618fb22386f87cd7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 13 十一月 2020 18:12:21 +0800
Subject: [PATCH] 增加强制不查询编码信息配置

---
 src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java |   35 ++++++++++++-----------------------
 1 files changed, 12 insertions(+), 23 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..52d8089 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -1,9 +1,10 @@
 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}")
@@ -12,12 +13,10 @@
 	Integer sipPort;
 	@Value("${sip.domain}")
 	String sipDomain;
+	@Value("${sip.id}")
+	String sipId;
 	@Value("${sip.password}")
 	String sipPassword;
-	@Value("${media.ip}")
-	String mediaIp;
-	@Value("${media.port}")
-	Integer mediaPort;
 	
 	@Value("${sip.ptz.speed:50}")
 	Integer speed;
@@ -46,28 +45,20 @@
 		this.sipDomain = sipDomain;
 	}
 
+	public String getSipId() {
+		return sipId;
+	}
+
+	public void setSipId(String sipId) {
+		this.sipId = 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() {
@@ -77,6 +68,4 @@
 	public void setSpeed(Integer speed) {
 		this.speed = speed;
 	}
-	
-	
 }

--
Gitblit v1.8.0