648540858
							
						 | 
						
							
							
								a7bf29a4cb
							
							恢复默认值
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								fa62ab9a01
							
							Merge pull request #893 from sxh-netizen/wvp-28181-2.0
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								9e28923b8c
							
							Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								b4dadf6c51
							
							修复删除的设备无法重新注册的问题
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								21a96ad20f
							
							修复通道刷新
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								d310204d00
							
							去除多余字段
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								0532363192
							
							优化国标级联注册机制
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								6b3732b8c4
							
							Merge branch '2.6.8' into wvp-28181-2.0
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								8cf5b65e38
							
							优化国标级联注册机制
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								8942ab0112
							
							优化国标级联的目录创建以及推送规则,优化接收目录规则,更加规范
						 | 
						2 years ago | 
					
				
					
						
							
								   ‘sxh’
							
						 | 
						
							
							
								ccc0a99d68
							
							同步主线的代码,保持一致性
						 | 
						2 years ago | 
					
				
					
						
							
								   ‘sxh’
							
						 | 
						
							
							
								652489b47e
							
							Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
						 | 
						2 years ago | 
					
				
					
						
							
								   ‘sxh’
							
						 | 
						
							
							
								05cc0d14f1
							
							新增设备主子码流选择(mysql语句)
						 | 
						2 years ago | 
					
				
					
						
							
								   ‘sxh’
							
						 | 
						
							
							
								15df08964b
							
							新增设备主子码流选择,默认为不开启
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								319cdd2151
							
							优化移动位置的时间
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								138216c395
							
							Merge pull request #876 from criver31/wvp-28181-2.0
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								5b8ffd5b61
							
							修复前端空指针异常 #831
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								f4960b2618
							
							修复移动位置获取接口超时 #857
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								f3388dd53a
							
							修复级联录像查询sql错误
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								e68eb850a9
							
							去除多余日志
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								c4d7dd9651
							
							Merge branch '2.6.8' into wvp-28181-2.0
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								8f5bbfa5c2
							
							修复zlm上线时过期任务设置错误
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								fa80ba6f2b
							
							修复sdp解析错误
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								52f9c295f9
							
							Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								446f729e55
							
							优化sdp解析,兼容带有f=的设备
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								d93947c657
							
							Merge pull request #887 from bigbeef/wvp-28181-2.0
						 | 
						2 years ago | 
					
				
					
						
							
								   winfed
							
						 | 
						
							
							
								1bdc0621b8
							
							feat:删除拉流代理时,提示是否确认删除,防止误删
						 | 
						2 years ago | 
					
				
					
						
							
								   winfed
							
						 | 
						
							
							
								a2d93fce81
							
							fix:修复拉流代理配置展示问题:音频、录制、无人观看
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								03f3598681
							
							修复stream-on-demand配置失效的BUG
						 | 
						2 years ago | 
					
				
					
						
							
								   648540858
							
						 | 
						
							
							
								20a47729fc
							
							Merge branch '2.6.8' into wvp-28181-2.0
						 | 
						2 years ago |