wvp-pro.git - Gitblit

搭配zgyw，实现gb28181

Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-06-29 c014a90cc6a294dfc2aac740be87e75f44193a29

refs
用户	648540858 <648540858@qq.com>
	星期四, 六月 29, 2023 16:08 +0800
提交者	648540858 <648540858@qq.com>
	星期四, 六月 29, 2023 16:08 +0800
提交	c014a90cc6a294dfc2aac740be87e75f44193a29
目录	fdf06bb1ea314d238b03f8c845be5118556f0151 目录 \| zip \| gz
parent	9bd588957a08ae3fa574fddacc2eebc5ba79553b 查看 \| 对比 e8b766172e4f1af382a27185172dccf1e1ada556 查看 \| 对比

Merge branch 'wvp-28181-2.0' into main-dev

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

21个文件已修改

2个文件已添加

	doc/_sidebar.md	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java	282 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java	45 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java	32 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/service/bean/MessageForPushChannel.java	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java	34 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java	120 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/ptz/PtzController.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java	117 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史