Commit Graph

1416 Commits

Author SHA1 Message Date
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
mk1990
b18abb3ee1 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-07 11:25:13 +08:00
648540858
cba8c4ae1d Merge pull request #468 from TristingChen/resetQuery--add
开发----增加预置位查询接口开发
2022-05-07 09:00:22 +08:00
mk1990
80d7a0cae5 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-06 17:46:01 +08:00
chenjialing
2a948e0bee 开发----增加预置位查询接口开发 2022-05-06 17:44:56 +08:00
648540858
87d8c8ad97 去除多与引用 2022-05-06 17:29:24 +08:00
648540858
e2dbd1f45b 优化地图功能的开关 2022-05-06 16:01:36 +08:00
648540858
d117122e27 统一userAgent 2022-05-06 15:55:32 +08:00
wangyimeng
11ef2f827e Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
# Conflicts:
#	bootstrap.sh
#	web_src/package-lock.json
#	web_src/static/js/jessibuca/decoder.wasm
2022-05-06 12:19:44 +08:00
wangyimeng
54fd12a95a 1 2022-05-06 12:05:12 +08:00
wangyimeng
63978c03a7 更新同步wvp 2022-05-06 11:56:29 +08:00
hotcoffie
8bcf3458f3 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-06 10:59:33 +08:00
648540858
0dd2267bb1 使用阿里代码规范。规范代码写法 2022-05-06 10:12:34 +08:00
648540858
5b4e6acfd1 使用阿里代码规范。规范代码写法 2022-05-05 17:07:16 +08:00
648540858
b13bb09a81 规范代码写法 2022-05-05 14:36:27 +08:00
648540858
69508b1744 优化收到心跳设置设备上线的逻辑 2022-05-05 14:26:42 +08:00
mk1990
7b6e801890 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-05 08:43:10 +08:00
xiaoxie
9b3eea169c 升级shelljs,解决较高版本node打包时的警告 2022-05-01 21:33:56 +08:00
xiaoxie
cffafbca54 替换一个过时的API,解决maven打包警告 2022-05-01 21:32:43 +08:00
648540858
78b8a59837 #453 2022-04-28 18:18:09 +08:00