From df11956c3c203434d3ef54955a502c466f1382dd Mon Sep 17 00:00:00 2001 From: 64850858 <648540858@qq.com> Date: 星期一, 07 六月 2021 15:42:01 +0800 Subject: [PATCH] 取出错误配置 --- src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 2 +- src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 2 ++ src/main/resources/all-application.yml | 2 -- src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 6 ++++-- 4 files changed, 7 insertions(+), 5 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 4fc28bc..6db63ee 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java @@ -69,4 +69,6 @@ public Integer getKeepaliveTimeOut() { return keepaliveTimeOut; } + + } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java index 34a1bde..9c3e230 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java @@ -72,7 +72,7 @@ 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 = diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java index d11f70b..ca66809 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java @@ -16,10 +16,10 @@ @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 @@ "<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); diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml index 6923d97..804da1d 100644 --- a/src/main/resources/all-application.yml +++ b/src/main/resources/all-application.yml @@ -70,8 +70,6 @@ #zlm鏈嶅姟鍣ㄩ厤缃� media: - # [蹇呴』淇敼] 鏈満鐨処P, 蹇呴』鏄綉鍗′笂鐨処P锛岀敤浜巗ip涓嬪崗璁爤鐩戝惉ip锛屽鏋滅洃鍚墍鏈夎缃负0.0.0.0 - monitorIp: 0.0.0.0 # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP ip: 192.168.0.100 # [鍙�塢 wvp鍦ㄥ浗鏍囦俊浠や腑浣跨敤鐨刬p锛屾ip涓烘憚鍍忔満鍙互璁块棶鍒扮殑ip锛� 缃┖浣跨敤 media.ip -- Gitblit v1.8.0