Commit Graph

  • e8770eec36 Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-22 16:02:28 +08:00
  • d68aebd409 指定service使用的数据源 648540858 2024-01-22 15:56:24 +08:00
  • 5a3b1c04d6 补充日志 648540858 2024-01-22 12:09:04 +08:00
  • 97a87542a6 Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-22 10:37:13 +08:00
  • 0e94aeaf5f 优化录像合并下载,支持不过滤zlm节点ID 648540858 2024-01-22 10:16:16 +08:00
  • 07729fbe49 优化录像合并下载 648540858 2024-01-22 09:46:03 +08:00
  • 9a89cf81b8 添加多数据源配置实例 648540858 2024-01-22 00:33:04 +08:00
  • 79c8447298 支持使用多数据源 648540858 2024-01-22 00:29:09 +08:00
  • 46af350868 优化多节点国标级联国标录像查询 648540858 2024-01-21 22:38:50 +08:00
  • 31df0fb3ff 修复级联点播时tcp模式信令回复的错误 648540858 2024-01-21 16:56:13 +08:00
  • 7055c53192 BUGFIX:回放时,优先从SDP中提取channelId,兼容从Subject无法提取到channelId的问题 hexq 2024-01-20 10:26:49 +08:00
  • dd4e0d0d9c BUGFIX:向下级目录关联通道时,出现“未查询到目录xxx的信息" hexq 2024-01-20 10:22:34 +08:00
  • 55b15f8ba6 Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-19 17:45:11 +08:00
  • cf8a1261b5 支持合并录像使用https 648540858 2024-01-19 17:44:31 +08:00
  • 654599b659 修复通道重命名后无法被检索到 648540858 2024-01-19 16:07:30 +08:00
  • 47e5d2b00b Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-19 15:58:50 +08:00
  • 782e8b9800 修复sendRtpItem写入不及时导致的发流失败 648540858 2024-01-19 15:43:08 +08:00
  • 85f20df9de 修复空指针异常 648540858 2024-01-19 15:05:24 +08:00
  • 47526e241e 修复多wvp推流时,收到停止消息数据处理失败问题 648540858 2024-01-19 12:12:35 +08:00
  • ebc65b40d3 添加收到invite消息后的日志,减少国标级联推送代理流的等待时间 648540858 2024-01-18 14:54:03 +08:00
  • 7f79b92568 修复设备在事务内注销失败的问题 648540858 2024-01-18 10:17:03 +08:00
  • 88721511e7 Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-16 14:51:17 +08:00
  • 6eed486ff1 合并主线 648540858 2024-01-16 14:18:17 +08:00
  • 9a96597e66 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2024-01-16 14:10:27 +08:00
  • c32ba1dea8 修复语音对讲 648540858 2024-01-16 11:33:12 +08:00
  • 9b62fbe467 优化设备编辑页面 648540858 2024-01-15 18:36:31 +08:00
  • 13e2a96dae 添加删除通道时通知的日志 648540858 2024-01-15 15:39:28 +08:00
  • 0371f5a96e 修复国标级联全部添加与全部删除 648540858 2024-01-15 15:31:20 +08:00
  • 674ab18c02 修复rtp暂停检查调用失败 648540858 2024-01-12 15:03:11 +08:00
  • e5a9dd24ef Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-12 14:17:01 +08:00
  • 18b5c73365 获取InviteInfo添加异常日志 648540858 2024-01-12 10:35:26 +08:00
  • 41c7137e3a Merge pull request #1242 from criver31/wvp-28181-2.0 648540858 2024-01-12 09:06:10 +08:00
  • 2b2efb59a6 修复多个推流推送到上级是不完整的问题,修改平台注销时不删除自己模拟的订阅信息 648540858 2024-01-11 14:56:11 +08:00
  • a23c1aca40 合并269分支修复的内容 648540858 2024-01-10 19:14:11 +08:00
  • 81a32fdb47 Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-10 19:12:06 +08:00
  • 29f7a6b6eb 修复多wvp模式推流时信息存储错误 648540858 2024-01-10 18:55:14 +08:00
  • 64be28ed77 Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-10 16:17:53 +08:00
  • c25a99d60b 修复空指针异常 648540858 2024-01-10 16:17:29 +08:00
  • 28e060fd6f 修复空指针异常 648540858 2024-01-10 14:42:30 +08:00
  • 0c10c77a56 优化录像路径的设置 648540858 2024-01-10 11:14:49 +08:00
  • db493e2625 修复单端口下历史回放暂停和恢复发送的流ID与zlm不一致 fine 2024-01-09 11:50:26 +08:00
  • 8874c90db2 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 fine 2024-01-09 11:45:30 +08:00
  • 1af6324a09 优化jessibuca播放器 648540858 2024-01-08 17:30:48 +08:00
  • b15e559eae Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-08 16:18:28 +08:00
  • a74fb6ecd6 优化目录订阅处理,保证存储异常时不影响后续操作 648540858 2024-01-08 15:03:07 +08:00
  • f3acf33fbf 添加日志 648540858 2024-01-05 17:53:20 +08:00
  • b6df13af24 修复zlm重连不在线 fine 2024-01-05 14:14:19 +08:00
  • a2cac5ca12 Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-04 18:34:46 +08:00
  • 6120e6bd7b 添加金仓数据库x86驱动,优化兼容接口通道列表查询。修复多个通道同时推送 648540858 2024-01-04 17:26:47 +08:00
  • 64b6a35603 Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-04 11:33:29 +08:00
  • d91583b833 修复从redis同步推流列表更新失败 648540858 2024-01-04 11:33:08 +08:00
  • e7e407eb57 增加版本号 648540858 2024-01-03 16:00:03 +08:00
  • 9d61a93077 优化数据库sql文件组织方式 648540858 2024-01-03 15:50:47 +08:00
  • 76e8480cb1 去除多余方法 648540858 2023-12-27 16:18:22 +08:00
  • b3eb319e05 合并主线 648540858 2023-12-26 15:39:04 +08:00
  • 07b182da98 Merge branch 'wvp-28181-2.0' into feature/record 648540858 2023-12-26 15:38:40 +08:00
  • f8d2b933b1 为每个接口添加调试接口需要的描述 648540858 2023-12-26 15:30:24 +08:00
  • 7c07ae9421 修复文档页面不可用BUG,支持设置认证消息头来方便调用其他接口 648540858 2023-12-26 15:03:00 +08:00
  • 33fba05a38 Merge pull request #1219 from xiaoQQya/develop 648540858 2023-12-26 09:52:03 +08:00
  • 3ab4ce0a83 perf: 分屏监控设备列表优先使用自定义通道名称 xiaoQQya 2023-12-26 08:50:41 +08:00
  • 9ae520a58a feat(channel): 新增通道支持自定义名称、位置及云台类型 xiaoQQya 2023-12-19 15:22:09 +08:00
  • ef58f29cfc perf(catlog): 优化同步通道时通道名称的处理 xiaoQQya 2023-12-19 10:07:48 +08:00
  • 41fdb9d13f Merge branch 'wvp-28181-record' into feature/record 648540858 2023-12-18 15:41:39 +08:00
  • a380246e49 修复每次注册都会发送状态变化的BUG 648540858 2023-12-18 15:27:51 +08:00
  • 964d55431f 修复推流无声音的问题 648540858 2023-12-18 14:43:04 +08:00
  • c0b79878f4 合并主线 648540858 2023-12-18 14:40:54 +08:00
  • 67d1ff0d26 Merge branch 'wvp-28181-2.0' into feature/record 648540858 2023-12-18 14:23:48 +08:00
  • 76d09bcadb 修复sql注入 #1112 648540858 2023-12-18 11:14:59 +08:00
  • 18a9f86a0a Merge pull request #1209 from DavidSche/fix-1208 648540858 2023-12-18 09:59:06 +08:00
  • 7430c98309 增加日志提示 648540858 2023-12-17 23:41:21 +08:00
  • d8011e9ee7 去除只有udp收流支持ssrc校验的判断 648540858 2023-12-17 23:33:18 +08:00
  • cb1f1417b6 兼容回复的invite 200OK消息中缺少ssrc(y字段)的情况 648540858 2023-12-15 22:44:41 +08:00
  • 01ecb07a2f Merge branch 'wvp-28181-record' into feature/record 648540858 2023-12-15 17:54:56 +08:00
  • 0a245c4cfe 修复非鉴权接口的跨域失败问题 648540858 2023-12-15 17:54:34 +08:00
  • df3f5795e7 修复非鉴权接口的跨域失败问题 648540858 2023-12-15 17:45:47 +08:00
  • 3a1fc63d7a 优化ssrc释放逻辑 648540858 2023-12-15 17:28:55 +08:00
  • 2397344973 优化ssrc释放逻辑 648540858 2023-12-15 16:44:46 +08:00
  • 04a1bfa329 优化事务释放逻辑 648540858 2023-12-15 16:25:05 +08:00
  • 60dffa5813 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-12-14 09:30:21 +08:00
  • b699158e43 修复点播流地址修改 648540858 2023-12-13 14:43:42 +08:00
  • eac72fd06e 优化日志打印样式 648540858 2023-12-13 14:37:08 +08:00
  • 94edd95824 Merge pull request #1205 from xu-bin-bin/wvp-28181-2.0 648540858 2023-12-13 14:31:06 +08:00
  • 572c8850dc fix bug #1208 修复拉流代理启用状态下调用启用接口的返回错误 davidche 2023-12-13 13:48:04 +08:00
  • b4b9ad2873 修复写入事务信息callid错误 648540858 2023-12-13 09:40:30 +08:00
  • 42a2772d1a bugfix:请求头带token, SecurityUtils 获取用户id 一直为0 #1195 xubinbin 2023-12-12 17:09:04 +08:00
  • 360fe689b1 增加日志记录时的完全限定类名,用于定位日志位置。 ps:2023-12-12 16:30:58.779 [Thread-10] INFO --- gov.nist.javax.sip.stack.UDPMessageChannel : 81 Done processing MESSAGE sip:44010200492000000003@4401020049 SIP/2.0 日志中的“gov.nist.javax.sip.stack.UDPMessageChannel”内容 xubinbin 2023-12-12 16:41:15 +08:00
  • 5a9621840c 修改控制台输出日志格式,增加显示线程名称,调用类的全类路径以及日子输出行的行号。 xubinbin 2023-12-12 16:37:06 +08:00
  • e73d00060e Merge pull request #1137 from xiaoQQya/develop 648540858 2023-12-11 10:22:26 +08:00
  • 7a52db4e89 Merge pull request #1138 from shuxiaoyuan/fix-subscribe-catalog 648540858 2023-12-11 10:11:36 +08:00
  • 083523d204 Merge pull request #1188 from lunasaw/wvp-28181-2.0-fix 648540858 2023-12-11 10:06:35 +08:00
  • 9f7dc295cf Merge pull request #1140 from shuxiaoyuan/fix-update-time 648540858 2023-12-11 10:05:57 +08:00
  • 33506a0046 Merge pull request #1146 from leibnewton/fix_on_stream_changed 648540858 2023-12-11 10:05:36 +08:00
  • bdd1846eb4 优化自动点播判断逻辑 648540858 2023-12-06 22:31:26 +08:00
  • 92e5ed2e30 优化前端云端录像的播放 648540858 2023-12-06 16:10:32 +08:00
  • 7e136c9ac7 完成下载文件的前后调试 648540858 2023-12-06 15:11:21 +08:00
  • ad36354ef4 优化国标录像服务端,使用zlm新接口实现功能 648540858 2023-12-05 11:29:05 +08:00
  • fc77b3f819 支持重新接入zlm的时候检查拉流代理数据是否异常,异常数据自动移除 648540858 2023-12-01 15:49:18 +08:00
  • 0542700225 fix find stream chenzhangyue 2023-12-01 10:34:16 +08:00
  • 67e4060053 添加推流信息专属redis数据 648540858 2023-11-30 18:09:43 +08:00
  • 3d5842e9e2 查询合并文件列表增加app,stream, callId过滤参数 648540858 2023-11-28 09:30:49 +08:00