From 335916f1f15eb9d0b34dea38cacee2300eac0606 Mon Sep 17 00:00:00 2001
From: 李防 <liguofang0703@126.com>
Date: 星期一, 07 三月 2022 14:20:27 +0800
Subject: [PATCH] InviteRequestProcessor类中，channelid从invite消息的header subject获取，不再从第一行request line获取。原因是和第三方平台对接时，发送的invite消息第一行为国标平台编码而不是设备通道编码，导致报错通道不存在，返回404。
---
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 111 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 30 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 32352c7..6fa802d 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -1,66 +1,117 @@
package com.genersoft.iot.vmp.conf;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
-@Configuration("sipConfig")
+@Component
+@ConfigurationProperties(prefix = "sip", ignoreInvalidFields = true)
public class SipConfig {
- @Value("${sip.ip}")
- private String sipIp;
+ private String ip;
/**
- * 榛樿浣跨敤sip.ip
+ * 榛樿浣跨敤 0.0.0.0
*/
- @Value("${sip.monitorIp:0.0.0.0}")
- private String monitorIp;
+ private String monitorIp = "0.0.0.0";
- @Value("${sip.port}")
- private Integer sipPort;
+ private Integer port;
- @Value("${sip.domain}")
- private String sipDomain;
+ private String domain;
- @Value("${sip.id}")
- private String sipId;
+ private String id;
- @Value("${sip.password}")
- private String sipPassword;
+ private String password;
- @Value("${sip.ptz.speed:50}")
- Integer speed;
+ Integer ptzSpeed = 50;
+
+ Integer keepaliveTimeOut = 255;
+
+ Integer registerTimeInterval = 120;
+
+ private boolean alarm = false;
+
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ public void setMonitorIp(String monitorIp) {
+ this.monitorIp = monitorIp;
+ }
+
+ public void setPort(Integer port) {
+ this.port = port;
+ }
+
+ public void setDomain(String domain) {
+ this.domain = domain;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public void setPtzSpeed(Integer ptzSpeed) {
+ this.ptzSpeed = ptzSpeed;
+ }
+
+ public void setKeepaliveTimeOut(Integer keepaliveTimeOut) {
+ this.keepaliveTimeOut = keepaliveTimeOut;
+ }
+
+ public void setRegisterTimeInterval(Integer registerTimeInterval) {
+ this.registerTimeInterval = registerTimeInterval;
+ }
public String getMonitorIp() {
return monitorIp;
}
- public String getSipIp() {
- return sipIp;
+ public String getIp() {
+ return ip;
}
- public Integer getSipPort() {
- return sipPort;
+ public Integer getPort() {
+ return port;
}
- public String getSipDomain() {
- return sipDomain;
+ public String getDomain() {
+ return domain;
}
- public String getSipId() {
- return sipId;
+ public String getId() {
+ return id;
}
- public String getSipPassword() {
- return sipPassword;
+ public String getPassword() {
+ return password;
}
- public Integer getSpeed() {
- return speed;
+ public Integer getPtzSpeed() {
+ return ptzSpeed;
}
+ public Integer getKeepaliveTimeOut() {
+ return keepaliveTimeOut;
+ }
+
+ public Integer getRegisterTimeInterval() {
+ return registerTimeInterval;
+ }
+
+ public boolean isAlarm() {
+ return alarm;
+ }
+
+ public void setAlarm(boolean alarm) {
+ this.alarm = alarm;
+ }
}
--
Gitblit v1.8.0