Commit Graph

  • a23c1aca40 合并269分支修复的内容 648540858 2024-01-10 19:14:11 +0800
  • 81a32fdb47 Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-10 19:12:06 +0800
  • 29f7a6b6eb 修复多wvp模式推流时信息存储错误 648540858 2024-01-10 18:55:14 +0800
  • 731a7e32c2 Merge branch 'wvp-28181-2.0' into 结构优化 648540858 2024-01-10 16:18:15 +0800
  • 64be28ed77 Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-10 16:17:53 +0800
  • c25a99d60b 修复空指针异常 648540858 2024-01-10 16:17:29 +0800
  • 28e060fd6f 修复空指针异常 648540858 2024-01-10 14:42:30 +0800
  • 0c10c77a56 优化录像路径的设置 648540858 2024-01-10 11:14:49 +0800
  • 48d4871ea4 添加编辑拉流代理接口 648540858 2024-01-09 17:43:16 +0800
  • db493e2625
    修复单端口下历史回放暂停和恢复发送的流ID与zlm不一致 fine 2024-01-09 11:50:26 +0800
  • 8874c90db2
    Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 fine 2024-01-09 11:45:30 +0800
  • 7c7b35ca80 添加拉流代理相关接口-获取FFMPEG命令模板 648540858 2024-01-08 23:50:41 +0800
  • 8d9916f94e 添加新的删除拉流代理接口 648540858 2024-01-08 18:40:46 +0800
  • 1af6324a09 优化jessibuca播放器 648540858 2024-01-08 17:30:48 +0800
  • 9b1c6c46a8 Merge branch 'wvp-28181-2.0' into 结构优化 648540858 2024-01-08 16:21:39 +0800
  • b15e559eae Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-08 16:18:28 +0800
  • a74fb6ecd6 优化目录订阅处理,保证存储异常时不影响后续操作 648540858 2024-01-08 15:03:07 +0800
  • fc2f9d8cca 优化方法 648540858 2024-01-08 14:16:56 +0800
  • 8db0192a27 添加拉流代理接口-新增拉流代理 648540858 2024-01-07 23:57:33 +0800
  • c186ce94c1 优化推流列表接口 648540858 2024-01-07 01:50:02 +0800
  • f3acf33fbf 添加日志 648540858 2024-01-05 17:53:20 +0800
  • 7fd03a50a0 临时提交 648540858 2024-01-05 16:58:31 +0800
  • b6df13af24
    修复zlm重连不在线 fine 2024-01-05 14:14:19 +0800
  • 6bfc75286b 修复云端录像查询的时间设置问题 648540858 2024-01-04 20:47:33 +0800
  • 3fd7b0c025 优化视频流化调用 648540858 2024-01-04 19:02:38 +0800
  • d2e7f247a6 Merge branch 'wvp-28181-2.0' into 结构优化 648540858 2024-01-04 18:35:32 +0800
  • a2cac5ca12 Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-04 18:34:46 +0800
  • ed67afb7a2 添加云端录像获取视频播放地址的接口 648540858 2024-01-04 18:29:34 +0800
  • 6120e6bd7b 添加金仓数据库x86驱动,优化兼容接口通道列表查询。修复多个通道同时推送 648540858 2024-01-04 17:26:47 +0800
  • 3912d0b18a Merge branch 'wvp-28181-2.0' into 结构优化 648540858 2024-01-04 11:33:52 +0800
  • 64b6a35603 Merge branch '2.6.9' into wvp-28181-2.0 648540858 2024-01-04 11:33:29 +0800
  • d91583b833 修复从redis同步推流列表更新失败 648540858 2024-01-04 11:33:08 +0800
  • 5f4d148353 修复云端录像查询时间错误 648540858 2024-01-04 11:09:34 +0800
  • aa3c678839 修改注释 648540858 2024-01-03 18:12:20 +0800
  • e7e407eb57 增加版本号 648540858 2024-01-03 16:00:03 +0800
  • 2d5aa1e549 优化数据库 648540858 2024-01-03 15:58:01 +0800
  • 07503d6111 Merge branch 'wvp-28181-2.0' into 结构优化 648540858 2024-01-03 15:51:22 +0800
  • 9d61a93077 优化数据库sql文件组织方式 648540858 2024-01-03 15:50:47 +0800
  • 975993f8b0 合并主线 648540858 2024-01-03 15:39:52 +0800
  • b4fb076246 Merge branch 'wvp-28181-2.0' into 结构优化 648540858 2024-01-03 15:35:21 +0800
  • 37fcc77c26 优化日志 648540858 2024-01-03 15:12:04 +0800
  • 96a16e94e0 添加readme引用 648540858 2024-01-02 18:18:18 +0800
  • 416dae00bf 优化接口 648540858 2023-12-28 00:15:18 +0800
  • 5ce562aea1 优化云台控制相关接口定义 648540858 2023-12-27 18:36:14 +0800
  • 76e8480cb1 去除多余方法 648540858 2023-12-27 16:18:22 +0800
  • 456ef2c5e4 临时提交 648540858 2023-12-27 15:32:43 +0800
  • 66f32d799d 临时提交 648540858 2023-12-27 14:28:58 +0800
  • aa11d02dbf 优化手动添加设备后设备的登录 648540858 2023-12-27 09:41:48 +0800
  • a7f1bd95df 临时提交 648540858 2023-12-26 23:46:24 +0800
  • 14fe1936d0 合并主线 648540858 2023-12-26 18:34:41 +0800
  • da8a7d67e4 Merge branch 'wvp-28181-2.0' into 结构优化 648540858 2023-12-26 15:42:34 +0800
  • b3eb319e05 合并主线 648540858 2023-12-26 15:39:04 +0800
  • 07b182da98 Merge branch 'wvp-28181-2.0' into feature/record 648540858 2023-12-26 15:38:40 +0800
  • f8d2b933b1 为每个接口添加调试接口需要的描述 648540858 2023-12-26 15:30:24 +0800
  • 7c07ae9421 修复文档页面不可用BUG,支持设置认证消息头来方便调用其他接口 648540858 2023-12-26 15:03:00 +0800
  • 33fba05a38
    Merge pull request #1219 from xiaoQQya/develop 648540858 2023-12-26 09:52:03 +0800
  • 3ab4ce0a83 perf: 分屏监控设备列表优先使用自定义通道名称 xiaoQQya 2023-12-26 08:50:41 +0800
  • b38c7eef70 补充字段 648540858 2023-12-25 23:45:00 +0800
  • 746cd2543d 优化设备列表查询,支持搜索。支持获取流信息 648540858 2023-12-25 17:50:37 +0800
  • 8b9bac5cb3 添加摄像机控制接口 648540858 2023-12-23 00:49:28 +0800
  • 67507e64b2 优化预置位设置 648540858 2023-12-22 18:09:17 +0800
  • 974e822f84 优化预置位查询 648540858 2023-12-21 15:31:28 +0800
  • 35fd5eee63 优化预置位查询 648540858 2023-12-21 13:16:03 +0800
  • 52c56bfdf2 优化点播超时的日志以及代码 648540858 2023-12-20 23:55:03 +0800
  • 8a605ad722 临时提交 648540858 2023-12-20 18:02:47 +0800
  • 913d4bdc8f 修复拉流代理 648540858 2023-12-19 23:17:58 +0800
  • 9ae08fd6c3 修复推流的添加 648540858 2023-12-19 18:49:49 +0800
  • 6d0361edf8 Merge branch 'wvp-28181-2.0' into 结构优化 648540858 2023-12-19 17:27:50 +0800
  • 36c641c467 实现目录订阅的相关接口 648540858 2023-12-19 16:50:47 +0800
  • 9ae520a58a feat(channel): 新增通道支持自定义名称、位置及云台类型 xiaoQQya 2023-12-19 15:22:09 +0800
  • 31ab6eb174 临时提交 648540858 2023-12-19 14:39:16 +0800
  • ef58f29cfc perf(catlog): 优化同步通道时通道名称的处理 xiaoQQya 2023-12-19 10:07:48 +0800
  • 74ce2be55b 临时提交 648540858 2023-12-18 23:44:37 +0800
  • 41fdb9d13f Merge branch 'wvp-28181-record' into feature/record 648540858 2023-12-18 15:41:39 +0800
  • a380246e49 修复每次注册都会发送状态变化的BUG wvp-28181-record 648540858 2023-12-18 15:27:51 +0800
  • 964d55431f 修复推流无声音的问题 648540858 2023-12-18 14:43:04 +0800
  • c0b79878f4 合并主线 648540858 2023-12-18 14:40:54 +0800
  • 67d1ff0d26 Merge branch 'wvp-28181-2.0' into feature/record 648540858 2023-12-18 14:23:48 +0800
  • 76d09bcadb 修复sql注入 #1112 648540858 2023-12-18 11:14:59 +0800
  • 18a9f86a0a
    Merge pull request #1209 from DavidSche/fix-1208 648540858 2023-12-18 09:59:06 +0800
  • 7430c98309 增加日志提示 648540858 2023-12-17 23:41:21 +0800
  • d8011e9ee7 去除只有udp收流支持ssrc校验的判断 648540858 2023-12-17 23:33:18 +0800
  • cb1f1417b6 兼容回复的invite 200OK消息中缺少ssrc(y字段)的情况 648540858 2023-12-15 22:44:41 +0800
  • 01ecb07a2f Merge branch 'wvp-28181-record' into feature/record 648540858 2023-12-15 17:54:56 +0800
  • 0a245c4cfe 修复非鉴权接口的跨域失败问题 648540858 2023-12-15 17:54:34 +0800
  • df3f5795e7 修复非鉴权接口的跨域失败问题 648540858 2023-12-15 17:45:47 +0800
  • 3a1fc63d7a 优化ssrc释放逻辑 648540858 2023-12-15 17:28:55 +0800
  • 2397344973 优化ssrc释放逻辑 648540858 2023-12-15 16:44:46 +0800
  • 04a1bfa329 优化事务释放逻辑 648540858 2023-12-15 16:25:05 +0800
  • 60dffa5813 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-12-14 09:30:21 +0800
  • b699158e43 修复点播流地址修改 648540858 2023-12-13 14:43:42 +0800
  • eac72fd06e 优化日志打印样式 648540858 2023-12-13 14:37:08 +0800
  • 94edd95824
    Merge pull request #1205 from xu-bin-bin/wvp-28181-2.0 648540858 2023-12-13 14:31:06 +0800
  • 572c8850dc
    fix bug #1208 修复拉流代理启用状态下调用启用接口的返回错误 davidche 2023-12-13 13:48:04 +0800
  • b4b9ad2873 修复写入事务信息callid错误 648540858 2023-12-13 09:40:30 +0800
  • dc841a9dcf 临时提交 648540858 2023-12-12 17:57:19 +0800
  • 42a2772d1a bugfix:请求头带token, SecurityUtils 获取用户id 一直为0 #1195 xubinbin 2023-12-12 17:09:04 +0800
  • 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 +0800
  • 5a9621840c 修改控制台输出日志格式,增加显示线程名称,调用类的全类路径以及日子输出行的行号。 xubinbin 2023-12-12 16:37:06 +0800
  • e0686dd426 临时提交 648540858 2023-12-11 23:09:58 +0800