495 Commits

Author	SHA1	Message	Date
648540858	a9ab5c28e9	优化订阅机制，需要重新订阅时，取消命令发送后再发送订阅命令 #1273	2024-02-20 11:12:42 +08:00
648540858	b3d21c7452	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-22 16:35:17 +08:00
648540858	a9264a8bc0	修复assist使用https时无法请求的bug	2024-01-22 16:34:58 +08:00
648540858	e8770eec36	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-22 16:02:28 +08:00
648540858	d68aebd409	指定service使用的数据源	2024-01-22 15:56:24 +08:00
648540858	97a87542a6	Merge branch '2.6.9' into wvp-28181-2.0 ... # Conflicts: # pom.xml	2024-01-22 10:37:13 +08:00
648540858	0e94aeaf5f	优化录像合并下载,支持不过滤zlm节点ID	2024-01-22 10:16:16 +08:00
648540858	07729fbe49	优化录像合并下载	2024-01-22 09:46:03 +08:00
648540858	79c8447298	支持使用多数据源	2024-01-22 00:29:09 +08:00
648540858	55b15f8ba6	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-19 17:45:11 +08:00
648540858	cf8a1261b5	支持合并录像使用https	2024-01-19 17:44:31 +08:00
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	47526e241e	修复多wvp推流时，收到停止消息数据处理失败问题	2024-01-19 12:12:35 +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	81a32fdb47	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-10 19:12:06 +08:00
648540858	29f7a6b6eb	修复多wvp模式推流时信息存储错误	2024-01-10 18:55:14 +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	8874c90db2	Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0	2024-01-09 11:45:30 +08:00
648540858	b15e559eae	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-08 16:18:28 +08:00
648540858	f3acf33fbf	添加日志	2024-01-05 17:53:20 +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