‘sxh’ 652489b47e Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java

2023-06-15 11:10:20 +08:00

..

auth

修复 设备注册时报错 #799

2023-03-31 09:10:16 +08:00

bean

Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

2023-06-15 11:10:20 +08:00

conf

修身目录刷新，优化公网下远程IP端口的获取

2023-04-23 14:36:13 +08:00

event

支持推流和拉流代理通道状态变化发送通知

2023-04-23 15:54:34 +08:00

session

Merge branch '2.6.8' into wvp-28181-2.0

2023-06-07 20:21:10 +08:00

task

优化国标规范，参考国标文档中-点播外域设备媒体流SSRC处理方式，上级点播时自定义ssrc，不适用上级携带的ssrc，也避免上级兼容性差，不携带ssrc的问题，可通过配置关闭此特性

2023-05-04 14:21:58 +08:00

transmit

Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

2023-06-15 11:10:20 +08:00

utils

优化移动位置的时间

2023-06-14 20:39:10 +08:00

SipLayer.java

redis优化

2023-04-13 17:14:04 +08:00