Commit Graph

  • 9978d30aa1 Merge branch '2.7.0' 648540858 2024-04-11 09:36:48 +08:00
  • fe55920dab 更新文档 648540858 2024-04-10 23:17:27 +08:00
  • 0f4b5eed7d 优化apikey列表样式 648540858 2024-04-10 23:09:28 +08:00
  • b45d71ba6d Merge pull request #1389 from ancienter/develop-add-api-key 648540858 2024-04-10 22:56:14 +08:00
  • 31be0a3874 更新webrtc调用 648540858 2024-04-10 22:44:19 +08:00
  • f458c9b793 优化代码调用 648540858 2024-04-10 22:38:12 +08:00
  • ce950dea4a Merge branch 'refs/heads/master' into develop-add-api-key leesam 2024-04-10 22:18:40 +08:00
  • 53199b32f6 适配postgres数据库 leesam 2024-04-10 22:16:56 +08:00
  • 6c0087db88 优化代码调用 648540858 2024-04-10 20:56:45 +08:00
  • 16b7e4a7ef Merge branch 'refs/heads/master' into develop-add-api-key leesam 2024-04-10 20:49:44 +08:00
  • 0f55872dbb Merge pull request #1412 from ancienter/develop-support-content-path 648540858 2024-04-10 20:01:32 +08:00
  • 10e2180c72 [bugfix]支持context-path配置 leesam 2024-04-10 19:07:37 +08:00
  • 9bb5ef6522 修复多个wvp执行推流转发失败的BUG 648540858 2024-04-10 18:22:42 +08:00
  • 1d36382986 修改抓拍存储 648540858 2024-04-10 16:52:39 +08:00
  • bb350e847d 修复抓拍存储 648540858 2024-04-10 16:35:47 +08:00
  • d410a3ca18 添加抓拍支持 648540858 2024-04-10 16:26:46 +08:00
  • b08f00104e abl添加getMediaInfo接口实现 648540858 2024-04-10 00:03:45 +08:00
  • 2dc7eecb47 abl添加checkMediaServer实现 648540858 2024-04-09 23:41:48 +08:00
  • 48a0e88b95 Merge branch 'refs/heads/master' into dev/abl支持 648540858 2024-04-09 22:52:33 +08:00
  • 82ca3a778a 优化媒体节点redis数据格式 648540858 2024-04-09 22:52:06 +08:00
  • 54b878d2e1 优化代码,升级版本号为2.7.1 648540858 2024-04-09 22:43:45 +08:00
  • 0077df29d4 临时提交 648540858 2024-04-09 21:42:08 +08:00
  • cf8320e749 Merge pull request #1400 from Anyuei/master 648540858 2024-04-09 20:57:50 +08:00
  • 5457407601 恢复abl实现 648540858 2024-04-09 20:56:41 +08:00
  • 7ed84bed7f Merge pull request #1411 from 648540858/dev/zlm 648540858 2024-04-09 20:11:10 +08:00
  • a1861038e5 修复录像下载 648540858 2024-04-09 19:53:43 +08:00
  • 7a59acc8e6 合并主线 648540858 2024-04-09 17:30:18 +08:00
  • 9abc1974a5 Merge branch 'master' into dev/zlm 648540858 2024-04-09 17:28:52 +08:00
  • 0fa9a1506c Merge branch '2.7.0' 648540858 2024-04-09 17:26:25 +08:00
  • de5d025cee 修复单端口收流时音频禁用失败的问题 648540858 2024-04-09 16:10:02 +08:00
  • ab318fcf70 修复点播错误时关闭rtpserver 648540858 2024-04-09 14:53:11 +08:00
  • 6dd870e74c 修复点播端口为空 648540858 2024-04-09 10:59:59 +08:00
  • bbf19c7909 合并主线 648540858 2024-04-09 10:40:16 +08:00
  • b1b6fae22c Merge branch 'master' into dev/zlm 648540858 2024-04-09 10:35:11 +08:00
  • 0b2f635176 移除非主线内容 648540858 2024-04-09 10:30:00 +08:00
  • b6d70c6807 Merge branch 'develop-add-api-key' of https://github.com/ancienter/wvp-GB28181-pro into develop-add-api-key leesam 2024-04-09 09:59:06 +08:00
  • 25ff2fc4ef Merge branch '648540858:master' into develop-add-api-key ancienter 2024-04-09 09:52:23 +08:00
  • ae239c8848 Merge branch 'master' into 1078 648540858 2024-04-08 18:15:06 +08:00
  • 9badf1c7fe 1078-添加位置附加信息定义 648540858 2024-04-08 18:15:02 +08:00
  • a890b62fa1 Merge branch '2.7.0' 648540858 2024-04-08 18:13:33 +08:00
  • 48351c875e 国标级联支持制定200OK中sdp的IP 648540858 2024-04-08 18:13:15 +08:00
  • d54787f323 1078-添加读取位置信息汇报附加信息读取 648540858 2024-04-07 23:50:58 +08:00
  • 8a2dc6031e 1078-实现云台控制接口 648540858 2024-04-07 22:06:41 +08:00
  • 9255ea802f 1078-添加云台控制接口 648540858 2024-04-07 20:59:21 +08:00
  • 349b0442d6 Merge remote-tracking branch 'origin/1078' into 1078 648540858 2024-04-07 20:42:32 +08:00
  • 403eb4499d Merge branch 'master' into 1078 648540858 2024-04-07 20:42:10 +08:00
  • 7d0aebd311 Merge branch '2.7.0' 648540858 2024-04-07 20:26:01 +08:00
  • aeb75c0df1 优化推流结束后发送BYE 648540858 2024-04-07 20:25:44 +08:00
  • 7d53009987 优化推流通知 648540858 2024-04-07 20:06:48 +08:00
  • 6757f4b719 1078-云台变倍控制 648540858 2024-04-07 07:21:21 +08:00
  • 8ba30e83ef 1078-修复错别字 648540858 2024-04-07 07:19:02 +08:00
  • 98d9eb5314 1078-添加云台红外补光控制 648540858 2024-04-07 07:17:35 +08:00
  • a8a4aecc15 1078-添加云台雨刷控制 648540858 2024-04-07 07:15:43 +08:00
  • b649464753 1078-添加云台光圈控制 648540858 2024-04-07 07:12:51 +08:00
  • ebdd9ab534 1078-添加云台焦距控制 648540858 2024-04-07 07:09:49 +08:00
  • a1ab834875 1078-添加云台旋转 648540858 2024-04-07 07:07:27 +08:00
  • 4ec4d618d6 1078-添加文件上传控制 648540858 2024-04-07 07:02:06 +08:00
  • 5fc1000fcc 1078-添加文件上传完成通知 648540858 2024-04-07 06:56:39 +08:00
  • 302eb98d51 1078-添加文件上传指令 648540858 2024-04-07 06:44:52 +08:00
  • 984d8743be 1078-优化录像回放开始和停止 648540858 2024-04-06 00:42:54 +08:00
  • 26bbeac6c7 1078-添加录像回放开始和停止 648540858 2024-04-06 00:06:40 +08:00
  • 81c2b5715c 1078-添加录像回放列表查询 648540858 2024-04-04 16:54:08 +08:00
  • 3e5da98539 1078-支持点播暂停/继续 648540858 2024-04-04 07:19:46 +08:00
  • a7b7371e74 1078-增加结束点播 648540858 2024-04-03 18:00:48 +08:00
  • 0f420c43ac 1078-优化点播 648540858 2024-04-03 16:59:33 +08:00
  • abc3766556 1078-优化点播 648540858 2024-04-03 16:33:49 +08:00
  • 62f716be9c 添加idea logo 648540858 2024-04-03 15:04:33 +08:00
  • 5743917439 添加idea logo 648540858 2024-04-03 15:03:49 +08:00
  • 603ce18573 1078-添加点播支持 648540858 2024-04-02 23:26:40 +08:00
  • 6acc395ad2 Merge branch 'master' into 1078 648540858 2024-04-02 18:33:53 +08:00
  • a1c02605c1 abl-实现closeRtpServer 648540858 2024-04-02 14:41:02 +08:00
  • 86a35f3612 合并开源主线 648540858 2024-04-02 11:25:19 +08:00
  • 1bb813758a Merge branch 'master' into dev/abl支持 648540858 2024-04-02 11:20:51 +08:00
  • 67688d4a4b 优化停止国标收流 648540858 2024-04-02 11:20:19 +08:00
  • 969ff86ebe 放行abl hook 接口 648540858 2024-04-02 09:53:47 +08:00
  • 8b90fade9e 支持使用abl接收国标流 648540858 2024-04-02 00:05:09 +08:00
  • b78769f997 临时提交 648540858 2024-04-01 18:35:26 +08:00
  • 33b75be71a 支持abl hook 648540858 2024-04-01 18:21:38 +08:00
  • b7b950ec8b 支持展示abl-logo 648540858 2024-04-01 16:47:45 +08:00
  • 4d6f881460 修复空指针异常 648540858 2024-04-01 16:20:30 +08:00
  • 722f1d0ee7 国标级联-修复拉流代理播放 648540858 2024-04-01 16:17:01 +08:00
  • 426ea72d7f 修复拉流代理播放 648540858 2024-04-01 15:46:36 +08:00
  • 73733ab13f 修复推流播放 648540858 2024-04-01 15:40:21 +08:00
  • fd2ef6effe 修复国标点播 648540858 2024-04-01 15:29:49 +08:00
  • ecd1d2a414 临时提交 648540858 2024-04-01 15:22:45 +08:00
  • 23beb4fde0 Merge branch 'master' into develop-add-api-key leesam 2024-04-01 09:19:46 +08:00
  • 2738750c3e 移除失效的服务 648540858 2024-04-01 09:11:56 +08:00
  • 5973dcd975 修复点播与录像回放 648540858 2024-03-31 00:34:44 +08:00
  • 4548695a0b hook优化 648540858 2024-03-31 00:28:45 +08:00
  • 0447b83c3a 临时提交 648540858 2024-03-29 23:41:00 +08:00
  • 0324855190 Merge branch 'master' into dev/abl支持 648540858 2024-03-29 22:55:09 +08:00
  • bb6ecb1552 Merge remote-tracking branch 'origin/master' 648540858 2024-03-29 19:18:50 +08:00
  • 486daf4dfe 调整看守位控制接口 648540858 2024-03-29 19:18:34 +08:00
  • 728e60ce84 处理可能会出现的空指针异常 pei 2024-03-29 11:55:44 +08:00
  • d34371a9f9 优化通道列表按钮排列 648540858 2024-03-28 23:06:27 +08:00
  • 7a3b9c6f69 调整hook订阅通知的位置 648540858 2024-03-28 19:10:53 +08:00
  • cc793d16f5 调整hook订阅通知的位置 648540858 2024-03-28 18:35:28 +08:00
  • d6df7c8355 Merge branch 'master' into dev/abl支持 648540858 2024-03-28 18:13:36 +08:00
  • cf3d98102a Merge branch 'master' into 2.7.0 648540858 2024-03-28 18:08:57 +08:00
  • 1de344674a 使用冒号分隔redis的key 648540858 2024-03-28 18:08:33 +08:00