648540858
|
131ea77669
|
接口使用旧的stream信息，支持使用远程ip端口做为回复的地址而不是使用sip中的地址
|
2022-12-06 10:33:43 +08:00 |
|
648540858
|
850260ec28
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-12-02 15:15:50 +08:00 |
|
648540858
|
142b17cc76
|
更新接口
|
2022-12-02 15:12:56 +08:00 |
xiaoQQya
|
8f39254dd0
|
perf(PlayService): 修改截图请求使用 FLV 地址，解决 RTSP 地址截图出现图像丢包模糊的问题
|
2022-11-30 16:32:28 +08:00 |
|
648540858
|
ef6693aabb
|
Merge branch 'wvp-28181-2.0' into Zafu-Dev-1127
|
2022-11-29 15:18:56 +08:00 |
|
648540858
|
3aabbd6919
|
更新配置说明文件
|
2022-11-29 12:13:54 +08:00 |
|
648540858
|
14151c07e3
|
优化队列处理逻辑
|
2022-11-29 11:42:09 +08:00 |
WuPeng
|
d60452560e
|
弃用废弃方法toJavaObject，改用to方法，消除编译警告。
|
2022-11-27 10:28:42 +08:00 |
|
648540858
|
f89491ada3
|
修复单端口模式下ssrc的释放 #667
|
2022-11-25 14:38:46 +08:00 |
|
648540858
|
fb957b0dba
|
优化注释
|
2022-11-25 12:12:35 +08:00 |
|
648540858
|
bdd9ff1fd7
|
优化okhttp并发参数
|
2022-11-25 11:57:46 +08:00 |
|
648540858
|
0629d4cf0d
|
清空级联录像记录 #672
|
2022-11-25 11:17:48 +08:00 |
|
648540858
|
fa2ccb4ec8
|
修复协议端口配置不全导致前端播放页面无法弹出的问题
|
2022-11-25 10:50:16 +08:00 |
|
648540858
|
278264a2c6
|
优化拉流代理注释
|
2022-11-22 17:30:49 +08:00 |
|
648540858
|
8ea6e192d9
|
优化拉流代理表单以及逻辑
|
2022-11-22 17:17:35 +08:00 |
|
648540858
|
1469971102
|
支持配置设备上线时自动更新查询通道，修复通道刷新进度展示
|
2022-11-22 15:02:25 +08:00 |
|
648540858
|
1983b8b0a7
|
国标级联->选择通道支持移除目前下所有以及全部添加到目录下
|
2022-11-22 12:55:29 +08:00 |
|
648540858
|
8cab9f23b0
|
修复使用来源IP作为流ip配置
|
2022-11-21 10:07:27 +08:00 |
|
648540858
|
86c08db266
|
移除重复方法
|
2022-11-18 17:29:22 +08:00 |
|
648540858
|
a02883b394
|
更新文档
|
2022-11-18 17:26:58 +08:00 |
|
648540858
|
946e1dc245
|
添加远程启动信令
|
2022-11-18 17:17:01 +08:00 |
|
648540858
|
5f7c53823a
|
清理过期的推流鉴权信息
|
2022-11-17 18:21:45 +08:00 |
|
648540858
|
6b8ecd1f9d
|
优化级联注册稳定性
|
2022-11-17 18:09:28 +08:00 |
|
648540858
|
23710f1c64
|
优化多网卡下的localIp获取
|
2022-11-17 17:01:54 +08:00 |
|
648540858
|
d340a37a00
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-11-17 11:31:30 +08:00 |
|
648540858
|
c04de4cd70
|
注释与日志优化
|
2022-11-17 10:04:05 +08:00 |
|
648540858
|
694076dc8c
|
优化国标级联发流并发能力
|
2022-11-16 09:39:27 +08:00 |
|
648540858
|
2466a24860
|
去除发送流端口范围
|
2022-11-10 16:48:17 +08:00 |
|
648540858
|
8870f5f5a1
|
优化使用来源ip作为流ip
|
2022-11-10 09:40:01 +08:00 |
|
648540858
|
eb2a4139fa
|
添加缺少的导入
|
2022-11-09 10:18:42 +08:00 |
|
648540858
|
96bb3814f6
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# web_src/src/components/dialog/devicePlayer.vue
# web_src/src/components/live.vue
|
2022-11-08 20:43:25 +08:00 |
|
648540858
|
c62a8986dd
|
优化线程休眠异常日志
|
2022-11-08 20:40:03 +08:00 |
|
648540858
|
cc4c4ac144
|
支持配置是否开去推流鉴权
|
2022-11-08 20:29:27 +08:00 |
|
648540858
|
4c8e2beb4d
|
优化hook处理速度
|
2022-11-08 19:58:36 +08:00 |
|
WuPeng
|
ab909feedf
|
升级Fastjson到Fastjson2
|
2022-11-05 20:49:56 +08:00 |
ljm
|
c56258ba8a
|
【同步设备通道】第一次收到同步请求应该将通道放入 不然会造成通道数量不一致 同步时也会漏掉第一个通道
|
2022-11-01 17:25:47 +08:00 |
|
648540858
|
aed45e0f0d
|
优化多网卡
|
2022-10-28 16:40:12 +08:00 |
|
648540858
|
1ab73f69eb
|
支持多网卡
|
2022-10-26 17:15:29 +08:00 |
|
648540858
|
f3454caaf6
|
Merge pull request #647 from L120820/wvp-28181-2.0
【zlm心跳hook】重复查询redis了
|
2022-10-25 14:43:12 +08:00 |
|
648540858
|
662a70e20f
|
修复设备信息后同步redis
|
2022-10-25 10:27:32 +08:00 |
|
648540858
|
0f0ece2401
|
设备编辑增加收流IP
|
2022-10-25 10:17:59 +08:00 |
|
648540858
|
958474c646
|
首页改造完成,添加系统信息
|
2022-10-24 18:14:31 +08:00 |
|
648540858
|
ca891f367c
|
首页改造完成,待添加系统信息
|
2022-10-24 15:20:35 +08:00 |
|
ljm
|
d6fe626b1c
|
【zlm心跳hook】重复查询redis了
变量也不需要多次定义
数据库有的话应该恢复zlm
缓存没有的话需要重新加载缓存
|
2022-10-22 09:48:45 +08:00 |
|
648540858
|
3ffe205082
|
首页改造,完成cpu,内存,网络图
|
2022-10-20 18:03:40 +08:00 |
|
ljm
|
2bf7cdc2df
|
【zlm心跳hook】重复查询redis了
变量也不需要多次定义
数据库有的话应该恢复zlm
|
2022-10-20 16:04:47 +08:00 |
|
648540858
|
95d367702a
|
增加启动时清理redis中错误zlm数据
|
2022-10-19 16:25:38 +08:00 |
|
648540858
|
6dbc7a68bd
|
兼容设备通道信息中自己为自己父节点的情况
|
2022-10-19 11:20:23 +08:00 |
|
648540858
|
b25f3631ee
|
国标级联支持拉流代理自动拉起
|
2022-10-19 11:17:08 +08:00 |
|
648540858
|
b6bcb5f2f4
|
隐藏liveplayer
|
2022-10-19 10:28:51 +08:00 |
|
648540858
|
7bfa85424a
|
增加日志
|
2022-10-18 23:04:44 +08:00 |
|
648540858
|
84c60381cc
|
增加设备通道数为0时自动发起更新通道
|
2022-10-18 23:03:33 +08:00 |
|
648540858
|
f9ae4cfdbe
|
更新readme
|
2022-10-18 22:40:43 +08:00 |
|
648540858
|
1af77ab5f7
|
Merge pull request #645 from IKangXu/wvp-28181-2.0
优化 国标设备中通道内查看的逻辑，保证与分屏与电子地图中树结构的数据一致
|
2022-10-18 22:18:49 +08:00 |
|
648540858
|
c9fd7f940f
|
修复录像回放ssrc不一致无法播放的问题
|
2022-10-18 17:32:08 +08:00 |
|
648540858
|
3c52a16e5f
|
支持手动添加，为设备设置单独的密码
|
2022-10-18 17:02:05 +08:00 |
|
648540858
|
882e6a027e
|
去除多余引入
|
2022-10-18 14:37:33 +08:00 |
|
648540858
|
878dc33e6b
|
去除国标级联中ServerTransaction的使用
|
2022-10-18 14:30:39 +08:00 |
|
648540858
|
80d2edeef2
|
优化sip消息构建，去除ServerTransaction的使用
|
2022-10-18 13:07:38 +08:00 |
IKangXu
|
58b9dab89f
|
优化 分屏设备与电子地图中树结构展示信息
优化 国标设备中通道内查看的逻辑，保证与分屏与电子地图中树结构的数据一致
|
2022-10-18 09:27:12 +08:00 |
|
648540858
|
3e91483d4b
|
支持锁定编辑后的设备名 #642
|
2022-10-17 17:16:59 +08:00 |
|
648540858
|
7918f03734
|
优化按需拉流配置，拉流代理支持按需拉流
|
2022-10-17 16:38:28 +08:00 |
|
648540858
|
1e1364e51a
|
修复开始点播功能接口调用返回参数与定义的不符 #635
|
2022-10-17 14:33:25 +08:00 |
|
648540858
|
2f11618199
|
修复用户删除失败，#636
|
2022-10-17 14:08:44 +08:00 |
|
648540858
|
0ff4ed217d
|
优化消息处理中存在可能异常的处理流程
|
2022-10-17 12:39:58 +08:00 |
|
648540858
|
c4fc4abf7c
|
优化代码空字符串判断
|
2022-10-17 09:39:21 +08:00 |
XiaoQiTong
|
dabee4ed7d
|
增加指定流媒体收流功能
|
2022-10-15 20:57:24 +08:00 |
|
648540858
|
ad246bf921
|
去除ffmpeg模板配置
|
2022-10-14 23:11:47 +08:00 |
|
648540858
|
5bf1fe84ec
|
还原#640点播开始后的截图任务，判断启用https后使用https_fmp4流地址
|
2022-10-13 22:25:46 +08:00 |
duzeng
|
a463b676e2
|
feat: 点播开始后的截图任务，判断启用https后使用https_fmp4流地址
Signed-off-by: duzeng <duzengrass@163.com>
|
2022-10-13 20:42:35 +08:00 |
jshqhxm
|
c18dd55c74
|
去除 com.sun.javafx 无引用包，会导致在linux环境下编译不通过
|
2022-10-09 16:20:39 +08:00 |
|
648540858
|
a4f48a1522
|
修复回看控制失效 #619
|
2022-09-30 17:54:58 +08:00 |
|
648540858
|
386b48192d
|
修复点播时viatag不规范的问题
|
2022-09-26 15:38:55 +08:00 |
|
648540858
|
6ae33f2a67
|
修复空指针
|
2022-09-26 14:01:22 +08:00 |
|
648540858
|
30979eb6ea
|
Merge pull request #627 from 648540858/wvp-dialog
修复兼通api错误
|
2022-09-26 10:41:04 +08:00 |
|
648540858
|
3fb9694c2d
|
修复兼通api错误
|
2022-09-26 10:40:20 +08:00 |
|
648540858
|
bf97908c5e
|
Merge pull request #626 from 648540858/wvp-dialog
合并bug修复
|
2022-09-26 10:38:48 +08:00 |
|
648540858
|
0cc5917d8a
|
修复通道更新
|
2022-09-26 10:14:31 +08:00 |
|
648540858
|
559fbf1258
|
添加缺失的打印信息
|
2022-09-26 10:02:26 +08:00 |
|
648540858
|
d176b5231b
|
Merge pull request #620 from xu-bin-bin/wvp-28181-2.0
处理上级平台发送的invite请求不携带“y=”sdp信息时，使用默认“y=0000000000”视频无法播放的问题。
|
2022-09-23 23:18:06 +08:00 |
|
648540858
|
4c6c77be7a
|
异常情况打印信息优化
|
2022-09-23 23:15:44 +08:00 |
|
648540858
|
cd117ed228
|
dialog去除以及异常情况处理优化
|
2022-09-23 23:15:39 +08:00 |
xubinbin
|
fc7f1b3459
|
处理上级平台发送的invite请求不携带“y=”sdp信息时，使用默认“y=0000000000”视频无法播放的问题。
|
2022-09-23 10:55:42 +08:00 |
|
648540858
|
a574ff0944
|
修复使用队列导致的问题
|
2022-09-22 16:56:20 +08:00 |
|
648540858
|
70c20364af
|
修复流注销时移除流认证信息
|
2022-09-22 14:10:26 +08:00 |
|
648540858
|
1abfced3b4
|
修复点播后bye信息的发送
|
2022-09-22 11:32:01 +08:00 |
|
648540858
|
5e73874880
|
添加队列处理redis消息和sip消息，支持使用推流状态作为通道在线状态
|
2022-09-22 11:22:08 +08:00 |
|
648540858
|
710600db6f
|
优化sip消息，去除自动dialog创建
|
2022-09-21 18:18:37 +08:00 |
|
648540858
|
692f716788
|
优化点播时RtpServer为正常关闭的问题
|
2022-09-16 18:02:56 +08:00 |
|
648540858
|
5b3dc4d595
|
优化点播结束后关闭RTPServer
|
2022-09-14 16:11:18 +08:00 |
|
648540858
|
250a059ca0
|
优化目录发送
|
2022-09-13 14:53:41 +08:00 |
|
648540858
|
243edbd143
|
为User-Agent添加必要的版本信息
|
2022-09-09 23:19:19 +08:00 |
|
648540858
|
221f99c764
|
优化sip消息
|
2022-09-09 17:06:19 +08:00 |
|
648540858
|
b5fb82934e
|
修复发送目录信息是状态错误
|
2022-09-08 21:22:49 +08:00 |
|
648540858
|
bd5b9ca1f7
|
获取实际内容长度，不使用header中的长度信息
|
2022-09-08 20:20:43 +08:00 |
|
648540858
|
feb9996538
|
修复添加业务分组失败
|
2022-09-08 17:51:12 +08:00 |
|
648540858
|
394c40d8bb
|
修复目录订阅的状态异常
|
2022-09-08 16:42:46 +08:00 |
|
648540858
|
4bda14b098
|
修复cseq序号回退
|
2022-09-08 15:27:47 +08:00 |
|
648540858
|
a6f9c090cb
|
重启服务时上级平台直接注销再注册
|
2022-09-08 10:50:44 +08:00 |
|
648540858
|
6a5ab117f5
|
修复推流列表状态过滤
|
2022-09-08 09:21:11 +08:00 |
|
648540858
|
f1c7d612ca
|
Merge pull request #590 from ixingqiao/wvp-28181-2.0
1.解决轮询内存增长过快问题
|
2022-09-08 09:19:57 +08:00 |
|
648540858
|
60c4f767f0
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-09-07 16:18:52 +08:00 |
|
648540858
|
ec0ec5eb54
|
修复并发点播时可能出现的rtpServer开启但是还未收到流的情况，编码类型136，137,138默认开启音频通道
|
2022-09-07 16:18:35 +08:00 |
jiang
|
3884e9a56a
|
1.根据redis消息更新推流列表时同时更新在线状态
2.推流列表的模板增加在线状态
|
2022-09-07 15:56:48 +08:00 |
|
648540858
|
e7bdcc1f8d
|
修复选择通道时默认节点显示错误的问题
|
2022-09-06 16:31:28 +08:00 |
|
648540858
|
d5e8aa62a1
|
添加对海康平台录像回放的兼容，修复录像信息发送失败, 级联平台支持开启rtcp保活
|
2022-09-05 17:10:21 +08:00 |
|
648540858
|
0134488428
|
优化推流列表查询
|
2022-09-02 17:00:41 +08:00 |
|
648540858
|
ee7ef0bf41
|
优化级联平台注册的周期时间
|
2022-09-02 15:49:40 +08:00 |
|
648540858
|
7db2bf7b51
|
使用equalsIgnoreCase代替equals,忽略大小写差异
|
2022-09-02 10:51:55 +08:00 |
|
648540858
|
b46e5efad2
|
测试sip消息预处理
|
2022-09-01 22:27:18 +08:00 |
|
648540858
|
3146e63fc0
|
优化异常处理
|
2022-09-01 17:53:00 +08:00 |
|
648540858
|
703c2e292a
|
云端录像详情页添加返回按钮
|
2022-08-31 18:07:53 +08:00 |
|
648540858
|
275b272160
|
hook订阅曾增加过期清除功能，防止内存溢出
|
2022-08-31 13:09:45 +08:00 |
|
648540858
|
2de4c322f6
|
去除对redis key过期事件的使用；重构国标级联的注册保活
|
2022-08-31 11:29:13 +08:00 |
|
648540858
|
d47902bdca
|
启动时redis未连接导致无法启动
|
2022-08-29 14:39:18 +08:00 |
|
648540858
|
9e2630ee32
|
增加zlm心跳超时的判定时间
|
2022-08-29 14:04:54 +08:00 |
|
648540858
|
6e90050db4
|
去除zlm使用redis过期作为心跳超时的方式
|
2022-08-29 11:50:36 +08:00 |
|
648540858
|
8b6449ce3a
|
升级版本号
|
2022-08-29 09:55:09 +08:00 |
|
648540858
|
9f680a2e9e
|
修复bug以及日志按照，错误/sip/数据库 分割
|
2022-08-26 18:03:09 +08:00 |
xingqiao
|
3c025a5ac0
|
1.解决轮询内存增长过快问题
|
2022-08-26 11:03:43 +08:00 |
|
648540858
|
942c5caa7c
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-08-23 11:00:57 +08:00 |
|
648540858
|
f24b6fa13f
|
优化国标录像的异常判断
|
2022-08-23 11:00:46 +08:00 |
|
648540858
|
89a2e62702
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
2022-08-22 23:01:52 +08:00 |
|
648540858
|
977bab158b
|
修复使用ssl的配置
|
2022-08-22 23:00:13 +08:00 |
|
648540858
|
042b28b2d6
|
支持全局异常和统一返回结果
|
2022-08-22 16:17:28 +08:00 |
|
648540858
|
5461b8ebf2
|
支持全局异常和统一返回结果，未完待续
|
2022-08-22 16:17:28 +08:00 |
zx
|
4ee8924bd9
|
fix PlatformKeepaliveExpireEvent typo
|
2022-08-19 21:55:59 +08:00 |
|
648540858
|
117387be8f
|
更新在线文档的等新方式
|
2022-08-19 17:22:08 +08:00 |
|
648540858
|
7f05c91176
|
依赖包版本升级
|
2022-08-19 17:12:03 +08:00 |
|
648540858
|
1a9e49d9ff
|
依赖包版本升级
|
2022-08-19 17:11:51 +08:00 |
|
jiang
|
8f77d0c25c
|
根据redis消息更新推流列表
|
2022-08-18 16:17:23 +08:00 |
|
jiang
|
b67841b319
|
实时直播 - 开始直播接口返回值增加WEBRTC字段
|
2022-08-18 15:32:12 +08:00 |
|
648540858
|
e666bb0407
|
去除连接池中wall配置，此配制影响批量执行sql
|
2022-08-18 10:15:49 +08:00 |
|
648540858
|
59bda74e88
|
处理获取消息体内容为空时造成的空指针异常
|
2022-08-17 17:06:33 +08:00 |
|
648540858
|
4fe5672623
|
处理获取消息体内容为空时造成的空指针异常
|
2022-08-17 16:45:06 +08:00 |
|
648540858
|
470aa47969
|
优化队列的处理逻辑
|
2022-08-17 15:38:06 +08:00 |
|
648540858
|
c041aaccb4
|
修复录像回放中的信令错误
|
2022-08-15 15:08:51 +08:00 |
|
648540858
|
dab04fcab7
|
优化使用tcp连接时的超时时间
|
2022-08-11 16:37:55 +08:00 |
|
648540858
|
82ab6b1760
|
去除jedis，方便支持redis集群
|
2022-08-10 18:14:33 +08:00 |
chenjialing
|
871b4e5359
|
优化--直播结束异步处理截图操作，提高接口响应速度和并发能力
|
2022-08-09 17:26:32 +08:00 |
wym
|
7ecc86b33d
|
zlm关闭一段时间后，重启后信令服务不重连zlm
|
2022-08-08 08:31:12 +08:00 |
mrjackwang
|
28df05e261
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-08-06 09:42:28 +08:00 |
gushouzheng
|
d21d281b2c
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-08-06 09:00:14 +08:00 |
|
gushouzheng
|
c273a6aa5a
|
更新级联查看直播视频及代理拉流视频bug
|
2022-08-06 08:58:17 +08:00 |
|
648540858
|
231582eb77
|
推流列表增加经纬度的添加
|
2022-08-05 17:10:53 +08:00 |
|
648540858
|
142efdd915
|
修复单个添加的推流级联国标的问题
|
2022-08-05 09:48:13 +08:00 |
|
648540858
|
97d4599390
|
修复二级目录添加失败的问题
|
2022-08-02 11:34:56 +08:00 |
|
648540858
|
e05d0aa0a9
|
修复ssrc变化时端口变化的问题
|
2022-07-29 11:57:04 +08:00 |
|
648540858
|
646c3e41b7
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-28 16:24:51 +08:00 |
|
648540858
|
778969f1eb
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-28 16:21:09 +08:00 |
|
648540858
|
fd091e545b
|
优化hook订阅机制
|
2022-07-28 16:18:41 +08:00 |
|
648540858
|
34f2832bef
|
优化gps信息存入数据库
|
2022-07-28 11:22:51 +08:00 |
庄梦蝶殇
|
fff3d64f85
|
fix 优化pom依赖，去除几个重复客户端。并改了几个 equals判断不精准的bug
|
2022-07-27 18:31:33 +08:00 |
|
648540858
|
f84eebdb75
|
优化部分hook订阅
|
2022-07-27 16:16:12 +08:00 |
|
648540858
|
bc38f5ef29
|
修复流地址返回错误
|
2022-07-27 14:48:21 +08:00 |
|
648540858
|
76dedb11f8
|
bug修复
|
2022-07-27 11:11:18 +08:00 |
|
648540858
|
b957ab61c7
|
bug修复
|
2022-07-26 11:43:56 +08:00 |
|
648540858
|
c77c1a956c
|
修复推流推流状态提示
|
2022-07-25 11:17:46 +08:00 |
|
648540858
|
91dc4566a2
|
修复级联无通道时更新停止在等待更新的问题
|
2022-07-25 09:44:43 +08:00 |
|
648540858
|
e29d94c83f
|
增加推流添加功能，修复级联目录推送
|
2022-07-22 16:02:14 +08:00 |
|
chenjialing
|
f66bf823fa
|
优化----设备下线,通道状态也切换至离线状态
|
2022-07-20 17:02:55 +08:00 |
|
jiang
|
a51b411101
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-19 18:13:42 +08:00 |
|
jiang
|
fc0ad32f81
|
1.修复新增用户没有pushkey的问题
2.将重置pushkey改为修改pushkey
|
2022-07-19 18:13:19 +08:00 |
|
648540858
|
9e397ba9f6
|
移除共享所有直播流功能
|
2022-07-19 17:46:16 +08:00 |
|
648540858
|
28b5cc39d0
|
修复更新推流状态sql错误
|
2022-07-19 14:27:30 +08:00 |
|
648540858
|
03864ae46f
|
修复用户查询sql错误
|
2022-07-19 11:13:46 +08:00 |
|
648540858
|
4765f9b9f2
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-19 11:10:50 +08:00 |
|
648540858
|
c48def08cf
|
MediaItem增加callId
|
2022-07-18 20:33:47 +08:00 |
|
jiang
|
1002150b2a
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-18 17:15:33 +08:00 |
|
jiang
|
c6fbd03276
|
增加用户管理功能。管理员可以添加删除用户、修改用户密码、重置pushkey
|
2022-07-18 17:09:35 +08:00 |
|
648540858
|
4d1c6401c2
|
去除无用引用
|
2022-07-17 23:19:59 +08:00 |
|
648540858
|
a509587980
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-17 23:17:55 +08:00 |
|
648540858
|
4451994959
|
优化国标级联目录订阅通知以及目录查询回复
|
2022-07-17 23:17:36 +08:00 |
|
jiang
|
fc89b7b517
|
测试提交权限
|
2022-07-13 11:29:46 +08:00 |
|
648540858
|
be5dbc9a21
|
支持从redis消息更新推流设备状态
|
2022-07-12 17:33:32 +08:00 |
|
648540858
|
81f69eb6f4
|
支持从redis消息更新推流设备状态
|
2022-07-12 17:33:17 +08:00 |
|
648540858
|
0b1cae75fe
|
动态人物管理增加自检机制。防止内存溢出
|
2022-07-12 10:32:45 +08:00 |
|
648540858
|
74d97734ba
|
修复获取推流播放地址接口
|
2022-07-11 17:34:22 +08:00 |
|
648540858
|
1a1a68784b
|
去除失效的配置，增加人物结束时移除人物缓存
|
2022-07-11 16:41:32 +08:00 |
|
648540858
|
afbec28906
|
增加推流鉴权。保护服务安全
|
2022-07-11 16:21:01 +08:00 |
|
648540858
|
fcd79b9864
|
用户表增加推流鉴权KEY
|
2022-07-08 11:20:29 +08:00 |
|
648540858
|
8aa0bdf539
|
数据库优化
|
2022-07-06 09:44:37 +08:00 |
|
648540858
|
10cb58391a
|
修复轨迹的储存与查询展示
|
2022-07-04 01:08:26 +08:00 |
|
648540858
|
5d673fb033
|
修复通道数据写入数据库
|
2022-07-03 08:47:47 +08:00 |
|
648540858
|
f5fcc79a2c
|
优化国标树型展示
|
2022-07-03 07:40:54 +08:00 |
mk1990
|
23bd11869b
|
添加国标级联录像控制功能
|
2022-06-22 16:47:26 +08:00 |
|
mk1990
|
c239ee277c
|
添加国标级联录像控制功能
|
2022-06-22 16:39:07 +08:00 |
|
mk1990
|
5e5437b630
|
添加国标级联录像控制功能
|
2022-06-22 16:31:58 +08:00 |
|
mk1990
|
4b4afa4ef7
|
添加国标级联录像控制功能
|
2022-06-22 16:26:41 +08:00 |
|
mk1990
|
6c919937bd
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
|
2022-06-22 14:42:46 +08:00 |
|
mk1990
|
519a08e530
|
添加国标级联录像控制功能
|
2022-06-22 14:39:57 +08:00 |
mk1990
|
1e105fb6e1
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-06-22 13:38:25 +08:00 |
|
mk1990
|
0e18a163ac
|
添加国标级联录像控制功能
|
2022-06-22 13:33:55 +08:00 |
|
mk1990
|
4d2c36edcd
|
fix设备状态查询接口
|
2022-06-22 13:09:09 +08:00 |
bradyxu
|
072e84db19
|
fix(SIP): 修复海康NVR无parentId导致分屏监控没办法展开的问题
由于海康NVR通道信息中不带NVR的ID作为parentId。导致通道信息parentId缺失,
在通道信息中判断device信息中的DeviceId如果为NVR的话，将NVR的deviceId设置为通道的parentId
|
2022-06-18 10:40:24 +08:00 |
|
chenjialing
|
39a5c8e2cf
|
fixed--解决ssrc默认开启失败的问题，解决信令超时设备下线的bug
|
2022-06-17 16:01:18 +08:00 |
|
648540858
|
dbe6ece653
|
优化播放中zlm离线判断
|
2022-06-15 15:06:22 +08:00 |
|
648540858
|
f7006e4881
|
修复播放中zlm离线导致的bye发送失败
|
2022-06-15 14:55:33 +08:00 |
|
648540858
|
f760134b39
|
Merge pull request #517 from TristingChen/optimize-play-controller
Optimize play controller
|
2022-06-15 14:19:33 +08:00 |
|
chenjialing
|
0e826e3448
|
优化--端口获取失败之时（如zlm连接失败），不进行invite点播消息的发送
|
2022-06-15 14:14:29 +08:00 |
|
chenjialing
|
8f7db635a3
|
优化----okhttp连接访问超时设置，访问异常code设置为-2
|
2022-06-15 14:13:43 +08:00 |
|
648540858
|
5fae9a7b34
|
优化列表展示效果
|
2022-06-15 10:40:45 +08:00 |
|
648540858
|
c022213972
|
设备支持设置地理坐标系，并将级联输出坐标系统一为wgs84
|
2022-06-14 17:00:24 +08:00 |
|
648540858
|
e0344ccf97
|
国标级联推送推流 支持多wvp间自动选择与推送
|
2022-06-14 14:37:34 +08:00 |
|
648540858
|
6d4312e383
|
Merge pull request #473 from AlphaWu/Zafu-Dev
添加on_record_ts事件支持
|
2022-06-07 11:12:22 +08:00 |
|
648540858
|
8a362506c6
|
#508
|
2022-06-05 12:44:30 +08:00 |
|
648540858
|
d3e815bf16
|
修复订阅超时
|
2022-06-04 10:18:04 +08:00 |
|
648540858
|
5df95ba850
|
级联回放增加MediaStatus消息 #377
|
2022-06-04 00:02:39 +08:00 |
|
648540858
|
19a52a20f3
|
固定时区为Asia/Shanghai
|
2022-06-03 18:52:40 +08:00 |
|
648540858
|
47abdde339
|
解决设备上线停止线程导致的报错，优化录像的获取以及通道的更新
|
2022-06-03 16:24:11 +08:00 |
|
648540858
|
9ae0691c80
|
优化快照的存储与显示
|
2022-06-02 10:55:41 +08:00 |
|
648540858
|
936adf31fe
|
Merge pull request #504 from TristingChen/fixed--reset-channel
修复--重设通道多个设备注册下发生的sql错误修复
|
2022-06-02 09:31:06 +08:00 |
|
chenjialing
|
ed2680bf03
|
修复--重设通道多个设备注册下发生的sql错误修复
|
2022-06-01 14:11:06 +08:00 |
|
648540858
|
9a0ea9e322
|
修复级联点播时海康使用自定义ssrc的情况
|
2022-06-01 11:35:53 +08:00 |
|
648540858
|
8555d64f95
|
修复点播超时的事件设置
|
2022-05-31 16:20:46 +08:00 |
|
648540858
|
0e2908c1be
|
#488
|
2022-05-27 23:14:17 +08:00 |
|
648540858
|
f09f1c9a2a
|
换种写法
|
2022-05-27 18:23:43 +08:00 |
|
chenjialing
|
0cd9a20242
|
修复--获取全部ssrc的缓存问题修复
|
2022-05-27 18:15:06 +08:00 |
|
648540858
|
2a5404c68f
|
兼容海康信令问题 #493
|
2022-05-26 13:45:57 +08:00 |
|
648540858
|
dc6769664e
|
兼容不规范的时间格式iso8601格式；升级fastjson版本
|
2022-05-26 12:10:46 +08:00 |
|
mk1990
|
f513f5ef67
|
解决海康设备在实时监控模块中无法获取到通道信息
|
2022-05-25 14:09:43 +08:00 |
|
mk1990
|
4e13489366
|
解决设备第一次注册获取不到设备信息和通道信息的问题
|
2022-05-25 13:39:34 +08:00 |
|
mk1990
|
3c48ef8f43
|
Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
|
2022-05-23 13:03:51 +08:00 |
|
mk1990
|
46c77302a1
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-23 13:02:50 +08:00 |
|
648540858
|
a4a0394f6b
|
Merge pull request #487 from hotcoffie/wvp-28181-2.0
fix：之前引入了错误的DigestServerAuthenticationHelper
|
2022-05-23 10:39:05 +08:00 |
xiaoxie
|
6cee5a0751
|
fix：之前引入了错误的DigestServerAuthenticationHelper
|
2022-05-23 10:37:38 +08:00 |
|
648540858
|
cb845726f6
|
优化代码
|
2022-05-23 10:16:46 +08:00 |
|
xiaoxie
|
d739bfa597
|
处理冲突
|
2022-05-23 09:44:21 +08:00 |
|
xiaoxie
|
07fa589e06
|
处理冲突
|
2022-05-23 09:42:32 +08:00 |
hotcoffie
|
3aa2665fb2
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-23 09:15:59 +08:00 |
|
648540858
|
590358c313
|
修复国标级联录像查询 #485
|
2022-05-21 21:13:12 +08:00 |
|
648540858
|
78fac69cd5
|
支持sdp ip 配置为域名
|
2022-05-19 17:00:47 +08:00 |
|
mk1990
|
fe576c5838
|
Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
|
2022-05-18 16:58:26 +08:00 |
|
mk1990
|
7bb38c5c7b
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-18 16:57:06 +08:00 |
|
648540858
|
d202291aa8
|
优化单端口下的ssrc修复
|
2022-05-18 16:46:09 +08:00 |
|
648540858
|
973e75f808
|
优化收到心跳的信息更新判断
|
2022-05-18 16:08:52 +08:00 |
|
648540858
|
1e75b2567f
|
兼容海康ssrc问题
|
2022-05-18 15:47:20 +08:00 |
|
mk1990
|
491286095c
|
Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
|
2022-05-18 14:40:32 +08:00 |
|
mk1990
|
6fbac144d6
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-18 14:36:47 +08:00 |
|
hotcoffie
|
1d753b48c0
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-17 11:53:42 +08:00 |
钢翼
|
debfb2222f
|
无认证密码时，不校验是否存在授权头
|
2022-05-17 08:18:38 +08:00 |
|
mk1990
|
e6790d88fc
|
Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
|
2022-05-16 10:14:24 +08:00 |
|
mk1990
|
e541341504
|
修改application-dev.yml
|
2022-05-16 10:10:50 +08:00 |
|
mk1990
|
850f20143f
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-16 09:38:06 +08:00 |
|
WuPeng
|
bbf8ab9310
|
添加on_record_ts事件支持
|
2022-05-13 22:22:10 +08:00 |
|
648540858
|
9a80e10f6e
|
使用 java.time.Instant代替 java.util.Date
|
2022-05-13 22:15:31 +08:00 |
|
648540858
|
95642d0bb8
|
优化录像结束发送BYE判断
|
2022-05-13 21:10:02 +08:00 |
|
648540858
|
98e6cf5bae
|
优化海康录像下载
|
2022-05-13 21:05:33 +08:00 |
|
648540858
|
d571e44040
|
去除过时注释
|
2022-05-13 15:45:02 +08:00 |
|
648540858
|
4d3f0a8d79
|
优化海康国标录像播放的控制
|
2022-05-13 15:41:50 +08:00 |
|
648540858
|
1757203202
|
支持海康摄像头国标录像查看播放
|
2022-05-13 15:32:30 +08:00 |
|
mk1990
|
95b1cbba65
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-13 10:58:33 +08:00 |
|
648540858
|
4199650c20
|
#471
|
2022-05-12 18:15:35 +08:00 |
|
648540858
|
0781d9bc28
|
修复缺失的设备时间
|
2022-05-12 17:48:52 +08:00 |
|
mk1990
|
2d7a202096
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-12 16:16:55 +08:00 |
|
648540858
|
a030d00c88
|
修复代码
|
2022-05-12 10:48:50 +08:00 |
|
648540858
|
3cd1378d39
|
修复新设备注册
|
2022-05-12 10:24:08 +08:00 |
|
648540858
|
715ecb1d64
|
修复设备缺失的数据
|
2022-05-11 20:22:15 +08:00 |
|
648540858
|
f6893cf95b
|
优化设备在线状态
|
2022-05-11 18:37:24 +08:00 |
|
mk1990
|
6bab3b6740
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-10 18:02:09 +08:00 |
|
648540858
|
c395cf42d1
|
修复发流接口的调用
|
2022-05-10 11:01:33 +08:00 |
|
648540858
|
a1321c29c5
|
优化级联点播流程
|
2022-05-10 10:58:26 +08:00 |
|
648540858
|
93e6347f18
|
优化推流调用
|
2022-05-10 09:45:09 +08:00 |
|
648540858
|
bd21d0e391
|
优化目录获取并法能力
|
2022-05-10 09:38:05 +08:00 |
|
hotcoffie
|
ec8ab540f8
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-07 17:42:31 +08:00 |
|
648540858
|
36170df3f4
|
修复打包优化pom
|
2022-05-07 15:13:56 +08:00 |
|
mk1990
|
88db57697a
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-07 11:25:13 +08:00 |
|
648540858
|
523139143f
|
Merge pull request #468 from TristingChen/resetQuery--add
开发----增加预置位查询接口开发
|
2022-05-07 09:00:22 +08:00 |
|
mk1990
|
a2182b5a7b
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-06 17:46:01 +08:00 |
|
chenjialing
|
cc63a52884
|
开发----增加预置位查询接口开发
|
2022-05-06 17:44:56 +08:00 |
|
648540858
|
e218553685
|
去除多与引用
|
2022-05-06 17:29:24 +08:00 |
|
648540858
|
ee62f17170
|
统一userAgent
|
2022-05-06 15:55:32 +08:00 |
|
hotcoffie
|
bfaa519e49
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-06 10:59:33 +08:00 |
|
648540858
|
5d901b5e3f
|
使用阿里代码规范。规范代码写法
|
2022-05-06 10:12:34 +08:00 |
|
648540858
|
c286ecb455
|
使用阿里代码规范。规范代码写法
|
2022-05-05 17:07:16 +08:00 |
|
648540858
|
7f0ca85850
|
规范代码写法
|
2022-05-05 14:36:27 +08:00 |
|
648540858
|
ff3c30f32e
|
优化收到心跳设置设备上线的逻辑
|
2022-05-05 14:26:42 +08:00 |
|
mk1990
|
05a324a07a
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-05 08:43:10 +08:00 |
|
xiaoxie
|
260bfd5935
|
替换一个过时的API，解决maven打包警告
|
2022-05-01 21:32:43 +08:00 |
648540858
|
d679a9fcf8
|
添加对点播时设备自定义ssrc的支持
|
2022-04-28 17:28:51 +08:00 |
|
mk1990
|
a0537d74df
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-28 16:32:09 +08:00 |
|
648540858
|
a53fe7761f
|
Merge pull request #457 from J1031/bugfix/transaction_is_null
修复ServerTransaction空指针异常
|
2022-04-28 14:02:18 +08:00 |
|
648540858
|
420a87cfd7
|
优化对Parental字段的判断
|
2022-04-28 10:05:56 +08:00 |
|
648540858
|
4e0a463f88
|
优化对Parental字段的判断
|
2022-04-28 09:47:46 +08:00 |
quangz
|
effe71640d
|
修复ServerTransaction空指针异常
|
2022-04-27 18:51:47 +08:00 |
|
648540858
|
102aad1f5d
|
判空
|
2022-04-26 18:46:18 +08:00 |
|
648540858
|
363606d845
|
优化级联目录发送
|
2022-04-26 18:29:47 +08:00 |
|
648540858
|
9ce22eba3c
|
行政区划作为级联数据的处理,修复设备树的显示
|
2022-04-26 17:24:41 +08:00 |
|
mk1990
|
c88b0a8bd6
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-26 15:32:23 +08:00 |
|
648540858
|
0b6b72ae44
|
多级虚拟组织处理修复
|
2022-04-25 17:13:22 +08:00 |
|
648540858
|
a012007f36
|
多级虚拟组织处理修复
|
2022-04-25 17:12:29 +08:00 |
|
648540858
|
26c3ca6a21
|
对于虚拟目录中出现多级虚拟组织的情况进行处理
|
2022-04-25 16:55:38 +08:00 |
|
648540858
|
d4b05c11c0
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-24 16:34:21 +08:00 |
|
648540858
|
5dc08a45f8
|
增加redis通知方式向设备/平台发送报警消息功能
|
2022-04-24 16:33:59 +08:00 |
|
xiaoxie
|
bea61f909d
|
修复一处日志打印错误
|
2022-04-24 09:51:54 +08:00 |
|
648540858
|
92421b46cc
|
支持关闭地图功能，添加授权声明
|
2022-04-22 16:55:46 +08:00 |
|
648540858
|
1e2d207aea
|
添加优化后的地图页面，完全一处百度地图相关的api
|
2022-04-22 16:21:05 +08:00 |
|
mk1990
|
7d1116c892
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-21 13:34:50 +08:00 |
|
648540858
|
d7bfd9bfa7
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
|
2022-04-21 10:30:46 +08:00 |
|
648540858
|
f7236c4a90
|
添加公共组件设备树
|
2022-04-20 18:21:18 +08:00 |
|
xiaoxie
|
f635f9c300
|
修复录像列表：实测部分厂家（TP-Link IPC43AW）录像列表接口，返回的xml报文数据中有多余的空格，导致解析String为Integer失败，增加trim修复这个问题
|
2022-04-20 13:56:30 +08:00 |
|
648540858
|
088419b4d8
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
|
2022-04-20 09:38:09 +08:00 |
|
648540858
|
4d975c21da
|
优化国标级联目录推送，支持zlm新特性ssrc校验
|
2022-04-19 11:52:03 +08:00 |
|
648540858
|
9466bf5863
|
Merge pull request #437 from hotcoffie/wvp-28181-2.0
优化摄像头注册流程
|
2022-04-19 10:36:21 +08:00 |
|
648540858
|
91515f1b05
|
添加行政区划功能，修复目录发送数量统计的BUG
|
2022-04-18 17:38:49 +08:00 |
|
648540858
|
93d69d5476
|
添加国标级联目录分组分组加快通道传输速度
|
2022-04-18 16:16:49 +08:00 |
|
xiaoxie
|
6bb8f45e27
|
优化摄像头注册流程
|
2022-04-18 15:04:22 +08:00 |
|
648540858
|
20622d20d6
|
修复更新通道状态回复不准的问题
|
2022-04-18 12:55:54 +08:00 |
|
648540858
|
596a633d2e
|
修复更新通道日志显示
|
2022-04-18 12:45:19 +08:00 |
|
648540858
|
b8bb9c1b74
|
修复更新通道结束后释放慢的问题
|
2022-04-18 12:42:58 +08:00 |
|
648540858
|
d36920c699
|
添加自动拉起未推流设备的控制开关
|
2022-04-18 10:52:38 +08:00 |
|
mk1990
|
22e1d92a9d
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-18 09:32:20 +08:00 |
|
648540858
|
0dc1807f62
|
优化通道同步添加对SN的判断，精简代码
|
2022-04-17 19:48:05 +08:00 |
|
648540858
|
25102229f6
|
接收所有notify请求，即使没有订阅
|
2022-04-15 18:04:19 +08:00 |
|
mk1990
|
eef78c7873
|
同步使用临时方案解决更新通道调用百度API问题之前的内容
|
2022-04-15 17:05:26 +08:00 |
|
648540858
|
40a806329c
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/SubscribeListenerForPlatform.java
|
2022-04-15 09:37:33 +08:00 |
|
648540858
|
e6ee7fe747
|
优化级联移动位置订阅位置更新
|
2022-04-14 16:52:48 +08:00 |
|
648540858
|
efc4a7bc8e
|
优化级联移动位置订阅位置更新
|
2022-04-13 17:59:21 +08:00 |
|
648540858
|
3955e6ed53
|
异步通道刷新，优化ui效果
|
2022-04-12 21:06:21 +08:00 |
|
648540858
|
c2e2e24551
|
优化通道刷新
|
2022-04-12 11:04:08 +08:00 |
|
648540858
|
40fb794798
|
使用临时方案解决更新通道调用百度API问题
|
2022-04-11 15:30:49 +08:00 |
|
648540858
|
fcf8c40150
|
默认推流通道始终在线
|
2022-04-11 14:59:31 +08:00 |
|
648540858
|
ba8633e99a
|
优化地图-添加地图页面以及设备树
|
2022-04-08 18:09:23 +08:00 |
|
648540858
|
81f1b8ee25
|
修复停止推流的参数组织方式
|
2022-04-08 16:30:39 +08:00 |
|
648540858
|
f10b458fc9
|
优化订阅信息的发送与取消订阅
|
2022-04-08 14:44:49 +08:00 |
|
648540858
|
f1c8ca602d
|
添加日志
|
2022-04-07 15:41:46 +08:00 |
|
648540858
|
8553769e76
|
补充xml缺失的编码信息
|
2022-04-07 14:22:41 +08:00 |
|
648540858
|
7ad28af0e3
|
补充xml缺失的编码信息
|
2022-04-07 14:21:21 +08:00 |
|
648540858
|
f7e39141db
|
修复重启服务后拉流代理回复失败的问题
|
2022-04-06 11:07:42 +08:00 |
|
648540858
|
c9f091d560
|
Merge pull request #419 from nikmu/wvp-28181-2.0
目录订阅推送问题，在线事件发送问题
|
2022-04-02 18:23:50 +08:00 |
|
648540858
|
c3b47fa734
|
修复启动报错
|
2022-04-02 17:09:33 +08:00 |
|
648540858
|
d42329a021
|
Merge pull request #426 from J1031/bugfix/map_modification_exception
修复ConcurrentModificationException
|
2022-04-02 14:34:41 +08:00 |
|
648540858
|
5ed44c3e09
|
支持级联云台控制
|
2022-04-02 14:13:32 +08:00 |
|
quangz
|
d883de7f9a
|
修复ConcurrentModificationException
|
2022-04-02 08:06:30 +08:00 |
|
648540858
|
2659f10551
|
去除无用引用
|
2022-04-01 17:44:43 +08:00 |
|
648540858
|
4ac63a158d
|
使用getHostAddress代替getHostName避免经过DNS时间过久
|
2022-04-01 17:13:11 +08:00 |
|
648540858
|
7e755f405d
|
支持国标移动位置订阅，收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug
|
2022-04-01 16:45:29 +08:00 |
朱俊杰
|
cb80119090
|
订阅查询错误和空指针
|
2022-03-31 09:19:45 +08:00 |
|
朱俊杰
|
b0e494b842
|
2个小bug
1、add update事件调用错误函数
2、在线的还发在线事件，如果别人正在给你推送目录就会不停的update设备表，设备表又没加锁，页面就无法更改设备信息了。。。
|
2022-03-29 17:31:41 +08:00 |
|
648540858
|
0de634cdf7
|
补充缺失的文件
|
2022-03-29 12:17:54 +08:00 |
|
648540858
|
1553b39b45
|
修复级联的国标通道无经纬度问题
|
2022-03-29 10:04:28 +08:00 |
|
648540858
|
60278ee6ad
|
修复国标目录发送缺失的问题
|
2022-03-28 11:03:17 +08:00 |
|
648540858
|
9aee7d42e3
|
兼容海康 媒体通知 消息from字段不是设备ID的问题
|
2022-03-25 18:05:05 +08:00 |
|
648540858
|
daab2586ca
|
优化国标级联上级要求tcp推流时的回复
|
2022-03-25 17:22:17 +08:00 |
|
648540858
|
7d9cc96ef5
|
优化国标录像下载，添加进度条以及自动合并文件下载，需要结合新版assist服务使用。
|
2022-03-25 16:05:14 +08:00 |
|
648540858
|
e9586687f7
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-25 10:01:12 +08:00 |
|
648540858
|
a77ba194ad
|
优化目录推送CivilCode值
|
2022-03-24 15:59:38 +08:00 |
|
648540858
|
2142b7ffcd
|
Merge pull request #379 from MeBetterMan/wvp-28181-2.0
级联场景，invite消息中获取channelid。以前从invite的第一行读取，现在从subject header读取。
|
2022-03-22 11:45:11 +08:00 |
|
648540858
|
bc1b8098a2
|
修身颠簸与录像回放redis前缀重复的问题
|
2022-03-21 16:58:42 +08:00 |
brewswang
|
7af3cb03ec
|
执法记录仪在更新目录数据的时候需要更新位置信息
|
2022-03-17 12:39:59 +08:00 |
|
648540858
|
59ef6e67d3
|
统一国标设备与级联平台字符集的使用
|
2022-03-17 10:29:49 +08:00 |
|
648540858
|
c8f9f19c38
|
#393
|
2022-03-16 17:46:24 +08:00 |
|
648540858
|
4a0fd9ead3
|
修复合并pr带来的bug
|
2022-03-16 16:55:04 +08:00 |
|
648540858
|
57e6cdefdf
|
#401
|
2022-03-16 16:46:18 +08:00 |
|
648540858
|
bf10cc1b35
|
Merge pull request #399 from nikmu/wvp-28181-2.0
修复device_channel的Id改变带来的tree查询bug
|
2022-03-16 16:42:50 +08:00 |
|
朱俊杰
|
ba3c38d7d3
|
去掉createinfo中的cseq参数
|
2022-03-16 11:21:39 +08:00 |
|
朱俊杰
|
b1c479b938
|
修复info请求头中的cseq序列
|
2022-03-16 11:18:09 +08:00 |
|
648540858
|
e752dbd1a7
|
修复推流关联平台的bug again
|
2022-03-16 10:12:31 +08:00 |
|
648540858
|
66aac4526b
|
修复推流关联平台的bug
|
2022-03-15 17:45:55 +08:00 |
|
648540858
|
d21a00418e
|
修复推流关联平台的bug
|
2022-03-15 16:58:50 +08:00 |
|
朱俊杰
|
70ada79c7a
|
修复device_channel的Id改变带来的tree查询bug
|
2022-03-15 16:31:06 +08:00 |
|
648540858
|
0dfce85d2f
|
必须提前在zlm上配置port_range属性，不然自动配置此属性可能不成功
|
2022-03-15 15:40:15 +08:00 |
|
648540858
|
ea08969bfc
|
使用zlm原生的rtp随机端口配置
|
2022-03-15 15:37:22 +08:00 |
|
648540858
|
0e69251281
|
修复多平台同时导入时的bug
|
2022-03-15 11:44:11 +08:00 |
|
648540858
|
11d40d3e22
|
#396
|
2022-03-15 10:47:07 +08:00 |
|
648540858
|
28e5c1ae05
|
修复平台编辑的bug
|
2022-03-15 10:13:19 +08:00 |
|
648540858
|
bde0e13682
|
#394
|
2022-03-14 18:34:25 +08:00 |
|
648540858
|
354a39961a
|
优化点播, 级联点播级联录像。级联列表显示订阅状态
|
2022-03-14 18:24:30 +08:00 |
|
648540858
|
1171cf1ea9
|
使用zlm新特性支持对与国标流关闭音频以加快拉流速度
|
2022-03-14 11:36:01 +08:00 |
|
648540858
|
61e91afd91
|
#390
|
2022-03-11 11:22:55 +08:00 |
|
648540858
|
1c95f1b4aa
|
移除多余字段
|
2022-03-11 11:22:47 +08:00 |
|
648540858
|
5cfaad2d6d
|
#376
|
2022-03-11 09:58:36 +08:00 |
|
648540858
|
4a22611320
|
优化目录订阅时父节点的更新
|
2022-03-11 09:54:35 +08:00 |
|
648540858
|
45e9fc880c
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-11 09:49:38 +08:00 |
|
648540858
|
c1d7f867c2
|
优化目录订阅以及国标级联目录订阅回复
|
2022-03-10 20:53:56 +08:00 |
dengming
|
f88c70d38c
|
删除重复字段，channelId字段查询了两次
|
2022-03-10 17:27:07 +08:00 |
|
dengming
|
bef7fb2440
|
修复关闭按需拉流无效的问题
|
2022-03-10 15:08:41 +08:00 |
Fang
|
bea63f67e7
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-07 14:21:29 +08:00 |
李防
|
335916f1f1
|
InviteRequestProcessor类中，channelid从invite消息的header subject获取，不再从第一行request line获取。原因是和第三方平台对接时，发送的invite消息第一行为国标平台编码而不是设备通道编码，导致报错通道不存在，返回404。
|
2022-03-07 14:20:27 +08:00 |
|
648540858
|
41616f726d
|
修复导入通道时无平台关联时的bug
|
2022-03-07 10:47:06 +08:00 |
|
648540858
|
ca79100b6f
|
优化失败的录像点播的ssrc释放逻辑
|
2022-03-07 01:23:23 +08:00 |
|
648540858
|
b2c953fc76
|
优化ssrc释放逻辑，优化级联点播速度，去除等待流格式的配置项
|
2022-03-07 01:17:45 +08:00 |
|
李防
|
cbea5f64c9
|
修改3个小bug
|
2022-03-05 17:05:05 +08:00 |
|
648540858
|
3dc1e0368e
|
修复合并分支造成的bug
|
2022-03-04 15:59:29 +08:00 |
|
648540858
|
ee746e53cd
|
Merge remote-tracking branch 'gitee.com/wvp-pro-record' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-03-04 15:39:30 +08:00 |
|
648540858
|
50c2a5a728
|
Revert "修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题"
This reverts commit 16e8aa323f.
|
2022-03-04 15:36:16 +08:00 |
|
648540858
|
cadd0ee038
|
Merge remote-tracking branch 'origin/wvp-pro-record' into wvp-28181-2.0
# Conflicts:
# web_src/src/components/control.vue
|
2022-03-04 15:29:56 +08:00 |
|
648540858
|
83671d8f10
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-03-04 15:27:28 +08:00 |
|
648540858
|
16e8aa323f
|
修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题
|
2022-03-04 11:26:53 +08:00 |
|
648540858
|
b10a65483d
|
去除lombok，readme更新
|
2022-03-04 10:30:55 +08:00 |
|
648540858
|
d21322a932
|
优化国标级联录像预览
|
2022-03-03 18:23:52 +08:00 |
|
648540858
|
01a619f9e3
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-03-03 16:55:20 +08:00 |
|
648540858
|
28d7fd3b58
|
参数名错误
|
2022-03-03 16:54:47 +08:00 |
|
648540858
|
14174ff400
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-03-03 16:28:32 +08:00 |
|
648540858
|
b019106c44
|
Merge pull request #365 from TristingChen/zlm-node-manage
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
|
2022-03-03 16:23:03 +08:00 |
|
648540858
|
2eb1ca2d94
|
国标录像支持多端同时播放
|
2022-03-03 15:57:28 +08:00 |
|
chenjialing
|
af885ca4d9
|
节点管理--某个zlm节点删除之后，数据库中仍有数据，导致再次添加该zlm节点
|
2022-03-03 15:40:12 +08:00 |
|
chenjialing
|
b225b53510
|
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
|
2022-03-03 15:30:16 +08:00 |
|
648540858
|
6a4cdc36b1
|
修复正则×号是引起的错误
|
2022-03-02 18:11:43 +08:00 |
|
648540858
|
d73630c49f
|
修复bug
|
2022-03-02 15:04:24 +08:00 |
panll
|
0993bedb46
|
!11 修改内存泄露
Merge pull request !11 from ydpd/wvp-28181-2.0
|
2022-03-02 06:26:54 +00:00 |
|
panll
|
ae83bd6d06
|
!8 update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java.
Merge pull request !8 from 随波/N/A
|
2022-03-02 06:24:26 +00:00 |
|
panll
|
94af90fa14
|
!7 rPort 变更了HostAddres也要变
Merge pull request !7 from ckb_test/N/A
|
2022-03-02 06:23:31 +00:00 |
|
648540858
|
1dcdbc3742
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
|
2022-03-02 12:52:37 +08:00 |
|
648540858
|
f5640fddb7
|
优化国标级联的目录订阅
|
2022-03-02 11:48:20 +08:00 |
|
chenjialing
|
fe0b5c33f9
|
告警信息上报过程中，AlarmType存储失败的解决
|
2022-03-02 09:18:17 +08:00 |
ydpd
|
86f87c4665
|
修改内存泄露
|
2022-03-02 00:24:14 +08:00 |
|
ydpd
|
e66b839659
|
修改内存泄露
|
2022-03-02 00:02:03 +08:00 |
|
648540858
|
29191373aa
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
# web_src/src/components/control.vue
|
2022-03-01 22:07:01 +08:00 |
|
648540858
|
298d104fec
|
优化配置文件与日志
|
2022-03-01 21:59:31 +08:00 |
|
648540858
|
1ea95d2b87
|
Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
|
2022-03-01 17:48:21 +08:00 |
|
648540858
|
4c53b10737
|
解决对接中遇到的问题
|
2022-03-01 17:42:22 +08:00 |
|
648540858
|
97698ee716
|
Merge pull request #346 from TristingChen/log-optimization
Log optimization
|
2022-03-01 17:37:19 +08:00 |
SaltFish
|
bb1fada32c
|
Update StreamPushMapper.java
|
2022-03-01 14:33:04 +08:00 |
随波
|
e4e0cde16c
|
update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java.
修改新建拉流代理时不保存“名称”字段问题
|
2022-02-28 15:31:50 +00:00 |
|
648540858
|
9c5b1060af
|
支持删除在线设备
|
2022-02-28 17:56:27 +08:00 |
ckb_test
|
6d454423a2
|
rPort 变更了HostAddres也要变
|
2022-02-28 09:07:02 +00:00 |
|
648540858
|
0cd86a79c2
|
修复设备删除
|
2022-02-28 10:39:51 +08:00 |
|
648540858
|
e94b99d11c
|
实现国标录像级联播放，优化点播流程，加快点播速度
|
2022-02-27 20:01:31 +08:00 |
|
648540858
|
10f776678e
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-02-25 20:33:38 +08:00 |
|
648540858
|
7400ace65d
|
规范数据库，解决bug
|
2022-02-25 20:33:02 +08:00 |
|
chenjialing
|
777f2e2121
|
日志优化--修改本地配置文件local的mysql连接方式
|
2022-02-25 09:54:18 +08:00 |
|
chenjialing
|
7852c4fde7
|
research--local文件
|
2022-02-25 09:36:05 +08:00 |
|
chenjialing
|
c8b9e590ef
|
日志优化--优化本地的日志记录方式，增加druid的sql的日志打印和监控面板，修改druid的配置方式
|
2022-02-25 09:23:46 +08:00 |
|
648540858
|
c9bfdf2525
|
实现国标的级联录像查询
|
2022-02-24 21:10:34 +08:00 |
|
648540858
|
00afecac47
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-02-24 17:18:36 +08:00 |
|
648540858
|
a42dda2bd3
|
规范数据库，添加必要约束，优化通道批量导入功能
|
2022-02-24 16:55:06 +08:00 |
|
648540858
|
0191e93768
|
同步主线
|
2022-02-23 21:55:46 +08:00 |
|
648540858
|
f4c03c1808
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-pro-record
|
2022-02-22 11:55:23 +08:00 |
|
648540858
|
e861c9dfab
|
Merge remote-tracking branch 'origin/master' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
|
2022-02-22 11:55:23 +08:00 |
|
648540858
|
2157bb0270
|
规范数据库，给各个标设置主键ID
|
2022-02-22 11:44:56 +08:00 |
|
648540858
|
0a44eb8965
|
增加配置将国标录像与其他录像分开
|
2022-02-20 17:33:17 +08:00 |
|
648540858
|
0b6587b1ad
|
增加配置将国标录像与其他录像分开
|
2022-02-20 17:29:03 +08:00 |
|
648540858
|
5bcd8495e0
|
兼容海康不规范的xml，大幅度提高通道分页查询速度，优化节点的保活。
|
2022-02-20 16:22:43 +08:00 |
|
648540858
|
b7635ec05d
|
优化级联通道发送速度
|
2022-02-20 16:18:14 +08:00 |
|
648540858
|
0327d16021
|
优化级联平台删除
|
2022-02-17 15:33:25 +08:00 |
|
648540858
|
59c79c08e1
|
修复级联通道回复错误
|
2022-02-16 15:13:16 +08:00 |
|
648540858
|
9442c37ce7
|
优化级联添加通道流程
|
2022-02-15 17:41:09 +08:00 |
|
648540858
|
d4fe0fb325
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
2022-02-15 09:13:16 +08:00 |
|
648540858
|
5528517471
|
Merge pull request #325 from nikmu/wvp-28181-2.0
新增实时监控功能
|
2022-02-15 09:13:03 +08:00 |
|
朱俊杰
|
54df5df031
|
mapper改用注释方式
|
2022-02-14 10:18:00 +08:00 |
|
648540858
|
b663a8ab41
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
2022-02-11 18:01:58 +08:00 |
|
648540858
|
bf66f8f694
|
推流导入支持添加平台信息与目录信息
|
2022-02-11 16:45:06 +08:00 |
|
朱俊杰
|
37a84e6691
|
新增实时监控功能
左边是设备通道树，右边是分屏预览
|
2022-02-10 14:45:33 +08:00 |
|
SaltFish
|
0209dc89c9
|
Update MediaServiceImpl.java
最新版本zlm更新了flv的链接地址， 同步更新
|
2022-02-10 10:29:36 +08:00 |
|
648540858
|
d07a5680f3
|
为推流列表增加批量移除功能
|
2022-02-07 18:30:43 +08:00 |
|
648540858
|
e0028a87cb
|
为推流列表增加搜索功能
|
2022-02-07 14:12:34 +08:00 |
|
648540858
|
ea85a620d1
|
添加服务器信息获取能力。
|
2022-02-04 21:46:48 +08:00 |
|
648540858
|
646419e4ad
|
#247
|
2022-01-28 16:45:12 +08:00 |
|
648540858
|
8cfff8db97
|
添加对可能空指针的判断
|
2022-01-28 16:30:10 +08:00 |