From 6968839f21fb05bf6e3204c2040ee47130006cd0 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期日, 27 十二月 2020 08:19:34 +0800
Subject: [PATCH] 修复空指针异常
---
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 36 ++++++++++++------------------------
1 files changed, 12 insertions(+), 24 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..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,13 +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;
@@ -47,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() {
@@ -78,6 +68,4 @@
public void setSpeed(Integer speed) {
this.speed = speed;
}
-
-
}
--
Gitblit v1.8.0