Commit Graph

1299 Commits

Author SHA1 Message Date
648540858
778969f1eb Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-07-28 16:21:09 +08:00
648540858
fd091e545b 优化hook订阅机制 2022-07-28 16:18:41 +08:00
648540858
34f2832bef 优化gps信息存入数据库 2022-07-28 11:22:51 +08:00
庄梦蝶殇
fff3d64f85 fix 优化pom依赖,去除几个重复客户端。并改了几个 equals判断不精准的bug 2022-07-27 18:31:33 +08:00
648540858
f84eebdb75 优化部分hook订阅 2022-07-27 16:16:12 +08:00
648540858
d891b89c4b 去除多余内容 2022-07-27 14:53:19 +08:00
648540858
c7e09589af 去除多余内容 2022-07-27 14:51:49 +08:00
648540858
bc38f5ef29 修复流地址返回错误 2022-07-27 14:48:21 +08:00
648540858
76dedb11f8 bug修复 2022-07-27 11:11:18 +08:00
648540858
b957ab61c7 bug修复 2022-07-26 11:43:56 +08:00
648540858
c77c1a956c 修复推流推流状态提示 2022-07-25 11:17:46 +08:00
648540858
91dc4566a2 修复级联无通道时更新停止在等待更新的问题 2022-07-25 09:44:43 +08:00
648540858
8ee7211ba3 更新mysql.sql 2022-07-22 16:05:23 +08:00
648540858
e29d94c83f 增加推流添加功能,修复级联目录推送 2022-07-22 16:02:14 +08:00
648540858
eefe6f4c8d
Merge pull request #549 from TristingChen/fix-channel_status
优化----设备下线,通道状态也切换至离线状态
2022-07-20 17:54:42 +08:00
chenjialing
f66bf823fa 优化----设备下线,通道状态也切换至离线状态 2022-07-20 17:02:55 +08:00
mrjackwang
8d87741dea
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-07-20 13:51:30 +08:00
jiang
a51b411101 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-07-19 18:13:42 +08:00
jiang
fc0ad32f81 1.修复新增用户没有pushkey的问题
2.将重置pushkey改为修改pushkey
2022-07-19 18:13:19 +08:00
648540858
9e397ba9f6 移除共享所有直播流功能 2022-07-19 17:46:16 +08:00
648540858
7f5a18d6b5 优化推流列表 2022-07-19 16:37:34 +08:00
648540858
4a43d04020 修复推流导入模板 2022-07-19 15:27:33 +08:00
648540858
28b5cc39d0 修复更新推流状态sql错误 2022-07-19 14:27:30 +08:00
648540858
03864ae46f 修复用户查询sql错误 2022-07-19 11:13:46 +08:00
648540858
4765f9b9f2 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-07-19 11:10:50 +08:00
648540858
2b351e1e18 为pushKey增加默认值 2022-07-18 20:38:47 +08:00
648540858
c48def08cf MediaItem增加callId 2022-07-18 20:33:47 +08:00
jiang
1002150b2a Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-07-18 17:15:33 +08:00
jiang
c6fbd03276 增加用户管理功能。管理员可以添加删除用户、修改用户密码、重置pushkey 2022-07-18 17:09:35 +08:00
648540858
4d1c6401c2 去除无用引用 2022-07-17 23:19:59 +08:00
648540858
a509587980 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-07-17 23:17:55 +08:00
648540858
4451994959 优化国标级联目录订阅通知以及目录查询回复 2022-07-17 23:17:36 +08:00
jiang
fc89b7b517 测试提交权限 2022-07-13 11:29:46 +08:00
648540858
be5dbc9a21 支持从redis消息更新推流设备状态 2022-07-12 17:33:32 +08:00
648540858
81f69eb6f4 支持从redis消息更新推流设备状态 2022-07-12 17:33:17 +08:00
648540858
0b1cae75fe 动态人物管理增加自检机制。防止内存溢出 2022-07-12 10:32:45 +08:00
648540858
74d97734ba 修复获取推流播放地址接口 2022-07-11 17:34:22 +08:00
648540858
1a1a68784b 去除失效的配置,增加人物结束时移除人物缓存 2022-07-11 16:41:32 +08:00
648540858
afbec28906 增加推流鉴权。保护服务安全 2022-07-11 16:21:01 +08:00
648540858
44b06e1b6e 修复默认用户信息插入 2022-07-11 15:26:25 +08:00
648540858
fcd79b9864 用户表增加推流鉴权KEY 2022-07-08 11:20:29 +08:00
wangyimeng
5e724cc062 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
d7c293c867 界面优化 2022-07-06 10:18:56 +08:00
648540858
8aa0bdf539 数据库优化 2022-07-06 09:44:37 +08:00
648540858
10cb58391a 修复轨迹的储存与查询展示 2022-07-04 01:08:26 +08:00
648540858
5d673fb033 修复通道数据写入数据库 2022-07-03 08:47:47 +08:00
648540858
f5fcc79a2c 优化国标树型展示 2022-07-03 07:40:54 +08:00
648540858
0da452293f Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-06-23 10:14:56 +08:00
648540858
59e0767179
Merge pull request #530 from mk1990/wvp-28181-2.0
fix设备状态查询接口
2022-06-22 17:43:59 +08:00
mk1990
23bd11869b 添加国标级联录像控制功能 2022-06-22 16:47:26 +08:00