lin
|
9941608207
|
写入第三方同步的别名信息
|
2025-09-27 21:10:58 +08:00 |
|
lin
|
77594dae3d
|
支持从第三方同步分组信息
|
2025-09-27 21:03:20 +08:00 |
|
lin
|
4280a1d08e
|
移除自定义的是否支持云台属性
|
2025-09-26 17:31:37 +08:00 |
|
lin
|
8d6fe0c9d8
|
优化地图展示流程,已经默认统一坐标为wgs84
|
2025-09-25 18:06:58 +08:00 |
|
lin
|
6469aefe22
|
支持从第三方读取地图配置
|
2025-09-25 15:27:30 +08:00 |
|
lin
|
bee911fa09
|
通道增加自定义属性 是否支持云台控制和是否支持语音对讲
|
2025-09-24 17:47:12 +08:00 |
|
lin
|
554a11ead6
|
移除多余接口
|
2025-09-24 16:36:33 +08:00 |
|
lin
|
c0ef35c3a0
|
支持通用通道云台控制,支持地图位置编辑
|
2025-09-24 16:21:02 +08:00 |
|
lin
|
602cd390e0
|
去除部分警告
|
2025-09-24 11:40:31 +08:00 |
|
648540858
|
96cc9cc7b1
|
Merge pull request #1981 from guoshaoqiu/master
[后端] 修复目录设置/位置移动的订阅逻辑:订阅周期必须 ≥30 秒,取消订阅时允许周期设为 0
|
2025-09-24 10:29:00 +08:00 |
|
lin
|
842647674a
|
升级spring boot版本。默认jdk版本升级至21
|
2025-09-24 10:24:42 +08:00 |
|
lin
|
1156880194
|
Merge branch 'master' into dev/springBoot3
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/controller/MediaController.java
# src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078Controller.java
|
2025-09-24 08:38:29 +08:00 |
|
lin
|
0ed37d58ec
|
完善录像回放播放器切换
|
2025-09-23 18:04:30 +08:00 |
|
lin
|
3a594f7bee
|
优化abl云端录像播放效果
|
2025-09-22 14:31:04 +08:00 |
|
lin
|
ff0d54968d
|
zlm适配新的云端录像播放界面
|
2025-09-19 22:55:44 +08:00 |
|
lin
|
af3a283b3d
|
适配abl新的端口命名
|
2025-09-19 20:48:41 +08:00 |
|
lin
|
fd306d8ede
|
云端录像回放使用单文件播放
|
2025-09-19 18:02:53 +08:00 |
|
lin
|
a064f27bf8
|
支持ABL风格地址
|
2025-09-18 18:53:12 +08:00 |
|
lin
|
fb9ff67701
|
支持ABL录像回放
|
2025-09-17 18:19:33 +08:00 |
|
guoshq
|
e91e96077a
|
[后端] 修复目录设置/位置移动的订阅逻辑:订阅周期必须 ≥30 秒,取消订阅时允许周期设为 0
|
2025-09-17 13:38:23 +08:00 |
|
lin
|
403e7648f9
|
优化ABL结果封装完成
|
2025-09-16 17:57:59 +08:00 |
|
lin
|
c1672728d3
|
优化zlm结果封装完成
|
2025-09-16 10:52:58 +08:00 |
|
lin
|
576feec514
|
临时提交
|
2025-09-15 18:01:00 +08:00 |
|
lin
|
5c83bf2a41
|
临时提交
|
2025-09-15 17:59:18 +08:00 |
|
lin
|
27c7969b8f
|
更新README
|
2025-09-12 10:35:24 +08:00 |
|
lin
|
18be8aff6c
|
abl 支持拉流代理
|
2025-09-08 16:09:01 +08:00 |
|
Dylan
|
dc5a66753c
|
Update PlatformServiceImpl.java 平台级联删除
平台级联删除
|
2025-09-03 19:26:05 +08:00 |
|
lin
|
04742531fc
|
修复推流列表在使用postgresql时查询失败 #1809
|
2025-08-27 10:01:22 +08:00 |
|
lin
|
5db66b0f40
|
修复分组信息缺少的行政区划编码 #1914
|
2025-08-27 09:56:50 +08:00 |
|
lin
|
416dac382e
|
修复离线失败 #1944
|
2025-08-25 15:44:18 +08:00 |
|
lin
|
dfba1840e3
|
推流数据导入完善异常提示
|
2025-08-15 17:03:31 +08:00 |
|
lin
|
6f577268ee
|
适配新版本zlm限流配置
|
2025-08-15 09:50:45 +08:00 |
|
lin
|
93724bac98
|
修复预置位查询空指针
|
2025-08-12 12:28:51 +08:00 |
|
yosixiaohu
|
2877d67e92
|
修复GB28181预置位查询只能返回10条数据BUG
|
2025-08-09 11:14:39 +08:00 |
|
lin
|
56d4e1ebd9
|
调整抓拍代码
|
2025-08-08 10:38:38 +08:00 |
|
lin
|
fad9f2954a
|
增加配置,修复添加部标设备异常
|
2025-08-07 17:52:06 +08:00 |
|
lin
|
45509372bd
|
修复过期时间设置异常
|
2025-08-07 17:31:51 +08:00 |
|
lin
|
1da487f02a
|
[1078] 优化鉴权码位置,支持1078国标级联
|
2025-08-06 15:17:44 +08:00 |
|
lin
|
e555df52d3
|
[1078] 通用通道支持位置更新
|
2025-08-06 06:38:37 +08:00 |
|
lin
|
c90836261a
|
[1078] 增加状态变化通知和位置事件
|
2025-08-05 18:05:18 +08:00 |
|
lin
|
d7f5e7d771
|
[1078] 通用通道录像回放支持
|
2025-08-03 17:20:24 +08:00 |
|
lin
|
0a19ce4f34
|
[1078] 临时提交
|
2025-08-01 19:45:40 +08:00 |
|
lin
|
efbd302260
|
Merge branch 'master' into 重构/1078
|
2025-08-01 19:00:13 +08:00 |
|
lin
|
09f1ef20a7
|
通用通道支持录像回放以及录像控制
|
2025-08-01 18:59:15 +08:00 |
|
lin
|
c75122008c
|
通用通道支持停止实时流
|
2025-08-01 15:58:30 +08:00 |
|
lin
|
e272d25939
|
[1078] 适配新结构接入通用通道支持云台控制
|
2025-08-01 14:39:33 +08:00 |
|
lin
|
2ee9a3fa71
|
[1078] 适配新结构接入通用通道
|
2025-07-31 21:21:31 +08:00 |
|
lin
|
333965255f
|
Merge branch 'master' into 重构/1078
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/common/enums/ChannelDataType.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
|
2025-07-31 21:14:23 +08:00 |
|
lin
|
8ec950d515
|
通用通道支持巡航组
|
2025-07-31 20:54:08 +08:00 |
|
lin
|
9614584219
|
通用通道支持预置位调用,删除, 增加
|
2025-07-31 19:05:07 +08:00 |
|
lin
|
19b873ba5c
|
通用通道支持云台控制
|
2025-07-31 18:49:53 +08:00 |
|
lin
|
edeb8d6b3f
|
临时提交
|
2025-07-30 18:02:49 +08:00 |
|
lin
|
867b26b9a8
|
Merge branch 'master' into dev/通用通道云台控制
|
2025-07-30 10:34:58 +08:00 |
|
lin
|
24417203f0
|
修复前端布防撤防调用失败
|
2025-07-30 10:22:51 +08:00 |
|
lin
|
f3bd58acfe
|
[1078] FTP使用随机用户和密码
|
2025-07-29 19:34:33 +08:00 |
|
lin
|
9e880786b3
|
[1078] 去除ftp配置中的ip配置 从连接中获取
|
2025-07-29 18:40:03 +08:00 |
|
lin
|
0ed395ff2e
|
[1078] 支持通用通道的点播
|
2025-07-29 14:46:16 +08:00 |
|
elpx
|
3cec9d2bd1
|
修改ip与port的拼接方式,以支持ipv6
|
2025-07-28 23:57:16 +08:00 |
|
lin
|
4c97022c78
|
[1078] 支持语音对讲 中心广播模式
|
2025-07-28 17:50:03 +08:00 |
|
linwumingshi
|
1693d904c4
|
fix: 🐛 修复云录像下载链接中的格式化问题
- 更新了 CloudRecordUtils 类,使其使用 UtilityClass 注解
- 优化了 getDownloadFilePath 方法,将文件路径作为独立参数传入
- 修复了原始实现中可能导致路径格式错误的问题
- 增加了方法注释,说明其功能和参数
|
2025-07-28 17:38:54 +08:00 |
|
648540858
|
c2d42d67c0
|
Merge pull request #1929 from XiaoQiTong/wvp-28181-2.0
修复一些实际使用中的bug
|
2025-07-28 14:58:15 +08:00 |
|
lin
|
4fb04776f2
|
[1078] 代码整理
|
2025-07-28 14:32:38 +08:00 |
|
韩浩然XiaoQiTong
|
65553e966e
|
Update SIPCommander.java
|
2025-07-28 10:29:47 +08:00 |
|
lin
|
e9eeeeefd7
|
Merge branch 'master' into 重构/1078
|
2025-07-28 08:47:30 +08:00 |
|
XiaoQiTong
|
e9c227a3cf
|
修复查询缓存少流媒体字段,导致指定流媒体收流失效问题
|
2025-07-27 16:29:00 +08:00 |
|
XiaoQiTong
|
f9f9d03502
|
修复预置位查询指令海康平台响应不了的问题
|
2025-07-27 16:22:50 +08:00 |
|
XiaoQiTong
|
47571962e6
|
解决获取所有预置位返回错误的bug
|
2025-07-27 16:19:57 +08:00 |
|
lin
|
34fb79093e
|
[1078] 完善立即拍摄的结果查询和下载
|
2025-07-25 17:49:22 +08:00 |
|
meqbyte
|
305c8ec8d7
|
jwt剩余时间计算错误
|
2025-07-25 15:59:59 +08:00 |
|
lin
|
43ef080f55
|
[1078] 增加立即拍摄
|
2025-07-25 15:37:03 +08:00 |
|
lin
|
ee52b43c99
|
[1078] 增加多媒体文件检索
|
2025-07-23 23:30:48 +08:00 |
|
lin
|
a69e3d5dde
|
[1078] 增加音视频属性查询
|
2025-07-22 20:56:32 +08:00 |
|
lin
|
c0ab010475
|
[1078] 增加音视频属性查询
|
2025-07-22 20:51:03 +08:00 |
|
lin
|
79ee116174
|
[1078] 优化netty bytebuf释放
|
2025-07-22 10:02:32 +08:00 |
|
lin
|
fb150da97a
|
[1078] 完善终端参数
|
2025-07-22 06:05:20 +08:00 |
|
lin
|
9388c279e7
|
[1078] 补充终端参数
|
2025-07-21 17:48:02 +08:00 |
|
lin
|
03b5c0241f
|
[1078] 优化终端参数查询和设置
|
2025-07-21 10:35:30 +08:00 |
|
lin
|
a60eb082fe
|
[1078] 临时提交
|
2025-07-20 23:05:49 +08:00 |
|
lin
|
9d0678f765
|
[1078] 修复终端参数保存
|
2025-07-20 22:56:33 +08:00 |
|
lin
|
9b0d091e4e
|
[1078] 优化终端参数查询和设置
|
2025-07-18 17:34:01 +08:00 |
|
lin
|
ebd95250c0
|
[1078] 增加车辆控制
|
2025-07-17 15:53:35 +08:00 |
|
lin
|
47e4f2343b
|
[1078] 增加连接到指定服务器
|
2025-07-17 15:12:23 +08:00 |
|
lin
|
8b17e97682
|
[1078] 增加驾驶员信息
|
2025-07-17 12:56:07 +08:00 |
|
lin
|
e730bf2d15
|
[1078] 修复mediaServer入库错误
|
2025-07-17 07:03:11 +08:00 |
|
lin
|
29802ccded
|
[1078] 增加文本下发
|
2025-07-16 18:22:33 +08:00 |
|
lin
|
3f2089f584
|
[1078] 增加位置信息展示
|
2025-07-16 16:02:07 +08:00 |
|
lin
|
45af124eb0
|
[1078] 支持终端属性和链路检测的UI
|
2025-07-16 11:00:43 +08:00 |
|
lin
|
5874d4d1fa
|
[1078] 修复webrtc地址
|
2025-07-15 18:37:53 +08:00 |
|
lin
|
d40bc5a034
|
[1078] 设备列表增加搜索和状态筛选
|
2025-07-15 18:21:11 +08:00 |
|
lin
|
44ed06bcbe
|
[1078] 支持无人观看自动停流
|
2025-07-15 18:11:23 +08:00 |
|
lin
|
be04660de8
|
[1078] 修复分包合并,优化设备列表排序,优化设备上线逻辑
|
2025-07-15 16:30:34 +08:00 |
|
lin
|
e28141da6e
|
[1078] 临时提交
|
2025-07-14 18:06:18 +08:00 |
|
lin
|
04bcb6dcb8
|
[1078] 优化多媒体数据上传处理
|
2025-07-14 11:03:45 +08:00 |
|
lin
|
9d47fe30f5
|
[1078] 增加单条存储多媒体数据上传
|
2025-07-11 22:07:32 +08:00 |
|
lin
|
cefc87ad47
|
[1078] 完善抓图
|
2025-07-11 21:41:50 +08:00 |
|
lin
|
8c3e9320fa
|
[1078] 增加抓图
|
2025-07-11 20:15:45 +08:00 |
|
lin
|
b7a2b6816b
|
[1078] 完善录像下载
|
2025-07-10 18:48:25 +08:00 |
|
lin
|
1655e5903b
|
[1078] 完善录像回放
|
2025-07-09 16:44:54 +08:00 |
|
lin
|
055bbc2dca
|
[1078] 修复回放结束发送失败
|
2025-07-09 16:37:33 +08:00 |
|
lin
|
3c6b715ce1
|
[1078] 临时提交
|
2025-07-09 16:16:04 +08:00 |
|
lin
|
3d9e718f26
|
临时提交
|
2025-07-09 14:58:26 +08:00 |
|
lin
|
48eff320fd
|
[1078] 适配abl的播放1078
|
2025-07-09 12:32:31 +08:00 |
|
lin
|
3c88f86a73
|
Merge branch 'master' into dev/通用通道云台控制
|
2025-07-07 18:03:39 +08:00 |
|
lin
|
4765d0efa6
|
调整国标级联通道发送逻辑
|
2025-07-07 17:56:06 +08:00 |
|
lin
|
fae839af05
|
[1078] 兼容2013版本的设备属性查询和注册鉴权
|
2025-07-07 17:23:12 +08:00 |
|
lin
|
70356c08d2
|
调整国标级联通道发送逻辑
|
2025-07-07 16:17:14 +08:00 |
|
lin
|
51759535fc
|
临时提交
|
2025-07-07 09:30:04 +08:00 |
|
lin
|
a424f270e8
|
[1078] 兼容abl流媒体
|
2025-07-03 17:30:59 +08:00 |
|
lin
|
1bfb51c90e
|
Merge branch 'dev/abl支持' into 重构/1078
# Conflicts:
# src/main/resources/application.yml
|
2025-07-03 15:29:13 +08:00 |
|
lin
|
5bcdf5dfb6
|
[abl] 合并主线
|
2025-07-03 15:28:47 +08:00 |
|
lin
|
bab5534134
|
Merge branch 'master' into dev/abl支持
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
# src/main/java/com/genersoft/iot/vmp/media/bean/RecordInfo.java
# src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
# src/main/resources/application.yml
|
2025-07-03 14:58:24 +08:00 |
|
lin
|
537d86ca89
|
[1078] 合并主线
|
2025-07-03 14:54:29 +08:00 |
|
lin
|
465e03d15d
|
Merge branch 'master' into 重构/1078
# Conflicts:
# web/src/router/index.js
# web/src/views/common/channelPlayer/chooseChannelForJt.vue
# web/src/views/common/channelPlayer/jtDeviceEdit.vue
# web/src/views/common/channelPlayer/jtDevicePlayer.vue
# web_src/src/layout/UiHeader.vue
# web_src/src/main.js
# web_src/src/router/index.js
|
2025-07-03 09:41:55 +08:00 |
|
lin
|
8d488b33e9
|
调整菜单结构,增加通道列表,支持节点搜索
|
2025-07-02 17:21:20 +08:00 |
|
lin
|
f8e5e8f057
|
优化拉流代理播放机制
|
2025-07-01 17:07:10 +08:00 |
|
lin
|
9e8fbea73b
|
支持zlm pro截图方式
|
2025-06-30 17:16:25 +08:00 |
|
lin
|
54f6ff9f81
|
修复拉流代理转国标级联点播失败的BUG
|
2025-06-27 15:32:02 +08:00 |
|
xiaoQQya
|
1c25f2f190
|
feat: 新增国标收流通道列表查看
|
2025-06-26 11:46:14 +08:00 |
|
lin
|
1c55bc3fd1
|
预置位查询支持多段返回
|
2025-06-19 15:12:47 +08:00 |
|
648540858
|
371511f836
|
Merge pull request #1891 from q792602257/h2
支持h2数据库
|
2025-06-14 20:20:32 +08:00 |
|
Jerry Yan
|
eada4a64dc
|
Merge branch 'boot3' into h2
# Conflicts:
# src/main/resources/application-dev.yml
|
2025-06-13 16:41:32 +08:00 |
|
648540858
|
196ecad3a3
|
Merge pull request #1889 from q792602257/boot3
升级至SpringBoot3
|
2025-06-13 09:28:20 +08:00 |
|
Jerry Yan
|
1b35fbd0e0
|
支持关闭返回Date Header,进而实现关闭对摄像头的校时功能
Fixes #1700
|
2025-06-12 16:05:06 +08:00 |
|
Jerry Yan
|
2657d61c08
|
修复SpringSecurity
|
2025-06-12 09:50:29 +08:00 |
|
Jerry Yan
|
5aaa1c016b
|
即将过期状态判断错误
|
2025-06-12 09:50:29 +08:00 |
|
648540858
|
ebcbc486b3
|
Merge pull request #1885 from q792602257/795
支持查询时根据channelId查询报警
|
2025-06-12 09:22:42 +08:00 |
|
648540858
|
a1cb616b0b
|
Merge pull request #1883 from q792602257/bugfix
knife4j文档中描述使用相对地址,可以直接点击打开对应页面
|
2025-06-12 09:22:15 +08:00 |
|
lin
|
b1da948513
|
修复录制计划查询方法名
|
2025-06-11 17:25:03 +08:00 |
|
Jerry Yan
|
68806b4202
|
支持查询时根据channelId查询报警
Fixes #795
|
2025-06-11 13:00:27 +08:00 |
|
Jerry Yan
|
8848de9d15
|
支持h2数据库
|
2025-06-11 12:54:45 +08:00 |
|
Jerry Yan
|
e6228df7a1
|
knife4j文档,描述使用相对地址,可以直接点击打开对应页面
|
2025-06-11 11:49:53 +08:00 |
|
Jerry Yan
|
14c85838f4
|
springboot3
|
2025-06-11 10:08:03 +08:00 |
|
lin
|
98ea5846fe
|
心跳入库 支持批量入库
|
2025-06-10 09:45:02 +08:00 |
|
lin
|
8acd3fa521
|
修复设备列表查询丢失字段,导致编辑后都是心跳参数
|
2025-06-06 15:24:58 +08:00 |
|
lin
|
8d97ee613e
|
修复移动位置订阅无法关闭的BUG
|
2025-06-06 09:26:36 +08:00 |
|
lin
|
bc545f12a5
|
优化延时任务到期时间更新
|
2025-06-05 11:19:07 +08:00 |
|
lin
|
6a6071973c
|
Merge remote-tracking branch 'origin/master'
|
2025-06-05 09:41:17 +08:00 |
|
lin
|
60e9fb3daa
|
修复推流列表和拉流代理的云端录像跳转错误
|
2025-06-05 09:40:43 +08:00 |
|
panlinlin
|
916553c559
|
订阅消息检查是否缺失Expires, 修复因华为的信令错误导致的空指针
|
2025-06-03 22:27:05 +08:00 |
|
lin
|
d15307533a
|
Merge branch 'master' into 重构/1078
# Conflicts:
# src/main/resources/application.yml
|
2025-06-03 17:21:21 +08:00 |
|
lin
|
227239f7f7
|
去除调试日志
|
2025-06-03 17:17:04 +08:00 |
|
lin
|
f4bbca78e5
|
优化通道变化消息发送以及增加设备状态丢失检测
|
2025-06-03 16:52:42 +08:00 |
|
lin
|
cc0c73a64d
|
Merge branch 'master' into dev/设备和平台使用不同的优化策略
|
2025-06-03 11:31:38 +08:00 |
|
lin
|
111274c08a
|
修复通道共享状态过滤, 优化发流端口获取, 避免递归过多异常
|
2025-06-03 10:36:29 +08:00 |
|
648540858
|
dccd27e9c2
|
修复空指针异常
|
2025-05-29 21:36:02 +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
|
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
|
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 |
|
lin
|
601d2b5d2b
|
修复集群推流BUG
|
2025-05-23 18:06:54 +08:00 |
|
lin
|
55f36f660b
|
修复集群播放BUG
|
2025-05-23 17:26:17 +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 |
|
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 |
|
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 |
|
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 |
|
lin
|
420b3889c5
|
[1078] 合并新UI
|
2025-05-16 15:17:35 +08:00 |
|
lin
|
592c1c2b71
|
[1078] 合并新UI
|
2025-05-15 18:32:03 +08:00 |
|
lin
|
5b89145337
|
增加接入信息展示
|
2025-05-15 10:28:02 +08:00 |
|
lin
|
98e6cfcc4c
|
Merge branch 'master' into dev/1078-newUI
|
2025-05-15 10:00:40 +08:00 |
|
lin
|
91d571d8d4
|
增加设置,支持屏蔽频繁注册不段开关tcp连接的设备
|
2025-05-15 09:55:37 +08:00 |
|
lin
|
081a146f2a
|
[1078] 合并新UI
|
2025-05-14 18:01:12 +08:00 |
|
648540858
|
1a7f517c5a
|
Merge branch 'refs/heads/master' into dev/1078-newUI
|
2025-05-13 21:22:01 +08:00 |
|
lin
|
a83a48e40e
|
修复因发送失败消息捕捉导致的消息处理异常
|
2025-05-13 15:25:17 +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
|
10c75036f5
|
Merge branch 'master' into dev/1078-newUI
|
2025-05-11 07:00:10 +08:00 |
|
648540858
|
d7ba1cab30
|
强化通道同步异常处理
|
2025-05-10 23:22:59 +08:00 |
|
648540858
|
3b7ba3eb46
|
Merge branch 'master' into dev/1078-newUI
# Conflicts:
# src/main/resources/application.yml
|
2025-05-10 08:59:45 +08:00 |
|