Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• dd9c64d7a8 增加设备状态保持任务 lin 2025-05-26 18:04:02 +08:00
• 0c29c90d3b Merge branch 'master' into 重构/1078 lin 2025-05-26 15:07:58 +08:00
• cb2ade744e 更新README lin 2025-05-26 11:02:21 +08:00
• 4b7467e8e0 Merge branch '2.7.3' lin 2025-05-26 10:17:46 +08:00
• b1ff1ef54c 增加订阅日志 lin 2025-05-26 10:16:52 +08:00
• 9da6e874fb 修复时间戳发送错误导致seek失败 lin 2025-05-26 09:54:33 +08:00
• a7f9cbd8ef 版本号提升 lin 2025-05-26 09:53:58 +08:00
• ca37162dd5 Merge branch 'master' into dev/设备和平台使用不同的优化策略 lin 2025-05-26 09:09:36 +08:00
• 75b1e8deb2 Merge branch '2.7.3' lin 2025-05-23 18:18:32 +08:00
• 0df557750f Merge pull request #1859 from Digital631/master 648540858 2025-05-23 18:17:41 +08:00
• 601d2b5d2b 修复集群推流BUG lin 2025-05-23 18:06:54 +08:00
• 55f36f660b 修复集群播放BUG lin 2025-05-23 17:26:17 +08:00
• 1a2de7a1c6 修复了分配监控的页面自适应 尚鹏暃 2025-05-23 16:13:57 +08:00
• 97c53f07c8 修复了分配监控的页面自适应 尚鹏暃 2025-05-23 15:59:58 +08:00
• d825b986dd 推流列表和拉流代理支持根据来源ip返回流地址 lin 2025-05-23 09:20:22 +08:00
• a1a5c53fad 合并国标级联状态重构 648540858 2025-05-22 21:14:50 +08:00
• 7c7ef34045 Merge branch '2.7.3' 648540858 2025-05-22 21:09:22 +08:00
• 243f7f62b7 国标级联调整心跳逻辑 lin 2025-05-22 17:40:10 +08:00
• b0b5a0f5e0 国标级联调整注册逻辑 lin 2025-05-22 15:17:13 +08:00
• 706806a138 Merge pull request #1857 from sxh-nice/master 648540858 2025-05-22 14:58:58 +08:00
• 83f603238a 修复开始时间和结束时间写反问题 yosixiaohu 2025-05-22 13:50:06 +08:00
• 7bb0cc19f4 重构平台保活逻辑-启动对未离线的平台注销 648540858 2025-05-22 07:09:20 +08:00
• 1d172cb387 重构平台保活逻辑-启动对未离线的平台注销 648540858 2025-05-22 07:02:10 +08:00
• bcf08d27fa 重构平台保活逻辑 648540858 2025-05-21 23:17:52 +08:00
• 29ac4850f4 去除移除订阅时设置订阅周期 lin 2025-05-21 18:06:07 +08:00
• dd17462b68 重构设备订阅保活和更新机制 lin 2025-05-21 14:57:10 +08:00
• a1ba811962 调整推流获取逻辑 lin 2025-05-20 17:59:16 +08:00
• bfc063e4f7 修复通过redis唤醒推流 lin 2025-05-19 16:52:12 +08:00
• d524905edb 增加设备和平台在线状态不同的同步策略 lin 2025-05-19 15:52:56 +08:00
• f7f3ed4c5b Merge branch 'master' into dev/设备和平台使用不同的优化策略 lin 2025-05-19 14:42:44 +08:00
• 2dcd070fbe 调整PR修复方式 lin 2025-05-19 14:42:26 +08:00
• 38059f4c38 Merge branch '2.7.3' lin 2025-05-19 14:41:29 +08:00
• 01b820c235 Merge pull request #1854 from vannewang/2.7.3 648540858 2025-05-19 14:40:35 +08:00
• ef22377fe5 Merge remote-tracking branch 'origin/master' lin 2025-05-19 14:39:07 +08:00
• 43916f27d7 Merge branch '2.7.3' lin 2025-05-19 14:39:01 +08:00
• 8a15331558 Merge pull request #1853 from iwanlebron/master 648540858 2025-05-19 14:26:53 +08:00
• 23e3173ed0 修复CatalogEventLister未判空ServerGBId引发的空指针异常 vannewang 2025-05-19 11:32:55 +08:00
• c19fae68a3 升级fastjson版本以解决json序列化BUG lin 2025-05-19 11:26:58 +08:00
• 5224f2b5c0 增加数据库脚本 lin 2025-05-19 10:39:49 +08:00
• 17a7b23239 fix sql err Iwan Lebron 2025-05-19 10:39:24 +08:00
• 420b3889c5 [1078] 合并新UI lin 2025-05-16 15:17:35 +08:00
• 7c5cee5d87 Merge branch 'refs/heads/master' into dev/1078-newUI lin 2025-05-16 11:03:40 +08:00
• c981e7f470 修复h265web调用的逻辑异常 lin 2025-05-16 11:03:10 +08:00
• 27d7f3cc6e Merge branch 'master' into dev/1078-newUI lin 2025-05-16 08:50:26 +08:00
• b8f2742c29 修复节点添加异常 lin 2025-05-16 08:48:38 +08:00
• 592c1c2b71 [1078] 合并新UI lin 2025-05-15 18:32:03 +08:00
• 5b89145337 增加接入信息展示 lin 2025-05-15 10:28:02 +08:00
• 6a2ecd937d Merge branch 'refs/heads/master' into dev/1078-newUI lin 2025-05-15 10:25:07 +08:00
• bb5018c7f4 调整接入信息页面 lin 2025-05-15 10:24:35 +08:00
• 98e6cfcc4c Merge branch 'master' into dev/1078-newUI lin 2025-05-15 10:00:40 +08:00
• 91d571d8d4 增加设置，支持屏蔽频繁注册不段开关tcp连接的设备 lin 2025-05-15 09:55:37 +08:00
• 081a146f2a [1078] 合并新UI lin 2025-05-14 18:01:12 +08:00
• 68f7d3ef74 [1078] 适配新UI 648540858 2025-05-14 15:48:35 +08:00
• 697ba10016 更新Readme lin 2025-05-14 09:15:15 +08:00
• 1a7f517c5a Merge branch 'refs/heads/master' into dev/1078-newUI 648540858 2025-05-13 21:22:01 +08:00
• a83a48e40e 修复因发送失败消息捕捉导致的消息处理异常 lin 2025-05-13 15:25:17 +08:00
• e4a0a37f0b [1078] 合并新UI lin 2025-05-12 18:01:10 +08:00
• 49f4306bb3 支持直接播放页面 lin 2025-05-12 17:29:45 +08:00
• c2c44daca6 修复播放地址复制和分屏播放布局BUG lin 2025-05-12 16:33:16 +08:00
• f1fb046774 修复播放弹窗下的地址复制 lin 2025-05-12 16:10:24 +08:00
• 198db8f684 修复分屏监控地址不一致 lin 2025-05-12 09:00:36 +08:00
• 9903f25cc1 强化消息发送失败的处理 648540858 2025-05-11 22:00:33 +08:00
• c4ab55a456 [部标1078] 适配新UI 648540858 2025-05-11 08:01:45 +08:00
• 10c75036f5 Merge branch 'master' into dev/1078-newUI 648540858 2025-05-11 07:00:10 +08:00
• d7ba1cab30 强化通道同步异常处理 648540858 2025-05-10 23:22:59 +08:00
• 594a696015 修复je播放器拉伸问题 648540858 2025-05-10 23:09:56 +08:00
• 3b7ba3eb46 Merge branch 'master' into dev/1078-newUI 648540858 2025-05-10 08:59:45 +08:00
• e22d96cfb7 调整文档指向地址 648540858 2025-05-10 08:01:08 +08:00
• b9a4cac707 修复文档描述跳转错误 648540858 2025-05-10 07:57:14 +08:00
• 9b8134752c Merge remote-tracking branch 'origin/master' lin 2025-05-07 15:10:50 +08:00
• 40b6580611 修复同步通道为空时, 更新通道异常 lin 2025-05-07 15:10:38 +08:00
• e459711680 Merge pull request #1834 from youngerLFC/patch-1 648540858 2025-04-30 09:12:56 +08:00
• b159775b0e 去除重复执行代码 lin 2025-04-29 17:27:44 +08:00
• a9c2837709 Update build.sh youngerLFC 2025-04-29 16:55:46 +08:00
• 87c0e061ba [文档] 去除多余命令 lin 2025-04-29 10:01:33 +08:00
• a916cc2252 [UI] 修复巡航 lin 2025-04-29 09:18:33 +08:00
• 55aff6f3f8 [UI] 增加云台控制API lin 2025-04-28 18:26:34 +08:00
• 6b3423b932 Merge branch 'refs/heads/dev/前端页面修改' lin 2025-04-28 17:36:39 +08:00
• dca69268aa [文档] 适配新UI lin 2025-04-28 17:33:09 +08:00
• 9abff9f1fb 更新README lin 2025-04-28 15:58:02 +08:00
• 4b6bdf0871 [文档] 更换新UI截图 lin 2025-04-28 15:38:56 +08:00
• 1f40f1c81f [UI] 调整字体图标导入 lin 2025-04-28 15:26:56 +08:00
• e72e5cdfe2 [UI] 去除默认用户名密码，调整打包路径 lin 2025-04-28 15:15:36 +08:00
• 113743a065 增加新版本web页面 lin 2025-04-28 15:04:06 +08:00
• 3c1c68d327 调整地址 lin 2025-04-28 13:07:04 +08:00
• 403bee3108 切换地址 lin 2025-04-27 17:09:57 +08:00
• 1f34dbcf21 Merge pull request #1826 from CNPolaris/master 648540858 2025-04-27 14:33:46 +08:00
• fe02fdcc02 修复单通道设备编号一致时的判断 lin 2025-04-27 10:17:16 +08:00
• f86af27b60 优化统计信息获取 648540858 2025-04-27 06:15:05 +08:00
• e2678f39e3 临时提交 lin 2025-04-25 18:04:51 +08:00
• e754d0d804 [1078] 去除测试程序中的调用错误 648540858 2025-04-24 22:39:15 +08:00
• 1dc65330fc 修复属性注释错误 lin 2025-04-24 17:53:05 +08:00
• 4dd5864cf1 Merge branch 'master' into dev/前端页面修改 lin 2025-04-24 08:43:41 +08:00
• 13b7edb271 去除重复的引入 648540858 2025-04-23 22:19:32 +08:00
• 900447ae5c 增加文档使用说明 648540858 2025-04-23 22:18:19 +08:00
• 24cb9a6696 Merge branch 'feat-docker' tianxin 2025-04-23 20:37:34 +08:00
• 4ad9f83ee9 登录后用户信息增加服务ID lin 2025-04-23 20:36:28 +08:00
• 18b231e637 一个可行的docker部署方案 tianxin 2025-04-23 20:34:41 +08:00
• 2d468f440e Merge branch 'master' of https://gitee.com/pan648540858/wvp-GB28181-pro tianxin 2025-04-23 19:20:45 +08:00
• a433003f74 增加异常处理 lin 2025-04-22 11:24:20 +08:00