463 Commits

Author	SHA1	Message	Date
648540858	47e5d2b00b	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-19 15:58:50 +08:00
648540858	85f20df9de	修复空指针异常	2024-01-19 15:05:24 +08:00
648540858	88721511e7	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-16 14:51:17 +08:00
648540858	9b62fbe467	优化设备编辑页面	2024-01-15 18:36:31 +08:00
648540858	0371f5a96e	修复国标级联全部添加与全部删除	2024-01-15 15:31:20 +08:00
648540858	674ab18c02	修复rtp暂停检查调用失败	2024-01-12 15:03:11 +08:00
648540858	e5a9dd24ef	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-12 14:17:01 +08:00
648540858	18b5c73365	获取InviteInfo添加异常日志	2024-01-12 10:35:26 +08:00
648540858	41c7137e3a	Merge pull request #1242 from criver31/wvp-28181-2.0 ... 1、修复zlm重连不在线 2、单端口下历史回放暂停和恢复发送的流ID与zlm不一致	2024-01-12 09:06:10 +08:00
648540858	2b2efb59a6	修复多个推流推送到上级是不完整的问题，修改平台注销时不删除自己模拟的订阅信息	2024-01-11 14:56:11 +08:00
648540858	64be28ed77	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-10 16:17:53 +08:00
648540858	28e060fd6f	修复空指针异常	2024-01-10 14:42:30 +08:00
648540858	0c10c77a56	优化录像路径的设置	2024-01-10 11:14:49 +08:00
fine	db493e2625	修复单端口下历史回放暂停和恢复发送的流ID与zlm不一致	2024-01-09 11:50:26 +08:00
fine	b6df13af24	修复zlm重连不在线	2024-01-05 14:14:19 +08:00
648540858	a2cac5ca12	Merge branch '2.6.9' into wvp-28181-2.0 ... # Conflicts: # pom.xml	2024-01-04 18:34:46 +08:00
648540858	6120e6bd7b	添加金仓数据库x86驱动，优化兼容接口通道列表查询。修复多个通道同时推送	2024-01-04 17:26:47 +08:00
648540858	76e8480cb1	去除多余方法	2023-12-27 16:18:22 +08:00
648540858	41fdb9d13f	Merge branch 'wvp-28181-record' into feature/record	2023-12-18 15:41:39 +08:00
648540858	a380246e49	修复每次注册都会发送状态变化的BUG	2023-12-18 15:27:51 +08:00
648540858	67d1ff0d26	Merge branch 'wvp-28181-2.0' into feature/record ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java	2023-12-18 14:23:48 +08:00
648540858	76d09bcadb	修复sql注入 #1112	2023-12-18 11:14:59 +08:00
648540858	18a9f86a0a	Merge pull request #1209 from DavidSche/fix-1208 ... fix bug #1208 修复拉流代理启用状态下调用启用接口的返回错误	2023-12-18 09:59:06 +08:00
648540858	7430c98309	增加日志提示	2023-12-17 23:41:21 +08:00
648540858	d8011e9ee7	去除只有udp收流支持ssrc校验的判断	2023-12-17 23:33:18 +08:00
648540858	cb1f1417b6	兼容回复的invite 200OK消息中缺少ssrc(y字段)的情况	2023-12-15 22:44:41 +08:00
648540858	3a1fc63d7a	优化ssrc释放逻辑	2023-12-15 17:28:55 +08:00
648540858	04a1bfa329	优化事务释放逻辑	2023-12-15 16:25:05 +08:00
davidche	572c8850dc	fix bug #1208 修复拉流代理启用状态下调用启用接口的返回错误	2023-12-13 13:48:04 +08:00
648540858	e73d00060e	Merge pull request #1137 from xiaoQQya/develop ... bugfix: 修复推流鉴权、报警推送等问题	2023-12-11 10:22:26 +08:00
648540858	083523d204	Merge pull request #1188 from lunasaw/wvp-28181-2.0-fix ... fix find stream	2023-12-11 10:06:35 +08:00
648540858	92e5ed2e30	优化前端云端录像的播放	2023-12-06 16:10:32 +08:00
648540858	7e136c9ac7	完成下载文件的前后调试	2023-12-06 15:11:21 +08:00
648540858	ad36354ef4	优化国标录像服务端，使用zlm新接口实现功能	2023-12-05 11:29:05 +08:00
648540858	fc77b3f819	支持重新接入zlm的时候检查拉流代理数据是否异常，异常数据自动移除	2023-12-01 15:49:18 +08:00
chenzhangyue	0542700225	fix find stream	2023-12-01 10:34:16 +08:00
648540858	67e4060053	添加推流信息专属redis数据	2023-11-30 18:09:43 +08:00
648540858	3d5842e9e2	查询合并文件列表增加app，stream, callId过滤参数	2023-11-28 09:30:49 +08:00
648540858	29ef68038d	优化拉流代理中关于ffmpeg.cmd的判断	2023-11-21 14:50:16 +08:00
648540858	c98ef23b98	修复定时删除过期录像文件时，收藏文件被删除的问题	2023-11-21 14:30:33 +08:00
648540858	58b333604d	修改错别字	2023-11-02 15:30:17 +08:00
648540858	073b6acec3	取出多余注释	2023-11-02 15:25:39 +08:00
lishuyuan	8bd2f47c9a	bugfix：目录订阅收到更新事件时，sql字段update_time为空导致的报错	2023-11-02 10:17:47 +08:00
xiaoQQya	f0d09d1808	perf(snap): 优化点播后 ffmpeg 截图使用的命令参数，解决部分情况下截图失败的问题	2023-11-01 17:15:19 +08:00
648540858	5d3f307b44	将录像存储路径迁移至wvp中配置，assist以有在需要视频合成的时候才会用	2023-11-01 14:07:32 +08:00
648540858	829ff200b8	Merge branch 'wvp-28181-2.0' into wvp-28181-record ... # Conflicts: # sql/2.6.9更新.sql	2023-10-27 16:01:07 +08:00
648540858	f4f3e60a6b	Merge pull request #1082 from DavidSche/Live_streaming_push ... 推流列表-->添加通道 补充播放需要的默认参数 媒体服务器ID,是否本平台推送,是否正在推送(影响播放按钮是否显示)	2023-10-27 15:47:27 +08:00
648540858	af911d4f02	Merge pull request #1102 from xu-bin-bin/wvp-28181-2.0 ... 修复在修改设备信息的移动位置订阅由非0值改为0值时不生效的问题	2023-10-27 15:42:32 +08:00
648540858	47783946fe	Merge pull request #1105 from lunasaw/dev-wvp-1011 ... feat:支持代理拉流状态检测，离线查询流是否离线	2023-10-27 15:41:26 +08:00
lishuyuan	da7889bf67	bugfix：编辑国标设备时，若目录订阅周期本来不为0时不生效	2023-10-27 11:15:30 +08:00