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 |
|
648540858
|
1962030748
|
修复添加/修改节点页面的BUG
|
2022-04-28 17:58:47 +08:00 |
|
648540858
|
bf2f5e93e7
|
添加对点播时设备自定义ssrc的支持
|
2022-04-28 17:28:51 +08:00 |
|
mk1990
|
1f12dd9f8e
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-28 16:32:09 +08:00 |
|
648540858
|
25b71e8f56
|
Merge pull request #462 from hotcoffie/wvp-28181-2.0
多屏界面，切换分屏数时播放器正确调整尺寸
|
2022-04-28 14:43:07 +08:00 |
|
xiaoxie
|
db1cbe4dbc
|
多屏界面，切换分屏数时播放器正确调整尺寸
|
2022-04-28 14:23:17 +08:00 |
|
648540858
|
32a74092a4
|
Merge pull request #461 from hotcoffie/wvp-28181-2.0
修复多屏播放时播放器样式错位
|
2022-04-28 14:03:37 +08:00 |
|
648540858
|
78f7f7645c
|
Merge pull request #457 from J1031/bugfix/transaction_is_null
修复ServerTransaction空指针异常
|
2022-04-28 14:02:18 +08:00 |
|
xiaoxie
|
80908f321c
|
修复多屏播放时播放器样式错位
|
2022-04-28 13:40:26 +08:00 |
|
648540858
|
b8e63574a5
|
优化对Parental字段的判断
|
2022-04-28 10:05:56 +08:00 |
|
648540858
|
dcaa8e3713
|
优化对Parental字段的判断
|
2022-04-28 09:47:46 +08:00 |
|
quangz
|
908e97f62b
|
修复ServerTransaction空指针异常
|
2022-04-27 18:51:47 +08:00 |
|
648540858
|
65d081f8c4
|
判空
|
2022-04-26 18:46:18 +08:00 |
|
648540858
|
5cabd8ff30
|
优化级联目录发送
|
2022-04-26 18:29:47 +08:00 |
|
648540858
|
19b4694d1d
|
行政区划作为级联数据的处理,修复设备树的显示
|
2022-04-26 17:24:41 +08:00 |
|
648540858
|
71c44e0785
|
Merge pull request #451 from itouxin/patch-1
修复docker运行配置WVP_CONFIG后，相关配置未生效的问题
|
2022-04-26 17:18:57 +08:00 |
|
648540858
|
cfbfb134f6
|
Merge pull request #452 from hotcoffie/wvp-28181-2.0
优化播放器尺寸调节逻辑：
|
2022-04-26 17:18:45 +08:00 |
|
mk1990
|
39bddf773c
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-26 15:32:23 +08:00 |
|
xiaoxie
|
fd3d2c31dc
|
优化播放器尺寸调节逻辑：
1.播放器不会大于屏幕高度
2.增加灰色背景色区分播放区域
3.播放器居中
|
2022-04-26 15:03:44 +08:00 |
|
TouXin
|
6315502dc7
|
Update DOCKERFILE
修复docker运行配置WVP_CONFIG后，相关配置未生效的问题
|
2022-04-26 14:32:02 +08:00 |
|
648540858
|
8248c32b4b
|
多级虚拟组织处理修复
|
2022-04-25 17:13:22 +08:00 |
|
648540858
|
de58ebeec3
|
多级虚拟组织处理修复
|
2022-04-25 17:12:29 +08:00 |
|
648540858
|
6e65006354
|
对于虚拟目录中出现多级虚拟组织的情况进行处理
|
2022-04-25 16:55:38 +08:00 |
|
648540858
|
bec3091767
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-24 16:34:21 +08:00 |
|
648540858
|
de21837334
|
增加redis通知方式向设备/平台发送报警消息功能
|
2022-04-24 16:33:59 +08:00 |
|
648540858
|
4511ad1da3
|
Merge pull request #449 from hotcoffie/wvp-28181-2.0
修复一处日志打印错误
|
2022-04-24 14:52:01 +08:00 |
|
xiaoxie
|
5fbece4cd8
|
修复一处日志打印错误
|
2022-04-24 09:51:54 +08:00 |
|
648540858
|
31f28cd72b
|
Merge pull request #448 from hotcoffie/wvp-28181-2.0
1.修正了播放地址无法正常播放视频的问题，包含两个错误：
|
2022-04-24 09:30:16 +08:00 |
|
xiaoxie
|
6c48fb23ca
|
live页面,删除一个不再使用的一些变量和函数
|
2022-04-24 00:36:18 +08:00 |
|
xiaoxie
|
7ca269ffb7
|
live页面适配palyer组件的修改
|
2022-04-24 00:30:31 +08:00 |
|