lin
|
a7f9cbd8ef
|
版本号提升
|
2025-05-26 09:53:58 +08:00 |
|
lin
|
75b1e8deb2
|
Merge branch '2.7.3'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
|
2025-05-23 18:18:32 +08:00 |
|
648540858
|
0df557750f
|
Merge pull request #1859 from Digital631/master
修复了分配监控的页面自适应
|
2025-05-23 18:17:41 +08:00 |
|
lin
|
601d2b5d2b
|
修复集群推流BUG
|
2025-05-23 18:06:54 +08:00 |
|
lin
|
55f36f660b
|
修复集群播放BUG
|
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 |
|
lin
|
d825b986dd
|
推流列表和拉流代理支持根据来源ip返回流地址
|
2025-05-23 09:20:22 +08:00 |
|
648540858
|
a1a5c53fad
|
合并国标级联状态重构
|
2025-05-22 21:14:50 +08:00 |
|
648540858
|
7c7ef34045
|
Merge branch '2.7.3'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPSender.java
|
2025-05-22 21:09:22 +08:00 |
|
lin
|
243f7f62b7
|
国标级联调整心跳逻辑
|
2025-05-22 17:40:10 +08:00 |
|
lin
|
b0b5a0f5e0
|
国标级联调整注册逻辑
|
2025-05-22 15:17:13 +08:00 |
|
648540858
|
706806a138
|
Merge pull request #1857 from sxh-nice/master
修复开始时间和结束时间写反问题
|
2025-05-22 14:58:58 +08:00 |
|
yosixiaohu
|
83f603238a
|
修复开始时间和结束时间写反问题
|
2025-05-22 13:50:06 +08:00 |
|
648540858
|
7bb0cc19f4
|
重构平台保活逻辑-启动对未离线的平台注销
|
2025-05-22 07:09:20 +08:00 |
|
648540858
|
1d172cb387
|
重构平台保活逻辑-启动对未离线的平台注销
|
2025-05-22 07:02:10 +08:00 |
|
648540858
|
bcf08d27fa
|
重构平台保活逻辑
|
2025-05-21 23:17:52 +08:00 |
|
lin
|
29ac4850f4
|
去除移除订阅时设置订阅周期
|
2025-05-21 18:06:07 +08:00 |
|
lin
|
dd17462b68
|
重构设备订阅保活和更新机制
|
2025-05-21 14:57:10 +08:00 |
|
lin
|
a1ba811962
|
调整推流获取逻辑
|
2025-05-20 17:59:16 +08:00 |
|
lin
|
bfc063e4f7
|
修复通过redis唤醒推流
|
2025-05-19 16:52:12 +08:00 |
|
lin
|
2dcd070fbe
|
调整PR修复方式
|
2025-05-19 14:42:26 +08:00 |
|
lin
|
38059f4c38
|
Merge branch '2.7.3'
|
2025-05-19 14:41:29 +08:00 |
|
648540858
|
01b820c235
|
Merge pull request #1854 from vannewang/2.7.3
修复CatalogEventLister未判空ServerGBId引发的空指针异常
|
2025-05-19 14:40:35 +08:00 |
|
lin
|
ef22377fe5
|
Merge remote-tracking branch 'origin/master'
|
2025-05-19 14:39:07 +08:00 |
|
lin
|
43916f27d7
|
Merge branch '2.7.3'
|
2025-05-19 14:39:01 +08:00 |
|
648540858
|
8a15331558
|
Merge pull request #1853 from iwanlebron/master
fix sql err
|
2025-05-19 14:26:53 +08:00 |
|
vannewang
|
23e3173ed0
|
修复CatalogEventLister未判空ServerGBId引发的空指针异常
|
2025-05-19 11:32:55 +08:00 |
|
lin
|
c19fae68a3
|
升级fastjson版本以解决json序列化BUG
|
2025-05-19 11:26:58 +08:00 |
|
Iwan Lebron
|
17a7b23239
|
fix sql err
|
2025-05-19 10:39:24 +08:00 |
|
lin
|
c981e7f470
|
修复h265web调用的逻辑异常
|
2025-05-16 11:03:10 +08:00 |
|
lin
|
b8f2742c29
|
修复节点添加异常
|
2025-05-16 08:48:38 +08:00 |
|
lin
|
bb5018c7f4
|
调整接入信息页面
|
2025-05-15 10:24:35 +08:00 |
|
lin
|
91d571d8d4
|
增加设置，支持屏蔽频繁注册不段开关tcp连接的设备
|
2025-05-15 09:55:37 +08:00 |
|
lin
|
697ba10016
|
更新Readme
|
2025-05-14 09:15:15 +08:00 |
|
lin
|
a83a48e40e
|
修复因发送失败消息捕捉导致的消息处理异常
|
2025-05-13 15:25:17 +08:00 |
|
lin
|
49f4306bb3
|
支持直接播放页面
|
2025-05-12 17:29:45 +08:00 |
|
lin
|
c2c44daca6
|
修复播放地址复制和分屏播放布局BUG
|
2025-05-12 16:33:16 +08:00 |
|
lin
|
f1fb046774
|
修复播放弹窗下的地址复制
|
2025-05-12 16:10:24 +08:00 |
|
lin
|
198db8f684
|
修复分屏监控地址不一致
|
2025-05-12 09:00:36 +08:00 |
|
648540858
|
9903f25cc1
|
强化消息发送失败的处理
|
2025-05-11 22:00:33 +08:00 |
|
648540858
|
d7ba1cab30
|
强化通道同步异常处理
|
2025-05-10 23:22:59 +08:00 |
|
648540858
|
594a696015
|
修复je播放器拉伸问题
|
2025-05-10 23:09:56 +08:00 |
|
648540858
|
e22d96cfb7
|
调整文档指向地址
|
2025-05-10 08:01:08 +08:00 |
|
648540858
|
b9a4cac707
|
修复文档描述跳转错误
|
2025-05-10 07:57:14 +08:00 |
|
lin
|
9b8134752c
|
Merge remote-tracking branch 'origin/master'
|
2025-05-07 15:10:50 +08:00 |
|
lin
|
40b6580611
|
修复同步通道为空时, 更新通道异常
|
2025-05-07 15:10:38 +08:00 |
|
648540858
|
e459711680
|
Merge pull request #1834 from youngerLFC/patch-1
fix the bug："cp: target './nginx/dist' is not a directory"
|
2025-04-30 09:12:56 +08:00 |
|
lin
|
b159775b0e
|
去除重复执行代码
|
2025-04-29 17:27:44 +08:00 |
|
youngerLFC
|
a9c2837709
|
Update build.sh
fix the bug："cp: target './nginx/dist' is not a directory"
|
2025-04-29 16:55:46 +08:00 |
|