763 Commits

Author	SHA1	Message	Date
648540858	dc841a9dcf	临时提交	2023-12-12 17:57:19 +08:00
648540858	e0686dd426	临时提交	2023-12-11 23:09:58 +08:00
648540858	31dcde7cc1	临时提交	2023-12-11 22:49:48 +08:00
648540858	92669f192f	临时提交	2023-12-11 21:18:53 +08:00
648540858	b7af59b2ce	修复拉流代理	2023-12-11 14:52:52 +08:00
648540858	6678ac8605	临时提交	2023-12-08 18:05:14 +08:00
648540858	dc4385da74	临时提交	2023-12-07 18:04:53 +08:00
648540858	0d3845af59	添加移除共享到上级平台的通道	2023-12-05 23:23:48 +08:00
648540858	e44be505d9	优化通用通道同步，待完成	2023-11-28 18:56:39 +08:00
648540858	a9e5883492	优化通用通道同步，待完成	2023-11-24 18:04:57 +08:00
648540858	d72f57c772	支持通用通道国标类型的播放	2023-11-24 10:12:36 +08:00
648540858	89fd69b5ab	优化国标通道同步到资源库	2023-10-08 18:09:46 +08:00
648540858	cb41fc9f84	Merge branch 'wvp-28181-2.0' into database-structure-optimization	2023-10-08 15:42:08 +08:00
648540858	205f1f1f60	优化国标级联心跳失败再次注册的逻辑	2023-10-08 15:41:24 +08:00
648540858	9fa4bf6f77	Merge branch 'wvp-28181-2.0' into database-structure-optimization	2023-10-08 11:04:30 +08:00
648540858	c084d6c98a	优化国标级联心跳失败判断逻辑	2023-10-07 18:00:08 +08:00
648540858	4c28f380aa	优化byte数组转换	2023-10-07 14:52:46 +08:00
648540858	6255e6f89f	支持自动同步国标通道到通用通道，分组信息以及行政区划自动同步	2023-10-04 00:59:16 +08:00
648540858	8f7673a083	Merge branch 'wvp-28181-2.0' into database-structure-optimization ... # Conflicts: # sql/2.6.9更新.sql	2023-10-01 23:59:04 +08:00
648540858	130dc5d82d	优化拉流代理逻辑，修复ffmpeg拉流代理鉴权	2023-09-30 06:09:16 +08:00
648540858	483d5e04a7	优化拉流代理	2023-09-25 18:51:02 +08:00
648540858	527dd66c0d	添加字段控制是否自动同步国标通道	2023-09-25 18:20:05 +08:00
648540858	ea271bf4b9	添加字段控制是否自动同步国标通道	2023-09-25 16:13:38 +08:00
648540858	94ec880fe8	Merge branch 'wvp-28181-2.0' into database-structure-optimization ... # Conflicts: # sql/2.6.9更新.sql	2023-09-22 17:46:58 +08:00
648540858	b9a33f03d6	国标级联支持添加通道后主动推动到上级	2023-09-22 17:46:31 +08:00
648540858	be527a4bd1	增加国标通道同步到资源管理	2023-09-19 17:55:13 +08:00
648540858	b902a659dc	Merge branch 'wvp-28181-2.0' into database-structure-optimization	2023-09-15 14:30:51 +08:00
648540858	2d11f1b3de	修复ssrc缓存初始化判断错误，导致初始化失败	2023-09-15 14:25:08 +08:00
648540858	1d8dd248a5	接口优化	2023-09-15 09:34:29 +08:00
648540858	b1ec6c6dd6	Merge branch 'wvp-28181-2.0' into database-structure-optimization	2023-09-12 15:33:41 +08:00
648540858	f57ed350b3	添加设置mobilePosition中ChannelId #1054	2023-09-11 11:01:20 +08:00
648540858	c56a842194	Merge branch 'wvp-28181-2.0' into database-structure-optimization	2023-09-06 16:18:33 +08:00
chenzhangyue	7155680793	fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set	2023-09-05 17:35:46 +08:00
648540858	cde7f6460a	Merge pull request #999 from a24211317/wvp-28181-2.0 ... 解决两个国标平台相互级联时，上级不能获取目录的问题	2023-09-01 09:21:05 +08:00
ChengHong	d0ef68af3f	Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0	2023-08-31 17:08:13 +08:00
648540858	6f6764eda5	Merge branch 'wvp-28181-2.0' into database-structure-optimization	2023-08-31 16:46:23 +08:00
648540858	32ec1cb912	增加通用通道接口	2023-08-31 09:45:51 +08:00
yangjunyi	1b81080f6f	修复通道目录同步异常问题	2023-08-29 14:23:28 +08:00
648540858	dc37f66792	Merge pull request #1028 from nikmu/wvp-28181-2.0 ... 捕获启动过程中发送sip异常导致的启动失败	2023-08-28 09:03:58 +08:00
648540858	288b4d4a41	Merge branch 'wvp-28181-2.0' into database-structure-optimization	2023-08-25 09:17:28 +08:00
648540858	760b14eaaa	恢复级联点播	2023-08-25 09:14:38 +08:00
648540858	3951a95284	Merge branch '2.6.8' into wvp-28181-2.0 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java	2023-08-25 08:56:47 +08:00
648540858	23ce55260f	修复级联点播	2023-08-25 08:51:06 +08:00
朱俊杰	49a8a08c94	捕获启动过程中发送sip异常导致的启动失败	2023-08-24 17:12:39 +08:00
648540858	dbe5b8f5a8	添加公用国标通道与sql	2023-08-21 17:54:15 +08:00
648540858	91e49745e4	修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化	2023-08-16 01:55:50 +08:00
chenghong	bac19f583c	解决两个国标平台相互级联时，上级不能获取目录的问题	2023-08-14 11:44:41 +08:00
648540858	eefd6a0e21	Merge pull request #993 from a24211317/wvp-28181-2.0 ... 平台保活消息增加回复200OK	2023-08-11 09:12:19 +08:00
chenzhangyue	dd2ae65786	修复代理访问跨域问题，和ScheduledFuture取消任务时指令重排异常，不结束正在运行的任务。防止 Command interrupted	2023-08-10 20:00:43 +08:00
chenghong	4ca97d3174	平台保活消息增加回复200OK	2023-08-09 16:18:19 +08:00