565 Commits

Author	SHA1	Message	Date
huangxiao	629a4dbea3	refactor: 优化zlm hook 推流鉴权事件找不到mediaServer的错误处理	2025-03-28 13:51:48 +08:00
lin	a9cf5131e1	修复zlm普通版本接入异常	2025-03-21 11:30:05 +08:00
lin	06de25bb4d	修复转码时拉流代理无人观看无法移除的BUG， 修复根据请求IP返回流地址失败的BUG	2025-03-19 15:45:23 +08:00
lin	0868219822	修复播放拉流代理时streamKey未写入的BUG	2025-03-14 15:49:29 +08:00
lin	90ab396652	拉流代理返回的流地址增加流来源信息	2025-03-12 16:51:45 +08:00
lin	90d2843255	播放按钮添加loading， 修复拉流代理播放后再次点播失败	2025-03-12 16:43:47 +08:00
lin	e473ab185d	优化播放地址携带流来源信息参数添加算法	2025-03-12 16:18:19 +08:00
lin	e5c3f82d54	播放地址携带流来源信息	2025-03-12 16:09:54 +08:00
648540858	26ee38aebe	Merge branch 'master' into dev/数据库统合 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxy.java # src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxyParam.java	2024-12-31 10:33:12 +08:00
648540858	f078c6f7a0	[拉流代理] 修复 #1718	2024-12-31 10:31:03 +08:00
648540858	e05d988755	Merge branch 'master' into dev/数据库统合 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java	2024-12-27 10:57:42 +08:00
648540858	460f73555e	[推流设备] 修复推流中重启服务导致无法继续播放	2024-12-27 10:42:40 +08:00
648540858	8d6a978978	[redis下的多wvp] 优化服务间方法调用	2024-12-11 18:26:18 +08:00
648540858	70310f918e	修复新增zlm节点初始化端口错误	2024-12-11 14:04:55 +08:00
648540858	8a06562a88	[录制计划] 增加录制计划执行	2024-11-28 18:00:52 +08:00
648540858	f625fb6aed	修复大华对讲talk模式	2024-11-27 10:11:49 +08:00
648540858	0d32608fa9	修复空指针异常	2024-11-15 17:02:43 +08:00
648540858	2060a2117c	优化编码信息的展示	2024-11-14 17:05:12 +08:00
648540858	5c2b4f386b	优化播放页面的预置位控制	2024-11-08 17:40:05 +08:00
648540858	396961ea20	策略配置文件增加注释与使用Lombok	2024-10-30 15:19:17 +08:00
648540858	5304620861	重构报警SSE推送	2024-10-29 15:57:52 +08:00
648540858	059635c2cc	修复国标点播缓存启动未清理的BUG	2024-10-25 17:41:50 +08:00
648540858	bf3e181bdb	修复节点上线和下线时未清理redis流信息的BUG	2024-10-24 16:41:41 +08:00
648540858	0ddc374c34	修复多zlm节点上线时的空指针异常+单端口收流未设置到zlm的BUG	2024-10-24 15:55:38 +08:00
648540858	2cd21a26d4	修复国标级联点播未使用自动自定义SSRC的BUG	2024-10-24 10:04:38 +08:00
Klu5ure	22d6350778	修正拼写错误：重命名 ZLMMediaServerStatusManger 为 ZLMMediaServerStatusManager，node_manger.md 为 node_manager.md	2024-10-21 18:12:16 +08:00
648540858	550b90b157	Merge branch 'master' into dev/master-通道结构重构 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java	2024-09-18 09:10:12 +08:00
hx	f6eeb59371	修复端口初始化wssSslPort获取失败 ... 修复字符集空指针异常导致心跳的错误	2024-09-14 15:16:47 +08:00
648540858	e078360928	修复语音对讲	2024-09-11 16:59:52 +08:00
648540858	1b34787d3a	临时提交	2024-09-10 17:47:58 +08:00
648540858	3140672e63	修复国标录像下载	2024-09-10 16:50:54 +08:00
648540858	489fbe31a5	临时提交	2024-09-09 00:07:00 +08:00
648540858	da441a67f8	临时提交	2024-09-06 17:56:24 +08:00
648540858	fa47f619ba	临时提交	2024-09-03 18:00:35 +08:00
648540858	dd794d4868	临时提交	2024-08-27 17:56:49 +08:00
648540858	5a259aaa63	临时提交	2024-08-24 00:18:54 +08:00
648540858	cce1d1de40	重构INVITE消息处理中的上级点播请求	2024-08-14 17:19:19 +08:00
648540858	16708e385b	支持多WVP的推流播放	2024-08-09 16:27:08 +08:00
648540858	5abf5012eb	完善分组通道管理	2024-08-07 17:12:39 +08:00
648540858	a3f7753b84	Merge branch 'refs/heads/master' into dev/master-通道结构重构 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java # web_src/src/components/PushVideoList.vue	2024-08-07 11:17:34 +08:00
648540858	c88681c7ad	合并分支	2024-08-07 10:41:54 +08:00
Iwan Lebron	c7c94ee73d	修复 ZLMServerFactory 日志不打印	2024-08-01 14:47:43 +08:00
648540858	9f4e66a38b	优化拉流代理	2024-07-19 17:54:14 +08:00
648540858	b98cfd1fed	使用Slf4j注解打印日志	2024-07-03 17:24:35 +08:00
648540858	799932f614	优化日志以及属性设置代码	2024-07-03 16:14:18 +08:00
648540858	b630190e30	临时提交	2024-06-28 18:06:09 +08:00
panlinlin	019af90f6e	临时提交	2024-06-28 07:36:28 +08:00
panlinlin	9c0e69c6c5	临时提交	2024-06-28 06:48:49 +08:00
648540858	88c021948f	临时提交	2024-06-27 18:41:58 +08:00
648540858	400eef2d2e	临时提交	2024-06-27 16:02:43 +08:00