648540858
|
aeeb61d141
|
合并271分支
|
2024-05-23 17:47:43 +08:00 |
|
648540858
|
475b8a49a3
|
优化录像文件信息入库
|
2024-05-23 17:44:30 +08:00 |
|
648540858
|
2c89fae49a
|
Merge branch 'refs/heads/2.7.1'
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
# src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
# src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
|
2024-05-23 17:32:15 +08:00 |
|
648540858
|
fe9b8154e0
|
去除调试日志
|
2024-05-23 17:15:14 +08:00 |
|
648540858
|
2daa59d78c
|
支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题
|
2024-05-23 17:10:45 +08:00 |
|
648540858
|
1e9cdfe87f
|
1078-单独视频通道参数设置+特殊报警录像参数设置+视频相关报警屏蔽字
|
2024-05-22 21:24:47 +08:00 |
|
648540858
|
9817bf3fb7
|
1078-音视频参数设置+音视频通道列表设置
|
2024-05-21 23:58:23 +08:00 |
|
648540858
|
82ab524fc4
|
1078-音视频参数设置+音视频通道列表设置
|
2024-05-21 23:56:51 +08:00 |
|
648540858
|
d70bfb53dd
|
修复兼容zlm-pro转码时无人管看自动移除失败的BUG
|
2024-05-20 11:37:07 +08:00 |
|
648540858
|
e085258d74
|
1078-数据下行透传+数据上行透传 + 数据压缩上报 + 平台 RSA公钥 + 终端 RSA公钥
|
2024-05-20 00:04:04 +08:00 |
|
648540858
|
2f1ebca335
|
1078-单条存储多媒体数据检索上传命令
|
2024-05-19 23:50:37 +08:00 |
|
648540858
|
b626a583f4
|
1078-录音
|
2024-05-19 17:50:40 +08:00 |
|
648540858
|
dcc20d0d15
|
1078-存储多媒体数据上传接口优化
|
2024-05-19 17:08:31 +08:00 |
|
648540858
|
6af9b8da1f
|
1078-存储多媒体数据上传
|
2024-05-18 16:52:02 +08:00 |
|
648540858
|
e9562d7d31
|
1078-存储多媒体数据上传命令
|
2024-05-18 07:29:15 +08:00 |
|
648540858
|
b0e25ef784
|
1078-修复分包消息处理
|
2024-05-18 05:59:23 +08:00 |
|
648540858
|
49101a37e0
|
兼容zlm-pro转码
|
2024-05-17 16:32:01 +08:00 |
|
648540858
|
7ddf066878
|
1078-修复存储多媒体数据检索
|
2024-05-17 07:43:28 +08:00 |
|
648540858
|
7f9c903344
|
Merge pull request #1455 from hexq/master
Bugfix: 解决疑似Mac 14寸下国标设备直播之Jessibuca下出现的部分黑屏问题
|
2024-05-17 05:12:23 +08:00 |
|
hexq
|
09efdef4ce
|
解决MacOS 14寸 M2：最新Chrome国标设备通道“直播”Jessibuca播放下方出现黑屏的兼容BUG
|
2024-05-16 13:25:06 +08:00 |
|
648540858
|
b3eba418a2
|
Merge pull request #1453 from BradyXs/master
fix: 系统启动时，停止已启动国标推流抛出异常被系统捕获，启动服务失败。
|
2024-05-16 09:08:07 +08:00 |
|
BradyXu
|
7565b2ea77
|
fix 优化及联本地IP选择
|
2024-05-15 23:28:38 +08:00 |
|
bradyx
|
6e8071d820
|
fix: 系统启动时，停止已启动国标推流抛出异常被系统捕获，启动服务失败。
|
2024-05-15 13:52:16 +08:00 |
|
648540858
|
9161a090f6
|
1078-存储多媒体数据检索接口
|
2024-05-15 13:15:14 +08:00 |
|
648540858
|
7bf548492a
|
1078-修复摄像头立即拍摄命令应答
|
2024-05-14 23:21:57 +08:00 |
|
648540858
|
e02a047eb2
|
1078-存储多媒体数据检索 + 存储多媒体数据检索应答
|
2024-05-14 13:13:58 +08:00 |
|
648540858
|
5564cfb384
|
优化大量notify 移动位置订阅的入库
|
2024-05-13 17:22:36 +08:00 |
|
648540858
|
588b1da35a
|
Merge branch 'refs/heads/2.7.0' into 271-优化notify存储
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java
|
2024-05-13 11:12:20 +08:00 |
|
648540858
|
aaa1d3a46f
|
1078-摄像头立即拍摄命令
|
2024-05-12 07:36:29 +08:00 |
|
648540858
|
db4ba4035f
|
Merge branch 'refs/heads/master' into 1078
|
2024-05-12 06:53:53 +08:00 |
|
648540858
|
69c81b3b96
|
Merge pull request #1450 from BradyXs/master
修复sip绑定监听多网卡IP时，新增上级平台新增失败的问题，本地IP改成从配置的多IP下拉选择
|
2024-05-12 06:05:31 +08:00 |
|
BradyXu
|
72b437cc52
|
修复当上级平台点播时，上级平台和下级平台局域网不通时，导致推流失败。推流目标IP地址改为配置的SDP发流IP，如果SDP发流IP存在的话。否则还是从连接中获取推流目标IP
|
2024-05-12 02:15:41 +08:00 |
|
BradyXu
|
a8c424e49d
|
修复sip绑定监听多网卡IP时，新增上级平台新增失败的问题，本地IP改成从配置的多IP下拉选择
|
2024-05-12 02:00:55 +08:00 |
|
648540858
|
e6a850891e
|
支持移动位置订阅通知的数据存储
|
2024-05-11 17:48:47 +08:00 |
|
648540858
|
17e9631de4
|
修复多节点时端口丢失的问题
|
2024-05-09 23:53:36 +08:00 |
|
648540858
|
632075da9b
|
优化接收BYE消息后的处理
|
2024-05-09 23:41:27 +08:00 |
|
648540858
|
cc71b7d9ca
|
1078-定位数据批量上传+多媒体事件信息上传+多媒体数据上传
|
2024-05-09 00:03:54 +08:00 |
|
648540858
|
c6e3df685a
|
1078-上报驾驶员身份信息请求+驾驶员身份信息采集上报
|
2024-05-08 22:51:29 +08:00 |
|
648540858
|
622d72b3f0
|
解决刷新通道异常
|
2024-05-08 12:16:18 +08:00 |
|
648540858
|
186b00e9b3
|
支持下载多个云端录像的zip压缩包
|
2024-05-08 11:18:47 +08:00 |
|
648540858
|
d79298c795
|
提升版本号
|
2024-05-07 14:18:49 +08:00 |
|
648540858
|
ad67155d73
|
1078-查询区域或线路数据
|
2024-05-06 23:58:17 +08:00 |
|
648540858
|
2112fffc26
|
1078-查询区域或线路数据应答...
|
2024-05-06 18:00:26 +08:00 |
|
648540858
|
364d613ccb
|
1078-修复删除路线
|
2024-05-06 16:05:16 +08:00 |
|
648540858
|
c53e4f6fbc
|
1078-设置路线
|
2024-05-06 15:55:14 +08:00 |
|
648540858
|
cc91db30c5
|
1078-查询区域或线路数据
|
2024-05-05 23:02:49 +08:00 |
|
648540858
|
00749619da
|
1078-设置路线...
|
2024-05-05 21:54:56 +08:00 |
|
648540858
|
9280b57974
|
1078-设置路线...
|
2024-05-04 23:19:27 +08:00 |
|
648540858
|
a3149139e2
|
1078-设置多边形区域+删除多边形区域
|
2024-05-04 21:56:47 +08:00 |
|
648540858
|
58401b1444
|
1078-设置多边形区域...
|
2024-05-04 14:57:48 +08:00 |
|