lin
|
79be053db7
|
更新README
|
2025-05-29 17:52:40 +08:00 |
|
648540858
|
08fe740481
|
Merge pull request #1866 from xiaoQQya/fix/sql
fix: 修复 sql 语法错误
|
2025-05-29 17:29:55 +08:00 |
|
lin
|
1420fcfcd0
|
Merge branch 'master' into 重构/1078
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/bean/InviteErrorCode.java
# src/main/resources/application.yml
|
2025-05-29 17:10:32 +08:00 |
|
lin
|
ec9a0bcc76
|
修复talk模式Bye消息发送失败的BUG
|
2025-05-29 17:02:37 +08:00 |
|
lin
|
46d30a8fe2
|
Merge branch 'master' into dev/设备和平台使用不同的优化策略
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
# 数据库/2.7.4/初始化-mysql-2.7.4.sql
# 数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql
|
2025-05-29 15:31:52 +08:00 |
|
lin
|
578b54ed09
|
完善设备有效期到期机制
|
2025-05-29 15:29:00 +08:00 |
|
xiaoQQya
|
3845c03250
|
fix: 修复 sql 语法错误
|
2025-05-29 14:37:22 +08:00 |
|
648540858
|
58e82ec185
|
临时提交
|
2025-05-28 22:32:14 +08:00 |
|
648540858
|
a40446e42b
|
临时提交
|
2025-05-27 23:19:10 +08:00 |
|
lin
|
3ad5d43368
|
临时提交
|
2025-05-27 18:24:07 +08:00 |
|
lin
|
dd9c64d7a8
|
增加设备状态保持任务
|
2025-05-26 18:04:02 +08:00 |
|
lin
|
0c29c90d3b
|
Merge branch 'master' into 重构/1078
|
2025-05-26 15:07:58 +08:00 |
|
lin
|
cb2ade744e
|
更新README
|
2025-05-26 11:02:21 +08:00 |
|
lin
|
4b7467e8e0
|
Merge branch '2.7.3'
|
2025-05-26 10:17:46 +08:00 |
|
lin
|
b1ff1ef54c
|
增加订阅日志
|
2025-05-26 10:16:52 +08:00 |
|
lin
|
9da6e874fb
|
修复时间戳发送错误导致seek失败
|
2025-05-26 09:54:33 +08:00 |
|
lin
|
a7f9cbd8ef
|
版本号提升
|
2025-05-26 09:53:58 +08:00 |
|
lin
|
ca37162dd5
|
Merge branch 'master' into dev/设备和平台使用不同的优化策略
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
|
2025-05-26 09:09:36 +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
|
d524905edb
|
增加设备和平台在线状态不同的同步策略
|
2025-05-19 15:52:56 +08:00 |
|
lin
|
f7f3ed4c5b
|
Merge branch 'master' into dev/设备和平台使用不同的优化策略
|
2025-05-19 14:42:44 +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 |
|
lin
|
5224f2b5c0
|
增加数据库脚本
|
2025-05-19 10:39:49 +08:00 |
|
Iwan Lebron
|
17a7b23239
|
fix sql err
|
2025-05-19 10:39:24 +08:00 |
|