取出错误配置

src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java

@@ -69,4 +69,6 @@ public class SipConfig {
 	public Integer getKeepaliveTimeOut() {
 		return keepaliveTimeOut;
 	}
+
+
 }

src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java

@@ -72,7 +72,7 @@ public class SipLayer implements SipListener {
 	private SipStack createSipStack() throws PeerUnavailableException {
 		Properties properties = new Properties();
 		properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP");
-		properties.setProperty("javax.sip.IP_ADDRESS", sipConfig.getSipIp());
+		properties.setProperty("javax.sip.IP_ADDRESS", sipConfig.getMonitorIp());
 		properties.setProperty("gov.nist.javax.sip.LOG_MESSAGE_CONTENT", "false");
 		/**
 		 * sip_server_log.log 和 sip_debug_log.log public static final int TRACE_NONE =

src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java

@@ -16,10 +16,10 @@ public interface DeviceChannelMapper {
 
     @Insert("INSERT INTO device_channel (channelId, deviceId, name, manufacture, model, owner, civilCode, block, " +
             "address, parental, parentId, safetyWay, registerWay, certNum, certifiable, errCode, secrecy, " +
-            "ipAddress, port, password, PTZType, status, streamId) " +
+            "ipAddress, port, password, PTZType, status, streamId, longitude, latitude) " +
             "VALUES ('${channelId}', '${deviceId}', '${name}', '${manufacture}', '${model}', '${owner}', '${civilCode}', '${block}'," +
             "'${address}', ${parental}, '${parentId}', ${safetyWay}, ${registerWay}, '${certNum}', ${certifiable}, ${errCode}, '${secrecy}', " +
-            "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status}, '${streamId}')")
+            "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status}, '${streamId}'), ${longitude}, ${latitude}")
     int add(DeviceChannel channel);
 
     @Update(value = {" <script>" +
@@ -47,6 +47,8 @@ public interface DeviceChannelMapper {
             "<if test=\"status != null\">, status='${status}'</if>" +
             "<if test=\"streamId != null\">, streamId='${streamId}'</if>" +
             "<if test=\"hasAudio != null\">, hasAudio=${hasAudio}</if>" +
+            "<if test=\"longitude != null\">, longitude=${longitude}</if>" +
+            "<if test=\"latitude != null\">, latitude=${latitude}</if>" +
             "WHERE deviceId='${deviceId}' AND channelId='${channelId}'"+
             " </script>"})
     int update(DeviceChannel channel);

src/main/resources/all-application.yml

@@ -70,8 +70,6 @@ sip:
 
 #zlm服务器配置
 media:
-    # [必须修改] 本机的IP, 必须是网卡上的IP，用于sip下协议栈监听ip，如果监听所有设置为0.0.0.0
-    monitorIp: 0.0.0.0
     # [必须修改] zlm服务器的内网IP
     ip: 192.168.0.100
     # [可选] wvp在国标信令中使用的ip，此ip为摄像机可以访问到的ip， 置空使用 media.ip