648540858
							
						 | 
						
							
							
							
								
							
								e9586687f7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								a77ba194ad
								
							
								
							
						 | 
						
							
							
								
								优化目录推送CivilCode值
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
								
								
							
							
								
							
								2142b7ffcd
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #379 from MeBetterMan/wvp-28181-2.0
							
							
							
							
							
							
								
							
							
							级联场景,invite消息中获取channelid。以前从invite的第一行读取,现在从subject header读取。 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								bc1b8098a2
								
							
								
							
						 | 
						
							
							
								
								修身颠簸与录像回放redis前缀重复的问题
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
								
								
							
							
								
							
								b565523684
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #403 from brewswang/wvp-28181-2.0
							
							
							
							
							
							
								
							
							
							执法记录仪在更新目录数据的时候需要更新位置信息 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								brewswang
							
						 | 
						
							
							
							
								
							
								7af3cb03ec
								
							
								
							
						 | 
						
							
							
								
								执法记录仪在更新目录数据的时候需要更新位置信息
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								59ef6e67d3
								
							
								
							
						 | 
						
							
							
								
								统一国标设备与级联平台字符集的使用
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								c8f9f19c38
								
							
								
							
						 | 
						
							
							
								
								#393
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								4a0fd9ead3
								
							
								
							
						 | 
						
							
							
								
								修复合并pr带来的bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								57e6cdefdf
								
							
								
							
						 | 
						
							
							
								
								#401
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
								
								
							
							
								
							
								bf10cc1b35
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #399 from nikmu/wvp-28181-2.0
							
							
							
							
							
							
								
							
							
							修复device_channel的Id改变带来的tree查询bug 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								朱俊杰
							
						 | 
						
							
							
							
								
							
								ba3c38d7d3
								
							
								
							
						 | 
						
							
							
								
								去掉createinfo中的cseq参数
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								朱俊杰
							
						 | 
						
							
							
							
								
							
								b1c479b938
								
							
								
							
						 | 
						
							
							
								
								修复info请求头中的cseq序列
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								e752dbd1a7
								
							
								
							
						 | 
						
							
							
								
								修复推流关联平台的bug again
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								66aac4526b
								
							
								
							
						 | 
						
							
							
								
								修复推流关联平台的bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								d21a00418e
								
							
								
							
						 | 
						
							
							
								
								修复推流关联平台的bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								朱俊杰
							
						 | 
						
							
							
							
								
							
								70ada79c7a
								
							
								
							
						 | 
						
							
							
								
								修复device_channel的Id改变带来的tree查询bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								0dfce85d2f
								
							
								
							
						 | 
						
							
							
								
								必须提前在zlm上配置port_range属性,不然自动配置此属性可能不成功
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								ea08969bfc
								
							
								
							
						 | 
						
							
							
								
								使用zlm原生的rtp随机端口配置
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								0e69251281
								
							
								
							
						 | 
						
							
							
								
								修复多平台同时导入时的bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								11d40d3e22
								
							
								
							
						 | 
						
							
							
								
								#396
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								28e5c1ae05
								
							
								
							
						 | 
						
							
							
								
								修复平台编辑的bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								28b1ed8b0d
								
							
								
							
						 | 
						
							
							
								
								修复使用ffmpeg拉流代理时ffmpeg cmd模板空白的bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								bde0e13682
								
							
								
							
						 | 
						
							
							
								
								#394
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								354a39961a
								
							
								
							
						 | 
						
							
							
								
								优化点播, 级联点播级联录像。级联列表显示订阅状态
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								1171cf1ea9
								
							
								
							
						 | 
						
							
							
								
								使用zlm新特性支持对与国标流关闭音频以加快拉流速度
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								61e91afd91
								
							
								
							
						 | 
						
							
							
								
								#390
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								1c95f1b4aa
								
							
								
							
						 | 
						
							
							
								
								移除多余字段
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								5cfaad2d6d
								
							
								
							
						 | 
						
							
							
								
								#376
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								4a22611320
								
							
								
							
						 | 
						
							
							
								
								优化目录订阅时父节点的更新
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
								
								
							
							
								
							
								98d12ecd6b
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #388 from AbnerSC/wvp-28181-2.0
							
							
							
							
							
							
								
							
							
							修复关闭按需拉流无效的问题,和几个小问题 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
								
								
							
							
								
							
								45e9fc880c
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								4e3247e44e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								c1d7f867c2
								
							
								
							
						 | 
						
							
							
								
								优化目录订阅以及国标级联目录订阅回复
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								dengming
							
						 | 
						
							
							
							
								
							
								5e272330c2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wvp-28181-2.0' of github.com:AbnerSC/wvp-GB28181-pro into wvp-28181-2.0
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sc.dm
							
						 | 
						
							
							
								
								
							
							
								
							
								4abbf4df07
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								dengming
							
						 | 
						
							
							
							
								
							
								a948b38dd6
								
							
								
							
						 | 
						
							
							
								
								优化pom配置,解决编译Failed to perform fetch问题
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								dengming
							
						 | 
						
							
							
							
								
							
								f88c70d38c
								
							
								
							
						 | 
						
							
							
								
								删除重复字段,channelId字段查询了两次
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								dengming
							
						 | 
						
							
							
							
								
							
								d474bf929e
								
							
								
							
						 | 
						
							
							
								
								删除多余依赖包com.google.guava:30.0-jre,项目引用了版本31
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								dengming
							
						 | 
						
							
							
							
								
							
								bef7fb2440
								
							
								
							
						 | 
						
							
							
								
								修复关闭按需拉流无效的问题
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
								
								
							
							
								
							
								3b5ce2e4d1
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #387 from AbnerSC/wvp-28181-2.0
							
							
							
							
							
							
								
							
							
							修复云端录像播放和下载路径错误的问题 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								dengming
							
						 | 
						
							
							
							
								
							
								ec97c6a7d0
								
							
								
							
						 | 
						
							
							
								
								修复云端录像播放和下载路径错误的问题
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Fang
							
						 | 
						
							
							
								
								
							
							
								
							
								bea63f67e7
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								李防
							
						 | 
						
							
							
							
								
							
								335916f1f1
								
							
								
							
						 | 
						
							
							
								
								InviteRequestProcessor类中,channelid从invite消息的header subject获取,不再从第一行request line获取。原因是和第三方平台对接时,发送的invite消息第一行为国标平台编码而不是设备通道编码,导致报错通道不存在,返回404。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								41616f726d
								
							
								
							
						 | 
						
							
							
								
								修复导入通道时无平台关联时的bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								a45bb7d9df
								
							
								
							
						 | 
						
							
							
								
								导出sql
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								ca79100b6f
								
							
								
							
						 | 
						
							
							
								
								优化失败的录像点播的ssrc释放逻辑
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								b2c953fc76
								
							
								
							
						 | 
						
							
							
								
								优化ssrc释放逻辑,优化级联点播速度,去除等待流格式的配置项
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
								
								
							
							
								
							
								9d37b411ec
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #375 from MeBetterMan/wvp-28181-2.0
							
							
							
							
							
							
								
							
							
							修改3个小bug 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								李防
							
						 | 
						
							
							
							
								
							
								cbea5f64c9
								
							
								
							
						 | 
						
							
							
								
								修改3个小bug
							
							
							
							
								
							
							
						 | 
						4 years ago |