Commit Graph

1187 Commits

Author SHA1 Message Date
648540858
9a0ea9e322 修复级联点播时海康使用自定义ssrc的情况 2022-06-01 11:35:53 +08:00
648540858
8555d64f95 修复点播超时的事件设置 2022-05-31 16:20:46 +08:00
648540858
cf35daeb98 优化大数据下的设备树加载 2022-05-31 15:54:39 +08:00
648540858
0e2908c1be #488 2022-05-27 23:14:17 +08:00
648540858
f09f1c9a2a 换种写法 2022-05-27 18:23:43 +08:00
648540858
eda9bafd77
Merge pull request #497 from TristingChen/fixed--getAllSsrc
修复--获取全部ssrc的缓存问题修复
2022-05-27 18:22:23 +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
648540858
632630817b
Merge pull request #492 from mk1990/wvp-28181-2.0
解决海康设备在实时监控模块中无法获取到通道信息
2022-05-25 14:18:27 +08:00
648540858
0726bca36f
Merge pull request #491 from mk1990/wvp-28181-2.0
解决设备第一次注册获取不到设备信息和通道信息的问题
2022-05-25 14:09:43 +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
7a917ee50a 修复国标录像播放 2022-05-23 10:50:29 +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
648540858
72852799fc
Merge pull request #486 from hotcoffie/wvp-28181-2.0
一些细节修复
2022-05-23 09:49:37 +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
648540858
9ef1a0277b 更新jessibuca播放器 2022-05-18 15:36:33 +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
648540858
0ad8a11d8d Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-05-18 10:44:39 +08:00
648540858
ff83f2c7c8 优化播放页面 2022-05-18 10:42:27 +08:00
648540858
36e3398b76
Merge pull request #478 from wmz46/wvp-28181-2.0
无认证密码时,不校验是否存在授权头
2022-05-18 10:29:17 +08:00
648540858
17f219d351 优化播放页面 2022-05-18 10:01:58 +08:00
648540858
b9ffcd1d38 修复播放页面 2022-05-18 09:57:36 +08:00
648540858
3051fc82ee 添加直接支持切换多种开源播放器 2022-05-18 09:49:25 +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
648540858
bfb3b4ea13 播放页面显示所有流地址 2022-05-16 17:49:44 +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