From 21c0eb821f8d9f6df9bd310e3fef4cbbab83d3cc Mon Sep 17 00:00:00 2001
From: songww <songww@inspur.com>
Date: 星期四, 21 五月 2020 09:29:58 +0800
Subject: [PATCH] 增加跨域代码,允许VUE跨域访问

---
 src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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 e6d23a4..2694de3 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -3,7 +3,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
-@Configuration
+@Configuration("sipConfig")
 public class SipConfig {
 
 	@Value("${sip.ip}")
@@ -12,11 +12,12 @@
 	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;
 	
@@ -78,6 +79,12 @@
 	public void setSpeed(Integer speed) {
 		this.speed = speed;
 	}
-	
-	
+
+	public String getSipId() {
+		return sipId;
+	}
+
+	public void setSipId(String sipId) {
+		this.sipId = sipId;
+	}
 }

--
Gitblit v1.8.0