Commit Graph

1168 Commits

Author SHA1 Message Date
648540858
f4e80deac2 Merge pull request #486 from hotcoffie/wvp-28181-2.0
一些细节修复
2022-05-23 09:49:37 +08:00
xiaoxie
9caa43c6dc 处理冲突 2022-05-23 09:44:21 +08:00
xiaoxie
524eac68ea 处理冲突 2022-05-23 09:42:32 +08:00
hotcoffie
7edeb6fbe0 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-23 09:15:59 +08:00
648540858
e886a09596 修复国标级联录像查询 #485 2022-05-21 21:13:12 +08:00
648540858
998b8323f3 支持sdp ip 配置为域名 2022-05-19 17:00:47 +08:00
mk1990
3aacaaed58 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
2a461af8d6 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-18 16:57:06 +08:00
648540858
d1c15ad520 优化单端口下的ssrc修复 2022-05-18 16:46:09 +08:00
648540858
05485f57cd 优化收到心跳的信息更新判断 2022-05-18 16:08:52 +08:00
648540858
1986a059f8 兼容海康ssrc问题 2022-05-18 15:47:20 +08:00
648540858
9c7c42245d 更新jessibuca播放器 2022-05-18 15:36:33 +08:00
mk1990
bc8f03ac1d 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
ffb9174623 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-18 14:36:47 +08:00
648540858
688da92808 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-05-18 10:44:39 +08:00
648540858
94ca772ef6 优化播放页面 2022-05-18 10:42:27 +08:00
648540858
10d7f091b5 Merge pull request #478 from wmz46/wvp-28181-2.0
无认证密码时,不校验是否存在授权头
2022-05-18 10:29:17 +08:00
648540858
a55aeb87db 优化播放页面 2022-05-18 10:01:58 +08:00
648540858
49b4ceaf7c 修复播放页面 2022-05-18 09:57:36 +08:00
648540858
eacefd82a3 添加直接支持切换多种开源播放器 2022-05-18 09:49:25 +08:00
hotcoffie
3b48a96da4 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-17 11:53:42 +08:00
钢翼
587de1b9e7 无认证密码时,不校验是否存在授权头 2022-05-17 08:18:38 +08:00
648540858
e231eadd7f 播放页面显示所有流地址 2022-05-16 17:49:44 +08:00
mk1990
57febb3b76 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
3cb59aa4d1 修改application-dev.yml 2022-05-16 10:10:50 +08:00
mk1990
1b72bdb1af Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-16 09:38:06 +08:00
WuPeng
b12729866e 添加on_record_ts事件支持 2022-05-13 22:22:10 +08:00
648540858
7e9e27f562 使用 java.time.Instant代替 java.util.Date 2022-05-13 22:15:31 +08:00
648540858
a14ce86632 优化录像结束发送BYE判断 2022-05-13 21:10:02 +08:00
648540858
fe029b566d 优化海康录像下载 2022-05-13 21:05:33 +08:00
648540858
84a4bc354f 去除过时注释 2022-05-13 15:45:02 +08:00
648540858
91170a292e 优化海康国标录像播放的控制 2022-05-13 15:41:50 +08:00
648540858
37c61c4fb0 支持海康摄像头国标录像查看播放 2022-05-13 15:32:30 +08:00
mk1990
8707f4110d Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-13 10:58:33 +08:00
648540858
db4aa30bc6 #470 2022-05-12 18:17:15 +08:00
648540858
9600c25b9a #471 2022-05-12 18:15:35 +08:00
648540858
9c1bb14286 修复缺失的设备时间 2022-05-12 17:48:52 +08:00
mk1990
df3b3965f7 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-12 16:16:55 +08:00
648540858
277c6ea039 修复代码 2022-05-12 10:48:50 +08:00
648540858
cf933d7d5e 修复新设备注册 2022-05-12 10:24:08 +08:00
648540858
d91b58de0a 修复设备缺失的数据 2022-05-11 20:22:15 +08:00
648540858
738a0ce036 优化设备在线状态 2022-05-11 18:37:24 +08:00
mk1990
0eb8962db8 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-10 18:02:09 +08:00
648540858
b3fe55709b 修复发流接口的调用 2022-05-10 11:01:33 +08:00
648540858
a5f6a0953e 优化级联点播流程 2022-05-10 10:58:26 +08:00
648540858
5548e4287f 优化推流调用 2022-05-10 09:45:09 +08:00
648540858
f4f2126452 优化目录获取并法能力 2022-05-10 09:38:05 +08:00
hotcoffie
26bc0f1afe Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-07 17:42:31 +08:00
648540858
d10aabaa5f 修复打包优化pom 2022-05-07 15:13:56 +08:00
648540858
6b74b8b573 更新readme 2022-05-07 14:44:00 +08:00