Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java结构优化
commit
bd52096884
|
@ -23,7 +23,7 @@ public class UserSetting {
|
||||||
|
|
||||||
private Integer playTimeout = 18000;
|
private Integer playTimeout = 18000;
|
||||||
|
|
||||||
private int platformPlayTimeout = 60000;
|
private int platformPlayTimeout = 20000;
|
||||||
|
|
||||||
private Boolean interfaceAuthentication = Boolean.TRUE;
|
private Boolean interfaceAuthentication = Boolean.TRUE;
|
||||||
|
|
||||||
|
|
|
@ -152,6 +152,9 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger.info("[INVITE] requesterId: {}, callId: {}, 来自:{}:{}",
|
||||||
|
requesterId, callIdHeader.getCallId(), request.getRemoteAddress(), request.getRemotePort());
|
||||||
|
|
||||||
// 查询请求是否来自上级平台\设备
|
// 查询请求是否来自上级平台\设备
|
||||||
ParentPlatform platform = storager.queryParentPlatByServerGBId(requesterId);
|
ParentPlatform platform = storager.queryParentPlatByServerGBId(requesterId);
|
||||||
if (platform == null) {
|
if (platform == null) {
|
||||||
|
|
Loading…
Reference in New Issue