From cf8a22f50b81fa30abaa518bdce660cd65deabea Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 15 一月 2021 15:33:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 36 +++++++++---------------------------
1 files changed, 9 insertions(+), 27 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 2d79839..b88778e 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.conf;
+
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
@@ -7,15 +8,15 @@
public class SipConfig {
@Value("${sip.ip}")
- String sipIp;
+ private String sipIp;
@Value("${sip.port}")
- Integer sipPort;
+ private Integer sipPort;
@Value("${sip.domain}")
- String sipDomain;
+ private String sipDomain;
@Value("${sip.id}")
- String sipId;
+ private String sipId;
@Value("${sip.password}")
- String sipPassword;
+ private String sipPassword;
@Value("${sip.ptz.speed:50}")
Integer speed;
@@ -24,47 +25,28 @@
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 Integer getSpeed() {
return speed;
}
- 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