Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • de2452833d Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-06-29 09:52:05 +0800
  • 1294081a9c 优化树形列表通道查询 648540858 2023-06-29 09:36:13 +0800
  • ee59539530 优化树形列表通道查询 648540858 2023-06-29 09:36:13 +0800
  • bfae9780f7 增加流关闭时的处理 648540858 2023-06-28 20:32:48 +0800
  • f96973501c 增加流关闭时的处理 648540858 2023-06-28 20:32:48 +0800
  • def56793ba 增加上级推流和停止推流的通知 648540858 2023-06-28 16:52:27 +0800
  • 2b795b1d19 增加上级推流和停止推流的通知 648540858 2023-06-28 16:52:27 +0800
  • 639e0bab11 修复树形列表通道查询 648540858 2023-06-28 15:02:59 +0800
  • 74c79a12db 修复树形列表通道查询 648540858 2023-06-28 15:02:59 +0800
  • a77628e875 优化端口预占用，防止占用无法释放 648540858 2023-06-28 14:50:46 +0800
  • 1cb62ba3fc 优化端口预占用，防止占用无法释放 648540858 2023-06-28 14:50:46 +0800
  • ed035b74d9 添加关闭收流发流的接口 648540858 2023-06-28 10:47:33 +0800
  • a302a185f1 添加关闭收流发流的接口 648540858 2023-06-28 10:47:33 +0800
  • 6fcff0567e doc去除cdn依赖 648540858 2023-06-28 09:15:07 +0800
  • fd4964a118 doc去除cdn依赖 648540858 2023-06-28 09:15:07 +0800
  • c7d1515023 增加redis通道 648540858 2023-06-27 15:34:38 +0800
  • 25fa219be0 增加redis通道 648540858 2023-06-27 15:34:38 +0800
  • 724963324a 修复上级点播时如果推流信息中mediaServerID错误的情况 648540858 2023-06-26 19:06:14 +0800
  • b23d4b984e 修复上级点播时如果推流信息中mediaServerID错误的情况 648540858 2023-06-26 19:06:14 +0800
  • fec69c714c 优化国标信令 648540858 2023-06-25 22:40:26 +0800
  • f2001904f8 优化国标信令 648540858 2023-06-25 22:40:26 +0800
  • 7749ea3421 新增接口超时时间配置，修复点播超时的情况下报错org.springframework.web.context.request.async.AsyncRequestTimeoutException dsk 2023-06-25 16:16:40 +0800
  • 31515d2f7b 新增接口超时时间配置，修复点播超时的情况下报错org.springframework.web.context.request.async.AsyncRequestTimeoutException dsk 2023-06-25 16:16:40 +0800
  • cec266d3cd 修复请求报错404等情况下导致ResponseBody未关闭的问题 dsk 2023-06-25 16:00:37 +0800
  • 0d7789f2a6 修复请求报错404等情况下导致ResponseBody未关闭的问题 dsk 2023-06-25 16:00:37 +0800
  • f306937616 优化自动获取stream ip 648540858 2023-06-25 13:49:07 +0800
  • b9db7c15a6 优化自动获取stream ip 648540858 2023-06-25 13:49:07 +0800
  • 155838ce2e 优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895 648540858 2023-06-22 22:35:35 +0800
  • 3691d6ff97 优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895 648540858 2023-06-22 22:35:35 +0800
  • f4e5e03962 修复表名错误 #904 648540858 2023-06-21 15:53:26 +0800
  • 312775fb27 修复表名错误 #904 648540858 2023-06-21 15:53:26 +0800
  • 7b24d51db9 优化国标级联的端口保持 648540858 2023-06-21 14:03:31 +0800
  • 4fd26db2a1 优化国标级联的端口保持 648540858 2023-06-21 14:03:31 +0800
  • 3350b65259 添加文档依赖，去除cdn依赖 648540858 2023-06-20 15:25:56 +0800
  • 94ace01c42 添加文档依赖，去除cdn依赖 648540858 2023-06-20 15:25:56 +0800
  • 96d2a27d41 添加sql字段 648540858 2023-06-20 14:25:01 +0800
  • b0094a5755 添加sql字段 648540858 2023-06-20 14:25:01 +0800
  • a7bf29a4cb 恢复默认值 648540858 2023-06-20 14:17:44 +0800
  • 0325efd84c 恢复默认值 648540858 2023-06-20 14:17:44 +0800
  • fa62ab9a01
         Merge pull request #893 from sxh-netizen/wvp-28181-2.0 648540858 2023-06-20 14:16:46 +0800
  • 2546748867 Merge pull request #893 from sxh-netizen/wvp-28181-2.0 648540858 2023-06-20 14:16:46 +0800
  • 9e28923b8c
         Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-06-20 14:15:27 +0800
  • eef26ec736 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-06-20 14:15:27 +0800
  • b4dadf6c51 修复删除的设备无法重新注册的问题 648540858 2023-06-20 13:02:18 +0800
  • f3b44a97f5 修复删除的设备无法重新注册的问题 648540858 2023-06-20 13:02:18 +0800
  • 21a96ad20f 修复通道刷新 648540858 2023-06-20 12:51:06 +0800
  • f96f575d65 修复通道刷新 648540858 2023-06-20 12:51:06 +0800
  • d310204d00 去除多余字段 648540858 2023-06-20 09:57:28 +0800
  • 5c631d8039 去除多余字段 648540858 2023-06-20 09:57:28 +0800
  • 0532363192 优化国标级联注册机制 648540858 2023-06-20 09:29:12 +0800
  • 3e45526474 优化国标级联注册机制 648540858 2023-06-20 09:29:12 +0800
  • 6b3732b8c4 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-06-19 20:19:31 +0800
  • 16256537fb Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-06-19 20:19:31 +0800
  • 8cf5b65e38 优化国标级联注册机制 648540858 2023-06-19 20:09:16 +0800
  • c64fb0d3db 优化国标级联注册机制 648540858 2023-06-19 20:09:16 +0800
  • 8942ab0112 优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范 648540858 2023-06-19 18:42:36 +0800
  • eeb345fa93 优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范 648540858 2023-06-19 18:42:36 +0800
  • ccc0a99d68 同步主线的代码，保持一致性 ‘sxh’ 2023-06-15 11:20:43 +0800
  • 5d6b8c1804 同步主线的代码，保持一致性 ‘sxh’ 2023-06-15 11:20:43 +0800
  • 652489b47e Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 ‘sxh’ 2023-06-15 11:10:20 +0800
  • ed6aaa25b9 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 ‘sxh’ 2023-06-15 11:10:20 +0800
  • 05cc0d14f1 新增设备主子码流选择（mysql语句） ‘sxh’ 2023-06-15 11:04:04 +0800
  • 08e8469998 新增设备主子码流选择（mysql语句） ‘sxh’ 2023-06-15 11:04:04 +0800
  • 15df08964b 新增设备主子码流选择，默认为不开启 ‘sxh’ 2023-06-15 11:00:29 +0800
  • 7e70ad4849 新增设备主子码流选择，默认为不开启 ‘sxh’ 2023-06-15 11:00:29 +0800
  • 319cdd2151 优化移动位置的时间 648540858 2023-06-14 20:39:10 +0800
  • d9506b9e59 优化移动位置的时间 648540858 2023-06-14 20:39:10 +0800
  • 138216c395
         Merge pull request #876 from criver31/wvp-28181-2.0 648540858 2023-06-14 20:14:31 +0800
  • ef5440a97f Merge pull request #876 from criver31/wvp-28181-2.0 648540858 2023-06-14 20:14:31 +0800
  • 5b8ffd5b61 修复前端空指针异常 #831 648540858 2023-06-14 18:14:40 +0800
  • b4f0d17f9f 修复前端空指针异常 #831 648540858 2023-06-14 18:14:40 +0800
  • f4960b2618 修复移动位置获取接口超时 #857 648540858 2023-06-14 17:04:41 +0800
  • db1d503c55 修复移动位置获取接口超时 #857 648540858 2023-06-14 17:04:41 +0800
  • f3388dd53a 修复级联录像查询sql错误 648540858 2023-06-14 16:26:29 +0800
  • 7f22b5e504 修复级联录像查询sql错误 648540858 2023-06-14 16:26:29 +0800
  • e68eb850a9 去除多余日志 648540858 2023-06-13 23:11:56 +0800
  • dcde54d8cd 去除多余日志 648540858 2023-06-13 23:11:56 +0800
  • c4d7dd9651 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-06-13 23:11:00 +0800
  • 1fcb946700 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-06-13 23:11:00 +0800
  • 8f5bbfa5c2 修复zlm上线时过期任务设置错误 648540858 2023-06-13 23:06:35 +0800
  • 5f2d4393c3 修复zlm上线时过期任务设置错误 648540858 2023-06-13 23:06:35 +0800
  • fa80ba6f2b 修复sdp解析错误 648540858 2023-06-12 22:54:40 +0800
  • 97bd082a40 修复sdp解析错误 648540858 2023-06-12 22:54:40 +0800
  • 52f9c295f9 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-06-10 00:33:00 +0800
  • 415c13cf72 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-06-10 00:33:00 +0800
  • 446f729e55 优化sdp解析，兼容带有f=的设备 648540858 2023-06-10 00:32:42 +0800
  • 4ed7cb49be 优化sdp解析，兼容带有f=的设备 648540858 2023-06-10 00:32:42 +0800
  • d93947c657
         Merge pull request #887 from bigbeef/wvp-28181-2.0 648540858 2023-06-09 23:18:15 +0800
  • 0a538ca23d Merge pull request #887 from bigbeef/wvp-28181-2.0 648540858 2023-06-09 23:18:15 +0800
  • 1bdc0621b8
         feat:删除拉流代理时，提示是否确认删除，防止误删 winfed 2023-06-09 15:50:33 +0800
  • 45ad19b712 feat:删除拉流代理时，提示是否确认删除，防止误删 winfed 2023-06-09 15:50:33 +0800
  • a2d93fce81
         fix:修复拉流代理配置展示问题:音频、录制、无人观看 winfed 2023-06-09 15:19:18 +0800
  • 9f50dd8fcb fix:修复拉流代理配置展示问题:音频、录制、无人观看 winfed 2023-06-09 15:19:18 +0800
  • 03f3598681 修复stream-on-demand配置失效的BUG 648540858 2023-06-08 22:46:07 +0800
  • 4815af8ca0 修复stream-on-demand配置失效的BUG 648540858 2023-06-08 22:46:07 +0800
  • 20a47729fc Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-06-08 10:41:36 +0800
  • 4d8cf32fbc Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-06-08 10:41:36 +0800
  • 095b12ebbd 优化ffmpeg拉流代理 648540858 2023-06-08 10:40:16 +0800
  • 508b3aa44f 优化ffmpeg拉流代理 648540858 2023-06-08 10:40:16 +0800
  • ca715e0234 优化via的branch生成规则 648540858 2023-06-07 21:45:15 +0800