Commit df11956c3c203434d3ef54955a502c466f1382dd
1 parent
83411ad1
取出错误配置
Showing
4 changed files
with
7 additions
and
5 deletions
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
| @@ -72,7 +72,7 @@ public class SipLayer implements SipListener { | @@ -72,7 +72,7 @@ public class SipLayer implements SipListener { | ||
| 72 | private SipStack createSipStack() throws PeerUnavailableException { | 72 | private SipStack createSipStack() throws PeerUnavailableException { |
| 73 | Properties properties = new Properties(); | 73 | Properties properties = new Properties(); |
| 74 | properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP"); | 74 | properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP"); |
| 75 | - properties.setProperty("javax.sip.IP_ADDRESS", sipConfig.getSipIp()); | 75 | + properties.setProperty("javax.sip.IP_ADDRESS", sipConfig.getMonitorIp()); |
| 76 | properties.setProperty("gov.nist.javax.sip.LOG_MESSAGE_CONTENT", "false"); | 76 | properties.setProperty("gov.nist.javax.sip.LOG_MESSAGE_CONTENT", "false"); |
| 77 | /** | 77 | /** |
| 78 | * sip_server_log.log 和 sip_debug_log.log public static final int TRACE_NONE = | 78 | * 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 { | @@ -16,10 +16,10 @@ public interface DeviceChannelMapper { | ||
| 16 | 16 | ||
| 17 | @Insert("INSERT INTO device_channel (channelId, deviceId, name, manufacture, model, owner, civilCode, block, " + | 17 | @Insert("INSERT INTO device_channel (channelId, deviceId, name, manufacture, model, owner, civilCode, block, " + |
| 18 | "address, parental, parentId, safetyWay, registerWay, certNum, certifiable, errCode, secrecy, " + | 18 | "address, parental, parentId, safetyWay, registerWay, certNum, certifiable, errCode, secrecy, " + |
| 19 | - "ipAddress, port, password, PTZType, status, streamId) " + | 19 | + "ipAddress, port, password, PTZType, status, streamId, longitude, latitude) " + |
| 20 | "VALUES ('${channelId}', '${deviceId}', '${name}', '${manufacture}', '${model}', '${owner}', '${civilCode}', '${block}'," + | 20 | "VALUES ('${channelId}', '${deviceId}', '${name}', '${manufacture}', '${model}', '${owner}', '${civilCode}', '${block}'," + |
| 21 | "'${address}', ${parental}, '${parentId}', ${safetyWay}, ${registerWay}, '${certNum}', ${certifiable}, ${errCode}, '${secrecy}', " + | 21 | "'${address}', ${parental}, '${parentId}', ${safetyWay}, ${registerWay}, '${certNum}', ${certifiable}, ${errCode}, '${secrecy}', " + |
| 22 | - "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status}, '${streamId}')") | 22 | + "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status}, '${streamId}'), ${longitude}, ${latitude}") |
| 23 | int add(DeviceChannel channel); | 23 | int add(DeviceChannel channel); |
| 24 | 24 | ||
| 25 | @Update(value = {" <script>" + | 25 | @Update(value = {" <script>" + |
| @@ -47,6 +47,8 @@ public interface DeviceChannelMapper { | @@ -47,6 +47,8 @@ public interface DeviceChannelMapper { | ||
| 47 | "<if test=\"status != null\">, status='${status}'</if>" + | 47 | "<if test=\"status != null\">, status='${status}'</if>" + |
| 48 | "<if test=\"streamId != null\">, streamId='${streamId}'</if>" + | 48 | "<if test=\"streamId != null\">, streamId='${streamId}'</if>" + |
| 49 | "<if test=\"hasAudio != null\">, hasAudio=${hasAudio}</if>" + | 49 | "<if test=\"hasAudio != null\">, hasAudio=${hasAudio}</if>" + |
| 50 | + "<if test=\"longitude != null\">, longitude=${longitude}</if>" + | ||
| 51 | + "<if test=\"latitude != null\">, latitude=${latitude}</if>" + | ||
| 50 | "WHERE deviceId='${deviceId}' AND channelId='${channelId}'"+ | 52 | "WHERE deviceId='${deviceId}' AND channelId='${channelId}'"+ |
| 51 | " </script>"}) | 53 | " </script>"}) |
| 52 | int update(DeviceChannel channel); | 54 | int update(DeviceChannel channel); |
src/main/resources/all-application.yml
| @@ -70,8 +70,6 @@ sip: | @@ -70,8 +70,6 @@ sip: | ||
| 70 | 70 | ||
| 71 | #zlm服务器配置 | 71 | #zlm服务器配置 |
| 72 | media: | 72 | media: |
| 73 | - # [必须修改] 本机的IP, 必须是网卡上的IP，用于sip下协议栈监听ip，如果监听所有设置为0.0.0.0 | ||
| 74 | - monitorIp: 0.0.0.0 | ||
| 75 | # [必须修改] zlm服务器的内网IP | 73 | # [必须修改] zlm服务器的内网IP |
| 76 | ip: 192.168.0.100 | 74 | ip: 192.168.0.100 |
| 77 | # [可选] wvp在国标信令中使用的ip，此ip为摄像机可以访问到的ip， 置空使用 media.ip | 75 | # [可选] wvp在国标信令中使用的ip，此ip为摄像机可以访问到的ip， 置空使用 media.ip |