Commit Graph

1158 Commits

Author SHA1 Message Date
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
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
ec749de7c1 #470 2022-05-12 18:17:15 +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
648540858
a8097c35da 更新readme 2022-05-07 14:44:00 +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
afe2450a14 优化地图功能的开关 2022-05-06 16:01:36 +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