From 5c488cd03ba911224bca3a341b00455fbce2df09 Mon Sep 17 00:00:00 2001
From: swwheihei <swwheihei@163.com>
Date: 星期四, 11 六月 2020 13:33:38 +0800
Subject: [PATCH] Merge pull request #9 from lawrencehj/master
---
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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..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,6 +12,8 @@
Integer sipPort;
@Value("${sip.domain}")
String sipDomain;
+ @Value("${sip.id}")
+ String sipId;
@Value("${sip.password}")
String sipPassword;
@Value("${media.ip}")
@@ -77,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