jiang
|
716f0b95cc
|
1.修复新增用户没有pushkey的问题
2.将重置pushkey改为修改pushkey
|
2022-07-19 18:13:19 +08:00 |
|
648540858
|
64f6d596f4
|
移除共享所有直播流功能
|
2022-07-19 17:46:16 +08:00 |
|
648540858
|
fe6ca0c571
|
优化推流列表
|
2022-07-19 16:37:34 +08:00 |
|
648540858
|
a9fcd4502c
|
修复推流导入模板
|
2022-07-19 15:27:33 +08:00 |
|
648540858
|
f69f1bcb5f
|
修复更新推流状态sql错误
|
2022-07-19 14:27:30 +08:00 |
|
648540858
|
86deeedf85
|
修复用户查询sql错误
|
2022-07-19 11:13:46 +08:00 |
|
648540858
|
75e6b123ee
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-19 11:10:50 +08:00 |
|
648540858
|
bf189cb11b
|
为pushKey增加默认值
|
2022-07-18 20:38:47 +08:00 |
|
648540858
|
7e1b19e75f
|
MediaItem增加callId
|
2022-07-18 20:33:47 +08:00 |
|
jiang
|
90cc11e871
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-18 17:15:33 +08:00 |
|
jiang
|
9dcc315dbd
|
增加用户管理功能。管理员可以添加删除用户、修改用户密码、重置pushkey
|
2022-07-18 17:09:35 +08:00 |
|
648540858
|
11c47b139f
|
去除无用引用
|
2022-07-17 23:19:59 +08:00 |
|
648540858
|
0309140f48
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-17 23:17:55 +08:00 |
|
648540858
|
1a285ba00f
|
优化国标级联目录订阅通知以及目录查询回复
|
2022-07-17 23:17:36 +08:00 |
|
jiang
|
9fec9dc93a
|
测试提交权限
|
2022-07-13 11:29:46 +08:00 |
|
648540858
|
24fba85c38
|
支持从redis消息更新推流设备状态
|
2022-07-12 17:33:32 +08:00 |
|
648540858
|
86340fa1a2
|
支持从redis消息更新推流设备状态
|
2022-07-12 17:33:17 +08:00 |
|
648540858
|
6d8569f340
|
动态人物管理增加自检机制。防止内存溢出
|
2022-07-12 10:32:45 +08:00 |
|
648540858
|
0f945910f3
|
修复获取推流播放地址接口
|
2022-07-11 17:34:22 +08:00 |
|
648540858
|
56265c2f40
|
去除失效的配置，增加人物结束时移除人物缓存
|
2022-07-11 16:41:32 +08:00 |
|
648540858
|
a1d6e96c11
|
增加推流鉴权。保护服务安全
|
2022-07-11 16:21:01 +08:00 |
|
648540858
|
3b748f35b6
|
修复默认用户信息插入
|
2022-07-11 15:26:25 +08:00 |
|
648540858
|
99ab787468
|
用户表增加推流鉴权KEY
|
2022-07-08 11:20:29 +08:00 |
|
wangyimeng
|
401291eba5
|
Merge branch 'wvp-28181-2.0' of https://github.com/mrjackwang/wvp-GB28181-pro into wvp-28181-2.0
|
2022-07-06 15:33:43 +08:00 |
|
648540858
|
8fbed2b99d
|
界面优化
|
2022-07-06 10:18:56 +08:00 |
|
648540858
|
b1b4a45224
|
数据库优化
|
2022-07-06 09:44:37 +08:00 |
|
648540858
|
7be8f3668f
|
修复轨迹的储存与查询展示
|
2022-07-04 01:08:26 +08:00 |
|
648540858
|
c4d6f74091
|
修复通道数据写入数据库
|
2022-07-03 08:47:47 +08:00 |
|
648540858
|
0fea8cf29a
|
优化国标树型展示
|
2022-07-03 07:40:54 +08:00 |
|
648540858
|
7e90968141
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-06-23 10:14:56 +08:00 |
|
648540858
|
20f3e9885b
|
Merge pull request #530 from mk1990/wvp-28181-2.0
fix设备状态查询接口
|
2022-06-22 17:43:59 +08:00 |
|
mk1990
|
038ca32c56
|
添加国标级联录像控制功能
|
2022-06-22 16:47:26 +08:00 |
|
mk1990
|
8a924d10b1
|
添加国标级联录像控制功能
|
2022-06-22 16:39:07 +08:00 |
|
mk1990
|
c09c1013c4
|
添加国标级联录像控制功能
|
2022-06-22 16:31:58 +08:00 |
|
mk1990
|
b9aca76599
|
添加国标级联录像控制功能
|
2022-06-22 16:26:41 +08:00 |
|
mk1990
|
7643c7f18d
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
|
2022-06-22 14:42:46 +08:00 |
|
mk1990
|
04f6cf77bd
|
添加国标级联录像控制功能
|
2022-06-22 14:39:57 +08:00 |
|
mk1990
|
f3102831f6
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-06-22 14:27:33 +08:00 |
|
mk1990
|
615d11145e
|
添加国标级联录像控制功能
|
2022-06-22 14:26:46 +08:00 |
|
mk1990
|
4dae6820ee
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-06-22 13:38:25 +08:00 |
|
mk1990
|
341d4040e0
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
|
2022-06-22 13:34:56 +08:00 |
|
mk1990
|
51aad5dda4
|
添加国标级联录像控制功能
|
2022-06-22 13:33:55 +08:00 |
|
mk1990
|
e1a4790ed1
|
fix设备状态查询接口
|
2022-06-22 13:09:09 +08:00 |
|
648540858
|
e005fbf335
|
Merge pull request #527 from BradyXs/wvp-28181-2.0
fix(SIP): 修复海康NVR无parentId导致分屏监控没办法展开的问题
|
2022-06-22 10:02:53 +08:00 |
|
mk1990
|
b52863e685
|
添加国标级联录像控制功能；
|
2022-06-22 09:08:28 +08:00 |
|
mk1990
|
e87cd8cd91
|
fix设备状态查询接口
|
2022-06-20 15:10:31 +08:00 |
|
bradyxu
|
e5aca57579
|
fix(SIP): 修复海康NVR无parentId导致分屏监控没办法展开的问题
由于海康NVR通道信息中不带NVR的ID作为parentId。导致通道信息parentId缺失,
在通道信息中判断device信息中的DeviceId如果为NVR的话，将NVR的deviceId设置为通道的parentId
|
2022-06-18 10:40:24 +08:00 |
|
648540858
|
f0096af3e2
|
Merge pull request #524 from TristingChen/fixed--processTimeout
fixed--解决ssrc默认开启失败的问题，解决信令超时设备下线的bug
|
2022-06-17 16:05:35 +08:00 |
|
chenjialing
|
c8b7a182e9
|
fixed--解决ssrc默认开启失败的问题，解决信令超时设备下线的bug
|
2022-06-17 16:01:18 +08:00 |
|
648540858
|
e78986b6df
|
显示效果优化
|
2022-06-15 16:04:36 +08:00 |
|