ckb_test
							
						 | 
						
							
							
								
								
							
							
								
							
								6d454423a2
								
									
								
							
								
							
						 | 
						
							
							
								
								rPort 变更了HostAddres也要变
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								0cd86a79c2
								
							
								
							
						 | 
						
							
							
								
								修复设备删除
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								e94b99d11c
								
							
								
							
						 | 
						
							
							
								
								实现国标录像级联播放,优化点播流程,加快点播速度
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
								
								
							
							
								
							
								917e2b577d
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #352 from walkTtalk/wvp-28181-2.0
							
							
							
							
							
							
								
							
							
							Fix issue #347: 修改前端启动报错 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								walkTtalk
							
						 | 
						
							
							
							
								
							
								f52be30399
								
							
								
							
						 | 
						
							
							
								
								Fix issue #347: 修改前端启动报错
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								10f776678e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wvp-28181-2.0' into wvp-pro-record
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								7400ace65d
								
							
								
							
						 | 
						
							
							
								
								规范数据库,解决bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								chenjialing
							
						 | 
						
							
							
							
								
							
								777f2e2121
								
							
								
							
						 | 
						
							
							
								
								日志优化--修改本地配置文件local的mysql连接方式
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								chenjialing
							
						 | 
						
							
							
							
								
							
								e0f8acf09f
								
							
								
							
						 | 
						
							
							
								
								添加git的忽略logs
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								chenjialing
							
						 | 
						
							
							
							
								
							
								7852c4fde7
								
							
								
							
						 | 
						
							
							
								
								research--local文件
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								chenjialing
							
						 | 
						
							
							
							
								
							
								c8b9e590ef
								
							
								
							
						 | 
						
							
							
								
								日志优化--优化本地的日志记录方式,增加druid的sql的日志打印和监控面板,修改druid的配置方式
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								c9bfdf2525
								
							
								
							
						 | 
						
							
							
								
								实现国标的级联录像查询
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								00afecac47
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wvp-28181-2.0' into wvp-pro-record
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								a42dda2bd3
								
							
								
							
						 | 
						
							
							
								
								规范数据库,添加必要约束,优化通道批量导入功能
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								0191e93768
								
							
								
							
						 | 
						
							
							
								
								同步主线
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								f4c03c1808
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-pro-record
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								e861c9dfab
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into wvp-pro-record
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								2157bb0270
								
							
								
							
						 | 
						
							
							
								
								规范数据库,给各个标设置主键ID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								0a44eb8965
								
							
								
							
						 | 
						
							
							
								
								增加配置将国标录像与其他录像分开
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								0b6587b1ad
								
							
								
							
						 | 
						
							
							
								
								增加配置将国标录像与其他录像分开
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								5bcd8495e0
								
							
								
							
						 | 
						
							
							
								
								兼容海康不规范的xml,大幅度提高通道分页查询速度,优化节点的保活。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								b7635ec05d
								
							
								
							
						 | 
						
							
							
								
								优化级联通道发送速度
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								0327d16021
								
							
								
							
						 | 
						
							
							
								
								优化级联平台删除
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								59c79c08e1
								
							
								
							
						 | 
						
							
							
								
								修复级联通道回复错误
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								b0d3bf3ed9
								
							
								
							
						 | 
						
							
							
								
								添加通道导入实例文件
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								9442c37ce7
								
							
								
							
						 | 
						
							
							
								
								优化级联添加通道流程
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								d4fe0fb325
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
								
								
							
							
								
							
								5528517471
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #325 from nikmu/wvp-28181-2.0
							
							
							
							
							
							
								
							
							
							新增实时监控功能 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								朱俊杰
							
						 | 
						
							
							
							
								
							
								54df5df031
								
							
								
							
						 | 
						
							
							
								
								mapper改用注释方式
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								b663a8ab41
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								980052015a
								
							
								
							
						 | 
						
							
							
								
								优化列表展示
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								bf66f8f694
								
							
								
							
						 | 
						
							
							
								
								推流导入支持添加平台信息与目录信息
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
								
								
							
							
								
							
								59f0210d04
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #324 from SaltFish001/wvp-28181-2.0
							
							
							
							
							
							
								
							
							
							更新生成的HTTP(s)/WS(s)-flv的链接地址 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								朱俊杰
							
						 | 
						
							
							
							
								
							
								37a84e6691
								
							
								
							
						 | 
						
							
							
								
								新增实时监控功能
							
							
							
							
							
							
								
							
							
							左边是设备通道树,右边是分屏预览 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								SaltFish
							
						 | 
						
							
							
								
								
							
							
								
							
								0209dc89c9
								
									
								
							
								
							
						 | 
						
							
							
								
								Update MediaServiceImpl.java
							
							
							
							
							
							
								
							
							
							最新版本zlm更新了flv的链接地址, 同步更新 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								d07a5680f3
								
							
								
							
						 | 
						
							
							
								
								为推流列表增加批量移除功能
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								e0028a87cb
								
							
								
							
						 | 
						
							
							
								
								为推流列表增加搜索功能
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								ea85a620d1
								
							
								
							
						 | 
						
							
							
								
								添加服务器信息获取能力。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								d7afcab601
								
							
								
							
						 | 
						
							
							
								
								优化媒体服务器配置展示界面
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								8d5764b9a0
								
							
								
							
						 | 
						
							
							
								
								优化信令配置展示界面
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								646419e4ad
								
							
								
							
						 | 
						
							
							
								
								#247
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								8cfff8db97
								
							
								
							
						 | 
						
							
							
								
								添加对可能空指针的判断
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								f33c3a3630
								
							
								
							
						 | 
						
							
							
								
								添加重启后拉流代理自动恢复
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								66cadafd1c
								
							
								
							
						 | 
						
							
							
								
								优化直播推流的CivilCode
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								89db9991a2
								
							
								
							
						 | 
						
							
							
								
								2.0.2版本 去除默认的mediaIP 127.0.0.1,避免误导新用户
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								9b21fba871
								
							
								
							
						 | 
						
							
							
								
								解析xml异常时,回复400
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								e728233781
								
							
								
							
						 | 
						
							
							
								
								使用log4j-over-slf4j取代log4j避免log4j漏洞
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
							
								
							
								f9b8ea6573
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								648540858
							
						 | 
						
							
							
								
								
							
							
								
							
								7cb74dbe51
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #317 from nikmu/wvp-28181-2.0
							
							
							
							
							
							
								
							
							
							添加lombok,分离注册周期事件 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								lanss
							
						 | 
						
							
							
								
								
							
							
								
							
								d34be408d6
								
									
								
							
								
							
						 | 
						
							
							
								
								update web_src/src/components/dialog/changePassword.vue.
							
							
							
							
								
							
							
						 | 
						4 years ago |